Merge branch 'release/0.0.13'

wizbii · Apr 26, 2024 · 4dd9fcf · 4dd9fcf
2 parents 0b03c5a + dc81ccd
commit 4dd9fcf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ val artifactId = "cinematic.journey"
 val groupId = "com.wizbii"
 val packageId = "$groupId.$artifactId"
 
-val appVersionName = "0.0.12"
+val appVersionName = "0.0.13"
 val appVersionCode = appVersionName
     .removeSuffix("-SNAPSHOT")
     .split('.')

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ gradle = "8.7"
 agp = "8.2.2"
 build-config = "5.3.5"
 compose = "1.6.2"
-kotlinx-atomicfu = "0.23.2"
+kotlinx-atomicfu = "0.24.0"
 versions = "0.51.0"
 
 # Android SDK

diff --git a/...lin/com/wizbii/cinematic/journey/presentation/component/top/bar/DefaultTopBarComponent.kt b/...lin/com/wizbii/cinematic/journey/presentation/component/top/bar/DefaultTopBarComponent.kt
@@ -2,23 +2,27 @@ package com.wizbii.cinematic.journey.presentation.component.top.bar
 
 import com.arkivanov.decompose.ComponentContext
 import com.wizbii.cinematic.journey.domain.use.case.dark.mode.ToggleDarkModeUseCase
+import com.wizbii.cinematic.journey.isAndroid
 import com.wizbii.cinematic.journey.presentation.componentCoroutineScope
 import kotlinx.coroutines.launch
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
 class DefaultTopBarComponent(
     ctx: ComponentContext,
-    override val hasBackButton: Boolean,
+    private val displayBackButton: Boolean,
     private val onBackButtonClicked: (() -> Unit)? = null,
 ) : TopBarComponent, KoinComponent, ComponentContext by ctx {
 
     private val toggleDarkModeUseCase: ToggleDarkModeUseCase by inject()
 
     private val scope = componentCoroutineScope()
 
+    override val hasBackButton: Boolean
+        get() = !isAndroid && displayBackButton
+
     init {
-        if (hasBackButton) require(onBackButtonClicked != null) {
+        if (displayBackButton) require(onBackButtonClicked != null) {
             "Cannot have back button without handler"
         }
     }

diff --git a/...in/kotlin/com/wizbii/cinematic/journey/presentation/screen/movie/DefaultMovieComponent.kt b/...in/kotlin/com/wizbii/cinematic/journey/presentation/screen/movie/DefaultMovieComponent.kt
@@ -53,7 +53,7 @@ class DefaultMovieComponent(
     override val topBarComponent by lazy {
         DefaultTopBarComponent(
             ctx = childContext("top-bar"),
-            hasBackButton = true,
+            displayBackButton = true,
             onBackButtonClicked = onBackButtonClicked,
         )
     }

diff --git a/.../kotlin/com/wizbii/cinematic/journey/presentation/screen/movies/DefaultMoviesComponent.kt b/.../kotlin/com/wizbii/cinematic/journey/presentation/screen/movies/DefaultMoviesComponent.kt
@@ -48,7 +48,7 @@ class DefaultMoviesComponent(
     override val topBarComponent by lazy {
         DefaultTopBarComponent(
             ctx = childContext("top-bar"),
-            hasBackButton = true,
+            displayBackButton = true,
             onBackButtonClicked = onBackButtonClicked,
         )
     }

diff --git a/...n/com/wizbii/cinematic/journey/presentation/screen/universes/DefaultUniversesComponent.kt b/...n/com/wizbii/cinematic/journey/presentation/screen/universes/DefaultUniversesComponent.kt
@@ -24,7 +24,7 @@ class DefaultUniversesComponent(
     override val topBarComponent by lazy {
         DefaultTopBarComponent(
             ctx = childContext("top-bar"),
-            hasBackButton = false,
+            displayBackButton = false,
         )
     }
 

diff --git a/xcode/CinematicJourney/Info.plist b/xcode/CinematicJourney/Info.plist
@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.12</string>
+	<string>0.0.13</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>