anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

App | New naming | Rename "keychain phrase" to "recovery phrase" (#2216)

Browse source
This commit is contained in:
Evgenii Kozlov 2022-05-02 12:46:07 +03:00 • committed by GitHub
parent 54643294bd
commit 7327375bff
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/anytypeio/anytype/ui/settings/LogoutWarningFragment.kt
View file

@ -51,7 +51,7 @@ class LogoutWarningFragment : BaseBottomSheetComposeFragment() {
Warning(
actionButtonText = stringResource(R.string.log_out),
cancelButtonText = stringResource(R.string.back_up_your_phrase),
title = stringResource(R.string.have_you_back_up_your_keychain),
title = stringResource(R.string.have_you_back_up_your_recovery_phrase),
subtitle = stringResource(R.string.you_will_need_to_sign_in),
onNegativeClick = onBackupPhraseClicked,
onPositiveClick = { vm.onLogoutClicked() },

2
app/src/main/res/layout/alert_mnemonic_reminder.xml
View file

@ -15,7 +15,7 @@
android:fontFamily="@font/inter_bold"
android:textColor="@color/text_primary"
android:textSize="22sp"
android:text="Don’t forget to take and save your keychain phrase from settings" />
android:text="@string/do_not_forget_to_save_recovery_phrase_msg" />
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/dialog_keychain_phrase.xml
View file

@ -36,7 +36,7 @@
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="20dp"
android:text="@string/keychain_phrase_text"
android:text="@string/recovery_phrase_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />

2
app/src/main/res/layout/fragment_keychain_login.xml
View file

@ -76,7 +76,7 @@
android:gravity="top"
android:background="@null"
android:fontFamily="@font/inconsolata"
android:hint="@string/type_your_keychain"
android:hint="@string/type_your_recovery_phrase"
android:imeOptions="actionDone"
android:inputType="textMultiLine|text"
android:textColorHint="@color/keychain_hint_color"

11
app/src/main/res/values/strings.xml
View file

@ -53,7 +53,7 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="start_login_text">With Anytype you can write notes and documents, manage tasks, share files and save important content from the web.</string>
<string name="login">Login</string>
<string name="sign_up">Sign up</string>
<string name="type_your_keychain">or Type your keychain phrase</string>
<string name="type_your_recovery_phrase">or Type your recovery phrase</string>
<string name="login_with_keychain">Login with keychain</string>
<string name="or_scan_qr_code">Scan QR code</string>
<string name="choose_pin_code">Choose pin code</string>
@ -79,14 +79,14 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="switch_profile">Switch profile</string>
<string name="description_profile_picture">Profile picture</string>
<string name="description_arrow_icon">Arrow icon</string>
<string name="keychain_phrase">Keychain phrase</string>
<string name="recovery_phrase">Recovery phrase</string>
<string name="pin_code">Pin code</string>
<string name="user_settings">User settings</string>
<string name="other_settings">Other settings</string>
<string name="your_page">Your public page</string>
<string name="updates">Updates</string>
<string name="log_out">Log out</string>
<string name="keychain_phrase_text">Your Keychain phrase protects your account. You need it to sign in if you don\'t have access to your devices. Keep it in a safe place.</string>
<string name="recovery_phrase_text">Your recovery phrase protects your account. You need it to sign in if you don\'t have access to your devices. Keep it in a safe place.</string>
<string name="back_up_your_keychain_phrase">Back up your keychain \nphrase</string>
<string name="i_ve_written_it_down">i\'ve written it down</string>
<string name="keychain_mock">witch collapse practice feed shame open despair creek road again ice least lake tree young address brain envelope</string>
@ -211,7 +211,7 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="btn_upload_storage">Upload from External storage</string>
<string name="btn_upload">Upload</string>
<string name="alert_qr_camera">Open "Settings" and then "Keychain phrase" in Anytype Desktop.</string>
<string name="alert_qr_camera">Open "Settings" and then "Recovery phrase" in Anytype Desktop.</string>
<string name="alert_qr_camera_ok">Ok</string>
<string name="choose_option">Choose option</string>
<string name="find_a_relation">Find a relation</string>
@ -255,7 +255,7 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="shortcut_create_new">Create a new %1$s</string>
<string name="close">Close</string>
<string name="go_to_settings">Go to settings</string>
<string name="do_not_forget_mnemonic_phrase">Don’t forget to take and save your keychain phrase</string>
<string name="do_not_forget_mnemonic_phrase">Don’t forget to take and save your recovery phrase</string>
<string name="you_can_always_find_mnemonic_in_settings">You can always find the phrase in the settings on the dashboard screen.</string>
<string name="if_you_lose_passphrase_warning">If you lose the passphrase and get logged out you will not be able to ever access your data again. Save this passphrase outside of Anytype for data recovery.</string>
<string name="card_size">Card size</string>
@ -282,4 +282,5 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="swipe_to_choose">Use swipe to choose</string>
<string name="without_template">Without template</string>
<string name="unsplash_generic_error">Error while searching for images on Unsplash. Please try again later.</string>
<string name="do_not_forget_to_save_recovery_phrase_msg">Don’t forget to take and save your recovery phrase from settings</string>
</resources>

2
domain/src/main/java/com/anytypeio/anytype/domain/auth/interactor/RecoverWallet.kt
View file

@ -5,7 +5,7 @@ import com.anytypeio.anytype.domain.base.BaseUseCase
import com.anytypeio.anytype.domain.base.Either
/**
* Use case for recovering wallet via keychain phrase (mnemonic).
* Use case for recovering wallet via recovery (aka keychain) phrase (mnemonic).
*/
class RecoverWallet(
private val repository: AuthRepository

16
ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/account/AccountAndDataScreen.kt
View file

@ -2,7 +2,13 @@ package com.anytypeio.anytype.ui_settings.account
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
@ -14,7 +20,11 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.anytypeio.anytype.core_ui.foundation.*
import com.anytypeio.anytype.core_ui.foundation.Arrow
import com.anytypeio.anytype.core_ui.foundation.Divider
import com.anytypeio.anytype.core_ui.foundation.Dragger
import com.anytypeio.anytype.core_ui.foundation.Option
import com.anytypeio.anytype.core_ui.foundation.Toolbar
import com.anytypeio.anytype.ui_settings.R
@Composable
@ -34,7 +44,7 @@ fun AccountAndDataScreen(
Section(stringResource(R.string.access))
Option(
image = R.drawable.ic_keychain_phrase,
text = stringResource(R.string.keychain_phrase),
text = stringResource(R.string.recovery_phrase),
onClick = onKeychainPhraseClicked
)
Divider(paddingStart = 60.dp)

4
ui-settings/src/main/res/values/strings.xml
View file

@ -8,7 +8,7 @@
<string name="account_and_data"><![CDATA[Account & Data]]></string>
<string name="personalization">Personalization</string>
<string name="appearance">Appearance</string>
<string name="keychain_phrase">Keychain phrase</string>
<string name="recovery_phrase">Recovery phrase</string>
<string name="clear_file_cache">Clear file cache</string>
<string name="account">Account</string>
<string name="reset_account">Reset account</string>
@ -24,7 +24,7 @@
<string name="dark">Dark</string>
<string name="system">System</string>
<string name="have_you_back_up_your_keychain">Have you backed up your keychain phrase?</string>
<string name="have_you_back_up_your_recovery_phrase">Have you backed up your recovery phrase?</string>
<string name="you_will_need_to_sign_in">You will need it to sign in. Keep it in a safe place. If you lose it, you can no longer access your account.</string>
</resources>