From e20c6add4398ffc0137fc637bb9897c2cd09cb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 22 Feb 2015 23:52:29 +0100 Subject: Fix multi select and more colors --- .../sufficientlysecure/keychain/KeychainApplication.java | 2 +- .../org/sufficientlysecure/keychain/ui/MainActivity.java | 2 -- .../sufficientlysecure/keychain/ui/NavDrawerActivity.java | 2 -- .../keychain/ui/dialog/CustomAlertDialogBuilder.java | 4 ++-- .../src/main/res/drawable-hdpi/ic_lock_white_24dp.png | Bin 0 -> 399 bytes .../src/main/res/drawable-mdpi/ic_lock_white_24dp.png | Bin 0 -> 296 bytes .../src/main/res/drawable-xhdpi/ic_lock_white_24dp.png | Bin 0 -> 465 bytes .../src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png | Bin 0 -> 760 bytes .../src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png | Bin 0 -> 971 bytes OpenKeychain/src/main/res/drawable/section_header.xml | 2 +- .../src/main/res/layout/foldable_linearlayout.xml | 2 +- OpenKeychain/src/main/res/menu/key_list_multi.xml | 5 +---- OpenKeychain/src/main/res/values/colors.xml | 8 ++++---- OpenKeychain/src/main/res/values/styles.xml | 2 +- OpenKeychain/src/main/res/values/themes.xml | 4 +++- 15 files changed, 14 insertions(+), 19 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index 957ce4b23..01f6735ea 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -86,7 +86,7 @@ public class KeychainApplication extends Application { } brandGlowEffect(getApplicationContext(), - getApplicationContext().getResources().getColor(R.color.emphasis)); + getApplicationContext().getResources().getColor(R.color.primary)); setupAccountAsNeeded(this); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index f3bf337c9..2f29f9360 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -31,8 +31,6 @@ public class MainActivity extends NavDrawerActivity { public void init(Bundle savedInstanceState) { super.init(savedInstanceState); - setTitle(R.string.nav_keys); - // if this is the first time show first time activity Preferences prefs = Preferences.getPreferences(this); if (prefs.isFirstTime()) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java index 1bd1f0085..fb23c7d3a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java @@ -24,8 +24,6 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.remote.ui.AppsListFragment; import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; -import it.neokree.materialnavigationdrawer.elements.MaterialSection; -import it.neokree.materialnavigationdrawer.elements.listeners.MaterialSectionListener; public abstract class NavDrawerActivity extends MaterialNavigationDrawer { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java index aa27e8391..d405b1dda 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CustomAlertDialogBuilder.java @@ -26,13 +26,13 @@ public class CustomAlertDialogBuilder extends AlertDialog.Builder { int dividerId = dialog.getContext().getResources().getIdentifier("android:id/titleDivider", null, null); View divider = dialog.findViewById(dividerId); if (divider != null) { - divider.setBackgroundColor(dialog.getContext().getResources().getColor(R.color.emphasis)); + divider.setBackgroundColor(dialog.getContext().getResources().getColor(R.color.header_text)); } int textViewId = dialog.getContext().getResources().getIdentifier("android:id/alertTitle", null, null); TextView tv = (TextView) dialog.findViewById(textViewId); if (tv != null) { - tv.setTextColor(dialog.getContext().getResources().getColor(R.color.emphasis)); + tv.setTextColor(dialog.getContext().getResources().getColor(R.color.header_text)); } return dialog; diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png new file mode 100644 index 000000000..b94735ecb Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png new file mode 100644 index 000000000..381b6a118 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png new file mode 100644 index 000000000..c5e9d0b49 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png new file mode 100644 index 000000000..0dcada814 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png new file mode 100644 index 000000000..a70c55b7e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_white_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml index a4468484e..04d3d4957 100644 --- a/OpenKeychain/src/main/res/drawable/section_header.xml +++ b/OpenKeychain/src/main/res/drawable/section_header.xml @@ -6,6 +6,6 @@ android:height="2dp" android:width="1000dp" /> - + \ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml index cddc98ac5..773a9d416 100644 --- a/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml +++ b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:text="@string/none" android:layout_gravity="center_vertical" - android:textColor="@color/emphasis" /> + android:textColor="@color/header_text" /> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 006b9b9b5..895273967 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -14,16 +14,16 @@ #C8E6C9 - #2196F3 + @color/accent #1976D2 #212121 #727272 #FFFFFF #B6B6B6 - - #212121 - #727272 + #212121 + + @color/accent #cecbce #808080 diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 03ccce85e..f05bdb0ff 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -26,7 +26,7 @@ 8dp 8dp bold - @color/emphasis + @color/header_text 14sp diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 147bd8d4c..da616492c 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -12,12 +12,14 @@ true false + + true @style/MySearchViewStyle @integer/DRAWERTYPE_IMAGE - @style/ThemeOverlay.AppCompat.Dark.ActionBar + @style/ThemeOverlay.AppCompat.Dark @style/ThemeOverlay.AppCompat.Light #fafafa -- cgit v1.2.3