Update project

michaelbel · Nov 24, 2024 · 7570781 · 7570781
1 parent 80b3a75
commit 7570781
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 24 deletions.
diff --git a/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.android.kt b/core/common/src/androidMain/kotlin/org/michaelbel/movies/common/browser/Browser.android.kt
@@ -2,9 +2,14 @@ package org.michaelbel.movies.common.browser
 
 import android.content.Intent
 import androidx.activity.compose.ManagedActivityResultLauncher
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
 
 fun openUrl(
@@ -22,4 +27,20 @@ fun openUrl(
         intent.data = url.toUri()
     }
     resultContract.launch(customTabsIntent.intent)
+}
+
+@Composable
+actual fun navigateToUrl(url: String): () -> Unit {
+    val resultContract = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
+    val toolbarColor = MaterialTheme.colorScheme.primary.toArgb()
+    val colorSchemeParams = CustomTabColorSchemeParams.Builder()
+        .setToolbarColor(toolbarColor)
+        .build()
+    val customTabsIntentBuilder = CustomTabsIntent.Builder().apply {
+        setDefaultColorSchemeParams(colorSchemeParams)
+    }
+    val customTabsIntent = customTabsIntentBuilder.build().apply {
+        intent.data = url.toUri()
+    }
+    return { resultContract.launch(customTabsIntent.intent) }
 }
diff --git a/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt b/core/common/src/commonMain/kotlin/org/michaelbel/movies/common/browser/Browser.kt
@@ -0,0 +1,6 @@
+package org.michaelbel.movies.common.browser
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun navigateToUrl(url: String): () -> Unit
diff --git a/core/common/src/iosMain/kotlin/org/michaelbel/movies/common/browser/Browser.ios.kt b/core/common/src/iosMain/kotlin/org/michaelbel/movies/common/browser/Browser.ios.kt
@@ -1,11 +1,15 @@
 package org.michaelbel.movies.common.browser
 
+import androidx.compose.runtime.Composable
 import platform.Foundation.NSURL
 import platform.UIKit.UIApplication
 
