Fix xcode project setup

Author: SimonSchubert

README.md

@@ -1,4 +1,4 @@
-## Linux Command Library (Mobile+CLI+Web)
+## Linux Command Library (Android+iOS+Desktop GUI and CLI+Web)
 
 ![Icon](https://raw.githubusercontent.com/SimonSchubert/LinuxCommandLibrary/master/art/web_hi_res_144.png)
 
@@ -14,10 +14,16 @@ The app currently has **6219** manual pages, **23+** basic categories and a bunc
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-android-1.png" width="200">
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-android-2.png" width="200">
 </p>
+
+### iOS screenshots
+
 <p>
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-ios-1.png" width="200">
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-ios-2.png" width="200">
 </p>
+
+### Desktop screenshots
+
 <p>
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-desktop-1.png" width="400">
 <img src="https://raw.githubusercontent.com/SimonSchubert/LinuxCommandBibliotheca/master/art/screen-desktop-2.png" width="400">

android/src/main/java/com/inspiredandroid/linuxcommandbibliotheca/MainActivity.kt

@@ -35,7 +35,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
-            navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT)
+            navigationBarStyle = SystemBarStyle.dark(android.graphics.Color.TRANSPARENT),
         )
         super.onCreate(savedInstanceState)
 

art/web_hi_res_1024.png

@@ -60,6 +60,35 @@ kotlin {
     }
 }
 
+// Task to generate Version.kt from libs.versions.toml
+val generateVersionFile by tasks.registering {
+    val appVersion = libs.versions.appVersion.get()
+    val outputDir = file("src/commonMain/kotlin/com/linuxcommandlibrary/shared")
+    val outputFile = file("$outputDir/Version.kt")
+
+    inputs.property("appVersion", appVersion)
+    outputs.file(outputFile)
+
+    doLast {
+        outputDir.mkdirs()
+        outputFile.writeText(
+            """
+            |package com.linuxcommandlibrary.shared
+            |
+            |object Version {
+            |    const val appVersion = "$appVersion"
+            |}
+            |""".trimMargin()
+        )
+        println("Generated Version.kt with version $appVersion")
+    }
+}
+
+// Make compilation depend on version generation
+tasks.matching { it.name.contains("compileKotlin") || it.name.contains("Kotlin") && it.name.contains("compile") }.configureEach {
+    dependsOn(generateVersionFile)
+}
+
 android {
     compileSdk = 36
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

common/build.gradle.kts

@@ -1,5 +1,5 @@
 package com.linuxcommandlibrary.shared
 
 object Version {
-    const val appVersion = "3.5.3"
+    const val appVersion = "3.5.4"
 }

common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/Version.kt

@@ -96,3 +96,30 @@ compose.resources {
     packageOfResClass = "com.linuxcommandlibrary.app.resources"
     generateResClass = always
 }
+
+// Task to update iOS Info.plist with the app version from libs.versions.toml
+tasks.register("updateIosVersion") {
+    val appVersion = libs.versions.appVersion.get()
+    val infoPlistFile = file("${rootProject.projectDir}/iosApp/iosApp/Info.plist")
+
+    inputs.property("appVersion", appVersion)
+    outputs.file(infoPlistFile)
+
+    doLast {
+        if (infoPlistFile.exists()) {
+            var content = infoPlistFile.readText()
+            // Update CFBundleShortVersionString
+            content = content.replace(
+                Regex("<key>CFBundleShortVersionString</key>\\s*<string>[^<]*</string>"),
+                "<key>CFBundleShortVersionString</key>\n\t<string>$appVersion</string>"
+            )
+            infoPlistFile.writeText(content)
+            println("Updated iOS Info.plist with version $appVersion")
+        }
+    }
+}
+
+// Make iOS framework tasks depend on updateIosVersion
+tasks.matching { it.name.contains("link") && it.name.contains("Ios") }.configureEach {
+    dependsOn("updateIosVersion")
+}

composeApp/build.gradle.kts

@@ -4,19 +4,15 @@ import android.content.Context
 import com.linuxcommandlibrary.shared.platform.AssetReader
 
 class AndroidAssetReader(private val context: Context) : AssetReader {
-    override fun listFiles(path: String): List<String> {
-        return try {
-            context.assets.list(path)?.toList() ?: emptyList()
-        } catch (e: Exception) {
-            emptyList()
-        }
+    override fun listFiles(path: String): List<String> = try {
+        context.assets.list(path)?.toList() ?: emptyList()
+    } catch (e: Exception) {
+        emptyList()
     }
 
-    override fun readFile(path: String): String? {
-        return try {
-            context.assets.open(path).bufferedReader().readText()
-        } catch (e: Exception) {
-            null
-        }
+    override fun readFile(path: String): String? = try {
+        context.assets.open(path).bufferedReader().readText()
+    } catch (e: Exception) {
+        null
     }
 }

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

@@ -10,25 +10,19 @@ class AndroidPreferencesStorage(context: Context) : PreferencesStorage {
     // Use default shared preferences for backward compatibility with existing user data
     private val prefs: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
-    override fun getString(key: String, defaultValue: String): String {
-        return prefs.getString(key, defaultValue) ?: defaultValue
-    }
+    override fun getString(key: String, defaultValue: String): String = prefs.getString(key, defaultValue) ?: defaultValue
 
     override fun putString(key: String, value: String) {
         prefs.edit { putString(key, value) }
     }
 
-    override fun getBoolean(key: String, defaultValue: Boolean): Boolean {
-        return prefs.getBoolean(key, defaultValue)
-    }
+    override fun getBoolean(key: String, defaultValue: Boolean): Boolean = prefs.getBoolean(key, defaultValue)
 
     override fun putBoolean(key: String, value: Boolean) {
         prefs.edit { putBoolean(key, value) }
     }
 
-    override fun getInt(key: String, defaultValue: Int): Int {
-        return prefs.getInt(key, defaultValue)
-    }
+    override fun getInt(key: String, defaultValue: Int): Int = prefs.getInt(key, defaultValue)
 
     override fun putInt(key: String, value: Int) {
         prefs.edit { putInt(key, value) }

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

@@ -12,9 +12,11 @@ class AndroidShareHandler(private val context: Context) : ShareHandler {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         }
         try {
-            context.startActivity(Intent.createChooser(intent, "Share command").apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            })
+            context.startActivity(
+                Intent.createChooser(intent, "Share command").apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                },
+            )
         } catch (e: Exception) {
             e.printStackTrace()
         }

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

@@ -1,3 +1,8 @@
 package com.linuxcommandlibrary.app.platform
 
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.ui.graphics.vector.ImageVector
+
 actual val showRateAppButton: Boolean = true
+actual val backIcon: ImageVector = Icons.AutoMirrored.Filled.ArrowBack