avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-06-07 08:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Amoled theme

Browse Source 
Upgrade Gradle 7.1-rc-1 > 7.2
Bumped Kotlin Version 1.5.20 > 1.5.31
Gradle FIles cleanup
All dependencies upgraded
This commit is contained in:
LooKeR 2021-10-07 00:27:07 +05:30
parent f79d666219
commit 5d4fb29f9e
10 changed files with 136 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build.gradle
View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext.versions = [ ext.versions = [
kotlin: '1.5.10' kotlin: '1.5.31'
] ]
repositories { repositories {
@ -10,7 +10,7 @@ buildscript {
dependencies { dependencies {
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + versions.kotlin classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:' + versions.kotlin
classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.android.tools.build:gradle:7.0.2'
} }
} }
@ -18,15 +18,17 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
android { android {
compileSdkVersion 29
compileSdk 31
defaultConfig { defaultConfig {
archivesBaseName = 'droidify' archivesBaseName = 'droidify'
applicationId 'com.looker.droidify' applicationId 'com.looker.droidify'
minSdkVersion 28 minSdk 28
targetSdkVersion 29 targetSdk 31
versionCode 2 versionCode 3
versionName '0.2' versionName '0.3'
vectorDrawables.useSupportLibrary true
def languages = ['en'] def languages = ['en']
buildConfigField 'String[]', 'LANGUAGES', '{ "' + languages.join('", "') + '" }' buildConfigField 'String[]', 'LANGUAGES', '{ "' + languages.join('", "') + '" }'
@ -38,15 +40,6 @@ android {
it.java.srcDirs += new File(javaDir.parentFile, 'kotlin') it.java.srcDirs += new File(javaDir.parentFile, 'kotlin')
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = compileOptions.sourceCompatibility.toString()
}
buildTypes { buildTypes {
debug { debug {
minifyEnabled false minifyEnabled false
@ -54,7 +47,7 @@ android {
} }
release { release {
minifyEnabled true minifyEnabled true
shrinkResources false shrinkResources true
} }
all { all {
crunchPngs false crunchPngs false
@ -114,13 +107,11 @@ repositories {
} }
dependencies { dependencies {
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation 'androidx.fragment:fragment-ktx:1.3.4'
implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation 'androidx.viewpager2:viewpager2:1.0.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
implementation 'io.reactivex.rxjava3:rxjava:3.0.4' implementation 'io.reactivex.rxjava3:rxjava:3.1.1'
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
implementation 'com.fasterxml.jackson.core:jackson-core:2.12.1' implementation 'com.fasterxml.jackson.core:jackson-core:2.13.0'
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Jun 04 15:33:52 IST 2021 #Wed Oct 06 17:43:04 IST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-rc-1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

152
src/main/AndroidManifest.xml
View File

@ -1,93 +1,99 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools" package="com.looker.droidify">
package="com.looker.droidify">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<application <application
android:name="com.looker.droidify.MainApplication" android:name="com.looker.droidify.MainApplication"
android:label="@string/application_name" android:allowBackup="false"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:supportsRtl="true" android:label="@string/application_name"
android:allowBackup="false" android:supportsRtl="true"
android:theme="@style/MainTheme" android:theme="@style/MainTheme"
tools:ignore="GoogleAppIndexingWarning"> tools:ignore="GoogleAppIndexingWarning">
<receiver <receiver
android:name="com.looker.droidify.MainApplication$BootReceiver"> android:name="com.looker.droidify.MainApplication$BootReceiver"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity <activity
android:name="com.looker.droidify.MainActivity" android:name="com.looker.droidify.MainActivity"
android:launchMode="singleTask" android:exported="true"
android:windowSoftInputMode="adjustResize"> android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="fdroid.app" />
</intent-filter>
<intent-filter> <category android:name="android.intent.category.DEFAULT" />
<action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="market" android:host="details" />
</intent-filter>
<intent-filter> <data android:scheme="fdroid.app" />
<action android:name="android.intent.action.VIEW" /> </intent-filter>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="f-droid.org" />
<data android:host="www.f-droid.org" />
<data android:host="staging.f-droid.org" />
<data android:pathPattern="/app/.*" />
<data android:pathPattern="/packages/.*" />
<data android:pathPattern="/.*/packages/.*" />
</intent-filter>
</activity> <intent-filter>
<action android:name="android.intent.action.VIEW" />
<service <category android:name="android.intent.category.DEFAULT" />
android:name="com.looker.droidify.service.SyncService" /> <category android:name="android.intent.category.BROWSABLE" />
<service <data
android:name="com.looker.droidify.service.SyncService$Job" android:host="details"
android:exported="true" android:scheme="market" />
android:permission="android.permission.BIND_JOB_SERVICE" /> </intent-filter>
<service <intent-filter>
android:name="com.looker.droidify.service.DownloadService" /> <action android:name="android.intent.action.VIEW" />
<receiver <category android:name="android.intent.category.DEFAULT" />
android:name="com.looker.droidify.service.DownloadService$Receiver" /> <category android:name="android.intent.category.BROWSABLE" />
<provider <data android:scheme="http" />
android:name="com.looker.droidify.content.Cache$Provider" <data android:scheme="https" />
android:authorities="${applicationId}.provider.cache" <data android:host="f-droid.org" />
android:exported="false" <data android:host="www.f-droid.org" />
android:grantUriPermissions="true" /> <data android:host="staging.f-droid.org" />
<data android:pathPattern="/app/.*" />
<data android:pathPattern="/packages/.*" />
<data android:pathPattern="/.*/packages/.*" />
</intent-filter>
</application> </activity>
<service android:name="com.looker.droidify.service.SyncService" />
<service
android:name="com.looker.droidify.service.SyncService$Job"
android:exported="true"
android:permission="android.permission.BIND_JOB_SERVICE" />
<service android:name="com.looker.droidify.service.DownloadService" />
<receiver android:name="com.looker.droidify.service.DownloadService$Receiver" />
<provider
android:name="com.looker.droidify.content.Cache$Provider"
android:authorities="${applicationId}.provider.cache"
android:exported="false"
android:grantUriPermissions="true" />
</application>
</manifest> </manifest>

7
src/main/kotlin/com/looker/droidify/content/Preferences.kt
View File

@ -171,7 +171,8 @@ object Preferences {
sealed class Theme(override val valueString: String) : Enumeration<Theme> { sealed class Theme(override val valueString: String) : Enumeration<Theme> {
override val values: List<Theme> override val values: List<Theme>
get() = if (Android.sdk(29)) listOf(System, Light, Dark) else listOf(Light, Dark) get() = if (Android.sdk(29)) listOf(System, Light, Dark, Amoled)
else listOf(Light, Dark, Amoled)
abstract fun getResId(configuration: Configuration): Int abstract fun getResId(configuration: Configuration): Int
@ -189,6 +190,10 @@ object Preferences {
object Dark : Theme("dark") { object Dark : Theme("dark") {
override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Dark override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Dark
} }
object Amoled : Theme("amoled") {
override fun getResId(configuration: Configuration): Int = R.style.Theme_Main_Amoled
}
} }
operator fun <T> get(key: Key<T>): T { operator fun <T> get(key: Key<T>): T {

5
src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
View File

@ -474,9 +474,8 @@ class EditRepositoryFragment() : ScreenFragment() {
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe { result, throwable -> .subscribe { result, throwable ->
checkDisposable = null checkDisposable = null
throwable?.printStackTrace() throwable.printStackTrace()
val resultAddress = val resultAddress = if (result.isEmpty()) address else result
result?.let { if (it.isEmpty()) null else it } ?: address
val allow = resultAddress == address || run { val allow = resultAddress == address || run {
layout.address.setText(resultAddress) layout.address.setText(resultAddress)
invalidateAddress(resultAddress) invalidateAddress(resultAddress)

1
src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt
View File

@ -100,6 +100,7 @@ class SettingsFragment : ScreenFragment() {
is Preferences.Theme.System -> getString(R.string.system) is Preferences.Theme.System -> getString(R.string.system)
is Preferences.Theme.Light -> getString(R.string.light) is Preferences.Theme.Light -> getString(R.string.light)
is Preferences.Theme.Dark -> getString(R.string.dark) is Preferences.Theme.Dark -> getString(R.string.dark)
is Preferences.Theme.Amoled -> getString(R.string.amoled)
} }
} }
addSwitch( addSwitch(

4
src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt
View File

@ -7,6 +7,7 @@ import android.content.res.ColorStateList
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Typeface import android.graphics.Typeface
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.graphics.drawable.VectorDrawable
import android.net.Uri import android.net.Uri
import android.util.TypedValue import android.util.TypedValue
import android.util.Xml import android.util.Xml
@ -16,7 +17,6 @@ import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import com.looker.droidify.utility.extension.android.Android import com.looker.droidify.utility.extension.android.Android
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import com.squareup.picasso.RequestCreator import com.squareup.picasso.RequestCreator
@ -37,7 +37,7 @@ fun Context.getDrawableCompat(resId: Int): Drawable {
.find { it == XmlPullParser.START_TAG || it == XmlPullParser.END_DOCUMENT } .find { it == XmlPullParser.START_TAG || it == XmlPullParser.END_DOCUMENT }
if (eventType == XmlPullParser.START_TAG) { if (eventType == XmlPullParser.START_TAG) {
when (it.name) { when (it.name) {
"vector" -> VectorDrawableCompat.createFromXmlInner( "vector" -> VectorDrawable.createFromXmlInner(
resources, resources,
it, it,
Xml.asAttributeSet(it), Xml.asAttributeSet(it),

21
src/main/res/values/colors.xml
View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="default_green">#3EDA86</color> <color name="default_green">#3EDA86</color>
<color name="default_green_dark">#36C378</color> <color name="default_green_dark">#36C378</color>
<color name="white">#FFFFFF</color> <color name="white">#FFFFFF</color>
<color name="black">#1E1E1E</color> <color name="black">#1E1E1E</color>
<color name="grey_light">#333333</color> <color name="pitch_black">#000000</color>
<color name="grey_dark">#595959</color> <color name="grey_light">#333333</color>
<color name="accent_default_dark">#ff47a2fc</color> <color name="grey_dark">#595959</color>
<color name="error_default_dark">#D36C6B</color> <color name="accent_default_dark">#69ECA6</color>
<color name="accent_default_light">#ff1976d2</color> <color name="accent_default_light">#2C8756</color>
<color name="error_default_light">#F48886</color> <color name="error_default_dark">#D36C6B</color>
<color name="error_default_light">#F48886</color>
</resources> </resources>

1
src/main/res/values/strings.xml
View File

@ -8,6 +8,7 @@
<string name="all_applications_up_to_date">All applications up to date</string> <string name="all_applications_up_to_date">All applications up to date</string>
<string name="already_exists">Already exists</string> <string name="already_exists">Already exists</string>
<string name="always">Always</string> <string name="always">Always</string>
<string name="amoled">Amoled</string>
<string name="anti_features">Anti-features</string> <string name="anti_features">Anti-features</string>
<string name="application">Application</string> <string name="application">Application</string>
<string name="application_name" translatable="false">Droid-ify</string> <string name="application_name" translatable="false">Droid-ify</string>

19
src/main/res/values/styles.xml
View File

@ -43,6 +43,25 @@
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item> <item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
</style> </style>
<style name="Theme.Main.Amoled" parent="@android:style/Theme.Material.NoActionBar">
<item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
<item name="android:windowBackground">@color/pitch_black</item>
<item name="android:colorPrimary">@color/default_green_dark</item>
<item name="android:colorPrimaryDark">@color/pitch_black</item>
<item name="android:colorBackground">@color/pitch_black</item>
<item name="colorOnBackground">@color/black</item>
<item name="android:colorAccent">@color/accent_dark</item>
<item name="android:colorControlActivated">@color/default_green_dark</item>
<item name="colorError">@color/error_dark</item>
<item name="android:titleTextColor">@color/default_green_dark</item>
<item name="android:textColorPrimary">@color/default_green</item>
<item name="android:textColor">@color/white</item>
<item name="subTextColor">@color/black</item>
<item name="android:popupTheme">@style/Theme.Popup.Dark</item>
<item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
<item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
</style>
<style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar"> <style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar">
<item name="android:titleTextAppearance"> <item name="android:titleTextAppearance">
@android:style/TextAppearance.Material.Widget.Toolbar.Title @android:style/TextAppearance.Material.Widget.Toolbar.Title