diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
5 files changed, 43 insertions, 58 deletions
diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index ea6be462f..cb20254ff 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <LinearLayout android:visibility="gone" + tools:visibility="visible" android:id="@+id/decrypt_content" android:layout_width="match_parent" android:layout_height="match_parent" @@ -28,6 +30,7 @@ android:layout_height="wrap_content" android:gravity="top" android:hint="" + tools:text="This is the plaintext" android:textIsSelectable="true" /> </ScrollView> diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item.xml b/OpenKeychain/src/main/res/layout/keyspinner_item.xml deleted file mode 100644 index eea81eba5..000000000 --- a/OpenKeychain/src/main/res/layout/keyspinner_item.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:singleLine="true" - android:orientation="horizontal" - android:descendantFocusability="blocksDescendants" - android:focusable="false" - android:minHeight="44dip"> - - <LinearLayout - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:focusable="true" - android:orientation="vertical" - android:paddingLeft="8dp" - android:paddingRight="4dp"> - - <TextView - android:id="@+id/keyspinner_key_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_main_user_id" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/keyspinner_key_email" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:text="user@example.com" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView - android:id="@+id/keyspinner_duplicate" - android:text="creation: bla" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - - <ImageView - android:id="@+id/keyspinner_key_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:src="@drawable/status_signature_revoked_cutout_24dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml b/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml new file mode 100644 index 000000000..bd1d4ac11 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/keyspinner_item_none.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:singleLine="true" + android:orientation="horizontal" + android:minHeight="44dip" + android:paddingLeft="8dp" + android:paddingRight="4dp"> + + <TextView + android:id="@+id/keyspinner_key_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/choice_none" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index 4dbd793ea..b3f4e721d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -60,6 +60,7 @@ android:layout_marginRight="48dp" android:layout_marginEnd="48dp" android:text="" + tools:text="Alice Skywalker" android:textColor="@color/icons" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_above="@+id/view_key_status" /> @@ -73,6 +74,7 @@ android:layout_marginRight="48dp" android:layout_marginEnd="48dp" android:text="" + tools:text="My Key" android:textColor="@color/tab_text" android:textAppearance="?android:attr/textAppearanceSmall" android:layout_above="@+id/toolbar2" /> @@ -95,6 +97,7 @@ android:layout_width="64dp" android:layout_height="64dp" android:visibility="invisible" + tools:visibility="visible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_action_encrypt_file_24dp" /> @@ -103,6 +106,7 @@ android:layout_width="64dp" android:layout_height="64dp" android:visibility="invisible" + tools:visibility="visible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_action_encrypt_text_24dp" /> @@ -111,6 +115,7 @@ android:layout_width="64dp" android:layout_height="64dp" android:visibility="invisible" + tools:visibility="visible" style="?android:attr/borderlessButtonStyle" android:src="@drawable/ic_nfc_white_24dp" /> @@ -120,6 +125,7 @@ android:id="@+id/view_key_status_image" android:layout_width="96dp" android:visibility="invisible" + tools:visibility="visible" android:src="@drawable/status_signature_unverified_cutout_96dp" android:layout_height="96dp" android:layout_above="@id/toolbar2" @@ -139,6 +145,7 @@ android:layout_height="wrap_content" android:clickable="true" android:foreground="?android:attr/selectableItemBackground" + tools:visibility="invisible" card_view:cardBackgroundColor="@android:color/white" card_view:cardElevation="2dp" card_view:cardUseCompatPadding="true" @@ -147,7 +154,8 @@ <ImageView android:id="@+id/view_key_qr_code" android:layout_width="96dp" - android:layout_height="96dp" /> + android:layout_height="96dp" + /> </android.support.v7.widget.CardView> </RelativeLayout> @@ -189,6 +197,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="invisible" + tools:visibility="visible" android:elevation="4dp" fab:fab_icon="@drawable/ic_qrcode_white_24dp" fab:fab_colorNormal="@color/fab" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7200d9545..ae131e029 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1310,6 +1310,17 @@ <string name="btn_import">"Import"</string> <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> + <string name="error_pin">"NFC: Incorrect PIN; %d tries remaining."</string> + <string name="error_nfc_terminated">"NFC: Smart card in termination state"</string> + <string name="error_nfc_wrong_length">"NFC: Wrong length for sent / received data"</string> + <string name="error_nfc_conditions_not_satisfied">"NFC: Conditions of use not satisfied"</string> + <string name="error_nfc_security_not_satisfied">"NFC: Security status not satisfied"</string> + <string name="error_nfc_authentication_blocked">"NFC: PIN blocked after too many attempts"</string> + <string name="error_nfc_data_not_found">"NFC: Key or object not found"</string> + <string name="error_nfc_unknown">"NFC: Unknown Error"</string> + <string name="error_nfc_bad_data">"NFC: Card reported invalid data"</string> + <string name="error_nfc_chaining_error">"NFC: Card expected last command in a chain"</string> + <string name="error_nfc_header">"NFC: Card reported invalid %s byte"</string> <string name="error_pin_nodefault">Default PIN was rejected!</string> <string name="error_bluetooth_file">Error creating temporary file. Bluetooth sharing will fail.</string> <string name="btn_delete_original">Delete original file</string> |