Update kotlin and android target version

Martin Styk · Martin Styk · commit 1bc04af70a49 · 2023-12-28T20:38:09.000+01:00
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -31,6 +31,7 @@ android {
     buildFeatures {
         viewBinding = true
         dataBinding = true
+        buildConfig = true
     }
     lint {
         disable += "MissingTranslation"
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ActivityCommonModule.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ActivityCommonModule.kt
@@ -11,15 +11,14 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityComponent
 import dagger.hilt.android.scopes.ActivityScoped
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 import sk.styk.martin.apkanalyzer.manager.analytics.AnalyticsTracker
 import sk.styk.martin.apkanalyzer.manager.analytics.FragmentScreenTracker
 import sk.styk.martin.apkanalyzer.manager.navigationdrawer.ForegroundFragmentWatcher
 import sk.styk.martin.apkanalyzer.manager.permission.PermissionManager
 import sk.styk.martin.apkanalyzer.manager.permission.PermissionsManagerImpl
 import sk.styk.martin.apkanalyzer.manager.promo.UserReviewManager
 import sk.styk.martin.apkanalyzer.manager.resources.ActivityColorThemeManager
-import sk.styk.martin.apkanalyzer.manager.resources.ColorThemeManager
-import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 
 @InstallIn(ActivityComponent::class)
 @Module
@@ -51,14 +50,14 @@ class ActivityCommonModule {
 
     @Provides
     @ActivityScoped
-    fun provideColorThemeManager(activity: AppCompatActivity, applicationColorThemeManager: ColorThemeManager): ActivityColorThemeManager {
+    fun provideColorThemeManager(activity: AppCompatActivity): ActivityColorThemeManager {
         val activityColorThemeManager: ActivityColorThemeManager =
             ViewModelProvider(
                 activity,
                 object : ViewModelProvider.Factory {
                     override fun <T : ViewModel> create(modelClass: Class<T>): T {
                         @Suppress("UNCHECKED_CAST")
-                        return ActivityColorThemeManager(applicationColorThemeManager) as T
+                        return ActivityColorThemeManager() as T
                     }
                 },
             )[ActivityColorThemeManager::class.java]
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ApplicationModule.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ApplicationModule.kt
@@ -5,7 +5,6 @@ import android.app.NotificationManager
 import android.content.ContentResolver
 import android.content.Context
 import android.content.SharedPreferences
-import android.content.pm.PackageManager
 import androidx.preference.PreferenceManager
 import com.google.android.play.core.review.ReviewManager
 import com.google.android.play.core.review.ReviewManagerFactory
@@ -15,8 +14,6 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import sk.styk.martin.apkanalyzer.manager.resources.ColorThemeManager
-import sk.styk.martin.apkanalyzer.manager.resources.ColorThemeManagerImpl
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
@@ -35,9 +32,6 @@ class ApplicationModule {
     fun provideNotificationManager(@ApplicationContext context: Context): NotificationManager =
         context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    @Provides
-    fun provideColorThemeManagerImpl(colorThemeManagerImpl: ColorThemeManagerImpl): ColorThemeManager = colorThemeManagerImpl
-
     @Provides
     fun provideFirebaseAnalytics(@ApplicationContext context: Context): FirebaseAnalytics = FirebaseAnalytics.getInstance(context)
 
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/manager/persistence/PersistenceManager.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/manager/persistence/PersistenceManager.kt
@@ -10,7 +10,6 @@ private const val APP_START_NUMBER = "app_start_number"
 class PersistenceManager @Inject constructor(
     private val sharedPreferences: SharedPreferences,
 ) {
-
     var isOnboardingRequired: Boolean
         get() = sharedPreferences.getBoolean(FIRST_APP_START, true)
         set(value) = sharedPreferences.edit().putBoolean(FIRST_APP_START, value).apply()
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/manager/persistence/SettingsManager.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/manager/persistence/SettingsManager.kt
@@ -3,7 +3,7 @@ package sk.styk.martin.apkanalyzer.manager.persistence
 import android.content.SharedPreferences
 import javax.inject.Inject
 
-private const val DAY_NIGHT_KEY = "dayNightPref"
+const val DAY_NIGHT_KEY = "dayNightPref"
 
 class SettingsManager @Inject constructor(
     private val sharedPreferences: SharedPreferences,
@@ -17,7 +17,7 @@ class SettingsManager @Inject constructor(
         fun persist() = persisted
 
         companion object {
-            fun from(persisted: String) = values()
+            fun from(persisted: String) = entries
                 .firstOrNull { it.persisted == persisted }
                 ?: DEFAULT
         }
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ActivityColorThemeManager.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ActivityColorThemeManager.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModel
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
-class ActivityColorThemeManager @Inject constructor(private val colorThemeManager: ColorThemeManager) : ViewModel(), ColorThemeManager by colorThemeManager {
+class ActivityColorThemeManager @Inject constructor() : ViewModel() {
 
     private var activity: WeakReference<Activity>? = null
 
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ColorThemeManager.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ColorThemeManager.kt
@@ -1,6 +1,19 @@
 package sk.styk.martin.apkanalyzer.manager.resources
 
-interface ColorThemeManager {
+import androidx.appcompat.app.AppCompatDelegate
+import sk.styk.martin.apkanalyzer.manager.persistence.SettingsManager
+import javax.inject.Inject
+import javax.inject.Singleton
 
-    fun setTheme()
+@Singleton
+class ColorThemeManager @Inject constructor(
+    private val settingsManager: SettingsManager,
+) {
+    fun setTheme() {
+        when (settingsManager.colorScheme) {
+            SettingsManager.ColorScheme.LIGHT -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+            SettingsManager.ColorScheme.DARK -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+            SettingsManager.ColorScheme.DEFAULT -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+        }
+    }
 }
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ColorThemeManagerImpl.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/manager/resources/ColorThemeManagerImpl.kt
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/ui/settings/MainSettingsFragment.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/ui/settings/MainSettingsFragment.kt
@@ -2,15 +2,21 @@ package sk.styk.martin.apkanalyzer.ui.settings
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import androidx.preference.ListPreference
 import androidx.preference.PreferenceFragmentCompat
 import dagger.hilt.android.AndroidEntryPoint
 import sk.styk.martin.apkanalyzer.R
+import sk.styk.martin.apkanalyzer.manager.persistence.DAY_NIGHT_KEY
+import sk.styk.martin.apkanalyzer.manager.persistence.SettingsManager
 import sk.styk.martin.apkanalyzer.manager.resources.ColorThemeManager
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
 
+    @Inject
+    lateinit var settingsManager: SettingsManager
+
     @Inject
     lateinit var colorThemeManager: ColorThemeManager
 
@@ -21,14 +27,15 @@ class MainSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSha
     override fun onStart() {
         super.onStart()
         preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
+        (findPreference(DAY_NIGHT_KEY) as? ListPreference)?.setDefaultValue(settingsManager.colorScheme.persist())
     }
 
     override fun onStop() {
         preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         super.onStop()
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
         colorThemeManager.setTheme()
     }
 }
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/views/FloatingActionButton.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/views/FloatingActionButton.kt
@@ -515,6 +515,7 @@ class FloatingActionButton : RelativeLayout {
 
     inner class MoveUpwardBehavior : CoordinatorLayout.Behavior<View>() {
 
+        @SuppressLint("RestrictedApi")
         override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
             return buttonPosition.and(POSITION_BOTTOM) > 0 && dependency is Snackbar.SnackbarLayout
         }
diff --git a/app/src/main/java/sk/styk/martin/apkanalyzer/views/behavior/SnackBarLayoutBehavior.kt b/app/src/main/java/sk/styk/martin/apkanalyzer/views/behavior/SnackBarLayoutBehavior.kt
diff --git a/app/src/main/res/layout/list_item_application.xml b/app/src/main/res/layout/list_item_application.xml
@@ -15,6 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:colorBackground"
+        android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?android:selectableItemBackground"
diff --git a/build-logic/convention/src/main/kotlin/sk/styk/martin/apkanalyzer/AndroidSdk.kt b/build-logic/convention/src/main/kotlin/sk/styk/martin/apkanalyzer/AndroidSdk.kt
@@ -1,4 +1,4 @@
 package sk.styk.martin.apkanalyzer
 
-const val TargetSdk = 33
+const val TargetSdk = 34
 const val MinSdk = 21
diff --git a/build-logic/convention/src/main/kotlin/sk/styk/martin/apkanalyzer/Kotlin.kt b/build-logic/convention/src/main/kotlin/sk/styk/martin/apkanalyzer/Kotlin.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 internal fun Project.configureKotlin(
-    commonExtension: CommonExtension<*, *, *, *>
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     commonExtension.compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
diff --git a/gradle.properties b/gradle.properties
@@ -19,6 +19,5 @@
 org.gradle.jvmargs=-Xmx2g
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.8.21"
-gradle-plugin = "8.0.2"
+kotlin = "1.9.10"
+gradle-plugin = "8.2.0"
 hilt = "2.46.1"
 lifecycle = "2.6.1"
 coroutines = "1.7.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Apr 17 20:31:51 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ android {`
`31`	`31`	`buildFeatures {`
`32`	`32`	`viewBinding = true`
`33`	`33`	`dataBinding = true`
	`34`	`+ buildConfig = true`
`34`	`35`	`}`
`35`	`36`	`lint {`
`36`	`37`	`disable += "MissingTranslation"`