fix: go back button in settings screen sometimes not working

refactor: hoist navController from AppNavigation to MainActivity

Author: kid1412621

app/build.gradle.kts

@@ -21,8 +21,8 @@ android {
         applicationId = "me.nanova.summaryexpressive"
         minSdk = 33
         targetSdk = 36
-        versionCode = 29
-        versionName = "0.6.1"
+        versionCode = 30
+        versionName = "0.6.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/kotlin/me/nanova/summaryexpressive/InstantSummaryActivity.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -48,8 +49,8 @@ import androidx.compose.ui.window.DialogProperties
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import me.nanova.summaryexpressive.ui.theme.SummaryExpressiveTheme
-import me.nanova.summaryexpressive.vm.SummaryViewModel
 import me.nanova.summaryexpressive.vm.AppViewModel
+import me.nanova.summaryexpressive.vm.SummaryViewModel
 
 @AndroidEntryPoint
 class InstantSummaryActivity : ComponentActivity() {
@@ -87,7 +88,14 @@ class InstantSummaryActivity : ComponentActivity() {
                 }
             }
 
-            SummaryExpressiveTheme(theme = settings.theme, dynamicColor = settings.dynamicColor) {
+            SummaryExpressiveTheme(
+                darkTheme = when (settings.theme) {
+                    1 -> true
+                    2 -> false
+                    else -> isSystemInDarkTheme()
+                },
+                dynamicColor = settings.dynamicColor
+            ) {
                 InstantSummaryDialog(
                     viewModel = summaryViewModel,
                     onDismiss = { finish() }

app/src/main/kotlin/me/nanova/summaryexpressive/MainActivity.kt

@@ -7,20 +7,17 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
+import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import me.nanova.summaryexpressive.ui.AppNavigation
 import me.nanova.summaryexpressive.ui.theme.SummaryExpressiveTheme
 import me.nanova.summaryexpressive.vm.AppStartAction
 import me.nanova.summaryexpressive.vm.AppViewModel
 
-
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     private val viewModel: AppViewModel by viewModels()
@@ -34,21 +31,23 @@ class MainActivity : ComponentActivity() {
         handleIntent(intent)
 
         setContent {
-            val settings by viewModel.settingsUiState.collectAsState()
-            val startDest by viewModel.startDestination.collectAsState()
+            val navController = rememberNavController()
+            val settingsState by viewModel.settingsUiState.collectAsState()
+            val startDestination by viewModel.startDestination.collectAsState()
 
             SummaryExpressiveTheme(
-                theme = settings.theme,
-                dynamicColor = settings.dynamicColor
+                darkTheme = when (settingsState.theme) {
+                    1 -> true
+                    2 -> false
+                    else -> isSystemInDarkTheme()
+                },
+                dynamicColor = settingsState.dynamicColor
             ) {
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    startDest?.let {
-                        AppNavigation(startDestination = it, appViewModel = viewModel)
-                    }
-                }
+                AppNavigation(
+                    navController = navController,
+                    startDestination = startDestination,
+                    appViewModel = viewModel
+                )
             }
         }
     }
@@ -59,20 +58,23 @@ class MainActivity : ComponentActivity() {
         handleIntent(intent)
     }
 
-    private fun handleIntent(intent: Intent?) {
-        when {
-            intent?.action == Intent.ACTION_SEND && intent.type == "text/plain" -> {
-                viewModel.setAppStartAction(AppStartAction(content = intent.getStringExtra(Intent.EXTRA_TEXT)))
+    private fun handleIntent(intent: Intent) {
+        when (intent.action) {
+            Intent.ACTION_SEND -> {
+                if ("text/plain" == intent.type) {
+                    val content = intent.getStringExtra(Intent.EXTRA_TEXT)
+                    viewModel.onEvent(AppStartAction(content))
+                }
             }
-
-            intent?.action == Intent.ACTION_VIEW && intent.data?.host == "clipboard" -> {
+            Intent.ACTION_VIEW -> {
+                if (intent.data?.host != "clipboard") return
                 // To avoid re-triggering on configuration change, we clear the data.
                 intent.data = null
                 // Postpone clipboard access until the window has focus.
                 window.decorView.post {
                     val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
                     clipboard.primaryClip?.getItemAt(0)?.text?.let {
-                        viewModel.setAppStartAction(
+                        viewModel.onEvent(
                             AppStartAction(
                                 content = it.toString(),
                                 autoTrigger = true

app/src/main/kotlin/me/nanova/summaryexpressive/ui/AppNavigation.kt

@@ -9,17 +9,15 @@ import androidx.compose.animation.core.EaseOut
 import androidx.compose.animation.core.tween
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import me.nanova.summaryexpressive.ui.page.HistoryScreen
 import me.nanova.summaryexpressive.ui.page.HomeScreen
 import me.nanova.summaryexpressive.ui.page.OnboardingScreen
 import me.nanova.summaryexpressive.ui.page.SettingsScreen
-import me.nanova.summaryexpressive.vm.HistoryViewModel
 import me.nanova.summaryexpressive.vm.AppViewModel
 
 private fun slideIn(dir: SlideDirection): AnimatedContentTransitionScope<*>.() -> EnterTransition = {
@@ -38,12 +36,16 @@ private fun slideOut(dir: SlideDirection): AnimatedContentTransitionScope<*>.()
 
 @Composable
 fun AppNavigation(
-    startDestination: Nav,
+    navController: NavHostController,
+    startDestination: Nav?,
     appViewModel: AppViewModel,
 ) {
-    val navController = rememberNavController()
+    if (startDestination == null) return
 
-    NavHost(navController, startDestination = startDestination.name) {
+    NavHost(
+        navController = navController,
+        startDestination = startDestination.name
+    ) {
         composable(Nav.Home.name) {
             HomeScreen(
                 modifier = Modifier,
@@ -95,7 +97,7 @@ fun AppNavigation(
             enterTransition = slideIn(SlideDirection.Start),
             exitTransition = slideOut(SlideDirection.End)
         ) {
-            HistoryScreen(viewModel = hiltViewModel<HistoryViewModel>())
+            HistoryScreen()
         }
     }
 }

app/src/main/kotlin/me/nanova/summaryexpressive/ui/theme/Theme.kt

@@ -16,15 +16,10 @@ import androidx.core.view.WindowCompat
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun SummaryExpressiveTheme(
-    theme: Int = 0,
+    darkTheme: Boolean = isSystemInDarkTheme(),
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit,
 ) {
-    val darkTheme = when (theme) {
-        1 -> true
-        2 -> false
-        else -> isSystemInDarkTheme()
-    }
 
     val colorScheme = when {
         dynamicColor -> {

app/src/main/kotlin/me/nanova/summaryexpressive/vm/AppViewModel.kt

@@ -101,7 +101,7 @@ class AppViewModel @Inject constructor(
     private val _appStartAction = MutableStateFlow(AppStartAction())
     val appStartAction: StateFlow<AppStartAction> = _appStartAction.asStateFlow()
 
-    fun setAppStartAction(action: AppStartAction) {
+    fun onEvent(action: AppStartAction) {
         _appStartAction.value = action
     }