From f30ca1e92cb6dbf791635f38bd4c85f7d32fb312 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 25 Sep 2015 04:16:36 +0200 Subject: enc-backup: use black check icon for button, and some cleanup --- Graphics/get-material-icons.sh | 1 + .../keychain/ui/BackupCodeEntryFragment.java | 6 ++---- .../src/main/res/drawable-hdpi/ic_check_black_24dp.png | Bin 0 -> 169 bytes .../src/main/res/drawable-mdpi/ic_check_black_24dp.png | Bin 0 -> 128 bytes .../src/main/res/drawable-xhdpi/ic_check_black_24dp.png | Bin 0 -> 188 bytes .../src/main/res/drawable-xxhdpi/ic_check_black_24dp.png | Bin 0 -> 254 bytes .../src/main/res/drawable-xxxhdpi/ic_check_black_24dp.png | Bin 0 -> 277 bytes .../src/main/res/layout/backup_code_entry_fragment.xml | 2 +- 8 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_check_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_check_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_check_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_black_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index b6a2515c9..000415799 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -48,6 +48,7 @@ python copy OpenKeychain social black share 24 python copy OpenKeychain content black content_copy 24 python copy OpenKeychain communication black chat 24 python copy OpenKeychain navigation black more_vert 24 +python copy OpenKeychain navigation black check 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java index 4883e689e..2301724dd 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeEntryFragment.java @@ -251,16 +251,14 @@ public class BackupCodeEntryFragment extends Fragment implements OnBackStackChan // we could do this in better granularity in onTextChanged, but it's not worth it mCurrentCodeInput.replace(index, index +s.length(), s.toString()); - // if (s.length() == 6) { - checkIfMatchingCode(); - // } + checkIfCodeIsCorrect(); } }); } } - private void checkIfMatchingCode() { + private void checkIfCodeIsCorrect() { for (EditText editText : mCodeEditText) { if (editText.getText().length() < 6) { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_check_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_black_24dp.png new file mode 100644 index 000000000..e802d90ae Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_check_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_check_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_black_24dp.png new file mode 100644 index 000000000..1c14c9c44 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_check_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_black_24dp.png new file mode 100644 index 000000000..64a4944f7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_check_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_black_24dp.png new file mode 100644 index 000000000..b26a2c05e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_check_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_black_24dp.png new file mode 100644 index 000000000..2f6d6386d Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_check_black_24dp.png differ diff --git a/OpenKeychain/src/main/res/layout/backup_code_entry_fragment.xml b/OpenKeychain/src/main/res/layout/backup_code_entry_fragment.xml index b4938d5e9..e66af62ab 100644 --- a/OpenKeychain/src/main/res/layout/backup_code_entry_fragment.xml +++ b/OpenKeychain/src/main/res/layout/backup_code_entry_fragment.xml @@ -268,7 +268,7 @@ android:layout_gravity="center_horizontal" android:layout_margin="10dp" android:text="Ok, I wrote it down!" - android:drawableLeft="@drawable/ic_check_white_24dp" + android:drawableLeft="@drawable/ic_check_black_24dp" android:drawablePadding="8dp" android:padding="12dp" android:id="@+id/button_backup_input" -- cgit v1.2.3