Update project

michaelbel · Dec 17, 2024 · 7e2409f · 7e2409f
1 parent 58447c7
commit 7e2409f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -2,7 +2,6 @@ import com.google.firebase.appdistribution.gradle.AppDistributionExtension
 import org.apache.commons.io.output.ByteArrayOutputStream
 import org.jetbrains.kotlin.konan.properties.Properties
 import java.io.FileInputStream
-import java.nio.charset.Charset
 
 @Suppress("dsl_scope_violation")
 
@@ -14,15 +13,20 @@ plugins {
 }
 
 private val gitCommitsCount: Int by lazy {
-    val stdout = ByteArrayOutputStream()
-    exec {
-        commandLine("git", "rev-list", "--count", "HEAD")
-        standardOutput = stdout
+    when {
+        System.getProperty("os.name").contains("Windows", ignoreCase = true) -> 1
+        else -> {
+            val stdout = ByteArrayOutputStream()
+            exec {
+                commandLine("git", "rev-list", "--count", "HEAD")
+                standardOutput = stdout
+            }
+            stdout.toString(Charsets.UTF_8).trim().toInt()
+        }
     }
-    stdout.toString(Charset.defaultCharset()).trim().toInt()
 }
 
-val currentTime by lazy {
+private val currentTime by lazy {
     System.currentTimeMillis()
 }
 

diff --git a/feature/main-impl/src/commonMain/kotlin/org/michaelbel/movies/main/MainContent.kt b/feature/main-impl/src/commonMain/kotlin/org/michaelbel/movies/main/MainContent.kt
@@ -19,6 +19,7 @@ import org.michaelbel.movies.main.navigation.mainNavGraph
 import org.michaelbel.movies.search.navigateToSearch
 import org.michaelbel.movies.search.searchGraph
 import org.michaelbel.movies.settings.navigateToSettings
+import org.michaelbel.movies.settings.settingsGraph
 
 @Composable
 fun MainContent(
@@ -57,5 +58,10 @@ fun MainContent(
             navigateBack = navHostController::popBackStack,
             navigateToDetails = navHostController::navigateToDetails,
         )
+        settingsGraph(
+            navigateBack = navHostController::popBackStack,
+            onRequestReview = onRequestReview,
+            onRequestUpdate = onRequestUpdate
+        )
     }
 }