diff options
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
10 files changed, 580 insertions, 171 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml index 4b5058a81..b232ed423 100644 --- a/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_subkey_dialog.xml @@ -13,147 +13,68 @@ android:paddingRight="24dp" android:stretchColumns="1"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginBottom="4dp" - android:text="@string/key_creation_el_gamal_info" /> - <TableRow> - <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:text="@string/label_algorithm" /> + android:paddingRight="10dp" + android:text="@string/label_key_type" /> - <Spinner - android:id="@+id/add_subkey_algorithm" + <!-- custom spinner for fixing focus on first item in list at all times --> + <org.sufficientlysecure.keychain.ui.util.spinner.FocusFirstItemSpinner + android:id="@+id/add_subkey_type" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="4dp" /> - </TableRow> - - <TableRow android:id="@+id/add_subkey_row_size"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_key_size" /> - - <Spinner - android:id="@+id/add_subkey_size" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="right" + android:dropDownWidth="wrap_content" android:padding="4dp" /> </TableRow> <TableRow - android:id="@+id/add_subkey_row_curve" - android:visibility="gone"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_ecc_curve"/> - - <Spinner - android:id="@+id/add_subkey_curve" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="right" - android:padding="4dp"/> - </TableRow> - - <TextView - android:id="@+id/add_subkey_custom_key_size_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/key_size_custom_info" - android:visibility="gone" /> - - <EditText - android:id="@+id/add_subkey_custom_key_size_input" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="number" - android:visibility="gone" /> - - <TextView - android:id="@+id/add_subkey_custom_key_size_info" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - - <TableRow> + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"> <TextView android:id="@+id/label_usage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" + android:layout_gravity="center_vertical|top" + android:paddingRight="10dp" android:text="@string/label_usage" /> - - <CheckBox - android:id="@+id/add_subkey_flag_certify" - android:enabled="false" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_certify" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_sign" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_encrypt" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_encrypt" /> + <RadioGroup + android:id="@+id/add_subkey_usage_group" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content"> + + <RadioButton + android:id="@+id/add_subkey_usage_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:text="@string/usage_none" /> + + <RadioButton + android:id="@+id/add_subkey_usage_sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_sign" /> + + <RadioButton + android:id="@+id/add_subkey_usage_encrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_encrypt" /> + + <RadioButton + android:id="@+id/add_subkey_usage_sign_and_encrypt" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/usage_sign_and_encrypt" /> + </RadioGroup> </TableRow> - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" /> - - <CheckBox - android:id="@+id/add_subkey_flag_authenticate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/flag_authenticate" /> - </TableRow> <TableRow android:layout_marginTop="8dp" @@ -164,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingRight="10dip" + android:paddingRight="10dp" android:text="@string/label_expiry" /> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml index 330f18d1c..ecdaff5cc 100644 --- a/OpenKeychain/src/main/res/layout/backup_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/backup_code_fragment.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:custom="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -57,39 +56,330 @@ android:outAnimation="@anim/fade_out" custom:initialView="1"> - <TextView - android:id="@+id/backup_code_display" - style="@android:style/Widget.EditText" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:clickable="false" - android:focusable="false" - android:singleLine="true" - android:textSize="18dp" - android:textStyle="bold" - android:typeface="monospace" - tools:ignore="SpUsage" - tools:text="AAAA-AAAA-AAAA-AAAA-AAAA-AAAA" /> - - <com.github.pinball83.maskededittext.MaskedEditText - android:id="@+id/backup_code_input" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:orientation="horizontal"> + + <TextView + android:id="@+id/backup_code_display_1" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="ABCD" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:id="@+id/backup_code_display_2" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="EFGH" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:id="@+id/backup_code_display_3" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="IJKL" /> + + </LinearLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:id="@+id/backup_code_display_4" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:singleLine="true" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="MNOP" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:id="@+id/backup_code_display_5" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:singleLine="true" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="QRST" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:id="@+id/backup_code_display_6" + style="@android:style/Widget.EditText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:clickable="false" + android:focusable="false" + android:singleLine="true" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="SpUsage" + tools:text="UVWX" /> + </LinearLayout> + </LinearLayout> + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:textSize="18dp" - android:textStyle="bold" - android:typeface="monospace" - app:deleteChar="\u00a0" - app:mask="****-****-****-****-****-****" - app:maskIconColor="@color/colorPrimary" - app:notMaskedSymbol="*" - app:replacementChar="\u00a0" - tools:ignore="SpUsage" /> + android:orientation="vertical"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:orientation="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:id="@+id/backup_code_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="6" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="6" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + + </LinearLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="6" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="6" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="6" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + </LinearLayout> + </LinearLayout> </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> diff --git a/OpenKeychain/src/main/res/layout/certify_item.xml b/OpenKeychain/src/main/res/layout/certify_item.xml index 71838c2fc..8aff5823e 100644 --- a/OpenKeychain/src/main/res/layout/certify_item.xml +++ b/OpenKeychain/src/main/res/layout/certify_item.xml @@ -13,7 +13,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:clickable="true" - android:layout_marginLeft="8dip" android:layout_marginTop="8dip"/> <LinearLayout android:id="@+id/user_id_body" @@ -21,7 +20,6 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:singleLine="true" - android:layout_marginLeft="8dip" android:layout_marginTop="4dip"> <CheckBox diff --git a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml index 23685ce15..01837240b 100644 --- a/OpenKeychain/src/main/res/layout/certify_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/certify_key_fragment.xml @@ -22,8 +22,9 @@ android:id="@+id/textView" android:layout_weight="1" /> - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_user_ids" + <fragment + android:id="@+id/multi_user_ids_fragment" + android:name="org.sufficientlysecure.keychain.ui.MultiUserIdsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index 46b5d186d..dbd53db08 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -39,7 +39,9 @@ android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:layout_marginLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:textAppearance="?android:attr/textAppearanceMedium" + android:focusable="true" + android:focusableInTouchMode="true" /> <TextView android:layout_width="match_parent" @@ -54,6 +56,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" + android:focusable="true" + android:focusableInTouchMode="true" android:layout_marginBottom="8dp" android:layout_marginLeft="8dp" /> diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml index 3245fd28b..f81472cf8 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml @@ -39,13 +39,21 @@ <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView android:id="@+id/recipient_list" - android:layout_width="match_parent" + android:layout_width="0dp" + android:layout_weight="1" android:hint="@string/label_to" android:minHeight="56dip" android:paddingLeft="8dp" android:paddingRight="8dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" /> + <ImageView + android:id="@+id/add_recipient" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:clickable="true" + android:src="@drawable/ic_person_add_grey_24dp"/> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml b/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml new file mode 100644 index 000000000..560934f50 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/multi_user_ids_fragment.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<org.sufficientlysecure.keychain.ui.widget.FixedListView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/view_key_user_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml index b17c9dba7..1eb55b3f6 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml @@ -1,6 +1,5 @@ <?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" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -26,24 +25,168 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="8dp"> + android:layout_marginTop="8dp" + android:orientation="vertical"> - <com.github.pinball83.maskededittext.MaskedEditText - android:id="@+id/backup_code" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:textSize="18dp" - android:textStyle="bold" - android:typeface="monospace" - app:deleteChar="\u00a0" - app:mask="****-****-****-****-****-****" - app:maskIconColor="@color/colorPrimary" - app:notMaskedSymbol="*" - app:replacementChar="\u00a0" - tools:ignore="SpUsage" /> + android:layout_gravity="right" + android:orientation="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:id="@+id/backup_code_1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + + </LinearLayout> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:text="-" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + <EditText + android:id="@+id/backup_code_6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:hint="ABCD" + android:inputType="textNoSuggestions|textCapCharacters" + android:maxLength="4" + android:singleLine="true" + android:textColorHint="@android:color/transparent" + android:textSize="18dp" + android:textStyle="bold" + android:typeface="monospace" + tools:ignore="HardcodedText,SpUsage" /> + + </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml new file mode 100644 index 000000000..ae325eaab --- /dev/null +++ b/OpenKeychain/src/main/res/layout/two_line_spinner_dropdown_item.xml @@ -0,0 +1,32 @@ +<?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="match_parent" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingTop="6dp" + android:paddingRight="10dp" + android:paddingBottom="6dp" + android:background="?android:attr/selectableItemBackground"> + + <TextView android:id="@android:id/text1" + style="?android:attr/spinnerDropDownItemStyle" + android:textStyle="bold" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="6dp" + android:paddingRight="6dp" /> + + <TextView android:id="@android:id/text2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="6dp" + android:paddingRight="6dp" + android:paddingTop="2dp" /> + +</LinearLayout> + + + + diff --git a/OpenKeychain/src/main/res/layout/upload_key_activity.xml b/OpenKeychain/src/main/res/layout/upload_key_activity.xml index 6a0be9ce5..6acb22c3a 100644 --- a/OpenKeychain/src/main/res/layout/upload_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/upload_key_activity.xml @@ -41,6 +41,12 @@ android:layout_marginBottom="4dp" android:layout_marginTop="4dp" /> + <fragment + android:id="@+id/multi_user_ids_fragment" + android:name="org.sufficientlysecure.keychain.ui.MultiUserIdsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + <TextView style="@style/SectionHeader" android:layout_width="wrap_content" |