App analysis modularization part 1

Author: MartinStyk

.github/workflows/android-publish.yml

@@ -17,11 +17,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: '17'
+        distribution: 'zulu'
         cache: gradle
 
     - name: Create google-services.json

.github/workflows/android.yml

@@ -13,11 +13,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: '17'
+        distribution: 'zulu'
         cache: gradle
 
     - name: Create google-services.json

app/build.gradle.kts

@@ -62,6 +62,14 @@ dependencies {
     implementation(libs.expandablelayout)
     implementation(libs.timber)
     implementation(libs.glide)
+
+    implementation(project(":core:app-analysis-core"))
+    implementation(project(":core:app-list"))
+    implementation(project(":core:app-permissions"))
+    implementation(project(":core:app-statistics"))
+    implementation(project(":core:common"))
+    implementation(project(":core:ui-library"))
+
     annotationProcessor(libs.glide.compiler)
     implementation(libs.bundles.google.play)
 

app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ActivityCommonModule.kt

@@ -19,7 +19,7 @@ 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.util.coroutines.DispatcherProvider
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 
 @InstallIn(ActivityComponent::class)
 @Module

app/src/main/java/sk/styk/martin/apkanalyzer/manager/analytics/FragmentScreenTracker.kt

@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import sk.styk.martin.apkanalyzer.manager.navigationdrawer.ForegroundFragmentWatcher
 import sk.styk.martin.apkanalyzer.util.FragmentTag
-import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 import javax.inject.Inject
 
 @ActivityScoped

app/src/main/java/sk/styk/martin/apkanalyzer/manager/appanalysis/AppResourceManager.kt

@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.yield
 import sk.styk.martin.apkanalyzer.manager.notification.NotificationManager
 import sk.styk.martin.apkanalyzer.util.TAG_EXPORTS
-import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream

app/src/main/java/sk/styk/martin/apkanalyzer/manager/appanalysis/DexManager.kt

@@ -11,7 +11,7 @@ import androidx.core.net.toUri
 import kotlinx.coroutines.withContext
 import sk.styk.martin.apkanalyzer.manager.media.MediaManager
 import sk.styk.martin.apkanalyzer.manager.permission.hasScopedStorage
-import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 import sk.styk.martin.apkanalyzer.util.file.toBitmap
 import java.io.File
 import java.io.FileOutputStream

app/src/main/java/sk/styk/martin/apkanalyzer/manager/appanalysis/FileDataManager.kt

@@ -7,7 +7,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
-import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
+import sk.styk.martin.apkanalyzer.core.common.coroutines.DispatcherProvider
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException

app/src/main/java/sk/styk/martin/apkanalyzer/manager/file/ApkSaveManager.kt

@@ -11,7 +11,7 @@ import androidx.annotation.IntRange
 import androidx.core.app.NotificationCompat
 import dagger.hilt.android.qualifiers.ApplicationContext
 import sk.styk.martin.apkanalyzer.R
-import sk.styk.martin.apkanalyzer.manager.resources.ResourcesManager
+import sk.styk.martin.apkanalyzer.core.common.resources.ResourcesManager
 import sk.styk.martin.apkanalyzer.ui.main.MainActivity
 import javax.inject.Inject
 import javax.inject.Singleton

app/src/main/java/sk/styk/martin/apkanalyzer/manager/file/DrawableSaveManager.kt

@@ -1,13 +1,12 @@
 package sk.styk.martin.apkanalyzer.manager.persistence
 
 import android.content.SharedPreferences
-import sk.styk.martin.apkanalyzer.R
-import sk.styk.martin.apkanalyzer.manager.resources.ResourcesManager
 import javax.inject.Inject
 
+private const val DAY_NIGHT_KEY = "dayNightPref"
+
 class SettingsManager @Inject constructor(
     private val sharedPreferences: SharedPreferences,
-    private val resourcesManager: ResourcesManager,
 ) {
 
     enum class ColorScheme(private val persisted: String) {
@@ -25,7 +24,7 @@ class SettingsManager @Inject constructor(
     }
 
     var colorScheme: ColorScheme
-        get() = sharedPreferences.getString(resourcesManager.getString(R.string.preference_color_theme_key).toString(), null)?.let { ColorScheme.from(it) }
+        get() = sharedPreferences.getString(DAY_NIGHT_KEY, null)?.let { ColorScheme.from(it) }
             ?: ColorScheme.DEFAULT
-        set(value) = sharedPreferences.edit().putString(resourcesManager.getString(R.string.preference_color_theme_key).toString(), value.persist()).apply()
+        set(value) = sharedPreferences.edit().putString(DAY_NIGHT_KEY, value.persist()).apply()
 }