Convert 'change phone number' fragment to Jetpack Compose

signalapp · Dec 12, 2024 · 794c812 · 794c812
1 parent 6824f09
commit 794c812
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 105 deletions.
diff --git a/...a/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt b/...a/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberFragment.kt
@@ -5,34 +5,117 @@
 
 package org.thoughtcrime.securesms.components.settings.app.changenumber
 
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.Toolbar
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.LoggingFragment
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Previews
+import org.signal.core.ui.Scaffolds
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.ViewBinderDelegate
-import org.thoughtcrime.securesms.databinding.FragmentChangePhoneNumberBinding
+import org.thoughtcrime.securesms.compose.ComposeFragment
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
-/**
- * Screen used to educate the user about what they're about to do (change their phone number)
- */
-class ChangeNumberFragment : LoggingFragment(R.layout.fragment_change_phone_number) {
+class ChangeNumberFragment : ComposeFragment() {
 
-  companion object {
-    private val TAG = Log.tag(ChangeNumberFragment::class.java)
+  @Composable
+  override fun FragmentContent() {
+    val navController: NavController by remember { mutableStateOf(findNavController()) }
+    ChangeNumberScreen(navController)
   }
 
-  private val binding: FragmentChangePhoneNumberBinding by ViewBinderDelegate(FragmentChangePhoneNumberBinding::bind)
+}
+
+@Composable
+fun ChangeNumberScreen(
+  navController: NavController? = null
+) {
+
+  Scaffolds.Settings(
+    title = "",
+    onNavigationClick = { navController?.popBackStack() },
+    navigationIconPainter = painterResource(id = R.drawable.ic_arrow_left_24),
+    navigationContentDescription = stringResource(id = R.string.Material3SearchToolbar__close)
+  ) {
+    Column(
+      modifier = Modifier
+        .fillMaxSize()
+        .padding(it)
+        .padding(horizontal = dimensionResource(id = org.signal.core.ui.R.dimen.gutter))
+    ) {
+      LazyColumn(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier
+          .fillMaxWidth()
+          .weight(1f)
+      ) {
+        item {
+          Image(
+            painter = painterResource(id = R.drawable.change_number_hero_image),
+            contentDescription = null,
+            modifier = Modifier
+              .padding(top = 20.dp)
+          )
+        }
 
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    val toolbar: Toolbar = view.findViewById(R.id.toolbar)
-    toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
+        item {
+          Text(
+            text = stringResource(id = R.string.AccountSettingsFragment__change_phone_number),
+            style = MaterialTheme.typography.headlineMedium,
+            textAlign = TextAlign.Center,
+            fontWeight = FontWeight.Bold,
+            modifier = Modifier.padding(top = 24.dp)
+          )
+        }
 
-    binding.changePhoneNumberContinue.setOnClickListener {
-      findNavController().safeNavigate(ChangeNumberFragmentDirections.actionChangePhoneNumberFragmentToEnterPhoneNumberChangeFragment())
+        item {
+          Text(
+            text = stringResource(id = R.string.ChangeNumberFragment__use_this_to_change_your_current_phone_number_to_a_new_phone_number),
+            style = MaterialTheme.typography.bodyLarge,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(top = 12.dp)
+          )
+        }
+      }
+
+      Buttons.LargePrimary(
+        onClick = {
+          navController?.safeNavigate(ChangeNumberFragmentDirections.actionChangePhoneNumberFragmentToEnterPhoneNumberChangeFragment())
+        },
+        modifier = Modifier.fillMaxWidth()
+      ) {
+        Text(
+          text = stringResource(id = R.string.ChangeNumberFragment__continue)
+        )
+      }
     }
   }
 }
+
+@Preview
+@Composable
+private fun MessageBackupsEducationSheetPreview() {
+  Previews.Preview {
+    ChangeNumberScreen()
+  }
+}
diff --git a/app/src/main/res/layout/fragment_change_phone_number.xml b/app/src/main/res/layout/fragment_change_phone_number.xml
diff --git a/app/src/main/res/navigation/app_settings_change_number.xml b/app/src/main/res/navigation/app_settings_change_number.xml
@@ -7,8 +7,7 @@
 
     <fragment
         android:id="@+id/changePhoneNumberFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberFragment"
-        tools:layout="@layout/fragment_change_phone_number">
+        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberFragment">
 
         <action
             android:id="@+id/action_changePhoneNumberFragment_to_enterPhoneNumberChangeFragment"