Merge pull request #546 from synonymdev/chore/remove-onboarding-checkbox

chore: remove terms checkbox

Author: ovitrif

app/src/main/java/to/bitkit/ui/onboarding/TermsOfUseScreen.kt

@@ -1,32 +1,19 @@
 package to.bitkit.ui.onboarding
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 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.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
@@ -42,6 +29,7 @@ import to.bitkit.ui.components.BodyMSB
 import to.bitkit.ui.components.BodySSB
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
+import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -53,8 +41,6 @@ private val horizontalPadding = 32.dp
 fun TermsOfUseScreen(
     onNavigateToIntro: () -> Unit,
 ) {
-    var termsAccepted by rememberSaveable { mutableStateOf(false) }
-    var privacyAccepted by rememberSaveable { mutableStateOf(false) }
     Scaffold { contentPadding ->
         Column(
             modifier = Modifier
@@ -98,22 +84,18 @@ fun TermsOfUseScreen(
                     .fillMaxWidth()
                     .padding(bottom = 24.dp)
             ) {
-                CheckButton(
+                TermsText(
                     title = stringResource(R.string.onboarding__tos_checkbox),
                     htmlText = stringResource(R.string.onboarding__tos_checkbox_value)
                         .withAccentLink(Env.TERMS_OF_USE_URL),
-                    isChecked = termsAccepted,
-                    onCheckedChange = { termsAccepted = it },
                     modifier = Modifier
                         .padding(horizontal = horizontalPadding)
                         .testTag("Check1")
                 )
-                CheckButton(
+                TermsText(
                     title = stringResource(R.string.onboarding__pp_checkbox),
                     htmlText = stringResource(R.string.onboarding__pp_checkbox_value)
                         .withAccentLink(Env.PRIVACY_POLICY_URL),
-                    isChecked = privacyAccepted,
-                    onCheckedChange = { privacyAccepted = it },
                     modifier = Modifier
                         .padding(horizontal = horizontalPadding)
                         .testTag("Check2")
@@ -124,7 +106,6 @@ fun TermsOfUseScreen(
                 PrimaryButton(
                     text = stringResource(R.string.common__continue),
                     onClick = onNavigateToIntro,
-                    enabled = termsAccepted && privacyAccepted,
                     modifier = Modifier
                         .padding(horizontal = horizontalPadding)
                         .testTag("Continue")
@@ -135,63 +116,25 @@ fun TermsOfUseScreen(
 }
 
 @Composable
-private fun CheckButton(
+private fun TermsText(
     title: String,
     htmlText: AnnotatedString,
-    isChecked: Boolean,
-    onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
-            .clickable { onCheckedChange(!isChecked) }
             .then(modifier)
     ) {
-        Spacer(modifier = Modifier.height(14.dp))
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Column(
-                modifier = Modifier.weight(1f)
-            ) {
-                BodyMSB(title)
-                Spacer(modifier = Modifier.height(4.dp))
-                BodySSB(text = htmlText, color = Colors.White64)
-            }
-            Spacer(modifier = Modifier.width(48.dp))
-            CheckmarkBox(isChecked)
-        }
-        Spacer(modifier = Modifier.height(14.dp))
+        VerticalSpacer(14.dp)
+        BodyMSB(title)
+        VerticalSpacer(4.dp)
+        BodySSB(text = htmlText, color = Colors.White64)
+        VerticalSpacer(14.dp)
         HorizontalDivider()
     }
 }
 
-@Composable
-private fun CheckmarkBox(isChecked: Boolean) {
-    val borderColor = if (isChecked) Colors.Brand else Colors.White32
-    val backgroundColor = if (isChecked) Color(0x52FF6600) else Colors.White10
-
-    Box(
-        contentAlignment = Alignment.Center,
-        modifier = Modifier
-            .border(width = 1.dp, color = borderColor, shape = RoundedCornerShape(size = 8.dp))
-            .background(color = backgroundColor, shape = RoundedCornerShape(size = 8.dp))
-            .size(32.dp)
-    ) {
-        if (isChecked) {
-            Icon(
-                imageVector = Icons.Default.Check,
-                contentDescription = null,
-                tint = Colors.Brand,
-                modifier = Modifier
-                    .align(Alignment.Center)
-                    .size(22.dp)
-            )
-        }
-    }
-}
 
 @Preview(showSystemUi = true)
 @Composable