profile + auth screens fix; datastore for desktop path fix

dinaraparanid · dinaraparanid · commit d76065388cbf · 2024-07-21T13:11:33.000+03:00
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -126,8 +126,8 @@ android {
         applicationId = "com.paranid5.cooking_corner"
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 2
+        versionName = "1.0.1"
     }
     packaging {
         resources {
@@ -159,7 +159,7 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "Cooking Corner"
-            packageVersion = "1.0.0"
+            packageVersion = "1.0.1"
             description = "Cooking Recipes App"
             copyright = "© 2024 Arseny Savchenko. All rights reserved."
             includeAllModules = true
diff --git a/composeApp/src/androidMain/kotlin/com/paranid5/cooking_corner/MainActivity.kt b/composeApp/src/androidMain/kotlin/com/paranid5/cooking_corner/MainActivity.kt
@@ -1,8 +1,10 @@
 package com.paranid5.cooking_corner
 
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.ui.Modifier
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -22,6 +24,9 @@ class MainActivity : ComponentActivity(), DIAware {
         installSplashScreen()
         super.onCreate(savedInstanceState)
 
+        enableEdgeToEdge()
+        setNavigationBarColorToTransparent()
+
         val rootComponent = retainedComponent {
             rootComponentFactory.create(componentContext = it)
         }
@@ -34,3 +39,12 @@ class MainActivity : ComponentActivity(), DIAware {
         }
     }
 }
+
+internal fun MainActivity.setNavigationBarColorToTransparent() = window.run {
+    setFlags(
+        WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+        WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
+    )
+
+    navigationBarColor = getColor(android.R.color.transparent)
+}
diff --git a/composeApp/src/androidMain/res/values-v27/themes.xml b/composeApp/src/androidMain/res/values-v27/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.CookingCorner" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:colorPrimary">@color/main_pastel</item>
+        <item name="android:colorBackground">@color/main_pastel</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/main_pastel</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
diff --git a/composeApp/src/androidMain/res/values/themes.xml b/composeApp/src/androidMain/res/values/themes.xml
@@ -4,6 +4,6 @@
         <item name="android:colorPrimary">@color/main_pastel</item>
         <item name="android:colorBackground">@color/main_pastel</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/main_pastel</item>
     </style>
 </resources>
diff --git a/data/src/desktopMain/kotlin/com/paranid5/cooking_corner/data/datastore/DataStoreClientImpl.kt b/data/src/desktopMain/kotlin/com/paranid5/cooking_corner/data/datastore/DataStoreClientImpl.kt
@@ -5,12 +5,16 @@ import okio.Path.Companion.toPath
 
 internal class DataStoreClientImpl : DataStoreClient {
     private companion object {
-        const val DATA_STORE_PATH = "params.preferences_pb"
+        const val DATA_STORE_PATH = "CookingCorner/params.preferences_pb"
+    }
+
+    private val dataStorePath by lazy {
+        "${System.getProperty("user.home").orEmpty()}/$DATA_STORE_PATH"
     }
 
     override val dataStore by lazy {
         PreferenceDataStoreFactory.createWithPath(
-            produceFile = { DATA_STORE_PATH.toPath() }
+            produceFile = { dataStorePath.toPath() }
         )
     }
 }
diff --git a/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_in/component/SignInExecutor.kt b/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_in/component/SignInExecutor.kt
@@ -24,6 +24,7 @@ internal class SignInExecutor(
 
             is UiIntent.ConfirmCredentials -> scope.launch {
                 tryAcquireTokens(unhandledErrorSnackbar = intent.unhandledErrorSnackbarMessage)
+                dispatch(Msg.UpdateLoginText("ХУЕСОС"))
             }
 
             is UiIntent.ShowSignUp -> publish(Label.ShowSignUp)
@@ -55,4 +56,4 @@ internal class SignInExecutor(
         is TokenResult.UnhandledError ->
             globalEventRepository.sendSnackbar(unhandledErrorSnackbar)
     }
-}
+}
diff --git a/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_in/presentation/SignInUi.kt b/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_in/presentation/SignInUi.kt
@@ -7,6 +7,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material3.Text
@@ -48,7 +50,7 @@ internal fun SignInUi(
     val state by component.stateFlow.collectAsState()
     val onUiIntent = component::onUiIntent
 
-    Box(modifier) {
+    Column(modifier.verticalScroll(rememberScrollState())) {
         SignInContent(
             state = state,
             onUiIntent = onUiIntent,
@@ -57,11 +59,13 @@ internal fun SignInUi(
                 .padding(top = AppTheme.dimensions.padding.enormous),
         )
 
+        Spacer(Modifier.weight(1F))
+
         SignUpButton(
             onUiIntent = onUiIntent,
             modifier = Modifier
-                .align(Alignment.BottomCenter)
-                .padding(bottom = AppTheme.dimensions.padding.extraMedium),
+                .align(Alignment.CenterHorizontally)
+                .padding(vertical = AppTheme.dimensions.padding.extraMedium),
         )
     }
 }
diff --git a/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_up/error/UserAlreadyExistsException.kt b/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_up/error/UserAlreadyExistsException.kt
diff --git a/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_up/presentation/SignUpUi.kt b/feature/auth/src/commonMain/kotlin/com/paranid5/cooking_corner/featrue/auth/sign_up/presentation/SignUpUi.kt
@@ -1,5 +1,7 @@
 package com.paranid5.cooking_corner.featrue.auth.sign_up.presentation
 
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -63,7 +65,7 @@ private fun SignUpContent(
     val invalidCredentialsSnackbar =
         ErrorSnackbar(stringResource(Res.string.auth_user_already_exists))
 
-    ConstraintLayout(modifier = modifier) {
+    ConstraintLayout(modifier = modifier.verticalScroll(rememberScrollState())) {
         val (
             backButton,
             title,
@@ -149,6 +151,7 @@ private fun SignUpContent(
             },
             modifier = Modifier.constrainAs(confirmButton) {
                 top.linkTo(confirmPassword.bottom, margin = appPadding.large)
+                bottom.linkTo(parent.bottom, margin = appPadding.extraMedium)
                 start.linkTo(parent.start, margin = appPadding.extraMedium)
                 end.linkTo(parent.end, margin = appPadding.extraMedium)
                 width = Dimension.fillToConstraints
diff --git a/feature/main/profile/src/commonMain/kotlin/com/paranid5/cooking_corner/feature/main/profile/presentation/ProfileUi.kt b/feature/main/profile/src/commonMain/kotlin/com/paranid5/cooking_corner/feature/main/profile/presentation/ProfileUi.kt
@@ -6,9 +6,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
@@ -24,6 +27,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import com.paranid5.cooking_corner.core.resources.Res
 import com.paranid5.cooking_corner.core.resources.ic_edit
 import com.paranid5.cooking_corner.core.resources.profile_cooking_experience
@@ -71,23 +75,25 @@ fun ProfileUi(
     )
 
     @Composable
-    fun BoxScope.buildProfileButtonsModifier() =
+    fun ColumnScope.buildProfileButtonsModifier() =
         Modifier
             .fillMaxWidth()
-            .align(Alignment.BottomCenter)
-            .padding(bottom = AppTheme.dimensions.padding.large)
+            .align(Alignment.CenterHorizontally)
+            .padding(vertical = AppTheme.dimensions.padding.large)
             .padding(horizontal = AppTheme.dimensions.padding.extraLarge)
 
     @Composable
-    fun BoxScope.Content(profileUiState: ProfileUiState) {
+    fun ColumnScope.Content(profileUiState: ProfileUiState) {
         ProfileUiImpl(
             state = state,
             profileUiState = profileUiState,
             modifier = Modifier
-                .align(Alignment.TopCenter)
+                .align(Alignment.CenterHorizontally)
                 .padding(top = AppTheme.dimensions.padding.medium),
         )
 
+        Spacer(Modifier.weight(1F))
+
         ProfileButtons(
             isProfileEditable = true,
             onUiIntent = onUiIntent,
@@ -96,11 +102,17 @@ fun ProfileUi(
     }
 
     @Composable
-    fun BoxScope.Error() {
-        AppErrorStub(
-            errorMessage = stringResource(Res.string.profile_error),
-            modifier = Modifier.align(Alignment.Center),
-        )
+    fun ColumnScope.Error() {
+        Box(
+            Modifier
+                .fillMaxWidth()
+                .weight(1F)
+        ) {
+            AppErrorStub(
+                errorMessage = stringResource(Res.string.profile_error),
+                modifier = Modifier.align(Alignment.Center),
+            )
+        }
 
         ProfileButtons(
             isProfileEditable = false,
@@ -109,27 +121,30 @@ fun ProfileUi(
         )
     }
 
-    Box(
+    Column(
         modifier
             .pullRefresh(pullRefreshState)
             .verticalScroll(rememberScrollState())
     ) {
+        AppPullRefreshIndicator(
+            isRefreshing = isRefreshingShown,
+            state = pullRefreshState,
+            modifier = Modifier
+                .zIndex(1F)
+                .align(Alignment.CenterHorizontally),
+        )
+
         when (state.uiState) {
             is UiState.Data, is UiState.Refreshing, is UiState.Success ->
                 state.uiState.getOrNull()?.let { Content(profileUiState = it) }
 
-            is UiState.Error ->
-                Error()
+            is UiState.Error -> Error()
 
             is UiState.Loading, is UiState.Undefined ->
-                AppProgressIndicator(Modifier.align(Alignment.Center))
+                Box(Modifier.fillMaxSize()) {
+                    AppProgressIndicator(Modifier.align(Alignment.Center))
+                }
         }
-
-        AppPullRefreshIndicator(
-            isRefreshing = isRefreshingShown,
-            state = pullRefreshState,
-            modifier = Modifier.align(Alignment.TopCenter),
-        )
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,16 @@ import okio.Path.Companion.toPath`
`5`	`5`
`6`	`6`	`internal class DataStoreClientImpl : DataStoreClient {`
`7`	`7`	`private companion object {`
`8`		`- const val DATA_STORE_PATH = "params.preferences_pb"`
	`8`	`+ const val DATA_STORE_PATH = "CookingCorner/params.preferences_pb"`
	`9`	`+ }`
	`10`	`+`
	`11`	`+ private val dataStorePath by lazy {`
	`12`	`+ "${System.getProperty("user.home").orEmpty()}/$DATA_STORE_PATH"`
`9`	`13`	`}`
`10`	`14`
`11`	`15`	`override val dataStore by lazy {`
`12`	`16`	`PreferenceDataStoreFactory.createWithPath(`
`13`		`- produceFile = { DATA_STORE_PATH.toPath() }`
	`17`	`+ produceFile = { dataStorePath.toPath() }`
`14`	`18`	`)`
`15`	`19`	`}`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ internal class SignInExecutor(`
`24`	`24`
`25`	`25`	`is UiIntent.ConfirmCredentials -> scope.launch {`
`26`	`26`	`tryAcquireTokens(unhandledErrorSnackbar = intent.unhandledErrorSnackbarMessage)`
	`27`	`+ dispatch(Msg.UpdateLoginText("ХУЕСОС"))`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`is UiIntent.ShowSignUp -> publish(Label.ShowSignUp)`
`@@ -55,4 +56,4 @@ internal class SignInExecutor(`
`55`	`56`	`is TokenResult.UnhandledError ->`
`56`	`57`	`globalEventRepository.sendSnackbar(unhandledErrorSnackbar)`
`57`	`58`	`}`
`58`		`-}`
	`59`	`+}`