diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 9abda5d9a4..71e830cc08 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -364,11 +364,11 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
) {
Column(Modifier.weight(1f)) {
Row {
- Text("Save your recovery password", style = MaterialTheme.typography.h8)
+ Text(stringResource(R.string.save_your_recovery_password), style = MaterialTheme.typography.h8)
Spacer(Modifier.requiredWidth(8.dp))
SessionShieldIcon()
}
- Text("Save your recovery password to make sure you don't lose access to your account.", style = MaterialTheme.typography.small)
+ Text(stringResource(R.string.save_your_recovery_password_to_make_sure_you_don_t_lose_access_to_your_account), style = MaterialTheme.typography.small)
}
Spacer(Modifier.width(12.dp))
OutlineButton(
@@ -391,18 +391,17 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
) {
Spacer(modifier = Modifier.weight(1f))
Icon(
- painter = painterResource(id = R.drawable.emoji_tada),
+ painter = painterResource(id = R.drawable.ic_logo_large),
contentDescription = null,
tint = Color.Unspecified
)
- Text("Account Created", style = MaterialTheme.typography.h4, textAlign = TextAlign.Center)
- Text("Welcome to Session", color = MaterialTheme.colors.secondary, textAlign = TextAlign.Center)
Divider(modifier = Modifier.padding(vertical = 16.dp))
- Text("You don't have any conversations yet",
+ Text(
+ stringResource(R.string.conversationsNone),
style = MaterialTheme.typography.h8,
textAlign = TextAlign.Center,
modifier = Modifier.padding(bottom = 12.dp))
- Text("Hit the plus button to start a chat, create a group, or join an official communitiy!", textAlign = TextAlign.Center)
+ Text(stringResource(R.string.onboardingHitThePlusButton), textAlign = TextAlign.Center)
Spacer(modifier = Modifier.weight(2f))
}
}
@@ -717,7 +716,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
val message = if (recipient.isGroupRecipient) {
val group = groupDatabase.getGroup(recipient.address.toString()).orNull()
if (group != null && group.admins.map { it.toString() }.contains(textSecurePreferences.getLocalNumber())) {
- "Because you are the creator of this group it will be deleted for everyone. This cannot be undone."
+ getString(R.string.admin_group_leave_warning)
} else {
resources.getString(R.string.activity_home_leave_group_dialog_message)
}
@@ -773,7 +772,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
private fun hideMessageRequests() {
showSessionDialog {
- text("Hide message requests?")
+ text(getString(R.string.hide_message_requests))
button(R.string.yes) {
textSecurePreferences.setHasHiddenMessageRequests()
setupMessageRequestsBanner()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingViewModel.kt
index bf50baa736..e1eeaa560b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LoadingViewModel.kt
@@ -31,8 +31,8 @@ data class State(val duration: Duration)
private val DONE_TIME = 1.seconds
private val DONE_ANIMATE_TIME = 500.milliseconds
-private val TOTAL_ANIMATE_TIME = 14.seconds
-private val TOTAL_TIME = 15.seconds
+private val TOTAL_ANIMATE_TIME = 44.seconds
+private val TOTAL_TIME = 45.seconds
@HiltViewModel
class LoadingViewModel @Inject constructor(
diff --git a/app/src/main/res/drawable/emoji_tada.xml b/app/src/main/res/drawable/emoji_tada.xml
deleted file mode 100644
index ce0f30067d..0000000000
--- a/app/src/main/res/drawable/emoji_tada.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-