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 f8bda397ed..0cf49bb46b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt @@ -66,27 +66,27 @@ class LandingActivity : BaseActionBarActivity() { AppTheme { Column(modifier = Modifier.padding(horizontal = 36.dp)) { Spacer(modifier = Modifier.weight(1f)) - Text(stringResource(R.string.onboarding_privacy_in_your_pocket), modifier = Modifier.align(Alignment.CenterHorizontally), style = MaterialTheme.typography.h4, textAlign = TextAlign.Center) + Text(stringResource(R.string.onboardingBubblePrivacyInYourPocket), modifier = Modifier.align(Alignment.CenterHorizontally), style = MaterialTheme.typography.h4, textAlign = TextAlign.Center) Spacer(modifier = Modifier.height(24.dp)) - IncomingText(stringResource(R.string.onboarding_welcome_to_session)) + IncomingText(stringResource(R.string.onboardingBubbleWelcomeToSession)) Spacer(modifier = Modifier.height(14.dp)) - OutgoingText(stringResource(R.string.onboarding_session_is_engineered_to_protect_your_privacy)) + OutgoingText(stringResource(R.string.onboardingBubbleSessionIsEngineered)) Spacer(modifier = Modifier.height(14.dp)) - IncomingText(stringResource(R.string.onboarding_you_don_t_even_need_a_phone_number_to_sign_up)) + IncomingText(stringResource(R.string.onboardingBubbleNoPhoneNumber)) Spacer(modifier = Modifier.height(14.dp)) - OutgoingText(stringResource(R.string.onboarding_creating_an_account_is_instant_free_and_anonymous)) + OutgoingText(stringResource(R.string.onboardingBubbleCreatingAnAccountIsEasy)) Spacer(modifier = Modifier.weight(1f)) - OutlineButton(text = stringResource(R.string.onboarding_create_account), modifier = Modifier + OutlineButton(text = stringResource(R.string.onboardingAccountCreate), modifier = Modifier .width(262.dp) .align(Alignment.CenterHorizontally)) { startPickDisplayNameActivity() } Spacer(modifier = Modifier.height(14.dp)) - FilledButton(text = stringResource(R.string.onboarding_i_have_an_account), modifier = Modifier + FilledButton(text = stringResource(R.string.onboardingAccountExists), modifier = Modifier .width(262.dp) .align(Alignment.CenterHorizontally)) { startLinkDeviceActivity() } Spacer(modifier = Modifier.height(8.dp)) BorderlessButton( - text = stringResource(R.string.onboarding_by_using_this_service_you_agree_to_our_terms_of_service_and_privacy_policy), + text = stringResource(R.string.onboardingTosPrivacy), modifier = Modifier .width(262.dp) .align(Alignment.CenterHorizontally), diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt index e839451d13..6cfc3583fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt @@ -29,17 +29,13 @@ import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.material.ContentAlpha import androidx.compose.material.Icon -import androidx.compose.material.LocalContentAlpha -import androidx.compose.material.LocalContentColor import androidx.compose.material.MaterialTheme import androidx.compose.material.OutlinedTextField import androidx.compose.material.Scaffold import androidx.compose.material.Snackbar import androidx.compose.material.SnackbarHost import androidx.compose.material.Text -import androidx.compose.material.TextFieldDefaults import androidx.compose.material.rememberScaffoldState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -80,8 +76,6 @@ import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.ui.AppTheme import org.thoughtcrime.securesms.ui.OutlineButton import org.thoughtcrime.securesms.ui.baseBold -import org.thoughtcrime.securesms.ui.classicDark3 -import org.thoughtcrime.securesms.ui.colorDestructive import org.thoughtcrime.securesms.ui.components.SessionTabRow import org.thoughtcrime.securesms.ui.outlinedTextFieldColors import java.util.concurrent.Executors @@ -89,7 +83,7 @@ import javax.inject.Inject private const val TAG = "LinkDeviceActivity" -private val TITLES = listOf(R.string.activity_recovery_password, R.string.activity_link_device_scan_qr_code) +private val TITLES = listOf(R.string.sessionRecoveryPassword, R.string.qrScan) @AndroidEntryPoint @androidx.annotation.OptIn(ExperimentalGetImage::class) @@ -154,7 +148,7 @@ class LinkDeviceActivity : BaseActionBarActivity() { runCatching { cameraProvider.get().unbindAll() - if (title == R.string.activity_link_device_scan_qr_code) { + if (title == R.string.qrScan) { LocalSoftwareKeyboardController.current?.hide() cameraProvider.get().bindToLifecycle( LocalLifecycleOwner.current, @@ -165,8 +159,8 @@ class LinkDeviceActivity : BaseActionBarActivity() { } }.onFailure { Log.e(TAG, "error binding camera", it) } when (title) { - R.string.activity_recovery_password -> RecoveryPassword(state, onChange, onContinue) - R.string.activity_link_device_scan_qr_code -> MaybeScanQrCode() + R.string.sessionRecoveryPassword -> RecoveryPassword(state, onChange, onContinue) + R.string.qrScan -> MaybeScanQrCode() } } } @@ -193,7 +187,7 @@ class LinkDeviceActivity : BaseActionBarActivity() { ) Spacer(modifier = Modifier.size(20.dp)) OutlineButton( - text = stringResource(R.string.activity_link_settings), + text = stringResource(R.string.sessionSettings), modifier = Modifier.align(Alignment.CenterHorizontally) ) { Intent(ACTION_APPLICATION_DETAILS_SETTINGS).apply { @@ -203,7 +197,7 @@ class LinkDeviceActivity : BaseActionBarActivity() { } } else { OutlineButton( - text = stringResource(R.string.activity_link_grant_camera_permission), + text = stringResource(R.string.cameraGrantAccess), modifier = Modifier.align(Alignment.Center) ) { cameraPermissionState.run { launchPermissionRequest() } @@ -270,7 +264,7 @@ fun RecoveryPassword(state: LinkDeviceState, onChange: (String) -> Unit = {}, on ) { Spacer(Modifier.weight(1f)) Row { - Text(stringResource(R.string.activity_link_recovery_password), style = MaterialTheme.typography.h4) + Text(stringResource(R.string.sessionRecoveryPassword), style = MaterialTheme.typography.h4) Spacer(Modifier.width(6.dp)) Icon( painter = painterResource(id = R.drawable.ic_shield_outline), @@ -283,7 +277,7 @@ fun RecoveryPassword(state: LinkDeviceState, onChange: (String) -> Unit = {}, on OutlinedTextField( value = state.recoveryPhrase, onValueChange = { onChange(it) }, - placeholder = { Text(stringResource(R.string.activity_link_enter_your_recovery_password)) }, + placeholder = { Text(stringResource(R.string.recoveryPasswordEnter)) }, colors = outlinedTextFieldColors(state.error != null), singleLine = true, keyboardActions = KeyboardActions( diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceViewModel.kt index c4a04c0b57..69368c41da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceViewModel.kt @@ -42,7 +42,7 @@ class LinkDeviceViewModel @Inject constructor( val qrErrorsFlow = qrErrors.receiveAsFlow() .debounce(QR_ERROR_TIME) .takeWhile { event.isEmpty } - .mapNotNull { application.getString(R.string.activity_link_this_qr_code_does_not_contain_a_recovery_password) } + .mapNotNull { application.getString(R.string.qrNotRecoveryPassword) } private val codec by lazy { MnemonicCodec { MnemonicUtilities.loadFileContents(getApplication(), it) } } @@ -73,9 +73,9 @@ class LinkDeviceViewModel @Inject constructor( state.update { it.copy( error = when (error) { - is InputTooShort -> R.string.activity_link_the_recovery_password_you_entered_is_not_long_enough_please_check_and_try_again - is InvalidWord -> R.string.activity_link_some_of_the_words_in_your_recovery_password_are_incorrect_please_check_and_try_again - else -> R.string.activity_link_please_check_your_recovery_password_and_try_again + is InputTooShort -> R.string.recoveryPasswordErrorMessageShort + is InvalidWord -> R.string.recoveryPasswordErrorMessageIncorrect + else -> R.string.recoveryPasswordErrorMessageGeneric }.let(application::getString) ) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordActivity.kt index cb4b35bd40..a95cde5261 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/recoverypassword/RecoveryPasswordActivity.kt @@ -62,7 +62,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - supportActionBar!!.title = resources.getString(R.string.activity_recovery_password) + supportActionBar!!.title = resources.getString(R.string.sessionRecoveryPassword) ComposeView(this).apply { setContent { diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt index 891fed2aea..7d9ccedb1f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt @@ -55,6 +55,7 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.compose.ui.viewinterop.AndroidView +import network.loki.messenger.R import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.runIf import org.thoughtcrime.securesms.components.ProfilePictureView diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/SessionTabRow.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/SessionTabRow.kt index ce6446b124..2b51632fd6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/SessionTabRow.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/SessionTabRow.kt @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.ui.LocalExtraColors import org.thoughtcrime.securesms.ui.PreviewTheme import org.thoughtcrime.securesms.ui.ThemeResPreviewParameterProvider -private val TITLES = listOf(R.string.activity_recovery_password, R.string.activity_link_device_scan_qr_code) +private val TITLES = listOf(R.string.sessionRecoveryPassword, R.string.qrScan) @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/res/layout-sw400dp/activity_display_name.xml b/app/src/main/res/layout-sw400dp/activity_display_name.xml deleted file mode 100644 index 4d4ff30406..0000000000 --- a/app/src/main/res/layout-sw400dp/activity_display_name.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - -