Merge pull request #800 from tunjid/tj/guest-mode-fix

FIx guest mode and settings row toggle spacing

Author: tunjid

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/AuthRepository.kt

@@ -45,6 +45,7 @@ import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
@@ -56,6 +57,8 @@ import sh.christian.ozone.api.Did
 interface AuthRepository {
     val isSignedIn: Flow<Boolean>
 
+    val isGuest: Flow<Boolean>
+
     val signedInUser: Flow<Profile?>
 
     fun isSignedInProfile(id: ProfileId): Flow<Boolean>
@@ -87,6 +90,13 @@ internal class AuthTokenRepository(
         savedStateDataSource.signedInAuth.map {
             it != null
         }
+            .distinctUntilChanged()
+
+    override val isGuest: Flow<Boolean> =
+        savedStateDataSource.savedState.map { savedState ->
+            savedState.auth is SavedState.AuthTokens.Guest
+        }
+            .distinctUntilChanged()
 
     override val signedInUser: Flow<Profile?> =
         savedStateDataSource.singleSessionFlow { signedInProfileId ->

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/UserDataRepository.kt

@@ -67,6 +67,7 @@ internal class OfflineUserDataRepository @Inject constructor(
     override val navigation: Flow<SavedState.Navigation>
         get() = savedStateDataSource.savedState
             .map { it.navigation }
+            .distinctUntilChanged()
 
     override suspend fun persistNavigationState(
         navigation: SavedState.Navigation,

feature/settings/src/commonMain/kotlin/com/tunjid/heron/settings/ui/AppearanceItem.kt

@@ -16,15 +16,10 @@
 
 package com.tunjid.heron.settings.ui
 
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Palette
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import com.tunjid.heron.data.core.models.Preferences
 import heron.feature.settings.generated.resources.Res
@@ -53,33 +48,17 @@ fun AppearanceItem(
         title = stringResource(Res.string.appearance),
         icon = Icons.Rounded.Palette,
     ) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = stringResource(Res.string.use_dynamic_theming),
-            )
-            Switch(
-                checked = signedInProfilePreferences.useDynamicTheming,
-                onCheckedChange = setDynamicThemingPreference,
-                enabled = isDynamicThemingSupported,
-            )
-        }
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically,
-        ) {
-            Text(
-                text = stringResource(Res.string.use_compact_navigation),
-            )
-            Switch(
-                checked = signedInProfilePreferences.useCompactNavigation,
-                onCheckedChange = setCompactNavigation,
-                enabled = isCompactNavigationSupported,
-            )
-        }
+        SettingsToggleItem(
+            text = stringResource(Res.string.use_dynamic_theming),
+            enabled = isDynamicThemingSupported,
+            checked = signedInProfilePreferences.useDynamicTheming,
+            onCheckedChange = setDynamicThemingPreference,
+        )
+        SettingsToggleItem(
+            text = stringResource(Res.string.use_compact_navigation),
+            enabled = isCompactNavigationSupported,
+            checked = signedInProfilePreferences.useCompactNavigation,
+            onCheckedChange = setCompactNavigation,
+        )
     }
 }

feature/settings/src/commonMain/kotlin/com/tunjid/heron/settings/ui/SettingsItemRow.kt

@@ -37,6 +37,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExpandLess
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -155,6 +156,30 @@ fun ExpandableSettingsItemRow(
     }
 }
 
+@Composable
+fun SettingsToggleItem(
+    text: String,
+    enabled: Boolean,
+    checked: Boolean,
+    onCheckedChange: (Boolean) -> Unit,
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = text,
+        )
+        Spacer(Modifier.weight(1f))
+        Spacer(Modifier.width(16.dp))
+        Switch(
+            enabled = enabled,
+            checked = checked,
+            onCheckedChange = onCheckedChange,
+        )
+    }
+}
+
 private val EnterTransition = fadeIn() + slideInVertically { -it }
 private val ExitTransition =
     shrinkOut { IntSize(it.width, 0) } + slideOutVertically { -it } + fadeOut()

scaffold/src/commonMain/kotlin/com/tunjid/heron/scaffold/navigation/NavigationMutator.kt

@@ -496,12 +496,13 @@ private fun forceSignOutMutations(
 ): Flow<Mutation<MultiStackNav>> =
     combine(
         authRepository.isSignedIn,
+        authRepository.isGuest,
         userDataRepository.navigation,
-        ::Pair,
+        ::Triple,
     )
-        .filter { (isSignedIn, navigation) ->
+        .filter { (isSignedIn, isGuest, navigation) ->
             // No auth token and is displaying main navigation
-            !isSignedIn && navigation != EmptyNavigation
+            !isSignedIn && !isGuest && navigation != EmptyNavigation
         }
         .mapLatestToMutation {
             when (stacks[currentIndex].name) {