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

enc-export: localization, and layout compatibility

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-29 03:24:27 +02:00
parent 4923f08152
commit bc09d290f8
4 changed files with 394 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
OpenKeychain/src/main/res/layout-land/qr_code_activity.xml
View File

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include
android:id="@+id/toolbar_include"
layout="@layout/toolbar_standalone" />
<LinearLayout
android:layout_below="@id/toolbar_include"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.CardView
android:id="@+id/qr_code_image_layout"
android:transitionName="qr_code"
android:layout_gravity="center_horizontal"
android:layout_margin="32dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:clickable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="@android:color/white"
app:cardUseCompatPadding="true"
app:cardCornerRadius="4dp">
<org.sufficientlysecure.keychain.ui.widget.AspectRatioImageView
android:id="@+id/qr_code_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:dominantMeasurement="height"
app:aspectRatioEnabled="true" />
</android.support.v7.widget.CardView>
</LinearLayout>
</RelativeLayout>

79
OpenKeychain/src/main/res/layout/backup_code_fragment.xml → OpenKeychain/src/main/res/layout-mdpi/backup_code_fragment.xml
View File

@@ -22,7 +22,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="The backup will be secured with a backup code. Write it down before you proceed!"
android:text="@string/backup_code_explanation"
style="?android:textAppearanceMedium"
/>
@@ -32,7 +32,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Please enter the backup code:"
android:text="@string/backup_code_enter"
style="?android:textAppearanceMedium"
/>
@@ -42,7 +42,7 @@
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="Code accepted!"
android:text="@string/backup_code_ok"
style="?android:textAppearanceMedium"
/>
@@ -72,11 +72,12 @@
android:id="@+id/backup_code_display_1"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="ABCDEF"
tools:ignore="SpUsage"
/>
<TextView
@@ -85,9 +86,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
/>
tools:ignore="HardcodedText,SpUsage" />
<TextView
android:layout_width="wrap_content"
@@ -96,11 +97,12 @@
android:id="@+id/backup_code_display_2"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="GHIJKL"
tools:ignore="SpUsage"
/>
<TextView
@@ -109,8 +111,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
@@ -120,11 +123,12 @@
android:id="@+id/backup_code_display_3"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="MNOPQR"
tools:ignore="SpUsage"
/>
<TextView
@@ -133,8 +137,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
@@ -144,12 +149,13 @@
android:id="@+id/backup_code_display_4"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:singleLine="true"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="STUVWX"
tools:ignore="SpUsage"
/>
</LinearLayout>
@@ -160,6 +166,10 @@
android:layout_gravity="center_horizontal"
>
<!--
The most reliable way to correctly size these I found was to put a transparent hint on them.
Theoretically, this should be what the android:ems attribute is for - didn't work for me.
-->
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -167,12 +177,13 @@
android:id="@+id/backup_code_1"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
@@ -181,8 +192,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
@@ -192,12 +204,13 @@
android:id="@+id/backup_code_2"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
@@ -206,8 +219,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
@@ -217,12 +231,13 @@
android:id="@+id/backup_code_3"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
@@ -230,8 +245,9 @@
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
@@ -241,12 +257,13 @@
android:id="@+id/backup_code_4"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="@dimen/abc_text_size_medium_material"
android:textSize="16dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
</LinearLayout>
@@ -260,14 +277,14 @@
android:id="@+id/status_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="0">
custom:initialView="3">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:text="Ok, I wrote it down!"
android:text="@string/btn_code_wrotedown"
android:padding="12dp"
android:id="@+id/button_backup_input"
style="?android:buttonBarButtonStyle"
@@ -281,26 +298,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="The backup code you entered is wrong!\nDid you write it down correctly?"
android:text="@string/backup_code_wrong"
style="?android:textAppearanceMedium"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="?android:buttonBarStyle">
android:layout_gravity="center_horizontal"
style="?android:buttonBarStyle">
<Button
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="12dp"
android:text="Share backup"
android:text="@string/btn_backup_share"
android:drawableLeft="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:id="@+id/button_backup_share"
@@ -308,19 +322,18 @@
/>
<Button
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="12dp"
android:text="Save backup"
android:text="@string/btn_backup_save"
android:drawableLeft="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:id="@+id/button_backup_save"
style="?android:buttonBarButtonStyle"
/>
</LinearLayout>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>

341
OpenKeychain/src/main/res/layout-xhdpi/backup_code_fragment.xml Normal file
View File

@@ -0,0 +1,341 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="50dp">
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="center_horizontal"
android:id="@+id/title_animator"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
custom:initialView="0">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/backup_code_explanation"
style="?android:textAppearanceMedium"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/backup_code_enter"
style="?android:textAppearanceMedium"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:text="@string/backup_code_ok"
style="?android:textAppearanceMedium"
/>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="center_horizontal"
android:id="@+id/code_animator"
android:inAnimation="@anim/fade_in"
android:outAnimation="@anim/fade_out"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
custom:initialView="0">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_display_1"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="ABCDEF"
tools:ignore="SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_display_2"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="GHIJKL"
tools:ignore="SpUsage" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_display_3"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="MNOPQR"
tools:ignore="SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_display_4"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:singleLine="true"
style="@android:style/Widget.EditText"
android:clickable="false"
android:focusable="false"
tools:text="STUVWX"
tools:ignore="SpUsage"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
>
<!--
The most reliable way to correctly size these I found was to put a transparent hint on them.
Theoretically, this should be what the android:ems attribute is for - didn't work for me.
-->
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_1"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_2"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_3"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:text="-"
tools:ignore="HardcodedText,SpUsage"
/>
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:id="@+id/backup_code_4"
android:textStyle="bold"
android:typeface="monospace"
android:textSize="18dp"
android:singleLine="true"
android:inputType="textNoSuggestions|textCapCharacters"
android:hint="ABCDEF"
android:textColorHint="@android:color/transparent"
android:maxLength="6"
tools:ignore="HardcodedText,SpUsage"
/>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
<org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="center_horizontal"
android:id="@+id/status_animator"
android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out"
custom:initialView="3">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:text="@string/btn_code_wrotedown"
android:padding="12dp"
android:id="@+id/button_backup_input"
style="?android:buttonBarButtonStyle"
/>
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/backup_code_wrong"
style="?android:textAppearanceMedium"
/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
style="?android:buttonBarStyle">
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="12dp"
android:text="@string/btn_backup_share"
android:drawableLeft="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:id="@+id/button_backup_share"
style="?android:buttonBarButtonStyle"
/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:padding="12dp"
android:text="@string/btn_backup_save"
android:drawableLeft="@drawable/ic_save_grey_24dp"
android:drawablePadding="8dp"
android:id="@+id/button_backup_save"
style="?android:buttonBarButtonStyle"
/>
</LinearLayout>
</org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
</LinearLayout>

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

@@ -1644,5 +1644,12 @@
<string name="linked_webview_title_github">"GitHub Authorization"</string>
<string name="linked_gist_description">"OpenKeychain API Tests"</string>
<string name="snack_btn_overwrite">"Overwrite"</string>
<string name="backup_code_explanation">The backup will be secured with a backup code. Write it down before you proceed!</string>
<string name="backup_code_enter">Please enter the backup code:</string>
<string name="backup_code_ok">Code accepted!</string>
<string name="btn_code_wrotedown">Ok, I wrote it down!</string>
<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>
</resources>