From 5d4fb29f9ef9e9cee91ef583ed5de1d40eee947a Mon Sep 17 00:00:00 2001 From: LooKeR Date: Thu, 7 Oct 2021 00:27:07 +0530 Subject: [PATCH] Added Amoled theme Upgrade Gradle 7.1-rc-1 > 7.2 Bumped Kotlin Version 1.5.20 > 1.5.31 Gradle FIles cleanup All dependencies upgraded --- build.gradle | 35 ++-- gradle/wrapper/gradle-wrapper.properties | 4 +- src/main/AndroidManifest.xml | 152 +++++++++--------- .../looker/droidify/content/Preferences.kt | 7 +- .../droidify/screen/EditRepositoryFragment.kt | 5 +- .../droidify/screen/SettingsFragment.kt | 1 + .../droidify/utility/extension/Resources.kt | 4 +- src/main/res/values/colors.xml | 21 +-- src/main/res/values/strings.xml | 1 + src/main/res/values/styles.xml | 19 +++ 10 files changed, 136 insertions(+), 113 deletions(-) diff --git a/build.gradle b/build.gradle index 8787e1df..1935da20 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.versions = [ - kotlin: '1.5.10' + kotlin: '1.5.31' ] repositories { @@ -10,7 +10,7 @@ buildscript { dependencies { 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' android { - compileSdkVersion 29 + compileSdk 31 defaultConfig { archivesBaseName = 'droidify' applicationId 'com.looker.droidify' - minSdkVersion 28 - targetSdkVersion 29 - versionCode 2 - versionName '0.2' + minSdk 28 + targetSdk 31 + versionCode 3 + versionName '0.3' + + vectorDrawables.useSupportLibrary true def languages = ['en'] buildConfigField 'String[]', 'LANGUAGES', '{ "' + languages.join('", "') + '" }' @@ -38,15 +40,6 @@ android { 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 { debug { minifyEnabled false @@ -54,7 +47,7 @@ android { } release { minifyEnabled true - shrinkResources false + shrinkResources true } all { crunchPngs false @@ -114,13 +107,11 @@ repositories { } dependencies { - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin - implementation 'androidx.fragment:fragment-ktx:1.3.4' + implementation 'androidx.fragment:fragment-ktx:1.3.6' 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 'io.reactivex.rxjava3:rxjava:3.0.4' + implementation 'io.reactivex.rxjava3:rxjava:3.1.1' 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' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eeb815b8..15a3a95c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 04 15:33:52 IST 2021 +#Wed Oct 06 17:43:04 IST 2021 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 zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index bf04d447..46adbecb 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,93 +1,99 @@ - + - - - - - + + + + + - + - + - - - + + + - + - + - - - - + + + + - - - - - - + + - - - - - - + + - - - - - - - - - - - - - + + - + + - + + - + + - + + - + + - + + + + + + + + + - + + + + + + + + + + + + + diff --git a/src/main/kotlin/com/looker/droidify/content/Preferences.kt b/src/main/kotlin/com/looker/droidify/content/Preferences.kt index 5c86d670..a0d8d6e2 100644 --- a/src/main/kotlin/com/looker/droidify/content/Preferences.kt +++ b/src/main/kotlin/com/looker/droidify/content/Preferences.kt @@ -171,7 +171,8 @@ object Preferences { sealed class Theme(override val valueString: String) : Enumeration { override val values: List - 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 @@ -189,6 +190,10 @@ object Preferences { object Dark : Theme("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 get(key: Key): T { diff --git a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt index 5991fd73..9aa210fa 100644 --- a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt @@ -474,9 +474,8 @@ class EditRepositoryFragment() : ScreenFragment() { .observeOn(AndroidSchedulers.mainThread()) .subscribe { result, throwable -> checkDisposable = null - throwable?.printStackTrace() - val resultAddress = - result?.let { if (it.isEmpty()) null else it } ?: address + throwable.printStackTrace() + val resultAddress = if (result.isEmpty()) address else result val allow = resultAddress == address || run { layout.address.setText(resultAddress) invalidateAddress(resultAddress) diff --git a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt index 2f9532f8..bcd37d52 100644 --- a/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/SettingsFragment.kt @@ -100,6 +100,7 @@ class SettingsFragment : ScreenFragment() { is Preferences.Theme.System -> getString(R.string.system) is Preferences.Theme.Light -> getString(R.string.light) is Preferences.Theme.Dark -> getString(R.string.dark) + is Preferences.Theme.Amoled -> getString(R.string.amoled) } } addSwitch( diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt b/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt index 5de62429..feaaa775 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt +++ b/src/main/kotlin/com/looker/droidify/utility/extension/Resources.kt @@ -7,6 +7,7 @@ import android.content.res.ColorStateList import android.content.res.Resources import android.graphics.Typeface import android.graphics.drawable.Drawable +import android.graphics.drawable.VectorDrawable import android.net.Uri import android.util.TypedValue import android.util.Xml @@ -16,7 +17,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.core.content.ContextCompat -import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat import com.looker.droidify.utility.extension.android.Android import com.squareup.picasso.Picasso import com.squareup.picasso.RequestCreator @@ -37,7 +37,7 @@ fun Context.getDrawableCompat(resId: Int): Drawable { .find { it == XmlPullParser.START_TAG || it == XmlPullParser.END_DOCUMENT } if (eventType == XmlPullParser.START_TAG) { when (it.name) { - "vector" -> VectorDrawableCompat.createFromXmlInner( + "vector" -> VectorDrawable.createFromXmlInner( resources, it, Xml.asAttributeSet(it), diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index e576eed9..296017a4 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,14 +1,15 @@ - #3EDA86 - #36C378 - #FFFFFF - #1E1E1E - #333333 - #595959 - #ff47a2fc - #D36C6B - #ff1976d2 - #F48886 + #3EDA86 + #36C378 + #FFFFFF + #1E1E1E + #000000 + #333333 + #595959 + #69ECA6 + #2C8756 + #D36C6B + #F48886 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index d0f90282..9594a720 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -8,6 +8,7 @@ All applications up to date Already exists Always + Amoled Anti-features Application Droid-ify diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index d81e016e..99a814fe 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -43,6 +43,25 @@ @drawable/scrollbar_track + +