Restructure code. Setup Manual DI

RotBolt · Jul 28, 2023 · f0a3216 · f0a3216
1 parent fda6749
commit f0a3216
Show file tree

Hide file tree

Showing 50 changed files with 433 additions and 839 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-/.idea/deploymentTargetDropDown.xml
+/.idea/*
 .DS_Store
 /build
 /captures

diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -496,7 +496,7 @@ potential-bugs:
   UnreachableCode:
     active: true
   UnsafeCallOnNullableType:
-    active: true
+    active: false
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**']
   UnsafeCast:
     active: true

diff --git a/flaker-android-retrofit/build.gradle.kts b/flaker-android-retrofit/build.gradle.kts
@@ -44,6 +44,7 @@ dependencies {
     implementation(project(":flaker-android-ui"))
     api(project(":flaker-retrofit-core"))
     implementation(project(":flaker-domain"))
+    implementation(project(":flaker-data"))
 
     implementation(libs.core.ktx)
     implementation(libs.lifecycle.runtime.ktx)

diff --git a/flaker-android-retrofit/src/main/AndroidManifest.xml b/flaker-android-retrofit/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:supportsRtl="true"
         tools:targetApi="33">
         <activity
-            android:name="io.rotlabs.flakerandroidretrofit.FlakerActivity"
+            android:name="io.rotlabs.flakerandroidretrofit.ui.FlakerActivity"
             android:exported="true"
             android:icon="@mipmap/ic_flaker"
             android:label="@string/companion_app_name"

diff --git a/...roid-retrofit/src/main/java/io/rotlabs/flakerandroidretrofit/di/FlakerAndroidContainer.kt b/...roid-retrofit/src/main/java/io/rotlabs/flakerandroidretrofit/di/FlakerAndroidContainer.kt
@@ -0,0 +1,36 @@
+package io.rotlabs.flakerandroidretrofit.di
+
+import android.content.Context
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.createSavedStateHandle
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
+import io.rotlabs.FlakerDataDependencyContainer
+import io.rotlabs.flakerandroidretrofit.ui.FlakerViewModel
+import io.rotlabs.flakerdb.networkrequest.data.NetworkRequestRepo
+import io.rotlabs.flakerprefs.PrefDataStore
+import io.rotlabs.flakerretrofit.FlakerRetrofitDependencyContainer
+
+object FlakerAndroidContainer {
+
+    private var networkRequestRepo: NetworkRequestRepo? = null
+
+    private var prefDataStore: PrefDataStore? = null
+
+    private fun networkRequestRepo() = networkRequestRepo!!
+
+    private fun prefDataStore() = prefDataStore!!
+
+    fun init(appContext: Context) {
+        FlakerRetrofitDependencyContainer.init(FlakerDataDependencyContainer(appContext))
+        networkRequestRepo = FlakerRetrofitDependencyContainer.networkRequestRepo()
+        prefDataStore = FlakerRetrofitDependencyContainer.prefDataStore()
+    }
+
+    val flakerViewModelFactory: ViewModelProvider.Factory = viewModelFactory {
+        initializer {
+            val savedStateHandle = createSavedStateHandle()
+            FlakerViewModel(networkRequestRepo(), prefDataStore(), savedStateHandle)
+        }
+    }
+}
diff --git a/...s/flakerandroidretrofit/FlakerActivity.kt → ...lakerandroidretrofit/ui/FlakerActivity.kt b/...s/flakerandroidretrofit/FlakerActivity.kt → ...lakerandroidretrofit/ui/FlakerActivity.kt
@@ -1,4 +1,4 @@
-package io.rotlabs.flakerandroidretrofit
+package io.rotlabs.flakerandroidretrofit.ui
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -36,12 +36,14 @@ import androidx.compose.ui.unit.dp
 import io.rotlabs.flakerandroidapp.ui.listitem.NetworkRequestItem
 import io.rotlabs.flakerandroidapp.ui.listitem.SectionDateItem
 import io.rotlabs.flakerandroidapp.ui.theme.FlakerAndroidTheme
+import io.rotlabs.flakerandroidretrofit.R
+import io.rotlabs.flakerandroidretrofit.di.FlakerAndroidContainer
 import io.rotlabs.flakerandroidui.R as AndroidUiR
 
 @OptIn(ExperimentalMaterial3Api::class)
 class FlakerActivity : ComponentActivity() {
 
-    private val viewModel: FlakerViewModel by viewModels { FlakerViewModel.Factory }
+    private val viewModel: FlakerViewModel by viewModels { FlakerAndroidContainer.flakerViewModelFactory }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,11 +69,13 @@ class FlakerActivity : ComponentActivity() {
                 }
 
                 if (state.toShowPrefs) {
-                    FlakerPrefsDialog(
-                        onDismissRequest = viewModel::closePrefs,
-                        onConfirmAction = viewModel::updatePrefs,
-                        currentValues = viewModel.getCurrentPrefs(),
-                    )
+                    state.currentPrefs?.let { prefs ->
+                        FlakerPrefsDialog(
+                            onDismissRequest = viewModel::closePrefs,
+                            onConfirmAction = viewModel::updatePrefs,
+                            currentValues = prefs,
+                        )
+                    }
                 }
             }
         }