Merge pull request #491 from AniTrend/release/1.9.11

Release/1.9.11
AniTrend · Oct 10, 2022 · 97826aa · 97826aa
2 parents 1df8132 + 2d368d6
commit 97826aa
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 39 deletions.
diff --git a/app/.meta/version.json b/app/.meta/version.json
@@ -1,8 +1,8 @@
 {
-    "code": 1009010000,
+    "code": 1009011000,
     "migration": false,
     "minSdk": 17,
     "releaseNotes": "",
-    "version": "1.9.10",
+    "version": "1.9.11",
     "appId": "com.mxt.anitrend"
 }
diff --git a/app/src/github/java/com/mxt/anitrend/base/custom/activity/ActivityDelegateExtensions.kt b/app/src/github/java/com/mxt/anitrend/base/custom/activity/ActivityDelegateExtensions.kt
@@ -40,9 +40,9 @@ private fun MainActivity.onUpdateChecked(silent: Boolean, menuItems: Menu) {
         if (remoteVersion.isNewerVersion) {
             // If a new version of the application is available on GitHub
             val mAppUpdateWidget = menuItems.findItem(R.id.nav_check_update)
-                .actionView.findViewById<TextView>(R.id.app_update_info)
-            mAppUpdateWidget.text = getString(R.string.app_update, remoteVersion.version)
-            mAppUpdateWidget.visibility = View.VISIBLE
+                .actionView?.findViewById<TextView>(R.id.app_update_info)
+            mAppUpdateWidget?.text = getString(R.string.app_update, remoteVersion.version)
+            mAppUpdateWidget?.visibility = View.VISIBLE
         } else if (!silent) {
             onLatestUpdateInstalled()
         }

diff --git a/app/src/main/assets/changelog.md b/app/src/main/assets/changelog.md
@@ -6,17 +6,12 @@ Read the **FAQ** for issues regarding NSFW and notifications. Goto **Options** -
 ## What's Changed
 
 ### Enhancements
-- Improve share button experience. Thanks @Luk1337
 - Improve notification experience @Luk1337
 
-- Restore legacy markdown rendering with option to enable experimental mode in settings
-
 
 
 ### Bug Fixes
-- Many quality of life bug fixes. Thanks @Luk1337
-- Duplicate entries for list styles in settings
-- Translations not being applied correctly
+- Notification delivery on Android 12+. Thanks @Luk1337
 
 ### Current Issues
 - Gifs may show artifacts if more than one is playing at a given moment (with experimental markdown support in settings)

diff --git a/app/src/main/java/com/mxt/anitrend/initializer/injector/InjectorInitializer.kt b/app/src/main/java/com/mxt/anitrend/initializer/injector/InjectorInitializer.kt
@@ -6,6 +6,8 @@ import com.mxt.anitrend.BuildConfig
 import com.mxt.anitrend.extension.workManagerFactory
 import com.mxt.anitrend.initializer.ApplicationInitializer
 import com.mxt.anitrend.koin.appModules
+import com.mxt.anitrend.util.Settings
+import com.mxt.anitrend.util.locale.LocaleUtil
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import org.koin.core.logger.KOIN_TAG
@@ -23,7 +25,12 @@ class InjectorInitializer : Initializer<Unit> {
      */
     override fun create(context: Context) {
         startKoin {
-            androidContext(context)
+            androidContext(
+                LocaleUtil.applyConfiguration(
+                    context,
+                    Settings(context)
+                )
+            )
             logger(KoinLogger())
             workManagerFactory()
             modules(appModules)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -25,7 +25,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
-val buildToolsVersion = "7.2.1"
+val buildToolsVersion = "7.3.0"
 val kotlinVersion = "1.6.21"
 val manesVersion = "0.38.0"
 

diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/Libraries.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/Libraries.kt
@@ -14,8 +14,6 @@ object Libraries {
 
     const val betterLinkMovement = "me.saket:better-link-movement-method:${Versions.betterLinkMovement}"
 
-    const val scalingImageView = "com.davemorrissey.labs:subsampling-scale-image-view-androidx:${Versions.scalingImageView}"
-
     const val prettyTime = "org.ocpsoft.prettytime:prettytime:${Versions.prettyTime}"
 
     object Repositories {
@@ -27,28 +25,26 @@ object Libraries {
     object Android {
 
         object Tools {
-            private const val version = "4.1.3"
+            private const val version = "7.3.0"
             const val buildGradle = "com.android.tools.build:gradle:$version"
         }
     }
 
     object AndroidX {
 
         object Activity {
-            private const val version = "1.6.0-alpha05"
-            const val activity = "androidx.activity:activity:$version"
+            private const val version = "1.6.0"
             const val activityKtx = "androidx.activity:activity-ktx:$version"
         }
 
         object AppCompat {
-            private const val version = "1.6.0-alpha05"
+            private const val version = "1.6.0-rc01"
             const val appcompat = "androidx.appcompat:appcompat:$version"
             const val appcompatResources = "androidx.appcompat:appcompat-resources:$version"
         }
 
         object Collection {
             private const val version = "1.2.0"
-            const val collection = "androidx.collection:collection:$version"
             const val collectionKtx = "androidx.collection:collection-ktx:$version"
         }
 
@@ -64,14 +60,8 @@ object Libraries {
             const val constraintLayoutSolver = "androidx.constraintlayout:constraintlayout-solver:$version"
         }
 
-        object Emoji {
-            private const val version = "1.1.0"
-            const val appCompat = "androidx.emoji:emoji-appcompat:$version"
-        }
-
         object Fragment {
-            private const val version = "1.5.0"
-            const val fragment = "androidx.fragment:fragment:$version"
+            private const val version = "1.5.3"
             const val fragmentKtx = "androidx.fragment:fragment-ktx:$version"
             const val test = "androidx.fragment:fragment-ktx:fragment-testing$version"
         }
@@ -157,7 +147,6 @@ object Libraries {
 
             object Analytics {
                 private const val version = "18.0.2"
-                const val analytics = "com.google.firebase:firebase-analytics:$version"
                 const val analyticsKtx = "com.google.firebase:firebase-analytics-ktx:$version"
             }
 
@@ -215,10 +204,6 @@ object Libraries {
                 const val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
             }
 
-            object Android {
-                const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
-            }
-
             object Serialization {
                 const val serialization = "org.jetbrains.kotlin:kotlin-serialization:$version"
             }
@@ -245,8 +230,6 @@ object Libraries {
         const val core = "io.insert-koin:koin-core:$version"
 
         object AndroidX {
-            const val compose = "io.insert-koin:koin-androidx-compose:$version"
-            const val navigation = "io.insert-koin:koin-androidx-navigation:$version"
             const val workManager = "io.insert-koin:koin-androidx-workmanager:$version"
         }
 

diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/common/Configuration.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/common/Configuration.kt
@@ -21,11 +21,11 @@ object Configuration {
 
     private const val major = 1
     private const val minor = 9
-    private const val patch = 10
+    private const val patch = 11
     private const val candidate = 0
 
-    const val compileSdk = 32
-    const val targetSdk = 32
+    const val compileSdk = 33
+    const val targetSdk = 33
     const val minSdk = 17
 
     private const val channel = "beta"

diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/common/Versions.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/common/Versions.kt
@@ -8,7 +8,6 @@ object Versions {
     const val treesSence = "1.0.4"
 
     const val prettyTime = "4.0.4.Final"
-    const val scalingImageView = "3.10.0"
 
     const val betterLinkMovement = "2.2.0"
 

diff --git a/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/ProjectDependencies.kt b/buildSrc/src/main/java/com/mxt/anitrend/buildsrc/componets/ProjectDependencies.kt
@@ -30,6 +30,7 @@ internal fun Project.configureDependencies() {
     )
 
     dependencies.implementation(Libraries.JetBrains.Kotlin.stdlib)
+    dependencies.implementation(Libraries.JetBrains.Kotlin.reflect)
     dependencies.implementation(Libraries.JetBrains.KotlinX.Serialization.json)
     dependencies.implementation(Libraries.JetBrains.KotlinX.Coroutines.android)
     dependencies.implementation(Libraries.JetBrains.KotlinX.Coroutines.core)
@@ -57,6 +58,7 @@ internal fun Project.configureDependencies() {
     dependencies.implementation(Libraries.AndroidX.StartUp.startUpRuntime)
 
     dependencies.implementation(Libraries.AndroidX.Lifecycle.liveDataCoreKtx)
+    dependencies.implementation(Libraries.AndroidX.Lifecycle.viewModelKtx)
     dependencies.implementation(Libraries.AndroidX.Lifecycle.runTimeKtx)
     dependencies.implementation(Libraries.AndroidX.Lifecycle.liveDataKtx)
     dependencies.implementation(Libraries.AndroidX.Lifecycle.extensions)
@@ -65,6 +67,7 @@ internal fun Project.configureDependencies() {
     dependencies.implementation (Libraries.Koin.core)
     dependencies.implementation (Libraries.Koin.android)
     dependencies.implementation (Libraries.Koin.AndroidX.workManager)
+    dependencies.testImplementation(Libraries.Koin.Test.test)
     dependencies.androidTestImplementation(Libraries.Koin.Test.testJUnit4)
 
     /** Glide Libraries */
@@ -123,6 +126,7 @@ internal fun Project.configureDependencies() {
     dependencies.androidTestImplementation(Libraries.AndroidX.Test.coreKtx)
     dependencies.androidTestImplementation(Libraries.AndroidX.Test.rules)
     dependencies.androidTestImplementation(Libraries.AndroidX.Test.runner)
+    dependencies.androidTestImplementation(Libraries.AndroidX.Fragment.test)
     dependencies.androidTestImplementation(Libraries.AndroidX.Test.Espresso.core)
     dependencies.androidTestImplementation(Libraries.AndroidX.Test.Extension.junitKtx)
     dependencies.androidTestImplementation(Libraries.Mockito.core)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip