diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 110 insertions, 11 deletions
diff --git a/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml new file mode 100644 index 000000000..5e8e5aa5f --- /dev/null +++ b/OpenKeychain/src/main/res/layout-v11/safe_slinger_activity.xml @@ -0,0 +1,65 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="bla" /> + + <NumberPicker + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/safe_slinger_picker" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:id="@+id/safe_slinger_button" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="Start exchange" + android:layout_weight="1" + android:gravity="center_vertical" /> + + <!-- separate ImageView required for recoloring --> + <ImageView + android:id="@+id/safe_slinger_button_image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_safeslinger" + android:layout_gravity="center_vertical" /> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + </LinearLayout> +</ScrollView> diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index 46d9237ea..e81c21182 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -10,17 +10,56 @@ android:paddingRight="16dp"> <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" android:text="bla" /> - <NumberPicker - android:layout_width="wrap_content" + <Spinner + android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/safe_slinger_number_picker" /> + android:id="@+id/safe_slinger_spinner" /> - </LinearLayout> + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:id="@+id/safe_slinger_button" + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:clickable="true" + android:paddingRight="4dp" + style="@style/SelectableItem" + android:orientation="horizontal"> + + <TextView + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="match_parent" + android:text="Start exchange" + android:layout_weight="1" + android:gravity="center_vertical" /> + + <!-- separate ImageView required for recoloring --> + <ImageView + android:id="@+id/safe_slinger_button_image" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_action_safeslinger" + android:layout_gravity="center_vertical" /> + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:layout_marginBottom="4dp" + android:background="?android:attr/listDivider" /> + + </LinearLayout> </ScrollView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index a5763683d..f303f25b2 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -39,6 +39,7 @@ <string name="title_help">"Help"</string> <string name="title_log_display">"Log"</string> <string name="title_create_key">"Create Key"</string> + <string name="title_exchange_keys">"Exchange Keys"</string> <!-- section --> <string name="section_user_ids">"Identities"</string> @@ -238,7 +239,6 @@ <string name="select_key_to_certify">"Please select a key to be used for certification!"</string> <string name="key_too_big_for_sharing">"Key is too big to be shared this way!"</string> <string name="text_copied_to_clipboard">"Text has been copied to the clipboard!"</string> - <string name="select_key_for_exchange">"Please select a key to be used for secure exchange!"</string> <!-- errors @@ -283,12 +283,7 @@ <string name="decrypt_invalid_button">"I understand the risks, display it!"</string> <!-- Add keys --> - <string name="add_keys_section_secure_exchange">"Exchange"</string> - <string name="add_keys_section_secure_add">"Add"</string> <string name="add_keys_my_key">"My key:"</string> - <string name="add_keys_start_exchange">"Start exchange"</string> - <string name="add_keys_qr_code">"Scan QR Code"</string> - <string name="add_keys_nfc">"Receive via NFC"</string> <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">"Done."</string> |