diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-10 17:15:16 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-10 18:48:27 +0100 |
commit | a2ea509f06242fa713e26081fded56590788f1a7 (patch) | |
tree | 83c519ebc06966c063e2c505316a0a2c15177b72 /OpenKeychain/src/main/res | |
parent | 713f3076f4ee1b94f1a1a133fba32a396c0d1039 (diff) | |
download | open-keychain-a2ea509f06242fa713e26081fded56590788f1a7.tar.gz open-keychain-a2ea509f06242fa713e26081fded56590788f1a7.tar.bz2 open-keychain-a2ea509f06242fa713e26081fded56590788f1a7.zip |
Backup format v2: redesign restore dialog
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml | 98 |
1 files changed, 10 insertions, 88 deletions
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 0ffa695cf..a55033380 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml @@ -1,5 +1,6 @@ <?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" @@ -27,99 +28,20 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="8dp"> - <!-- - 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" + <com.github.pinball83.maskededittext.MaskedEditText + android:id="@+id/backup_code" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:hint="ABCDEF" - android:inputType="textNoSuggestions|textCapCharacters" - android:maxLength="6" - android:singleLine="true" - android:textColorHint="@android:color/transparent" - android:textSize="14dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + 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="14dp" - 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="ABCDEF" - android:inputType="textNoSuggestions|textCapCharacters" - android:maxLength="6" - android:singleLine="true" - android:textColorHint="@android:color/transparent" - android:textSize="14dp" - 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="14dp" - 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="ABCDEF" - android:inputType="textNoSuggestions|textCapCharacters" - android:maxLength="6" - android:singleLine="true" - android:textColorHint="@android:color/transparent" - android:textSize="14dp" - 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="14dp" - 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="ABCDEF" - android:inputType="textNoSuggestions|textCapCharacters" - android:maxLength="6" - android:singleLine="true" - android:textColorHint="@android:color/transparent" - android:textSize="14dp" - android:textStyle="bold" - android:typeface="monospace" - tools:ignore="HardcodedText,SpUsage" /> + app:mask="****-****-****-****-****-****" + app:maskIconColor="@color/colorPrimary" + app:notMaskedSymbol="*" + tools:ignore="SpUsage" /> </LinearLayout> </LinearLayout> |