Update project

michaelbel · Nov 26, 2024 · 2752c7c · 2752c7c
1 parent eb48e8f
commit 2752c7c
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 50 deletions.
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcuts.kt
@@ -6,16 +6,13 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.net.toUri
+import org.michaelbel.movies.ui.R
 import org.michaelbel.movies.ui.appicon.shortcutSearchIconRes
 import org.michaelbel.movies.ui.appicon.shortcutSettingsIconRes
-import org.michaelbel.movies.ui.R
 
 private const val SEARCH_SHORTCUT_ID = "searchShortcutId"
 private const val SETTINGS_SHORTCUT_ID = "settingsShortcutId"
 
-const val INTENT_ACTION_SEARCH = "movies_shortcut://search"
-const val INTENT_ACTION_SETTINGS = "movies_shortcut://settings"
-
 /**
  * See [App Shortcuts Design Guidelines](https://commondatastorage.googleapis.com/androiddevelopers/shareables/design/app-shortcuts-design-guidelines.pdf)
  */

diff --git a/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcutsLinks.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/shortcuts/MoviesShortcutsLinks.kt
@@ -0,0 +1,4 @@
+package org.michaelbel.movies.ui.shortcuts
+
+const val INTENT_ACTION_SEARCH = "movies_shortcut://search"
+const val INTENT_ACTION_SETTINGS = "movies_shortcut://settings"
diff --git a/...pl/src/androidMain/kotlin/org/michaelbel/movies/main/navigation/MainNavigation.android.kt b/...pl/src/androidMain/kotlin/org/michaelbel/movies/main/navigation/MainNavigation.android.kt
@@ -30,7 +30,7 @@ import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.feed.FeedDestination
 import org.michaelbel.movies.feed.feedGraph
 import org.michaelbel.movies.settings.SettingsDestination
-import org.michaelbel.movies.settings.settingsGraph
+import org.michaelbel.movies.settings.settingsGraph2
 import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.ktx.ObserveAsEvents
 
@@ -119,7 +119,7 @@ fun NavGraphBuilder.mainGraph(
                     navigateToSettings = navigateToSettings,
                     navigateToDetails = navigateToDetails
                 )
-                settingsGraph(
+                settingsGraph2(
                     navigateBack = {},
                     onRequestReview = onRequestReview,
                     onRequestUpdate = onRequestUpdate

diff --git a/feature/main-impl/src/iosMain/kotlin/org/michaelbel/movies/main/MainContent.ios.kt b/feature/main-impl/src/iosMain/kotlin/org/michaelbel/movies/main/MainContent.ios.kt
@@ -17,7 +17,7 @@ import org.michaelbel.movies.gallery.navigateToGallery
 import org.michaelbel.movies.search.navigateToSearch
 import org.michaelbel.movies.search.searchGraph
 import org.michaelbel.movies.settings.navigateToSettings
-import org.michaelbel.movies.settings.settingsGraph
+import org.michaelbel.movies.settings.settingsGraph2
 
 @Composable
 fun MainContent(
@@ -51,8 +51,10 @@ fun MainContent(
             navigateBack = navHostController::popBackStack,
             navigateToDetails = navHostController::navigateToDetails,
         )
-        settingsGraph(
-            navigateBack = navHostController::popBackStack
+        settingsGraph2(
+            navigateBack = navHostController::popBackStack,
+            onRequestReview = {},
+            onRequestUpdate = {}
         )
     }
 }
diff --git a/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.desktop.kt b/feature/main-impl/src/jvmMain/kotlin/org/michaelbel/movies/main/MainContent.desktop.kt
@@ -17,7 +17,7 @@ import org.michaelbel.movies.gallery.navigateToGallery
 import org.michaelbel.movies.search.navigateToSearch
 import org.michaelbel.movies.search.searchGraph
 import org.michaelbel.movies.settings.navigateToSettings
-import org.michaelbel.movies.settings.settingsGraph
+import org.michaelbel.movies.settings.settingsGraph2
 
 @Composable
 fun MainContent(
@@ -51,8 +51,10 @@ fun MainContent(
             navigateBack = navHostController::popBackStack,
             navigateToDetails = navHostController::navigateToDetails,
         )
-        settingsGraph(
-            navigateBack = navHostController::popBackStack
+        settingsGraph2(
+            navigateBack = navHostController::popBackStack,
+            onRequestReview = {},
+            onRequestUpdate = {}
         )
     }
 }
diff --git a/...bel/movies/settings/SettingsNavigation.kt → .../movies/settings/SettingsNavController.kt b/...bel/movies/settings/SettingsNavigation.kt → .../movies/settings/SettingsNavController.kt
diff --git a/...es/settings/SettingsNavigation.android.kt → ...ovies/settings/SettingsNavGraphBuilder.kt b/...es/settings/SettingsNavigation.android.kt → ...ovies/settings/SettingsNavGraphBuilder.kt
@@ -6,15 +6,13 @@ import androidx.navigation.navDeepLink
 import org.michaelbel.movies.settings.ui.SettingsRoute
 import org.michaelbel.movies.ui.shortcuts.INTENT_ACTION_SETTINGS
 
-fun NavGraphBuilder.settingsGraph(
+fun NavGraphBuilder.settingsGraph2(
     navigateBack: () -> Unit,
     onRequestReview: () -> Unit,
     onRequestUpdate: () -> Unit
 ) {
     composable<SettingsDestination>(
-        deepLinks = listOf(
-            navDeepLink { uriPattern = INTENT_ACTION_SETTINGS }
-        )
+        deepLinks = listOf(navDeepLink { uriPattern = INTENT_ACTION_SETTINGS })
     ) {
         SettingsRoute(
             onBackClick = navigateBack,

diff --git a/feature/settings/src/iosMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.ios.kt b/feature/settings/src/iosMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.ios.kt
diff --git a/.../settings/src/jvmMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.desktop.kt b/.../settings/src/jvmMain/kotlin/org/michaelbel/movies/settings/SettingsNavigation.desktop.kt