Merge pull request #302 from PermanentOrg/feature/VSP-1443

Sign in implementation
PermanentOrg · Sep 27, 2024 · 5d840fa · 5d840fa
2 parents 86ef4da + fe09206
commit 5d840fa
Show file tree

Hide file tree

Showing 38 changed files with 939 additions and 607 deletions.
diff --git a/app/src/main/java/org/permanent/permanent/Validator.kt b/app/src/main/java/org/permanent/permanent/Validator.kt
@@ -46,18 +46,18 @@ class Validator {
             }
         }
 
-        fun isValidPassword(password: String?, passwordError: MutableLiveData<Int>): Boolean {
+        fun isValidPassword(password: String?, passwordError: MutableLiveData<Int>?): Boolean {
             return when {
                 password.isNullOrEmpty() -> {
-                    passwordError.value = R.string.password_empty_error
+                    passwordError?.value = R.string.password_empty_error
                     false
                 }
                 password.length < MIN_PASSWORD_LENGTH -> {
-                    passwordError.value = R.string.password_too_short_error
+                    passwordError?.value = R.string.password_too_short_error
                     false
                 }
                 else -> {
-                    passwordError.value = null
+                    passwordError?.value = null
                     true
                 }
             }

diff --git a/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveNamePage.kt b/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveNamePage.kt
@@ -45,7 +45,7 @@ import kotlinx.coroutines.launch
 import org.permanent.permanent.R
 import org.permanent.permanent.ui.composeComponents.ButtonColor
 import org.permanent.permanent.ui.composeComponents.ButtonIconAlignment
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 
 
 @Composable
@@ -200,7 +200,7 @@ private fun TabletBody(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                    SmallTextAndIconButton(
+                    CenteredTextAndIconButton(
                         buttonColor = ButtonColor.TRANSPARENT,
                         text = stringResource(id = R.string.back),
                         icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -215,7 +215,7 @@ private fun TabletBody(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                    SmallTextAndIconButton(
+                    CenteredTextAndIconButton(
                         buttonColor = ButtonColor.LIGHT,
                         text = stringResource(id = R.string.next),
                         showButtonEnabled = textFieldValueState.text.isNotEmpty()
@@ -353,7 +353,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.TRANSPARENT,
                     text = stringResource(id = R.string.back),
                     icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -370,7 +370,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.LIGHT,
                     text = stringResource(id = R.string.next),
                     showButtonEnabled = textFieldValueState.text.isNotEmpty()

diff --git a/...main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveOnboardingScreen.kt b/...main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveOnboardingScreen.kt
@@ -2,16 +2,9 @@
 
 package org.permanent.permanent.ui.archiveOnboarding.compose
 
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -37,12 +30,10 @@ import androidx.compose.runtime.saveable.listSaver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.toMutableStateList
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -53,7 +44,8 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
 import org.permanent.permanent.R
 import org.permanent.permanent.models.ArchiveType
-import org.permanent.permanent.ui.composeComponents.CustomProgressIndicator
+import org.permanent.permanent.ui.composeComponents.CircularProgressIndicator
+import org.permanent.permanent.ui.composeComponents.CustomLinearProgressIndicator
 import org.permanent.permanent.viewmodels.ArchiveOnboardingViewModel
 
 @Composable
@@ -282,29 +274,7 @@ fun ArchiveOnboardingScreen(
 
         // Overlay with spinning images
         if (isBusyState) {
-            Box(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .background(Color.Black.copy(alpha = 0.5f))
-                    .clickable(enabled = false) {}, contentAlignment = Alignment.Center
-            ) {
-                val infiniteTransition = rememberInfiniteTransition(label = "")
-
-                val rotation by infiniteTransition.animateFloat(
-                    initialValue = 0f, targetValue = 360f, animationSpec = infiniteRepeatable(
-                        animation = tween(1000, easing = LinearEasing),
-                        repeatMode = RepeatMode.Restart
-                    ), label = ""
-                )
-
-                Image(painter = painterResource(id = R.drawable.ellipse_exterior),
-                    contentDescription = null,
-                    modifier = Modifier.graphicsLayer { rotationZ = -rotation })
-
-                Image(painter = painterResource(id = R.drawable.ellipse_interior),
-                    contentDescription = null,
-                    modifier = Modifier.graphicsLayer { rotationZ = rotation })
-            }
+            CircularProgressIndicator()
         }
     }
 
@@ -337,7 +307,7 @@ fun OnboardingProgressIndicator(
     val configuration = LocalConfiguration.current
     val screenWidthDp = configuration.screenWidthDp.dp
 
-    CustomProgressIndicator(
+    CustomLinearProgressIndicator(
         Modifier
             .clip(shape = RoundedCornerShape(3.dp))
             .height(height),

diff --git a/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveTypePage.kt b/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/ArchiveTypePage.kt
@@ -40,7 +40,7 @@ import org.permanent.permanent.R
 import org.permanent.permanent.models.ArchiveType
 import org.permanent.permanent.ui.composeComponents.ButtonColor
 import org.permanent.permanent.ui.composeComponents.ButtonIconAlignment
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 
 @Composable
 fun ArchiveTypePage(
@@ -131,7 +131,7 @@ private fun TabletBody(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.TRANSPARENT,
                             text = stringResource(id = R.string.back),
                             icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -146,7 +146,7 @@ private fun TabletBody(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                    SmallTextAndIconButton(
+                    CenteredTextAndIconButton(
                         buttonColor = ButtonColor.LIGHT,
                         text = stringResource(id = R.string.next)
                     ) {
@@ -218,7 +218,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.TRANSPARENT,
                     text = stringResource(id = R.string.back),
                     icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -235,7 +235,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     ButtonColor.LIGHT, text = stringResource(id = R.string.next)
                 ) {
                     coroutineScope.launch {

diff --git a/...src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/CongratulationsPage.kt b/...src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/CongratulationsPage.kt
@@ -43,7 +43,7 @@ import org.permanent.permanent.models.Archive
 import org.permanent.permanent.models.ThumbStatus
 import org.permanent.permanent.ui.composeComponents.ArchiveItem
 import org.permanent.permanent.ui.composeComponents.ButtonColor
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 import org.permanent.permanent.viewmodels.ArchiveOnboardingViewModel
 
 @Composable
@@ -176,7 +176,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.LIGHT,
                     text = stringResource(id = R.string.done),
                     icon = painterResource(id = R.drawable.ic_done_white),
@@ -287,7 +287,7 @@ private fun TabletBody(
                         .fillMaxWidth()
                         .weight(1f)
                 ) {
-                    SmallTextAndIconButton(
+                    CenteredTextAndIconButton(
                         buttonColor = ButtonColor.LIGHT,
                         text = stringResource(id = R.string.done),
                         icon = painterResource(id = R.drawable.ic_done_white),

diff --git a/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/GoalsPage.kt b/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/GoalsPage.kt
@@ -46,8 +46,8 @@ import kotlinx.coroutines.launch
 import org.permanent.permanent.R
 import org.permanent.permanent.ui.composeComponents.ButtonColor
 import org.permanent.permanent.ui.composeComponents.ButtonIconAlignment
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 import org.permanent.permanent.ui.composeComponents.CustomCheckbox
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
 import org.permanent.permanent.viewmodels.ArchiveOnboardingViewModel
 
 
@@ -181,7 +181,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.TRANSPARENT,
                     text = stringResource(id = R.string.back),
                     icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -200,7 +200,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.LIGHT, text = stringResource(id = R.string.next)
                 ) {
                     newArchive.goals = goals
@@ -317,7 +317,7 @@ private fun TabletBody(
                     Box(
                         modifier = Modifier.weight(1f)
                     ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.TRANSPARENT,
                             text = stringResource(id = R.string.back),
                             icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -334,7 +334,7 @@ private fun TabletBody(
                     Box(
                         modifier = Modifier.weight(1f)
                     ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.LIGHT,
                             text = stringResource(id = R.string.next)
                         ) {

diff --git a/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/PrioritiesPage.kt b/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/PrioritiesPage.kt
@@ -49,8 +49,8 @@ import kotlinx.coroutines.launch
 import org.permanent.permanent.R
 import org.permanent.permanent.ui.composeComponents.ButtonColor
 import org.permanent.permanent.ui.composeComponents.ButtonIconAlignment
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 import org.permanent.permanent.ui.composeComponents.CustomCheckbox
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
 import org.permanent.permanent.viewmodels.ArchiveOnboardingViewModel
 
 @Composable
@@ -199,7 +199,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.TRANSPARENT,
                     text = stringResource(id = R.string.back),
                     icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -216,7 +216,7 @@ private fun PhoneBody(
                     .fillMaxWidth()
                     .weight(1f)
             ) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.LIGHT, text = stringResource(id = R.string.next)
                 ) {
                     newArchive.priorities = priorities
@@ -334,7 +334,7 @@ private fun TabletBody(
                     Box(
                         modifier = Modifier.weight(1f)
                     ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.TRANSPARENT,
                             text = stringResource(id = R.string.back),
                             icon = painterResource(id = R.drawable.ic_arrow_back_rounded_white),
@@ -349,7 +349,7 @@ private fun TabletBody(
                     Box(
                         modifier = Modifier.weight(1f)
                     ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.LIGHT,
                             text = stringResource(id = R.string.next)
                         ) {

diff --git a/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/WelcomePage.kt b/app/src/main/java/org/permanent/permanent/ui/archiveOnboarding/compose/WelcomePage.kt
@@ -44,7 +44,7 @@ import org.permanent.permanent.models.Status
 import org.permanent.permanent.models.ThumbStatus
 import org.permanent.permanent.ui.composeComponents.ArchiveItem
 import org.permanent.permanent.ui.composeComponents.ButtonColor
-import org.permanent.permanent.ui.composeComponents.SmallTextAndIconButton
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
 import org.permanent.permanent.viewmodels.ArchiveOnboardingViewModel
 
 @Composable
@@ -169,7 +169,7 @@ private fun TabletBody(
                     modifier = Modifier.weight(1f)
                 ) {
                     if (archives.isNotEmpty()) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.TRANSPARENT,
                             text = stringResource(id = R.string.create_new_archive),
                             icon = painterResource(id = R.drawable.ic_plus_white)
@@ -184,7 +184,7 @@ private fun TabletBody(
                 Box(
                     modifier = Modifier.weight(1f)
                 ) {
-                    SmallTextAndIconButton(buttonColor = ButtonColor.LIGHT,
+                    CenteredTextAndIconButton(buttonColor = ButtonColor.LIGHT,
                         text = stringResource(id = if (archives.isEmpty()) R.string.get_started else R.string.next),
                         showButtonEnabled = archives.isEmpty() || archives.any { it.status == Status.OK }) {
                         val nextPage =
@@ -300,7 +300,7 @@ private fun PhoneBody(
             }
             .padding(horizontal = 32.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {
 
-            SmallTextAndIconButton(buttonColor = ButtonColor.LIGHT,
+            CenteredTextAndIconButton(buttonColor = ButtonColor.LIGHT,
                 text = stringResource(id = if (archives.isEmpty()) R.string.get_started else R.string.next),
                 showButtonEnabled = archives.isEmpty() || archives.any { it.status == Status.OK }
             ) {
@@ -316,7 +316,7 @@ private fun PhoneBody(
             }
 
             if (archives.isNotEmpty()) {
-                SmallTextAndIconButton(
+                CenteredTextAndIconButton(
                     buttonColor = ButtonColor.TRANSPARENT,
                     text = stringResource(id = R.string.new_archive),
                     icon = painterResource(id = R.drawable.ic_plus_white)

diff --git a/app/src/main/java/org/permanent/permanent/ui/composeComponents/ArchiveItem.kt b/app/src/main/java/org/permanent/permanent/ui/composeComponents/ArchiveItem.kt
@@ -105,7 +105,7 @@ fun ArchiveItem(
                             .width(90.dp)
                             .height(40.dp)
                     ) {
-                        SmallTextAndIconButton(
+                        CenteredTextAndIconButton(
                             buttonColor = ButtonColor.TRANSPARENT,
                             text = stringResource(id = R.string.accept),
                             fontSize = 12.sp,
@@ -183,7 +183,7 @@ private fun TabletBodyForWelcomePage(
                         .width(96.dp)
                         .height(48.dp)
                 ) {
-                    SmallTextAndIconButton(
+                    CenteredTextAndIconButton(
                         buttonColor = ButtonColor.TRANSPARENT,
                         text = stringResource(id = R.string.accept),
                         fontSize = 12.sp,