-fun openUrl(url: String) {
+@Composable
+actual fun navigateToUrl(url: String): () -> Unit {
     val nsUrl = NSURL.URLWithString(url)
-    if (nsUrl != null) {
-        UIApplication.sharedApplication().openURL(nsUrl)
+    return {
+        if (nsUrl != null) {
+            UIApplication.sharedApplication().openURL(nsUrl)
+        }
     }
 }
diff --git a/core/common/src/jsMain/kotlin/org/michaelbel/movies/common/browser/Browser.js.kt b/core/common/src/jsMain/kotlin/org/michaelbel/movies/common/browser/Browser.js.kt
@@ -1,5 +1,8 @@
 package org.michaelbel.movies.common.browser
 
-fun openUrl(url: String) {
+import androidx.compose.runtime.Composable
 
+@Composable
+actual fun navigateToUrl(url: String): () -> Unit {
+    return {}
 }
diff --git a/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.desktop.kt b/core/common/src/jvmMain/kotlin/org/michaelbel/movies/common/browser/Browser.desktop.kt
@@ -1,11 +1,15 @@
 package org.michaelbel.movies.common.browser
 
+import androidx.compose.runtime.Composable
 import java.awt.Desktop
 import java.net.URI
 
-fun openUrl(url: String) {
+@Composable
+actual fun navigateToUrl(url: String): () -> Unit {
     val desktop = if (Desktop.isDesktopSupported()) Desktop.getDesktop() else null
-    if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
-        desktop.browse(URI.create(url))
+    return {
+        if (desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) {
+            desktop.browse(URI.create(url))
+        }
     }
 }
diff --git a/core/common/src/wasmJsMain/kotlin/org/michaelbel/movies/common/browser/Browser.wasm.kt b/core/common/src/wasmJsMain/kotlin/org/michaelbel/movies/common/browser/Browser.wasm.kt
@@ -1,5 +1,8 @@
 package org.michaelbel.movies.common.browser
 
-fun openUrl(url: String) {
+import androidx.compose.runtime.Composable
 
+@Composable
+actual fun navigateToUrl(url: String): () -> Unit {
+    return {}
 }
diff --git a/feature/auth-impl/src/iosMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.ios.kt b/feature/auth-impl/src/iosMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.ios.kt
@@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import org.koin.compose.koinInject
 import org.michaelbel.movies.auth.AuthViewModel
-import org.michaelbel.movies.common.browser.openUrl
 
 @Composable
 fun AuthRoute(
@@ -21,7 +20,7 @@ fun AuthRoute(
         onSignInClick = { username, password -> },
         onLoginClick = {},
         onResetRequestToken = {},
-        onUrlClick = { url -> openUrl(url) },
+        onUrlClick = {},
         modifier = modifier
     )
 }
diff --git a/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.desktop.kt b/feature/auth-impl/src/jvmMain/kotlin/org/michaelbel/movies/auth/ui/AuthRoute.desktop.kt
@@ -4,7 +4,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import org.koin.compose.koinInject
 import org.michaelbel.movies.auth.AuthViewModel
-import org.michaelbel.movies.common.browser.openUrl
 
 @Composable
 fun AuthRoute(
@@ -21,7 +20,7 @@ fun AuthRoute(
         onSignInClick = { username, password -> },
         onLoginClick = {},
         onResetRequestToken = {},
-        onUrlClick = { url -> openUrl(url) },
+        onUrlClick = {},
         modifier = modifier
     )
 }
diff --git a/...gs-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.android.kt b/...gs-impl/src/androidMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.android.kt
@@ -1,9 +1,6 @@
 package org.michaelbel.movies.settings.ui
 
 import android.app.Activity
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
@@ -14,13 +11,12 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
 import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.common.MOVIES_GITHUB_URL
-import org.michaelbel.movies.common.browser.openUrl
+import org.michaelbel.movies.common.browser.navigateToUrl
 import org.michaelbel.movies.common.gender.GrammaticalGender
 import org.michaelbel.movies.interactor.entity.AppLanguage
 import org.michaelbel.movies.notifications.ktx.rememberPostNotificationsPermissionHandler
@@ -75,10 +71,9 @@ fun SettingsRoute(
     val appVersionData by viewModel.appVersionData.collectAsStateCommon()
     var areNotificationsEnabled by remember { mutableStateOf(viewModel.areNotificationsEnabled) }
     val openAppNotificationSettings = openAppNotificationSettings()
+    val navigateToUrl = navigateToUrl(MOVIES_GITHUB_URL)
 
     val context = LocalContext.current
-    val resultContract = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
-    val toolbarColor = MaterialTheme.colorScheme.primary.toArgb()
 
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
@@ -204,7 +199,7 @@ fun SettingsRoute(
             ),
             githubData = SettingsData.RequestedData(
                 isFeatureEnabled = isGithubFeatureEnabled,
-                onRequest = { openUrl(resultContract, toolbarColor, MOVIES_GITHUB_URL) }
+                onRequest = navigateToUrl
             ),
             reviewAppData = SettingsData.RequestedData(
                 isFeatureEnabled = isReviewAppFeatureEnabled && viewModel.isReviewFeatureEnabled,

diff --git a/...e/settings-impl/src/iosMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.ios.kt b/...e/settings-impl/src/iosMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.ios.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 import org.michaelbel.movies.common.MOVIES_GITHUB_URL
-import org.michaelbel.movies.common.browser.openUrl
+import org.michaelbel.movies.common.browser.navigateToUrl
 import org.michaelbel.movies.common.gender.GrammaticalGender
 import org.michaelbel.movies.interactor.entity.AppLanguage
 import org.michaelbel.movies.settings.SettingsViewModel
@@ -46,6 +46,7 @@ fun SettingsRoute(
     val currentFeedView by viewModel.currentFeedView.collectAsStateCommon()
     val currentMovieList by viewModel.currentMovieList.collectAsStateCommon()
     val snackbarHostState = remember { SnackbarHostState() }
+    val navigateToUrl = navigateToUrl(MOVIES_GITHUB_URL)
 
     SettingsScreenContent(
         settingsData = SettingsData(
@@ -111,7 +112,7 @@ fun SettingsRoute(
             ),
             githubData = SettingsData.RequestedData(
                 isFeatureEnabled = isGithubFeatureEnabled,
-                onRequest = { openUrl(MOVIES_GITHUB_URL) }
+                onRequest = navigateToUrl
             ),
             reviewAppData = SettingsData.RequestedData(
                 isFeatureEnabled = isReviewAppFeatureEnabled

diff --git a/...ttings-impl/src/jvmMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.desktop.kt b/...ttings-impl/src/jvmMain/kotlin/org/michaelbel/movies/settings/ui/SettingsRoute.desktop.kt
@@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 import org.michaelbel.movies.common.MOVIES_GITHUB_URL
-import org.michaelbel.movies.common.browser.openUrl
+import org.michaelbel.movies.common.browser.navigateToUrl
 import org.michaelbel.movies.common.gender.GrammaticalGender
 import org.michaelbel.movies.interactor.entity.AppLanguage
 import org.michaelbel.movies.settings.SettingsViewModel
@@ -46,6 +46,7 @@ fun SettingsRoute(
     val currentFeedView by viewModel.currentFeedView.collectAsStateCommon()
     val currentMovieList by viewModel.currentMovieList.collectAsStateCommon()
     val snackbarHostState = remember { SnackbarHostState() }
+    val navigateToUrl = navigateToUrl(MOVIES_GITHUB_URL)
 
     SettingsScreenContent(
         settingsData = SettingsData(
@@ -111,7 +112,7 @@ fun SettingsRoute(
             ),
             githubData = SettingsData.RequestedData(
                 isFeatureEnabled = isGithubFeatureEnabled,
-                onRequest = { openUrl(MOVIES_GITHUB_URL) }
+                onRequest = navigateToUrl
             ),
             reviewAppData = SettingsData.RequestedData(
                 isFeatureEnabled = isReviewAppFeatureEnabled