Merge pull request #5 from Merseyside/develop

Develop

archy-android/src/main/java/com/merseyside/merseyLib/archy/android/presentation/fragment/BaseVMFragment.kt

@@ -10,6 +10,7 @@ import com.merseyside.merseyLib.archy.core.presentation.model.BaseViewModel
 import com.merseyside.merseyLib.archy.core.presentation.model.StateViewModel
 import com.merseyside.merseyLib.archy.core.presentation.model.StateViewModel.Companion.INSTANCE_STATE_KEY
 import com.merseyside.merseyLib.utils.core.SavedState
+import com.merseyside.utils.ext.getSerialize
 import com.merseyside.utils.ext.putSerialize
 import com.merseyside.utils.reflection.ReflectionUtils
 import com.merseyside.utils.requestPermissions
@@ -109,6 +110,22 @@ abstract class BaseVMFragment<B : ViewDataBinding, M : BaseViewModel>
         }
     }
 
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        val savedState = SavedState().apply {
+            savedInstanceState?.getSerialize(
+                INSTANCE_STATE_KEY, MapSerializer(String.serializer(), String.serializer())
+            )?.let {
+                addAll(
+                    it
+                )
+            }
+        }
+        if (viewModel is StateViewModel) {
+            (viewModel as StateViewModel).onRestoreState(savedState)
+        }
+        super.onViewStateRestored(savedInstanceState)
+    }
+
     override fun updateLanguage(context: Context) {
         super.updateLanguage(context)
         //viewModel.updateLanguage(context)
@@ -160,3 +177,4 @@ abstract class BaseVMFragment<B : ViewDataBinding, M : BaseViewModel>
         ).kotlin as KClass<M>
     }
 }
+

archy-core/src/commonMain/kotlin/com/merseyside/merseyLib/archy/core/presentation/model/BaseViewModel.kt

@@ -14,8 +14,12 @@ abstract class BaseViewModel protected constructor() : ViewModel() {
     val isInProgress: LiveData<Boolean> = mutProgress
 
     protected var progress: Boolean
-        get() { return mutProgress.value }
-        set(value) { mutProgress.value = value }
+        get() {
+            return mutProgress.value
+        }
+        set(value) {
+            mutProgress.value = value
+        }
 
     private val mutProgressText = MutableSingleEvent<String?>(null)
     val progressText: LiveData<String?> = mutProgressText
@@ -32,6 +36,9 @@ abstract class BaseViewModel protected constructor() : ViewModel() {
     private val mutGrantPermissionLiveEvent = MutableSingleEvent<Pair<Array<String>, Int>?>(null)
     val grantPermissionLiveEvent: LiveData<Pair<Array<String>, Int>?> = mutGrantPermissionLiveEvent
 
+    private val mutQueryRestoreEvent = MutableSingleEvent<String?>(null)
+    val queryRestoreEvent: LiveData<String?> = mutQueryRestoreEvent
+
     data class TextMessage(
         val isError: Boolean = false,
         var msg: String = "",
@@ -182,7 +189,11 @@ abstract class BaseViewModel protected constructor() : ViewModel() {
         )
     }
 
-    open fun onBack() : Boolean {
+    fun restoreQuery(query: String) {
+        mutQueryRestoreEvent.value = query
+    }
+
+    open fun onBack(): Boolean {
         return true
     }
 }

buildSrc/src/main/kotlin/Modules.kt

@@ -15,6 +15,7 @@ object Modules {
         object MerseyLibs {
             val archy = ":archy-core"
             val utils = ":utils-core"
+            val kotlinExt = ":kotlin-ext"
         }
 
         val mppLibrary = ":mpp-library"

buildSrc/src/main/kotlin/extensions/GradleExtensions.kt

@@ -24,6 +24,9 @@ fun Project.isLocalDependencies(): Boolean =
 fun Project.isLocalAndroidDependencies(): Boolean =
     findTypedProperty("build.localAndroidDependencies")
 
+fun Project.isLocalKotlinExtLibrary(): Boolean =
+    findTypedProperty("build.localKotlinExtLibrary")
+
 inline fun <reified T: MinimalExternalModuleDependency> Any.toProvider(): Provider<T> {
     return when (this) {
         is Provider<*> -> this as Provider<T>

buildSrc/src/main/kotlin/publication/Metadata.kt

@@ -1,4 +1,4 @@
 object Metadata {
     const val groupId = "io.github.merseyside"
-    const val version = "1.4.4"
+    const val version = "1.4.5"
 }

gradle.properties

@@ -22,6 +22,7 @@ kotlin.code.style=official
 
 build.localDependencies=false
 build.localAndroidDependencies=false
+build.localKotlinExtLibrary=false
 
 #Enable commonizer
 kotlin.mpp.enableGranularSourceSetsMetadata=true