cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify backup code fragment

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-05-08 15:14:19 +02:00
parent 32005b94d9
commit cb6913f6dd
4 changed files with 108 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
OpenKeychain/src/main/res/layout/backup_code_fragment.xml
View File

@@ -1,168 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:custom="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="20dp">
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:id="@+id/title_animator"
android:layout_width="match_parent"
<TextView
style="?android:textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
custom:initialView="0">
android:gravity="center_horizontal"
android:padding="10dp"
android:text="@string/backup_code_explanation" />
<TextView
style="?android:textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:padding="10dp"
android:text="@string/backup_code_explanation" />
<include layout="@layout/transfer_code_display" android:id="@+id/transfer_code_display" />
<TextView
style="?android:textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:padding="10dp"
android:text="@string/backup_code_enter" />
<CheckBox
android:id="@+id/check_backup_code_written"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="8dp"
android:text="@string/backup_code_checkbox"
android:padding="8dp"
/>
<TextView
style="?android:textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:padding="10dp"
android:text="@string/backup_code_ok" />
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:id="@+id/code_animator"
android:layout_width="match_parent"
<LinearLayout
style="?android:buttonBarStyle"
android:id="@+id/button_bar_backup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:layout_marginTop="15dp"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
custom:initialView="1">
<include layout="@layout/transfer_code_display" android:id="@+id/transfer_code_display" />
<include layout="@layout/transfer_code_input" android:id="@+id/transfer_code_input" />
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:id="@+id/button_bar_animator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="2">
<Button
android:id="@+id/button_backup_input"
style="?android:buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:drawableLeft="@drawable/ic_mode_edit_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_code_wrotedown" />
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical">
<TextView
style="?android:textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/backup_code_wrong" />
<Button
android:id="@+id/button_backup_back"
style="?android:buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:drawableLeft="@drawable/ic_repeat_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_back" />
</LinearLayout>
android:orientation="vertical">
<LinearLayout
style="?android:buttonBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
style="?android:buttonBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<Button
android:id="@+id/button_backup_share"
style="?android:buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_share" />
<Button
android:id="@+id/button_backup_save"
style="?android:buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_save" />
</LinearLayout>
android:layout_gravity="center_horizontal">
<Button
android:id="@+id/button_faq"
android:id="@+id/button_backup_share"
style="?android:buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/how_to_import" />
android:layout_margin="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_share"
android:enabled="false"
/>
<Button
android:id="@+id/button_backup_save"
style="?android:buttonBarButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_weight="1"
android:drawableLeft="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_save"
android:enabled="false"
/>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
<Button
android:id="@+id/button_faq"
style="?android:buttonBarButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/how_to_import" />
</LinearLayout>
<Button
android:id="@+id/button_backup_export"
style="?android:buttonBarButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_gravity="center_horizontal"
android:drawableLeft="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:padding="12dp"
android:text="@string/btn_backup_export"
android:enabled="false"
android:visibility="gone"
/>
</LinearLayout>

10
OpenKeychain/src/main/res/menu/backup_fragment_debug_menu.xml
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/debug_accept_any_log"
android:title="Debug / Accept any code"
android:checkable="true"
/>
</menu>

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1722,6 +1722,7 @@
<string name="backup_code_wrong">"The backup code you entered is wrong!\nDid you write it down correctly?"</string>
<string name="btn_backup_share">"Share backup"</string>
<string name="btn_backup_save">"Save backup"</string>
<string name="btn_backup_export">"Export backup"</string>
<string name="snack_backup_error_saving">"Error saving backup!"</string>
<string name="snack_backup_saved">"Backup saved"</string>
<string name="snack_backup_exists">"Backup already exists!"</string>
@@ -2015,4 +2016,5 @@
<string name="key_import_text">To use an end-to-end key, it has to be imported into OpenKeychain.</string>
<string name="key_import_text_autocrypt_setup_msg">To import your existing setup from another device, you can also open an Autocrypt Setup Message in %s.</string>
<string name="button_goto_openkeychain">Go to OpenKeychain</string>
<string name="backup_code_checkbox">I have written down this backup code. Without it, I will be unable to restore the backup.</string>
</resources>