Internal navigation fix (#227)

ShiftHackZ · web-flow · commit 063baa7db764 · 2024-08-06T18:55:40.000+03:00
* Internal navigation fix

* Update drawer resources

* Fix drawer selected item state memory leak on context recreation (language change)
diff --git a/data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt b/data/src/main/java/com/shifthackz/aisdv1/data/preference/PreferenceManagerImpl.kt
@@ -247,7 +247,7 @@ class PreferenceManagerImpl(
         const val KEY_HUGGING_FACE_MODEL_KEY = "key_hugging_face_model_key"
         const val KEY_STABILITY_AI_API_KEY = "key_stability_ai_api_key"
         const val KEY_STABILITY_AI_ENGINE_ID_KEY = "key_stability_ai_engine_id_key"
-        const val KEY_FORCE_SETUP_AFTER_UPDATE = "force_upd_setup_v0.x.x-v0.5.8"
+        const val KEY_FORCE_SETUP_AFTER_UPDATE = "force_upd_setup_v0.x.x-v0.6.2"
         const val KEY_LOCAL_MODEL_ID = "key_local_model_id"
         const val KEY_LOCAL_NN_API = "key_local_nn_api"
         const val KEY_DESIGN_DYNAMIC_COLORS = "key_design_dynamic_colors"
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationFormUpdateEvent.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationFormUpdateEvent.kt
@@ -2,25 +2,41 @@ package com.shifthackz.aisdv1.presentation.core
 
 import com.shifthackz.aisdv1.domain.entity.AiGenerationResult
 import io.reactivex.rxjava3.core.BackpressureStrategy
+import io.reactivex.rxjava3.subjects.BehaviorSubject
 import io.reactivex.rxjava3.subjects.PublishSubject
 
 class GenerationFormUpdateEvent {
 
     private val sRoute: PublishSubject<AiGenerationResult.Type> = PublishSubject.create()
-    private val sTxt2Img: PublishSubject<AiGenerationResult> = PublishSubject.create()
-    private val sImg2Img: PublishSubject<AiGenerationResult> = PublishSubject.create()
+    private val sTxt2Img: BehaviorSubject<Payload> = BehaviorSubject.createDefault(Payload.None)
+    private val sImg2Img: BehaviorSubject<Payload> = BehaviorSubject.createDefault(Payload.None)
 
-    fun update(generation: AiGenerationResult, route: AiGenerationResult.Type) {
+    fun update(
+        generation: AiGenerationResult,
+        route: AiGenerationResult.Type,
+        inputImage: Boolean,
+    ) {
         sRoute.onNext(route)
         when (route) {
-            AiGenerationResult.Type.TEXT_TO_IMAGE -> sTxt2Img.onNext(generation)
-            AiGenerationResult.Type.IMAGE_TO_IMAGE -> sImg2Img.onNext(generation)
+            AiGenerationResult.Type.TEXT_TO_IMAGE -> sTxt2Img.onNext(Payload.T2IForm(generation))
+            AiGenerationResult.Type.IMAGE_TO_IMAGE -> sImg2Img.onNext(Payload.I2IForm(generation, inputImage))
         }
     }
 
+    fun clear() {
+        sTxt2Img.onNext(Payload.None)
+        sImg2Img.onNext(Payload.None)
+    }
+
     fun observeRoute() = sRoute.toFlowable(BackpressureStrategy.LATEST)
 
     fun observeTxt2ImgForm() = sTxt2Img.toFlowable(BackpressureStrategy.LATEST)
 
     fun observeImg2ImgForm() = sImg2Img.toFlowable(BackpressureStrategy.LATEST)
+
+    sealed interface Payload {
+        data object None : Payload
+        data class T2IForm(val ai: AiGenerationResult): Payload
+        data class I2IForm(val ai: AiGenerationResult, val inputImage: Boolean): Payload
+    }
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/core/GenerationMviViewModel.kt
@@ -250,9 +250,17 @@ abstract class GenerationMviViewModel<S : GenerationMviState, I : GenerationMviI
                 ServerSetupLaunchSource.SETTINGS
             )
 
-            is GenerationMviIntent.UpdateFromGeneration -> updateFormPreviousAiGeneration(
-                intent.ai
-            )
+            is GenerationMviIntent.UpdateFromGeneration -> {
+                val payload = when (intent.ai.type) {
+                    AiGenerationResult.Type.TEXT_TO_IMAGE -> {
+                        GenerationFormUpdateEvent.Payload.T2IForm(intent.ai)
+                    }
+                    AiGenerationResult.Type.IMAGE_TO_IMAGE -> {
+                        GenerationFormUpdateEvent.Payload.I2IForm(intent.ai, false)
+                    }
+                }
+                updateFormPreviousAiGeneration(payload)
+            }
 
             is GenerationMviIntent.Drawer -> when (intent.intent) {
                 DrawerIntent.Close -> drawerRouter.closeDrawer()
@@ -261,9 +269,14 @@ abstract class GenerationMviViewModel<S : GenerationMviState, I : GenerationMviI
         }
     }
 
-    protected open fun updateFormPreviousAiGeneration(ai: AiGenerationResult) =
-        updateGenerationState {
-            it
+    protected open fun updateFormPreviousAiGeneration(payload: GenerationFormUpdateEvent.Payload) {
+        val ai = when (payload) {
+            is GenerationFormUpdateEvent.Payload.I2IForm -> payload.ai
+            is GenerationFormUpdateEvent.Payload.T2IForm -> payload.ai
+            else -> return
+        }
+        updateGenerationState { oldState ->
+            oldState
                 .copyState(
                     advancedOptionsVisible = true,
                     prompt = ai.prompt,
@@ -282,6 +295,7 @@ abstract class GenerationMviViewModel<S : GenerationMviState, I : GenerationMviI
                     else state.copyState(selectedSampler = ai.sampler)
                 }
         }
+    }
 
     protected fun setActiveModal(modal: Modal) = updateGenerationState {
         it.copyState(screenModal = modal)
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/NavigationEffect.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/NavigationEffect.kt
@@ -28,5 +28,11 @@ sealed interface NavigationEffect : MviEffect {
         data object Close : Drawer
     }
 
-    data class Home(val route: String) : NavigationEffect
+    sealed interface Home : NavigationEffect {
+        val route: String
+
+        data class Route(override val route: String) : Home
+
+        data class Update(override val route: String) : Home
+    }
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/graph/DrawerNavGraph.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/graph/DrawerNavGraph.kt
@@ -15,8 +15,8 @@ import com.shifthackz.aisdv1.presentation.utils.Constants
 import com.shifthackz.aisdv1.presentation.widget.source.getNameUiText
 
 fun mainDrawerNavItems(settings: Settings? = null): List<NavItem> = buildList {
-    add(txt2ImgTab())
-    add(img2imgTab())
+    add(txt2ImgTab().copy(name = R.string.title_text_to_image.asUiText()))
+    add(img2imgTab().copy(name = R.string.title_image_to_image.asUiText()))
     add(galleryTab())
     settings?.source?.takeIf { it.featureTags.contains(FeatureTag.OwnServer) }?.let {
         add(webUi(it))
@@ -30,7 +30,7 @@ private fun webUi(source: ServerSource) = NavItem(
         R.string.drawer_web_ui.asUiText(),
         " (".asUiText(),
         source.getNameUiText(),
-        ")".asUiText()
+        ")".asUiText(),
     ),
     route = Constants.ROUTE_WEB_UI,
     icon = NavItem.Icon.Vector(
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/graph/HomeNavGraph.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/graph/HomeNavGraph.kt
@@ -3,6 +3,8 @@ package com.shifthackz.aisdv1.presentation.navigation.graph
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Settings
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavGraphBuilder
@@ -11,12 +13,14 @@ import androidx.navigation.get
 import com.shifthackz.aisdv1.core.model.asUiText
 import com.shifthackz.aisdv1.presentation.R
 import com.shifthackz.aisdv1.presentation.model.NavItem
+import com.shifthackz.aisdv1.presentation.navigation.router.home.HomeRouter
 import com.shifthackz.aisdv1.presentation.screen.gallery.list.GalleryScreen
 import com.shifthackz.aisdv1.presentation.screen.home.HomeNavigationScreen
 import com.shifthackz.aisdv1.presentation.screen.img2img.ImageToImageScreen
 import com.shifthackz.aisdv1.presentation.screen.settings.SettingsScreen
 import com.shifthackz.aisdv1.presentation.screen.txt2img.TextToImageScreen
 import com.shifthackz.aisdv1.presentation.utils.Constants
+import org.koin.compose.koinInject
 
 fun NavGraphBuilder.homeScreenNavGraph(route: String = Constants.ROUTE_HOME) {
     addDestination(
@@ -40,7 +44,11 @@ fun txt2ImgTab() = NavItem(
         resId = R.drawable.ic_text,
         modifier = Modifier.size(24.dp),
     ),
-    content = { TextToImageScreen() },
+    content = {
+        HomeTabBase(Constants.ROUTE_TXT_TO_IMG) {
+            TextToImageScreen()
+        }
+    },
 )
 
 fun img2imgTab() = NavItem(
@@ -51,7 +59,9 @@ fun img2imgTab() = NavItem(
         modifier = Modifier.size(24.dp),
     ),
     content = {
-        ImageToImageScreen()
+        HomeTabBase(Constants.ROUTE_IMG_TO_IMG) {
+            ImageToImageScreen()
+        }
     },
 )
 
@@ -63,7 +73,9 @@ fun galleryTab() = NavItem(
         modifier = Modifier.size(24.dp),
     ),
     content = {
-        GalleryScreen()
+        HomeTabBase(Constants.ROUTE_GALLERY) {
+            GalleryScreen()
+        }
     },
 )
 
@@ -74,6 +86,20 @@ fun settingsTab() = NavItem(
         vector = Icons.Default.Settings,
     ),
     content = {
-        SettingsScreen()
+        HomeTabBase(Constants.ROUTE_SETTINGS) {
+            SettingsScreen()
+        }
     }
 )
+
+@Composable
+private fun HomeTabBase(
+    route: String,
+    content: @Composable () -> Unit,
+) {
+    val homeRouter: HomeRouter = koinInject()
+    LaunchedEffect(Unit) {
+        homeRouter.updateExternallyWithoutNavigation(route)
+    }
+    content()
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/router/home/HomeRouter.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/router/home/HomeRouter.kt
@@ -5,6 +5,8 @@ import com.shifthackz.aisdv1.presentation.navigation.router.Router
 
 interface HomeRouter : Router<NavigationEffect.Home> {
 
+    fun updateExternallyWithoutNavigation(route: String)
+
     fun navigateToRoute(route: String)
 
     fun navigateToTxt2Img()
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/router/home/HomeRouterImpl.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/navigation/router/home/HomeRouterImpl.kt
@@ -9,8 +9,12 @@ class HomeRouterImpl : HomeRouter {
 
     private val effectSubject: PublishSubject<NavigationEffect.Home> = PublishSubject.create()
 
+    override fun updateExternallyWithoutNavigation(route: String) {
+        effectSubject.onNext(NavigationEffect.Home.Update(route))
+    }
+
     override fun navigateToRoute(route: String) {
-        effectSubject.onNext(NavigationEffect.Home(route))
+        effectSubject.onNext(NavigationEffect.Home.Route(route))
     }
 
     override fun navigateToTxt2Img() {
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/drawer/DrawerScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/drawer/DrawerScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.material3.NavigationDrawerItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -57,13 +56,16 @@ fun DrawerScreen(
         currentRootRoute
     }
 
-    val routes = remember { navItems.map(NavItem::route).take(4) }
     MviComponent(
         viewModel = koinViewModel<DrawerViewModel>(),
         applySystemUiColors = false,
     ) { _, intentHandler ->
         ModalNavigationDrawer(
-            gesturesEnabled = routes.contains(currentRoute),
+            gesturesEnabled = if (drawerState.isOpen) {
+                true
+            } else {
+                currentRootRoute == Constants.ROUTE_HOME
+            },
             drawerState = drawerState,
             drawerContent = {
                 ModalDrawerSheet {
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/gallery/detail/GalleryDetailViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/gallery/detail/GalleryDetailViewModel.kt
@@ -121,14 +121,21 @@ class GalleryDetailViewModel(
             }
         }
 
-    private fun sendPromptToGenerationScreen(screenType: AiGenerationResult.Type) =
+    private fun sendPromptToGenerationScreen(screenType: AiGenerationResult.Type) {
+        val state = (currentState as? GalleryDetailState.Content) ?: return
         !getGenerationResult(itemId)
             .subscribeOnMainThread(schedulersProvider)
             .doFinally { mainRouter.navigateBack() }
             .subscribeBy(::errorLog) { ai ->
-                generationFormUpdateEvent.update(ai, screenType)
+                generationFormUpdateEvent.update(
+                    ai,
+                    screenType,
+                    state.selectedTab == GalleryDetailState.Tab.ORIGINAL,
+                )
             }
 
+    }
+
     private fun getGenerationResult(id: Long): Single<AiGenerationResult> {
         if (id <= 0) return getLastResultFromCacheUseCase()
         return getGenerationResultUseCase(id)
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationIntent.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationIntent.kt
@@ -2,4 +2,9 @@ package com.shifthackz.aisdv1.presentation.screen.home
 
 import com.shifthackz.android.core.mvi.MviIntent
 
-data class HomeNavigationIntent(val route: String) : MviIntent
+sealed interface HomeNavigationIntent : MviIntent {
+
+    data class Route(val route: String) : HomeNavigationIntent
+
+    data class Update(val route: String) : HomeNavigationIntent
+}
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationScreen.kt
@@ -14,6 +14,7 @@ import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
@@ -23,6 +24,7 @@ import androidx.navigation.compose.rememberNavController
 import com.shifthackz.aisdv1.core.model.asString
 import com.shifthackz.aisdv1.core.ui.MviComponent
 import com.shifthackz.aisdv1.presentation.model.NavItem
+import com.shifthackz.aisdv1.presentation.utils.Constants
 import com.shifthackz.aisdv1.presentation.widget.connectivity.ConnectivityComposable
 import com.shifthackz.aisdv1.presentation.widget.item.NavigationItemIcon
 import org.koin.androidx.compose.koinViewModel
@@ -33,18 +35,24 @@ fun HomeNavigationScreen(
 ) {
     require(navItems.isNotEmpty()) { "navItems collection must not be empty." }
 
+    val viewModel = koinViewModel<HomeNavigationViewModel>()
     val navController = rememberNavController()
     val backStackEntry = navController.currentBackStackEntryAsState()
     val currentRoute = backStackEntry.value?.destination?.route
 
+    LaunchedEffect(currentRoute) {
+        if (currentRoute == Constants.ROUTE_TXT_TO_IMG) {
+            viewModel.processIntent(HomeNavigationIntent.Update(currentRoute))
+        }
+    }
+
     MviComponent(
-        viewModel = koinViewModel<HomeNavigationViewModel>(),
+        viewModel = viewModel,
         processEffect = { effect ->
             navController.navigate(effect.route) {
                 navController.graph.startDestinationRoute?.let { route ->
                     popUpTo(route) {
                         saveState = true
-                        navController.popBackStack()
                     }
                 }
                 launchSingleTop = true
@@ -72,7 +80,7 @@ fun HomeNavigationScreen(
                                     selectedIndicatorColor = MaterialTheme.colorScheme.primary,
                                 ),
                                 icon = { NavigationItemIcon(item.icon) },
-                                onClick = { processIntent(HomeNavigationIntent(item.route)) },
+                                onClick = { processIntent(HomeNavigationIntent.Route(item.route)) },
                             )
                         }
                     }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/home/HomeNavigationViewModel.kt
@@ -24,17 +24,22 @@ class HomeNavigationViewModel(
         !homeRouter
             .observe()
             .subscribeOnMainThread(schedulersProvider)
-            .subscribeBy(::errorLog, EmptyLambda, ::emitEffect)
+            .subscribeBy(::errorLog, EmptyLambda) { effect ->
+                (effect as? NavigationEffect.Home.Route)?.let(::emitEffect)
+            }
 
         !generationFormUpdateEvent
             .observeRoute()
             .map(AiGenerationResult.Type::mapToRoute)
-            .map(::HomeNavigationIntent)
+            .map(HomeNavigationIntent::Route)
             .subscribeOnMainThread(schedulersProvider)
             .subscribeBy(::errorLog, EmptyLambda, ::processIntent)
     }
 
     override fun processIntent(intent: HomeNavigationIntent) {
-        homeRouter.navigateToRoute(intent.route)
+        when (intent) {
+            is HomeNavigationIntent.Route -> homeRouter.navigateToRoute(intent.route)
+            is HomeNavigationIntent.Update -> homeRouter.updateExternallyWithoutNavigation(intent.route)
+        }
     }
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/img2img/ImageToImageViewModel.kt
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/txt2img/TextToImageViewModel.kt
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
diff --git a/presentation/src/test/java/com/shifthackz/aisdv1/presentation/core/CoreGenerationMviViewModelTest.kt b/presentation/src/test/java/com/shifthackz/aisdv1/presentation/core/CoreGenerationMviViewModelTest.kt
diff --git a/presentation/src/test/java/com/shifthackz/aisdv1/presentation/screen/gallery/detail/GalleryDetailViewModelTest.kt b/presentation/src/test/java/com/shifthackz/aisdv1/presentation/screen/gallery/detail/GalleryDetailViewModelTest.kt

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,11 @@ sealed interface NavigationEffect : MviEffect {`
`28`	`28`	`data object Close : Drawer`
`29`	`29`	`}`
`30`	`30`
`31`		`- data class Home(val route: String) : NavigationEffect`
	`31`	`+ sealed interface Home : NavigationEffect {`
	`32`	`+ val route: String`
	`33`	`+`
	`34`	`+ data class Route(override val route: String) : Home`
	`35`	`+`
	`36`	`+ data class Update(override val route: String) : Home`
	`37`	`+ }`
`32`	`38`	`}`