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

Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported

Browse Source
This commit is contained in:
Dominik Schürmann
2016-01-10 17:17:57 +01:00
parent 9163b93a90
commit 0fd5b45df9
57 changed files with 753 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
OpenKeychain/src/main/res/layout/create_key_start_fragment.xml
View File

@@ -50,22 +50,52 @@
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
<TextView
android:id="@+id/create_key_yubikey_button"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
<RelativeLayout
android:id="@+id/create_key_security_token_button"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_time_yubikey"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
android:drawablePadding="8dp"
android:gravity="right|center_vertical"
android:layout_height="?android:attr/listPreferredItemHeight"
android:layout_weight="1"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
android:minHeight="?android:attr/listPreferredItemHeight">
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="10dp"
android:text="@string/first_time_security_token"
android:textAllCaps="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/imageView5"
android:layout_toStartOf="@+id/imageView5" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingRight="10dp"
android:src="@drawable/ic_chevron_right_grey_24dp" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="10dp"
android:text="@string/first_time_security_token_subtitle"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@+id/imageView5"
android:layout_toStartOf="@+id/imageView5" />
</RelativeLayout>
<TextView
android:id="@+id/create_key_import_button"

20
OpenKeychain/src/main/res/layout/create_yubi_key_import_reset_fragment.xml → OpenKeychain/src/main/res/layout/create_security_token_import_reset_fragment.xml
View File

@@ -36,14 +36,14 @@
android:orientation="vertical">
<TextView
android:id="@+id/yubikey_serno"
android:id="@+id/token_serno"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="Yubikey #" />
<TextView
android:id="@+id/yubikey_userid"
android:id="@+id/token_userid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -67,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:text="@string/yubikey_reset_or_import"
android:text="@string/security_token_reset_or_import"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RadioGroup
@@ -76,19 +76,19 @@
android:orientation="vertical">
<RadioButton
android:id="@+id/yubikey_decision_import"
android:id="@+id/token_decision_import"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/yubikey_import_radio" />
android:text="@string/security_token_import_radio" />
<RadioButton
android:id="@+id/yubikey_decision_reset"
android:id="@+id/token_decision_reset"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:text="@string/yubikey_reset_radio" />
android:text="@string/security_token_reset_radio" />
</RadioGroup>
</LinearLayout>
@@ -101,19 +101,19 @@
android:background="?android:attr/listDivider" />
<FrameLayout
android:id="@+id/yubikey_import_fragment"
android:id="@+id/security_token_import_fragment"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_below="@id/yubikey_decision"
android:layout_marginTop="8dp">
<TextView
android:id="@+id/yubikey_import_reset_warning"
android:id="@+id/token_import_reset_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="24dp"
android:text="@string/yubikey_reset_warning"
android:text="@string/security_token_reset_warning"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/android_red_dark"
android:visibility="gone" />

2
OpenKeychain/src/main/res/layout/create_yubi_key_wait_fragment.xml → OpenKeychain/src/main/res/layout/create_security_token_wait_fragment.xml
View File

@@ -22,7 +22,7 @@
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/yubikey_create" />
android:text="@string/security_token_create" />
<ImageView
android:layout_width="match_parent"

4
OpenKeychain/src/main/res/layout/create_yubi_key_blank_fragment.xml
View File

@@ -22,7 +22,7 @@
android:layout_marginTop="16dp"
android:layout_marginLeft="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/first_time_blank_yubikey" />
android:text="@string/first_time_blank_security_token" />
</LinearLayout>
</ScrollView>
@@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical"
android:text="@string/first_time_blank_yubikey_yes"
android:text="@string/first_time_blank_security_token_yes"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"

54
OpenKeychain/src/main/res/layout/nfc_operation_activity.xml → OpenKeychain/src/main/res/layout/security_token_operation_activity.xml
View File

