Merge pull request #271 from ouchadam/tech/state-submodule

screen-state submodule

.github/workflows/assemble.yml

@@ -17,6 +17,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'

.github/workflows/check_size.yml

@@ -14,6 +14,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'

.github/workflows/release-candidate.yml

@@ -16,6 +16,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'

.github/workflows/release-train.yml

@@ -16,6 +16,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
 
       - uses: actions/setup-node@v3
         with:

.github/workflows/test.yml

@@ -17,6 +17,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "screen-state"]
+	path = screen-state
+	url = [email protected]:ouchadam/screen-state.git

build.gradle

@@ -163,7 +163,6 @@ ext.firebase = { dependencies, name ->
     }
 }
 
-
 if (launchTask.contains("codeCoverageReport".toLowerCase())) {
     apply from: 'tools/coverage.gradle'
 }

domains/android/compose-core/build.gradle

@@ -5,5 +5,4 @@ dependencies {
     implementation project(":features:navigator")
     implementation project(":design-library")
     api project(":domains:android:core")
-    api project(":domains:state")
 }

domains/android/compose-core/src/main/kotlin/app/dapk/st/core/ActivityExtensions.kt

@@ -21,53 +21,3 @@ inline fun <reified VM : ViewModel> ComponentActivity.viewModel(
     }
     return ViewModelLazy(VM::class, { viewModelStore }, { factoryPromise })
 }
-
-
-inline fun <reified S, E> ComponentActivity.state(
-    noinline factory: () -> State<S, E>
-): Lazy<State<S, E>> {
-    val factoryPromise = object : Factory {
-        @Suppress("UNCHECKED_CAST")
-        override fun <T : ViewModel> create(modelClass: Class<T>): T {
-            return when(modelClass) {
-                StateViewModel::class.java -> factory() as T
-                else -> throw Error()
-            }
-        }
-    }
-    return KeyedViewModelLazy(
-        key = S::class.java.canonicalName!!,
-        StateViewModel::class,
-        { viewModelStore },
-        { factoryPromise }
-    ) as Lazy<State<S, E>>
-}
-
-class KeyedViewModelLazy<VM : ViewModel> @JvmOverloads constructor(
-    private val key: String,
-    private val viewModelClass: KClass<VM>,
-    private val storeProducer: () -> ViewModelStore,
-    private val factoryProducer: () -> ViewModelProvider.Factory,
-) : Lazy<VM> {
-    private var cached: VM? = null
-
-    override val value: VM
-        get() {
-            val viewModel = cached
-            return if (viewModel == null) {
-                val factory = factoryProducer()
-                val store = storeProducer()
-                ViewModelProvider(
-                    store,
-                    factory,
-                    CreationExtras.Empty
-                ).get(key, viewModelClass.java).also {
-                    cached = it
-                }
-            } else {
-                viewModel
-            }
-        }
-
-    override fun isInitialized(): Boolean = cached != null
-}