Merge pull request #313 from synonymdev/fix/sreen-transitions

fix: add default screen transitions to nested navigation

Author: jvsena42

app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt

@@ -29,27 +29,28 @@ class VssBackupClient @Inject constructor(
     suspend fun setup() = withContext(bgDispatcher) {
         try {
             withTimeout(30.seconds) {
+                val vssServerUrl = Env.vssServerUrl
                 Logger.verbose("VSS client setting up…", context = TAG)
                 if (Env.lnurlAuthSeverUrl.isNotEmpty()) {
                     val mnemonic = keychain.loadString(Keychain.Key.BIP39_MNEMONIC.name)
                         ?: throw ServiceError.MnemonicNotFound
                     val passphrase = keychain.loadString(Keychain.Key.BIP39_PASSPHRASE.name)
 
                     vssNewClientWithLnurlAuth(
-                        baseUrl = Env.vssServerUrl,
+                        baseUrl = vssServerUrl,
                         storeId = vssStoreIdProvider.getVssStoreId(),
                         mnemonic = mnemonic,
                         passphrase = passphrase,
                         lnurlAuthServerUrl = Env.lnurlAuthSeverUrl,
                     )
                 } else {
                     vssNewClient(
-                        baseUrl = Env.vssServerUrl,
+                        baseUrl = vssServerUrl,
                         storeId = vssStoreIdProvider.getVssStoreId(),
                     )
                 }
                 isSetup.complete(Unit)
-                Logger.info("VSS client setup ok", context = TAG)
+                Logger.info("VSS client setup with server: '$vssServerUrl'", context = TAG)
             }
         } catch (e: Throwable) {
             isSetup.completeExceptionally(e)

…a/to/bitkit/ui/utils/WeViewExtensions.kt …p/src/main/java/to/bitkit/ext/WebView.ktapp/src/main/java/to/bitkit/ui/utils/WeViewExtensions.kt renamed to app/src/main/java/to/bitkit/ext/WebView.kt app/src/main/java/to/bitkit/ui/utils/WeViewExtensions.kt renamed to app/src/main/java/to/bitkit/ext/WebView.kt

@@ -1,4 +1,4 @@
-package to.bitkit.ui.utils
+package to.bitkit.ext
 
 import android.annotation.SuppressLint
 import android.webkit.WebSettings

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -24,7 +24,6 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import kotlinx.coroutines.delay
@@ -139,9 +138,9 @@ import to.bitkit.ui.sheets.PinSheet
 import to.bitkit.ui.sheets.SendSheet
 import to.bitkit.ui.theme.TRANSITION_SHEET_MS
 import to.bitkit.ui.utils.AutoReadClipboardHandler
+import to.bitkit.ui.utils.Transitions
 import to.bitkit.ui.utils.composableWithDefaultTransitions
-import to.bitkit.ui.utils.screenSlideIn
-import to.bitkit.ui.utils.screenSlideOut
+import to.bitkit.ui.utils.navigationWithDefaultTransitions
 import to.bitkit.utils.Logger
 import to.bitkit.viewmodels.ActivityListViewModel
 import to.bitkit.viewmodels.AppViewModel
@@ -411,7 +410,7 @@ private fun RootNavHost(
         widgets(navController, settingsViewModel, currencyViewModel)
 
         // TODO extract transferNavigation
-        navigation<Routes.TransferRoot>(
+        navigationWithDefaultTransitions<Routes.TransferRoot>(
             startDestination = Routes.TransferIntro,
         ) {
             composableWithDefaultTransitions<Routes.TransferIntro> {
@@ -550,7 +549,7 @@ private fun RootNavHost(
                     onCloseClick = { navController.navigateToHome() },
                 )
             }
-            navigation<Routes.ExternalNav>(
+            navigationWithDefaultTransitions<Routes.ExternalNav>(
                 startDestination = Routes.ExternalConnection(),
             ) {
                 composableWithDefaultTransitions<Routes.ExternalConnection> {
@@ -902,7 +901,7 @@ private fun NavGraphBuilder.cjitDetailSettings(
 private fun NavGraphBuilder.lightningConnections(
     navController: NavHostController,
 ) {
-    navigation<Routes.ConnectionsNav>(
+    navigationWithDefaultTransitions<Routes.ConnectionsNav>(
         startDestination = Routes.LightningConnections,
     ) {
         composableWithDefaultTransitions<Routes.LightningConnections> {
@@ -956,9 +955,9 @@ private fun NavGraphBuilder.qrScanner(
     appViewModel: AppViewModel,
     navController: NavHostController,
 ) {
-    composable<Routes.QrScanner>(
-        enterTransition = { screenSlideIn },
-        exitTransition = { screenSlideOut },
+    composableWithDefaultTransitions<Routes.QrScanner>(
+        enterTransition = { Transitions.slideInVertically },
+        popExitTransition = { Transitions.slideOutVertically },
     ) {
         QrScanningScreen(navController = navController) { qrCode ->
             appViewModel.onScanResult(
@@ -999,10 +998,7 @@ private fun NavGraphBuilder.logs(
 private fun NavGraphBuilder.suggestions(
     navController: NavHostController,
 ) {
-    composable<Routes.BuyIntro>(
-        enterTransition = { screenSlideIn },
-        exitTransition = { screenSlideOut },
-    ) {
+    composableWithDefaultTransitions<Routes.BuyIntro> {
         BuyIntroScreen(
             onBackClick = { navController.popBackStack() }
         )
@@ -1088,7 +1084,7 @@ private fun NavGraphBuilder.widgets(
             currencyViewModel = currencyViewModel
         )
     }
-    navigation<Routes.Headlines>(
+    navigationWithDefaultTransitions<Routes.Headlines>(
         startDestination = Routes.HeadlinesPreview
     ) {
         composableWithDefaultTransitions<Routes.HeadlinesPreview> {
@@ -1116,7 +1112,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Facts>(
+    navigationWithDefaultTransitions<Routes.Facts>(
         startDestination = Routes.FactsPreview
     ) {
         composableWithDefaultTransitions<Routes.FactsPreview> {
@@ -1142,7 +1138,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Blocks>(
+    navigationWithDefaultTransitions<Routes.Blocks>(
         startDestination = Routes.BlocksPreview
     ) {
         composableWithDefaultTransitions<Routes.BlocksPreview> {
@@ -1168,7 +1164,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Weather>(
+    navigationWithDefaultTransitions<Routes.Weather>(
         startDestination = Routes.WeatherPreview
     ) {
         composableWithDefaultTransitions<Routes.WeatherPreview> {
@@ -1194,7 +1190,7 @@ private fun NavGraphBuilder.widgets(
             )
         }
     }
-    navigation<Routes.Price>(
+    navigationWithDefaultTransitions<Routes.Price>(
         startDestination = Routes.PricePreview
     ) {
         composableWithDefaultTransitions<Routes.PricePreview> {