a few last minute changes

Author: Josh

app/src/main/java/net/frozendevelopment/openletters/MainActivity.kt

@@ -1,6 +1,9 @@
 package net.frozendevelopment.openletters
 
+import android.content.ActivityNotFoundException
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -27,6 +30,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.runtime.NavKey
@@ -85,7 +89,19 @@ class MainActivity : ComponentActivity() {
                 ReminderListDestination,
             ),
         )
-        val navigator = remember { Navigator(navigationState, onBackPressedDispatcher) }
+        val navigator = remember {
+            Navigator(
+                state = navigationState,
+                backPressedDispatcher = onBackPressedDispatcher,
+                openInBrowser = {
+                    try {
+                        startActivity(Intent(Intent.ACTION_VIEW, it.toUri()))
+                    } catch (_: ActivityNotFoundException) {
+                        Toast.makeText(this, "No browser found", Toast.LENGTH_SHORT).show()
+                    }
+                },
+            )
+        }
         val entryProvider: EntryProvider = koinEntryProvider()
 
         val windowAdaptiveInfo = currentWindowAdaptiveInfo()

app/src/main/java/net/frozendevelopment/openletters/feature/category/form/CategoryFormView.kt

@@ -80,11 +80,11 @@ fun Module.categoryFormNavigation() = navigation<CategoryFormDestination> { rout
             state = state,
             onLabelChanged = viewModel::setLabel,
             onColorChanged = viewModel::setColor,
-            onBackClicked = navigator::pop,
+            onBackClicked = navigator::onBackPressed,
             onSaveClicked = {
                 coroutineScope.launch {
                     viewModel.save()
-                    navigator.pop()
+                    navigator.onBackPressed()
                 }
             },
         )

app/src/main/java/net/frozendevelopment/openletters/feature/letter/scan/ScanLetterView.kt

@@ -169,7 +169,7 @@ fun Module.scanLetterNavigation() = navigation<ScanLetterDestination> { route ->
                     if (viewModel.save()) {
                         withContext(Dispatchers.Main) {
                             if (route.canNavigateBack) {
-                                navigator.pop()
+                                navigator.onBackPressed()
                             } else {
                                 navigator.navigate { backStack ->
                                     backStack.add(0, LetterListDestination)
@@ -180,7 +180,7 @@ fun Module.scanLetterNavigation() = navigation<ScanLetterDestination> { route ->
                     }
                 }
             },
-            onBackClicked = navigator::pop,
+            onBackClicked = navigator::onBackPressed,
             onDeleteDocumentClicked = viewModel::removeDocument,
             onCreateCategoryClicked = { navigator.navigate(CategoryFormDestination(CategoryFormDestination.Mode.Create)) },
         )

app/src/main/java/net/frozendevelopment/openletters/feature/reminder/detail/ReminderDetailView.kt

@@ -98,7 +98,7 @@ fun Module.reminderDetailNavigation() = navigation<ReminderDetailDestination>(
         ReminderDetailScreen(
             modifier = Modifier.fillMaxWidth(),
             state = state,
-            onBackClicked = navigator::pop,
+            onBackClicked = navigator::onBackPressed,
             onAcknowledgeClicked = viewModel::acknowledge,
             onLetterClicked = { navigator.navigate(LetterDetailDestination(it)) },
         )

app/src/main/java/net/frozendevelopment/openletters/feature/reminder/form/ReminderFormView.kt

@@ -113,11 +113,11 @@ fun Module.reminderFormNavigation() = navigation<ReminderFormDestination> { rout
             toggleLetterSelect = viewModel::toggleLetterSelect,
             onLetterClicked = { navigator.navigate(LetterDetailDestination(it)) },
             openDialog = viewModel::openDialog,
-            onBackClicked = navigator::pop,
+            onBackClicked = navigator::onBackPressed,
             onSaveClicked = {
                 coroutineScope.launch {
                     if (viewModel.save()) {
-                        navigator.pop()
+                        navigator.onBackPressed()
                     }
                 }
             },

app/src/main/java/net/frozendevelopment/openletters/feature/settings/SettingsView.kt

@@ -53,10 +53,10 @@ fun Module.settingsNavigation() = navigation<SettingsDestination> { route ->
         SettingsView(
             modifier = Modifier.fillMaxSize(),
             state = state,
-            onBackClicked = navigator::pop,
+            onBackClicked = navigator::onBackPressed,
             onThemeChanged = viewModel::setTheme,
             onColorVariantChanged = viewModel::setVariant,
-            onViewSourceClicked = {}, // { navigator.openUrl("https://github.com/frozenjava/OpenLetters") },
+            onViewSourceClicked = { navigator.openUrl("https://github.com/frozenjava/OpenLetters") },
         )
     }
 }

app/src/main/java/net/frozendevelopment/openletters/ui/navigation/Navigator.kt

@@ -16,12 +16,15 @@ interface NavigatorType {
     fun pop()
 
     fun onBackPressed()
+
+    fun openUrl(url: String)
 }
 
 @Stable
 class Navigator(
     val state: NavigationState,
     val backPressedDispatcher: OnBackPressedDispatcher? = null,
+    val openInBrowser: (url: String) -> Unit = {},
 ) : NavigatorType {
     override fun navigate(route: NavKey) {
         if (route in state.backStacks.keys) {
@@ -53,6 +56,8 @@ class Navigator(
     override fun onBackPressed() {
         backPressedDispatcher?.onBackPressed()
     }
+
+    override fun openUrl(url: String) = openInBrowser(url)
 }
 
 class PreviewNavigator : NavigatorType {
@@ -63,4 +68,6 @@ class PreviewNavigator : NavigatorType {
     override fun pop() {}
 
     override fun onBackPressed() {}
+
+    override fun openUrl(url: String) {}
 }