Replace graph-scoped viewmodel with default ones

massivemadness · Feb 5, 2025 · e89c3a5 · e89c3a5
1 parent 219915c
commit e89c3a5
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 43 deletions.
diff --git a/...rvers/impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/dialog/ServerDialog.kt b/...rvers/impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/dialog/ServerDialog.kt
@@ -32,6 +32,7 @@ import com.blacksquircle.ui.core.contract.ContractResult
 import com.blacksquircle.ui.core.contract.OpenFileContract
 import com.blacksquircle.ui.core.extensions.extractFilePath
 import com.blacksquircle.ui.core.extensions.sendFragmentResult
+import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
 import com.blacksquircle.ui.feature.servers.ui.fragment.CloudFragment
 import com.blacksquircle.ui.feature.servers.ui.navigation.ServerViewEvent
@@ -72,10 +73,7 @@ internal class ServerDialog : DialogFragment() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 SquircleTheme {
-                    ServerScreen(
-                        viewModel = viewModel,
-                        navController = navController,
-                    )
+                    ServerScreen(viewModel)
                 }
             }
         }
@@ -90,6 +88,9 @@ internal class ServerDialog : DialogFragment() {
         viewModel.viewEvent.flowWithLifecycle(viewLifecycleOwner.lifecycle)
             .onEach { event ->
                 when (event) {
+                    is ViewEvent.PopBackStack -> {
+                        navController.popBackStack()
+                    }
                     is ServerViewEvent.SendSaveResult -> {
                         sendFragmentResult(CloudFragment.KEY_SAVE)
                         navController.popBackStack()

diff --git a/...rvers/impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/dialog/ServerScreen.kt b/...rvers/impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/dialog/ServerScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
 import com.blacksquircle.ui.ds.SquircleTheme
 import com.blacksquircle.ui.ds.dialog.AlertDialog
 import com.blacksquircle.ui.feature.servers.R
@@ -48,10 +47,7 @@ import com.blacksquircle.ui.filesystem.base.model.AuthMethod
 import com.blacksquircle.ui.filesystem.base.model.FileServer
 
 @Composable
-internal fun ServerScreen(
-    viewModel: ServerViewModel,
-    navController: NavController,
-) {
+internal fun ServerScreen(viewModel: ServerViewModel) {
     val viewState by viewModel.viewState.collectAsStateWithLifecycle()
     ServerScreen(
         viewState = viewState,
@@ -70,7 +66,7 @@ internal fun ServerScreen(
         onInitialDirChanged = viewModel::onInitialDirChanged,
         onSaveClicked = viewModel::onSaveClicked,
         onDeleteClicked = viewModel::onDeleteClicked,
-        onCancelClicked = navController::popBackStack,
+        onCancelClicked = viewModel::onCancelClicked,
     )
 }
 

diff --git a/...impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/viewmodel/ServerViewModel.kt b/...impl/src/main/kotlin/com/blacksquircle/ui/feature/servers/ui/viewmodel/ServerViewModel.kt
@@ -202,6 +202,12 @@ internal class ServerViewModel @AssistedInject constructor(
         }
     }
 
+    fun onCancelClicked() {
+        viewModelScope.launch {
+            _viewEvent.send(ViewEvent.PopBackStack())
+        }
+    }
+
     private fun loadServer() {
         if (!isEditMode) {
             return

diff --git a/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/about/AboutHeaderFragment.kt b/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/about/AboutHeaderFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class AboutHeaderFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<AboutHeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<AboutHeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/...src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/application/AppHeaderFragment.kt b/...src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/application/AppHeaderFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class AppHeaderFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<AppHeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<AppHeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/.../src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/codestyle/CodeHeaderFragment.kt b/.../src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/codestyle/CodeHeaderFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class CodeHeaderFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<CodeHeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<CodeHeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/...l/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/editor/EditorHeaderFragment.kt b/...l/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/editor/EditorHeaderFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class EditorHeaderFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<EditorHeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<EditorHeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/files/FilesHeaderFragment.kt b/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/files/FilesHeaderFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class FilesHeaderFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<FilesHeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<FilesHeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/header/HeaderListFragment.kt b/...mpl/src/main/kotlin/com/blacksquircle/ui/feature/settings/ui/header/HeaderListFragment.kt
@@ -23,22 +23,21 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
-import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.blacksquircle.ui.core.extensions.navigateTo
 import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
-import com.blacksquircle.ui.feature.settings.R
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @AndroidEntryPoint
 internal class HeaderListFragment : Fragment() {
 
-    private val viewModel by hiltNavGraphViewModels<HeaderViewModel>(R.id.settings_graph)
+    private val viewModel by viewModels<HeaderViewModel>()
     private val navController by lazy { findNavController() }
 
     override fun onCreateView(

diff --git a/...impl/src/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/dialog/KeybindingDialog.kt b/...impl/src/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/dialog/KeybindingDialog.kt
@@ -29,6 +29,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.blacksquircle.ui.core.extensions.sendFragmentResult
+import com.blacksquircle.ui.core.mvi.ViewEvent
 import com.blacksquircle.ui.ds.SquircleTheme
 import com.blacksquircle.ui.feature.shortcuts.data.mapper.ShortcutMapper
 import com.blacksquircle.ui.feature.shortcuts.ui.fragment.ShortcutsFragment
@@ -61,10 +62,7 @@ internal class KeybindingDialog : DialogFragment() {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
             setContent {
                 SquircleTheme {
-                    KeybindingScreen(
-                        viewModel = viewModel,
-                        navController = navController,
-                    )
+                    KeybindingScreen(viewModel)
                 }
             }
         }
@@ -78,11 +76,16 @@ internal class KeybindingDialog : DialogFragment() {
     private fun observeViewModel() {
         viewModel.viewEvent.flowWithLifecycle(viewLifecycleOwner.lifecycle)
             .onEach { event ->
-                if (event is ShortcutViewEvent.SendSaveResult) {
-                    sendFragmentResult(
-                        resultKey = ShortcutsFragment.KEY_SAVE,
-                        bundle = ShortcutMapper.toBundle(event.keybinding),
-                    )
+                when (event) {
+                    is ViewEvent.PopBackStack -> {
+                        navController.popBackStack()
+                    }
+                    is ShortcutViewEvent.SendSaveResult -> {
+                        sendFragmentResult(
+                            resultKey = ShortcutsFragment.KEY_SAVE,
+                            bundle = ShortcutMapper.toBundle(event.keybinding),
+                        )
+                    }
                 }
             }
             .launchIn(viewLifecycleOwner.lifecycleScope)

diff --git a/...impl/src/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/dialog/KeybindingScreen.kt b/...impl/src/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/dialog/KeybindingScreen.kt
@@ -39,7 +39,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
 import com.blacksquircle.ui.core.extensions.keyCodeToChar
 import com.blacksquircle.ui.ds.SquircleTheme
 import com.blacksquircle.ui.ds.checkbox.CheckBox
@@ -51,10 +50,7 @@ import com.blacksquircle.ui.feature.shortcuts.ui.composable.keybindingResource
 import com.blacksquircle.ui.feature.shortcuts.ui.viewmodel.KeybindingViewModel
 
 @Composable
-internal fun KeybindingScreen(
-    viewModel: KeybindingViewModel,
-    navController: NavController
-) {
+internal fun KeybindingScreen(viewModel: KeybindingViewModel) {
     val viewState by viewModel.viewState.collectAsStateWithLifecycle()
     KeybindingScreen(
         viewState = viewState,
@@ -64,7 +60,7 @@ internal fun KeybindingScreen(
         onShiftClicked = viewModel::onShiftClicked,
         onAltClicked = viewModel::onAltClicked,
         onSaveClicked = viewModel::onSaveClicked,
-        onCancelClicked = navController::popBackStack,
+        onCancelClicked = viewModel::onCancelClicked,
     )
 }
 

diff --git a/...rc/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/viewmodel/KeybindingViewModel.kt b/...rc/main/kotlin/com/blacksquircle/ui/feature/shortcuts/ui/viewmodel/KeybindingViewModel.kt
@@ -100,6 +100,12 @@ internal class KeybindingViewModel @AssistedInject constructor(
         }
     }
 
+    fun onCancelClicked() {
+        viewModelScope.launch {
+            _viewEvent.send(ViewEvent.PopBackStack())
+        }
+    }
+
     private fun initialViewState(): KeybindingViewState {
         val keybinding = ShortcutMapper.fromBundle(initial)
         return KeybindingViewState(