Snappy back navigation

Author: SimonSchubert

composeApp/src/androidMain/kotlin/com/linuxcommandlibrary/app/platform/Platform.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 
+actual val isIOS: Boolean = false
 actual val showRateAppButton: Boolean = true
 actual val showAndroidTerminalTip: Boolean = Build.VERSION.SDK_INT >= 35
 actual val backIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/App.kt

@@ -1,6 +1,8 @@
 package com.linuxcommandlibrary.app
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -18,13 +20,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavDestination.Companion.hasRoute
+import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.linuxcommandlibrary.app.data.BasicsRepository
 import com.linuxcommandlibrary.app.data.CommandsRepository
+import com.linuxcommandlibrary.app.platform.isIOS
 import com.linuxcommandlibrary.app.platform.rememberOpenAppAction
 import com.linuxcommandlibrary.app.ui.composables.BottomBar
 import com.linuxcommandlibrary.app.ui.composables.DetailTopBar
@@ -180,10 +184,7 @@ fun LinuxApp(initialDeeplink: String? = null) {
             modifier = Modifier
                 .padding(innerPadding),
         ) {
-            NavHost(
-                navController = navController,
-                startDestination = initialRoute,
-            ) {
+            val navGraphBuilder: NavGraphBuilder.() -> Unit = {
                 composable<Route.Basics> {
                     val viewModel: BasicCategoriesViewModel = koinInject()
                     BasicCategoriesScreen(viewModel = viewModel, onNavigate = onNavigate)
@@ -217,6 +218,21 @@ fun LinuxApp(initialDeeplink: String? = null) {
                     }
                 }
             }
+            if (isIOS) {
+                NavHost(
+                    navController = navController,
+                    startDestination = initialRoute,
+                    builder = navGraphBuilder,
+                )
+            } else {
+                NavHost(
+                    navController = navController,
+                    startDestination = initialRoute,
+                    popEnterTransition = { EnterTransition.None },
+                    popExitTransition = { ExitTransition.None },
+                    builder = navGraphBuilder,
+                )
+            }
 
             val isSearchVisible = searchState.searchText.isNotEmpty() && !isOnCommandDetail
             AnimatedVisibility(

composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/platform/Platform.kt

@@ -3,6 +3,7 @@ package com.linuxcommandlibrary.app.platform
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 
+expect val isIOS: Boolean
 expect val showRateAppButton: Boolean
 expect val showAndroidTerminalTip: Boolean
 expect val backIcon: ImageVector

composeApp/src/desktopMain/kotlin/com/linuxcommandlibrary/app/platform/Platform.kt

@@ -5,6 +5,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 
+actual val isIOS: Boolean = false
 actual val showRateAppButton: Boolean = false
 actual val showAndroidTerminalTip: Boolean = false
 actual val backIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack

composeApp/src/iosMain/kotlin/com/linuxcommandlibrary/app/platform/Platform.kt

@@ -5,6 +5,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBackIos
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 
+actual val isIOS: Boolean = true
 actual val showRateAppButton: Boolean = false
 actual val showAndroidTerminalTip: Boolean = false
 actual val backIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBackIos

iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/simon.xcuserdatad/UserInterfaceState.xcuserstate

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.1</string>
+	<string>3.6.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

iosApp/iosApp/Info.plist

@@ -1,10 +1,10 @@
 package com.linuxcommandlibrary.desktop
 
+import org.json.JSONObject
 import java.io.File
 import java.io.PrintStream
 import java.net.HttpURLConnection
 import java.net.URI
-import org.json.JSONObject
 
 /* Copyright 2022 Simon Schubert
  *
@@ -175,28 +175,26 @@ class MarkdownBuilder {
         stream.close()
     }
 
-    private fun getPublicSponsors(): Pair<List<Pair<String, String>>, List<Pair<String, String>>> {
-        return try {
-            val connection = URI("https://ghs.vercel.app/v3/sponsors/SimonSchubert").toURL()
-                .openConnection() as HttpURLConnection
-            connection.connectTimeout = 5000
-            connection.readTimeout = 5000
-
-            val response = JSONObject(connection.inputStream.bufferedReader().readText())
-            val sponsors = response.getJSONObject("sponsors")
+    private fun getPublicSponsors(): Pair<List<Pair<String, String>>, List<Pair<String, String>>> = try {
+        val connection = URI("https://ghs.vercel.app/v3/sponsors/SimonSchubert").toURL()
+            .openConnection() as HttpURLConnection
+        connection.connectTimeout = 5000
+        connection.readTimeout = 5000
 
-            fun parseSponsors(array: org.json.JSONArray) = (0 until array.length()).map { i ->
-                val sponsor = array.getJSONObject(i)
-                Pair(sponsor.getString("username"), sponsor.getString("avatar"))
-            }
+        val response = JSONObject(connection.inputStream.bufferedReader().readText())
+        val sponsors = response.getJSONObject("sponsors")
 
-            Pair(
-                parseSponsors(sponsors.getJSONArray("current")),
-                parseSponsors(sponsors.getJSONArray("past")).take(10)
-            )
-        } catch (e: Exception) {
-            println("Failed to fetch sponsors: ${e.message}")
-            Pair(emptyList(), emptyList())
+        fun parseSponsors(array: org.json.JSONArray) = (0 until array.length()).map { i ->
+            val sponsor = array.getJSONObject(i)
+            Pair(sponsor.getString("username"), sponsor.getString("avatar"))
         }
+
+        Pair(
+            parseSponsors(sponsors.getJSONArray("current")),
+            parseSponsors(sponsors.getJSONArray("past")).take(10),
+        )
+    } catch (e: Exception) {
+        println("Failed to fetch sponsors: ${e.message}")
+        Pair(emptyList(), emptyList())
     }
 }