diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
3 files changed, 33 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml index 79137bf51..c1b97b02c 100644 --- a/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml +++ b/OpenKeychain/src/main/res/layout/add_user_id_dialog.xml @@ -8,13 +8,12 @@ android:paddingLeft="24dp" android:paddingRight="24dp"> - <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView + <org.sufficientlysecure.keychain.ui.widget.EmailEditText android:id="@+id/add_user_id_address" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/label_email" android:imeOptions="actionNext" - android:inputType="textAutoCorrect|textEmailAddress" android:textAppearance="?android:attr/textAppearanceMedium" /> <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index d7be00bcd..b320885d0 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res-auto" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -43,13 +43,12 @@ android:hint="@string/create_key_hint_full_name" android:ems="10" /> - <org.sufficientlysecure.keychain.ui.widget.AutoCorrectAutoCompleteTextView + <org.sufficientlysecure.keychain.ui.widget.EmailEditText android:id="@+id/create_key_email" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" android:imeOptions="actionNext" - android:inputType="textAutoCorrect|textEmailAddress" android:hint="@string/label_email" android:ems="10" /> @@ -65,15 +64,14 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp"> - <EditText + <org.sufficientlysecure.keychain.ui.widget.PasswordEditText android:id="@+id/create_key_passphrase" android:layout_width="match_parent" android:layout_height="wrap_content" android:imeOptions="actionNext" - android:inputType="textPassword" android:hint="@string/label_passphrase" android:ems="10" - android:layout_gravity="center_horizontal" /> + android:layout_gravity="center_horizontal" /> <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView android:id="@+id/create_key_passphrase_strength" @@ -84,7 +82,7 @@ custom:showGuides="false" custom:color_fail="@color/android_red_light" custom:color_weak="@color/android_orange_light" - custom:color_strong="@color/android_green_light"/> + custom:color_strong="@color/android_green_light" /> </FrameLayout> diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml index 09e37ee56..11355bbc0 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -14,17 +15,35 @@ android:layout_height="wrap_content" android:text="@string/label_no_passphrase" /> - <EditText - android:id="@+id/passphrase_passphrase" + <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:imeOptions="actionNext" - android:inputType="textPassword" - android:hint="@string/label_passphrase" - android:ems="10" - android:layout_gravity="center_horizontal" /> + android:layout_marginBottom="8dp"> + + <org.sufficientlysecure.keychain.ui.widget.PasswordEditText + android:id="@+id/passphrase_passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:imeOptions="actionNext" + android:hint="@string/label_passphrase" + android:ems="10" + android:layout_gravity="center_horizontal" /> + + <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView + android:id="@+id/passphrase_repeat_passphrase_strength" + android:layout_width="48dp" + android:layout_height="8dp" + android:layout_gravity="end|center_vertical" + custom:strength="medium" + custom:showGuides="false" + custom:color_fail="@color/android_red_light" + custom:color_weak="@color/android_orange_light" + custom:color_strong="@color/android_green_light" /> + + </FrameLayout> <EditText android:id="@+id/passphrase_passphrase_again" |