From c2ec2cb358b4fbf63f24c86b2a6b559054df4f03 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 27 Feb 2024 16:23:42 +1030
Subject: [PATCH] Add string resources to LandingScreen

---
 .../securesms/onboarding/LandingActivity.kt   | 19 +++++++++----------
 app/src/main/res/values/strings.xml           |  9 +++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
index e4d146ad19..f8bda397ed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -47,8 +48,6 @@ class LandingActivity : BaseActionBarActivity() {
         // Session then close this activity to resume the last activity from the previous instance.
         if (!isTaskRoot) { finish(); return }
 
-        val binding = ActivityLandingBinding.inflate(layoutInflater)
-        setContentView(binding.root)
         setUpActionBarSessionLogo(true)
 
         ComposeView(this)
@@ -67,27 +66,27 @@ class LandingActivity : BaseActionBarActivity() {
         AppTheme {
             Column(modifier = Modifier.padding(horizontal = 36.dp)) {
                 Spacer(modifier = Modifier.weight(1f))
-                Text("Privacy in your pocket.", modifier = Modifier.align(Alignment.CenterHorizontally), style = MaterialTheme.typography.h4, textAlign = TextAlign.Center)
+                Text(stringResource(R.string.onboarding_privacy_in_your_pocket), modifier = Modifier.align(Alignment.CenterHorizontally), style = MaterialTheme.typography.h4, textAlign = TextAlign.Center)
                 Spacer(modifier = Modifier.height(24.dp))
-                IncomingText("Welcome to Session \uD83D\uDC4B")
+                IncomingText(stringResource(R.string.onboarding_welcome_to_session))
                 Spacer(modifier = Modifier.height(14.dp))
-                OutgoingText("Session is engineered\nto protect your privacy.")
+                OutgoingText(stringResource(R.string.onboarding_session_is_engineered_to_protect_your_privacy))
                 Spacer(modifier = Modifier.height(14.dp))
-                IncomingText("You don’t even need a phone number to sign up. ")
+                IncomingText(stringResource(R.string.onboarding_you_don_t_even_need_a_phone_number_to_sign_up))
                 Spacer(modifier = Modifier.height(14.dp))
-                OutgoingText("Creating an account is \ninstant, free, and \nanonymous \uD83D\uDC47")
+                OutgoingText(stringResource(R.string.onboarding_creating_an_account_is_instant_free_and_anonymous))
                 Spacer(modifier = Modifier.weight(1f))
 
-                OutlineButton(text = "Create account", modifier = Modifier
+                OutlineButton(text = stringResource(R.string.onboarding_create_account), modifier = Modifier
                     .width(262.dp)
                     .align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() }
                 Spacer(modifier = Modifier.height(14.dp))
-                FilledButton(text = "I have an account", modifier = Modifier
+                FilledButton(text = stringResource(R.string.onboarding_i_have_an_account), modifier = Modifier
                     .width(262.dp)
                     .align(Alignment.CenterHorizontally)) { startLinkDeviceActivity() }
                 Spacer(modifier = Modifier.height(8.dp))
                 BorderlessButton(
-                    text = "By using this service, you agree to our Terms of Service and Privacy Policy",
+                    text = stringResource(R.string.onboarding_by_using_this_service_you_agree_to_our_terms_of_service_and_privacy_policy),
                     modifier = Modifier
                         .width(262.dp)
                         .align(Alignment.CenterHorizontally),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed4ff6e756..e0ffa51a93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1040,4 +1040,13 @@
     <string name="unread_marker">Unread Messages</string>
     <string name="activity_recovery_password">Recovery Password</string>
 
+    <string name="onboarding_privacy_in_your_pocket">Privacy in your pocket.</string>
+    <string name="onboarding_welcome_to_session">Welcome to Session 👋</string>
+    <string name="onboarding_session_is_engineered_to_protect_your_privacy">Session is engineered\nto protect your privacy.</string>
+    <string name="onboarding_you_don_t_even_need_a_phone_number_to_sign_up">"You don’t even need a phone number to sign up. "</string>
+    <string name="onboarding_creating_an_account_is_instant_free_and_anonymous">Creating an account is \ninstant, free, and \nanonymous 👇</string>
+    <string name="onboarding_create_account">Create account</string>
+    <string name="onboarding_i_have_an_account">I have an account</string>
+    <string name="onboarding_by_using_this_service_you_agree_to_our_terms_of_service_and_privacy_policy">By using this service, you agree to our Terms of Service and Privacy Policy</string>
+
 </resources>