Cleanup

app/src/main/java/org/thoughtcrime/securesms/conversation/start/newmessage/NewMessage.kt

@@ -1,16 +1,12 @@
 package org.thoughtcrime.securesms.conversation.start.newmessage
 
-import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 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.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.HorizontalPager
@@ -27,12 +23,10 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import network.loki.messenger.R
-import org.thoughtcrime.securesms.onboarding.ui.ContinueButton
 import org.thoughtcrime.securesms.ui.LoadingArcOr
 import org.thoughtcrime.securesms.ui.LocalDimensions
 import org.thoughtcrime.securesms.ui.PreviewTheme
 import org.thoughtcrime.securesms.ui.SessionColorsParameterProvider
-import org.thoughtcrime.securesms.ui.base
 import org.thoughtcrime.securesms.ui.color.Colors
 import org.thoughtcrime.securesms.ui.color.LocalColors
 import org.thoughtcrime.securesms.ui.components.AppBar
@@ -104,14 +98,14 @@ private fun EnterAccountId(
             BorderlessButtonWithIcon(
                 text = stringResource(R.string.messageNewDescription),
                 modifier = Modifier
-                    .animateContentSize()
                     .contentDescription(R.string.AccessibilityId_help_desk_link)
                     .padding(horizontal = LocalDimensions.current.margin)
                     .fillMaxWidth(),
                 style = small,
                 color = LocalColors.current.textSecondary,
-                iconRes = R.drawable.ic_circle_question_mark
-            ) { onHelp() }
+                iconRes = R.drawable.ic_circle_question_mark,
+                onClick = onHelp
+            )
         }
 
         Spacer(Modifier.weight(2f))
@@ -124,7 +118,7 @@ private fun EnterAccountId(
                 .contentDescription(R.string.next),
             color = LocalColors.current.primary,
             enabled = state.isNextButtonEnabled,
-            onClick = { callbacks.onContinue() }
+            onClick = callbacks::onContinue
         ) {
             LoadingArcOr(state.loading) {
                 Text(stringResource(R.string.next))

app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt

@@ -4,11 +4,9 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.defaultMinSize
 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.width
 import androidx.compose.foundation.pager.HorizontalPager
@@ -72,56 +70,51 @@ private fun PreviewRecoveryPassword() {
 
 @Composable
 private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onContinue: () -> Unit = {}) {
-        Column(
-            modifier = Modifier
-                .fillMaxSize()
-                .verticalScroll(rememberScrollState())
-        ) {
-            Spacer(
-                Modifier
-                    .heightIn(min = LocalDimensions.current.smallItemSpacing)
-                    .weight(1f))
-            // this is to make sure the spacer above doesn't get compressed to 0
-            Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+    ) {
+        Spacer(Modifier.weight(1f))
+        Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
 
-            Column(
-                modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin)
-            ) {
-                Row {
-                    Text(
-                        modifier = Modifier.weight(1f),
-                        text = stringResource(R.string.sessionRecoveryPassword),
-                        style = h4
-                    )
-                    Spacer(Modifier.width(LocalDimensions.current.xxsItemSpacing))
-                    Icon(
-                        modifier = Modifier.align(Alignment.CenterVertically),
-                        painter = painterResource(id = R.drawable.ic_shield_outline),
-                        contentDescription = null,
-                    )
-                }
-                Spacer(Modifier.height(LocalDimensions.current.smallItemSpacing))
+        Column(
+            modifier = Modifier.padding(horizontal = LocalDimensions.current.largeMargin)
+        ) {
+            Row {
                 Text(
-                    stringResource(R.string.activity_link_enter_your_recovery_password_to_load_your_account_if_you_haven_t_saved_it_you_can_find_it_in_your_app_settings),
-                    style = base
+                    modifier = Modifier.weight(1f),
+                    text = stringResource(R.string.sessionRecoveryPassword),
+                    style = h4
                 )
-                Spacer(Modifier.height(LocalDimensions.current.itemSpacing))
-                SessionOutlinedTextField(
-                    text = state.recoveryPhrase,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .contentDescription(R.string.AccessibilityId_recovery_phrase_input),
-                    placeholder = stringResource(R.string.recoveryPasswordEnter),
-                    onChange = onChange,
-                    onContinue = onContinue,
-                    error = state.error
+                Spacer(Modifier.width(LocalDimensions.current.xxsItemSpacing))
+                Icon(
+                    modifier = Modifier.align(Alignment.CenterVertically),
+                    painter = painterResource(id = R.drawable.ic_shield_outline),
+                    contentDescription = null,
                 )
             }
-
-            // this is to make sure the spacer below doesn't get compressed to 0
-            Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
-            Spacer(Modifier.weight(2f))
-
-            ContinueButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue)
+            Spacer(Modifier.height(LocalDimensions.current.smallItemSpacing))
+            Text(
+                stringResource(R.string.activity_link_enter_your_recovery_password_to_load_your_account_if_you_haven_t_saved_it_you_can_find_it_in_your_app_settings),
+                style = base
+            )
+            Spacer(Modifier.height(LocalDimensions.current.itemSpacing))
+            SessionOutlinedTextField(
+                text = state.recoveryPhrase,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .contentDescription(R.string.AccessibilityId_recovery_phrase_input),
+                placeholder = stringResource(R.string.recoveryPasswordEnter),
+                onChange = onChange,
+                onContinue = onContinue,
+                error = state.error
+            )
         }
+
+        Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
+        Spacer(Modifier.weight(2f))
+
+        ContinueButton(modifier = Modifier.align(Alignment.CenterHorizontally), onContinue)
+    }
 }

app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt

@@ -5,7 +5,6 @@ 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.rememberScrollState
 import androidx.compose.foundation.verticalScroll
@@ -39,11 +38,7 @@ internal fun DisplayName(state: State, onChange: (String) -> Unit = {}, onContin
             .fillMaxSize()
             .verticalScroll(rememberScrollState())
     ) {
-        Spacer(
-            Modifier
-                .heightIn(min = LocalDimensions.current.smallItemSpacing)
-                .weight(1f))
-        // this is to make sure the spacer above doesn't get compressed to 0
+        Spacer(Modifier.weight(1f))
         Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
 
         Column(
@@ -68,7 +63,6 @@ internal fun DisplayName(state: State, onChange: (String) -> Unit = {}, onContin
             )
         }
 
-        // this is to make sure the spacer below doesn't get compressed to 0
         Spacer(modifier = Modifier.height(LocalDimensions.current.smallItemSpacing))
         Spacer(Modifier.weight(2f))