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: [PATCH] Fix multi select and more colors --- Graphics/get-material-icons.sh | 5 ++++- .../keychain/KeychainApplication.java | 2 +- .../keychain/ui/MainActivity.java | 2 -- .../keychain/ui/NavDrawerActivity.java | 2 -- .../ui/dialog/CustomAlertDialogBuilder.java | 4 ++-- .../main/res/drawable-hdpi/ic_lock_white_24dp.png | Bin 0 -> 399 bytes .../main/res/drawable-mdpi/ic_lock_white_24dp.png | Bin 0 -> 296 bytes .../res/drawable-xhdpi/ic_lock_white_24dp.png | Bin 0 -> 465 bytes .../res/drawable-xxhdpi/ic_lock_white_24dp.png | Bin 0 -> 760 bytes .../res/drawable-xxxhdpi/ic_lock_white_24dp.png | Bin 0 -> 971 bytes .../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 +++- 16 files changed, 18 insertions(+), 20 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 diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 9263b7132..52f7514de 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -19,4 +19,7 @@ python copy OpenKeychain action black settings 24 python copy OpenKeychain av white play_arrow 24 # small floating action button -python copy OpenKeychain file white folder 24 \ No newline at end of file +python copy OpenKeychain file white folder 24 + +# multi select +python copy OpenKeychain action white lock 24 \ No newline at end of file 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 0000000000000000000000000000000000000000..b94735ecbb6043e2842514aaed9124dbcf18d34f GIT binary patch literal 399 zcmV;A0dW3_P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_009R{L_t(Y$L-d!O2beT2H=2L!6J09?!{3-)K{tK;35=X zpo?yOg3zp`=&K0DSJ1gy=g`3lSw06fh;1}!svz{g+c}r-!c92bK(Ltg(}tR+woAu0 z=ZETg5+6xi*_sF1G4wT0c8fywcV?omMY2yA;n zGW*(RL(Pn{ufb7%s0~_E^>c8MAL@XUsro7C{6}a_B$g**kxDicDUv7~iVHz;HdHiA z=q*E`&_h}1#=1bDYETZ^OM3_9pp~?@S`OMzdxzzqfvP}Y!)@8G_Nc3CwEVLd4UHEy tkBUvmFdM4mp4qYRyP5rq53Rq4UI7l%BzuJ0j)(vN002ovPDHLkV1i&mp)3FZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..381b6a118137f0b9c13bad8dd3138d9975b0952e GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkLc zz|+Ms#NzbXE7n|x90b@N^rjnBsXIP;9MR zGue1%VfXj1F4XL0eE)buJzMVAQgKF0QqI{N}{)+_?LmBG{1&t;ucLK6V4if&i{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c5e9d0b49842c071e162579ee77f19c8a15d6259 GIT binary patch literal 465 zcmV;?0WSWDP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Bu!L_t(o!|m8#OTthX$MNBXqdAh^L=4}GC|;NdhOa8< zMMR1sUGy5d2ux-~#Hen=@DJ$Cw~G#k=G4zsYbJ*-0kY`XLa z*svksnsaQEK$~~A>y4Hfpui<@bwNQN_&I*Xmn=9G7aciZ8mKU0$!}}H5N{u#!Y8UVixN>_gia08fu$BOPX}}>2XY_@m{7%` zL=8U+V8XHNDJKxhKsD4=HxF#@DvSfAtbtmnt6?7SDa)P{9004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00MAHL_t(&-tC&tYZE~f$GA*^?>jW+CAVzE=gNm%VWvwb%QAoa+xpboF1$tkAgIdWWAqwZG$o+dd;xehj;;B&O!#^xv8i+Ul6<5l9j>v&JoB99eZ|!gi`1sbH$Vo+ z039o!mgv0u`apG2pt?TLhA7awehF)#f}#-4HqPl^dbV%@H6fhYFdX!_IJbC{6*d#Q qp>FamZ!i}%XUcqGWq=Hju>1iAuTa5a>{Dg{0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00TowL_t(|+U=UpYZFlr$G=;eCK2kv>Y>{Dqeu#hhG-Qp zQcMn3(5phPVxk72wHN;by?L;$P4ExUvtsL^k>XJ?1R)?u8d8e~o0Hi5Ksp{}-zNL( zZT4+sCa0I(c{`u?W@cwzq7nLA2EYIeASHu6S(J-NVhS;gVi>?L{J>XyLIEGK=lRpf z+s`;Xp>66WTlAQYc>6>zCp$4 zjl7{~5CB57N^a$~{4QwHr9>Wgx?K5&GU@RXS~|ah7TZokdju9`VTOw8`;2Y7(5s?= z6_mW}2cq(GsWeL_K~FdE+rU%0T_S*7=Qs7pbr6xxQiIV2xAiW zY7LkmHQK;ceCXIBu2~hw!Kg+bbTl8>z`TlcA#&{d z=S)_!hO}AX%ujMs!HLJ_PXBW%5fELIWjhf?BSEaXwZCV&Z~ zkaq1nnkoR#mY82;48Q;kzyJ)u01TiIpsm!tmOMaJDL_RYpr90BUA`ZPqi9vq_Dl$I ze39LOlK01fwq@DMe0zWTi(n1Y3e10xYhDB~(8LUKK6hq>B|GLj`P*e2X(Vx?7mc}) tI4f93-r9Mb0`Qxd0T_S*7~p>d_zOvJx9YCDLk9o=002ovPDHLkV1jZOu1){| literal 0 HcmV?d00001 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