TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-12 13:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add string resources to LandingScreen

Browse Source
This commit is contained in:
Andrew 2024-02-27 16:23:42 +10:30
parent 0ca55c8f42
commit c2ec2cb358
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp 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. // Session then close this activity to resume the last activity from the previous instance.
if (!isTaskRoot) { finish(); return } if (!isTaskRoot) { finish(); return }
val binding = ActivityLandingBinding.inflate(layoutInflater)
setContentView(binding.root)
setUpActionBarSessionLogo(true) setUpActionBarSessionLogo(true)
ComposeView(this) ComposeView(this)
@ -67,27 +66,27 @@ class LandingActivity : BaseActionBarActivity() {
AppTheme { AppTheme {
Column(modifier = Modifier.padding(horizontal = 36.dp)) { Column(modifier = Modifier.padding(horizontal = 36.dp)) {
Spacer(modifier = Modifier.weight(1f)) 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)) 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)) 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)) 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)) 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)) Spacer(modifier = Modifier.weight(1f))
OutlineButton(text = "Create account", modifier = Modifier OutlineButton(text = stringResource(R.string.onboarding_create_account), modifier = Modifier
.width(262.dp) .width(262.dp)
.align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() } .align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() }
Spacer(modifier = Modifier.height(14.dp)) 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) .width(262.dp)
.align(Alignment.CenterHorizontally)) { startLinkDeviceActivity() } .align(Alignment.CenterHorizontally)) { startLinkDeviceActivity() }
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
BorderlessButton( 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 modifier = Modifier
.width(262.dp) .width(262.dp)
.align(Alignment.CenterHorizontally), .align(Alignment.CenterHorizontally),

9
app/src/main/res/values/strings.xml
View File

@ -1040,4 +1040,13 @@
<string name="unread_marker">Unread Messages</string> <string name="unread_marker">Unread Messages</string>
<string name="activity_recovery_password">Recovery Password</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> </resources>