@@ -21,34 +21,34 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/nfc_activity_0_text"
android:id="@+id/security_token_activity_0_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
android:text="@string/nfc_text"
android:text="@string/security_token_nfc_text"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ImageView
android:id="@+id/nfc_activity_0_image"
android:id="@+id/security_token_activity_0_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_0_text"
android:layout_below="@+id/security_token_activity_0_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
android:src="@drawable/yubikey_phone" />
<Button
android:id="@+id/nfc_activity_0_cancel"
android:id="@+id/security_token_activity_0_cancel"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_0_image"
android:layout_below="@+id/security_token_activity_0_image"
android:layout_margin="8dp"
android:text="@string/progress_cancel" />
</RelativeLayout>
@@ -58,13 +58,13 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/nfc_activity_1_text"
android:id="@+id/security_token_activity_1_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
android:text="@string/nfc_wait"
android:text="@string/security_token_nfc_wait"
android:textAppearance="@android:style/TextAppearance.Medium" />
<ProgressBar
@@ -77,12 +77,12 @@
<!-- placeholder to retain dialog size -->
<ImageView
android:id="@+id/nfc_activity_1_placeholder"
android:id="@+id/security_token_activity_1_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_1_text"
android:layout_below="@+id/security_token_activity_1_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -90,12 +90,12 @@
android:visibility="invisible" />
<Button
android:id="@+id/nfc_activity_1_button_placeholder"
android:id="@+id/security_token_activity_1_button_placeholder"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_1_placeholder"
android:layout_below="@+id/security_token_activity_1_placeholder"
android:layout_margin="8dp"
android:text=""
android:visibility="invisible" />
@@ -107,23 +107,23 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/nfc_activity_2_text"
android:id="@+id/security_token_activity_2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginTop="24dp"
android:text="@string/nfc_finished"
android:text="@string/security_token_nfc_finished"
android:textAppearance="@android:style/TextAppearance.Medium" />
<!-- placeholder to retain dialog size -->
<ImageView
android:id="@+id/nfc_activity_2_placeholder"
android:id="@+id/security_token_activity_2_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_2_text"
android:layout_below="@+id/security_token_activity_2_text"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -140,12 +140,12 @@
android:src="@drawable/ic_check_circle_black_48dp" />
<Button
android:id="@+id/nfc_activity_2_button_placeholder"
android:id="@+id/security_token_activity_2_button_placeholder"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_2_placeholder"
android:layout_below="@+id/security_token_activity_2_placeholder"
android:layout_margin="8dp"
android:text=""
android:visibility="invisible" />
@@ -157,11 +157,11 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/nfc_activity_3_text_placeholder"
android:id="@+id/security_token_activity_3_text_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/nfc_activity_3_placeholder"
android:layout_alignRight="@+id/nfc_activity_3_placeholder"
android:layout_alignEnd="@+id/security_token_activity_3_placeholder"
android:layout_alignRight="@+id/security_token_activity_3_placeholder"
android:layout_marginLeft="24dp"
android:layout_marginTop="24dp"
android:text=""
@@ -169,12 +169,12 @@
<!-- placeholder to retain dialog size -->
<ImageView
android:id="@+id/nfc_activity_3_placeholder"
android:id="@+id/security_token_activity_3_placeholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/nfc_activity_3_text_placeholder"
android:layout_below="@+id/security_token_activity_3_text_placeholder"
android:layout_margin="24dp"
android:adjustViewBounds="true"
android:background="@android:color/transparent"
@@ -182,7 +182,7 @@
android:visibility="invisible" />
<TextView
android:id="@+id/nfc_activity_3_error_text"
android:id="@+id/security_token_activity_3_error_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
@@ -193,14 +193,14 @@
tools:text="Error text" />
<Button
android:id="@+id/nfc_activity_3_error_try_again"
android:id="@+id/security_token_activity_3_error_try_again"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/nfc_activity_3_placeholder"
android:layout_below="@+id/security_token_activity_3_placeholder"
android:layout_margin="8dp"
android:text="@string/error_nfc_try_again" />
android:text="@string/security_token_error_try_again" />
</RelativeLayout>

8
OpenKeychain/src/main/res/layout/view_key_yubikey.xml → OpenKeychain/src/main/res/layout/view_key_security_token.xml
View File

@@ -33,7 +33,7 @@
style="@style/CardViewHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/section_yubikey"/>
android:text="@string/section_security_token"/>
<LinearLayout
android:layout_width="match_parent"
@@ -56,7 +56,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/yubikey_serno"
android:id="@+id/token_serno"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -64,7 +64,7 @@
/>
<TextView
android:id="@+id/yubikey_userid"
android:id="@+id/token_userid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -72,7 +72,7 @@
/>
<TextView
android:id="@+id/yubikey_status"
android:id="@+id/token_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"