From e049895b9f8f5f9996ac678acf6810768e859695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 26 Jan 2015 15:24:42 +0100 Subject: [PATCH] Material Design Drawer --- Graphics/get-material-icons.sh | 7 +++ OpenKeychain/build.gradle | 1 + .../keychain/remote/ui/AppsListActivity.java | 26 ++++++---- .../keychain/ui/EncryptActivity.java | 2 +- .../keychain/ui/EncryptFilesActivity.java | 12 ++--- .../keychain/ui/EncryptTextActivity.java | 12 ++--- .../keychain/ui/KeyListActivity.java | 20 +++++--- .../keychain/ui/NavDrawerActivity.java | 47 ++++++++++++++++++ .../res/drawable-hdpi/ic_apps_black_24dp.png | Bin 0 -> 182 bytes .../drawable-hdpi/ic_lock_open_black_24dp.png | Bin 0 -> 393 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 398 bytes .../drawable-hdpi/ic_settings_black_24dp.png | Bin 0 -> 561 bytes .../drawable-hdpi/ic_vpn_key_black_24dp.png | Bin 0 -> 381 bytes .../res/drawable-mdpi/ic_apps_black_24dp.png | Bin 0 -> 173 bytes .../drawable-mdpi/ic_lock_open_black_24dp.png | Bin 0 -> 295 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 294 bytes .../drawable-mdpi/ic_settings_black_24dp.png | Bin 0 -> 416 bytes .../drawable-mdpi/ic_vpn_key_black_24dp.png | Bin 0 -> 293 bytes .../res/drawable-xhdpi/ic_apps_black_24dp.png | Bin 0 -> 193 bytes .../ic_lock_open_black_24dp.png | Bin 0 -> 450 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 484 bytes .../drawable-xhdpi/ic_settings_black_24dp.png | Bin 0 -> 691 bytes .../drawable-xhdpi/ic_vpn_key_black_24dp.png | Bin 0 -> 446 bytes .../drawable-xxhdpi/ic_apps_black_24dp.png | Bin 0 -> 213 bytes .../ic_lock_open_black_24dp.png | Bin 0 -> 615 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 675 bytes .../ic_settings_black_24dp.png | Bin 0 -> 969 bytes .../drawable-xxhdpi/ic_vpn_key_black_24dp.png | Bin 0 -> 622 bytes .../drawable-xxxhdpi/ic_apps_black_24dp.png | Bin 0 -> 236 bytes .../ic_lock_open_black_24dp.png | Bin 0 -> 881 bytes .../ic_lock_outline_black_24dp.png | Bin 0 -> 883 bytes .../ic_settings_black_24dp.png | Bin 0 -> 1257 bytes .../ic_vpn_key_black_24dp.png | Bin 0 -> 789 bytes OpenKeychain/src/main/res/drawable/mat2.jpg | Bin 0 -> 11737 bytes OpenKeychain/src/main/res/values/themes.xml | 5 ++ 35 files changed, 102 insertions(+), 30 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_settings_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_vpn_key_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_apps_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_open_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_outline_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable/mat2.jpg diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 0ebeb46af..0d7d688f2 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -7,3 +7,10 @@ python copy OpenKeychain navigation white check 24 python copy OpenKeychain navigation black expand_less 24 python copy OpenKeychain navigation black expand_more 24 python copy OpenKeychain navigation white refresh 24 + +# navigation drawer sections +python copy OpenKeychain communication black vpn_key 24 +python copy OpenKeychain action black lock_open 24 +python copy OpenKeychain action black lock_outline 24 +python copy OpenKeychain navigation black apps 24 +python copy OpenKeychain action black settings 24 \ No newline at end of file diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index 05b9bd73e..c55adc5cf 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -26,6 +26,7 @@ dependencies { compile 'com.journeyapps:zxing-android-integration:2.0.1@aar' compile 'com.google.zxing:core:3.0.1' compile 'com.jpardogo.materialtabstrip:library:1.0.8' + compile 'it.neokree:MaterialNavigationDrawer:1.3' } android { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java index 079b3065e..3b4cc654e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java @@ -21,19 +21,27 @@ import android.os.Bundle; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.DrawerActivity; +import org.sufficientlysecure.keychain.ui.NavDrawerActivity; -public class AppsListActivity extends DrawerActivity { +public class AppsListActivity extends NavDrawerActivity { + +// @Override +// protected void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// +// activateDrawerNavigation(savedInstanceState); +// } @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - activateDrawerNavigation(savedInstanceState); - } - - @Override - protected void initLayout() { + public void init(Bundle savedInstanceState) { + super.init(savedInstanceState); setContentView(R.layout.api_apps_list_activity); } + +// @Override +// protected void initLayout() { +// setContentView(R.layout.api_apps_list_activity); +// } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java index b9058a37d..11780e761 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java @@ -14,7 +14,7 @@ import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; import java.util.Date; -public abstract class EncryptActivity extends DrawerActivity { +public abstract class EncryptActivity extends NavDrawerActivity { public static final int REQUEST_CODE_PASSPHRASE = 0x00008001; public static final int REQUEST_CODE_NFC = 0x00008002; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java index b1da1f2c5..6a5eaa26c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesActivity.java @@ -312,10 +312,10 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_DATA.equals(getIntent().getAction())) { // lock drawer - deactivateDrawerNavigation(); +// deactivateDrawerNavigation(); // TODO: back button to key? } else { - activateDrawerNavigation(savedInstanceState); +// activateDrawerNavigation(savedInstanceState); } // Handle intent actions @@ -325,10 +325,10 @@ public class EncryptFilesActivity extends EncryptActivity implements EncryptActi mUseArmor = Preferences.getPreferences(this).getDefaultAsciiArmor(); } - @Override - protected void initLayout() { - setContentView(R.layout.encrypt_files_activity); - } +// @Override +// protected void initLayout() { +// setContentView(R.layout.encrypt_files_activity); +// } @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index dabd5ddd5..f9faf683d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -292,10 +292,10 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_TEXT.equals(getIntent().getAction())) { // lock drawer - deactivateDrawerNavigation(); +// deactivateDrawerNavigation(); // TODO: back button to key? } else { - activateDrawerNavigation(savedInstanceState); +// activateDrawerNavigation(savedInstanceState); } // Handle intent actions @@ -303,10 +303,10 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv updateModeFragment(); } - @Override - protected void initLayout() { - setContentView(R.layout.encrypt_text_activity); - } +// @Override +// protected void initLayout() { +// setContentView(R.layout.encrypt_text_activity); +// } @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index 1d9a9cf64..b7f3588eb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -41,15 +41,19 @@ import org.sufficientlysecure.keychain.util.Preferences; import java.io.IOException; -public class KeyListActivity extends DrawerActivity { +import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; + +public class KeyListActivity extends NavDrawerActivity { public static final int REQUEST_CODE_RESULT_TO_LIST = 1; ExportHelper mExportHelper; @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); +// public void onCreate(Bundle savedInstanceState) { + public void init(Bundle savedInstanceState) { + super.init(savedInstanceState); +// super.onCreate(savedInstanceState); // setActionBarIcon(R.drawable.ic_ab_drawer); setTitle(R.string.nav_keys); @@ -72,13 +76,13 @@ public class KeyListActivity extends DrawerActivity { } // now setup navigation drawer in DrawerActivity... - activateDrawerNavigation(savedInstanceState); +// activateDrawerNavigation(savedInstanceState); } - @Override - protected void initLayout() { - setContentView(R.layout.key_list_activity); - } +// @Override +// protected void initLayout() { +// setContentView(R.layout.key_list_activity); +// } @Override public boolean onCreateOptionsMenu(Menu menu) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java new file mode 100644 index 000000000..092334ac3 --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NavDrawerActivity.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2015 Dominik Schürmann + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui; + +import android.content.Intent; +import android.os.Bundle; + +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.remote.ui.AppsListActivity; + +import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer; + +public abstract class NavDrawerActivity extends MaterialNavigationDrawer { + + @Override + public void init(Bundle savedInstanceState) { + + // set the header image + this.setDrawerHeaderImage(R.drawable.mat2); + + // create sections + this.addSection(newSection(getString(R.string.app_name), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment())); + + this.addSection(newSection(getString(R.string.title_encrypt_text), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptTextActivity.class))); + this.addSection(newSection(getString(R.string.title_encrypt_files), R.drawable.ic_lock_outline_black_24dp, new Intent(this, EncryptFilesActivity.class))); + this.addSection(newSection(getString(R.string.title_decrypt), R.drawable.ic_lock_open_black_24dp, new Intent(this, DecryptActivity.class))); + this.addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new Intent(this, AppsListActivity.class))); + + // create bottom section + this.addBottomSection(newSection(getString(R.string.menu_preferences), R.drawable.ic_settings_black_24dp, new Intent(this, SettingsActivity.class))); + } +} diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_apps_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..37931a0ad178616b8ceace58ef29f8127ae9f5dd GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?#g-FrIKZT1ZlcoR>YkJi-a3|5 zDTi|}xGdsnJlMH|x5|H#FVdQ&MBb@0FL8_g#Z8m literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_lock_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fc019db7231123c40ecc49eab07dc0aa9e853866 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00F5VGpw2O5THccy! z2&$Yh#WW>NBM{s%$qeVz5Zu#Z7Nw;P-$so;vT4%v@owF0Td(x!qLV*s1cD>KW)#p*_^A)XUqS zH7|6V-rJUhd|5ZUzaAn0T6jQE;e>G}C>k|6l1y;Q2Z9n&``lQeqtRCxO_Oerovbnx zbfyezqW*Amt<6`dPutY^w~-B5Txnf2>95oeR+#d4F}@SE00000NkvXXu0mjfm%8R= literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c900b8ec7c92b955e2927e88655bb31b882588df GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?b)+LLZ^DBz@mTc4s2&sCoLlK&PTSkIHn z)3ZeK@UaboX9Xl;&K_{;a^xippkEg{WW6I-e##8^!fYTh-0XO=_f^>>H&9`oLH{mKQV z+X6FKdK)8KpBzX_uyA#Fs5m7e??4(0ONFq(iOz^-35jP94AZn`MeSkRXtd^V;u)?U zpYH1l0fs?*I%Wa9KhFg8ER|495a8%w=HBeglP~#?;Ui;0q)Jn$s32Q!Q=q{CU`S1g VKXjT;p%EAW44$rjF6*2UngHc$fS>>X literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_apps_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5b1fd77667f73daf8d0c77d548dec98920f8ea91 GIT binary patch literal 173 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=WkLM z>gnPbVsSb-LE=|~;JIJ@Dox$IEIvzaIaKp5UT7la<*Ys>gP)O=~G=WkJ` z-_yl0#NzbXNse5H3IL+>55-*R=Y`|(LP juCLhWdGJER{NvomCGr`R8W(Q^I+elG)z4*}Q$iB}@8@Rt literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_lock_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1df91994c3a91d1f4a63efb050576d219447170b GIT binary patch literal 294 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=WkJ` z&(p;*#NzbXNzq(~3`AV~ckOXnxpucu%#+ybm38>OHYLV9FDk~U9zUL jwpVPn$rO=~G=WkOt zDBJ>5+tknKG**5lyRqf5Yf>);oSFO2OyJ|*=>B1^EU0-uErmU9@zD$!p6}q1N zly}8W`c~bE>AT|YDnzcEVwGgic5W@(uZoII)gsFcCp=Dmc9>P?#iG8nJ~ze6mpuA5 zn~oZpwbaudil&cZpHeNm%{!4@I>}SMDbEPJVd>7;p@pu6{1- HoD!MO=~G=WkJ` z*VDx@#NzbZi3how97J5tYvo28I)%hX2zkbfx_pri%9u4j$f^7KBF#B-3jZ*?kG6eh z*?qiO@vrctf~Cuz9qPN#zJ7;tuVzHa!(=UH@fPXE=o{M$9B=GsjZtP#)9?%XYt69d zixH#4SMg;GE_I5RPYb#pxv8&mE$i>@iw*Yv+R+uqPUs$(bm&0wv)*e;4hN=9QRfeO hw10VIt72>=^CO2j{+5iJnt%>v@O1TaS?83{1OSF9X0`wT literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_apps_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c8187799b762f60bab53ce012828a7ee3c7536a7 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zEj?WvLn02py<*74puod&@W}uFH%-bWDJ{6`BiVBFnNq_Zz1@|Dd*xq$=VxKr;JVG@ hfLLNT3rj;e*S4>mdIfzP+ku8Kc)I$ztaD0e0st5*Hl6?g literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_open_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9cd0501004b56e414c2a0b92577c3ad65fc71272 GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=14Fw zFj{%KIEF+VemnJ`*I@?{SN_;75x-=G{>+PN@!Ie8LHS5q+k->v1zs&uP;$IG&1;g= zW=U~Br=)Zbqsb+gEAywHzGJ*+rgdZSNvE-5K4Hbtjbc>k8(C;0zYccl3<=6C&P zKJQCT;MchQKJxRaeN7wW{PMOYo)TzKG``pM{(71F?DPLR3teY^(3$GrX}ZdF{>XAK^5YpXcKWdu0v&M-_Vc~jO&q;%S(`#_6}B=R`O1)3VJx-2xM4HfAJv%Y5!nuw4_6(D zVm>qrNL&IDllCz>vOXy1|8PU}*0j@h>sB7`njsON_-=K(N1QZ@-aRd97cgiUJYD@<);T3K0RUj_vkm|N literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_lock_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ae48a3bf71a1db8d672c906c5d6efb8f12a701df GIT binary patch literal 484 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00CS{L_t(o!|hbuvxFeAI}9p`H$qB$3Yo#ULd-s`!*f58d5=pn|MRg8OFvy&2W zg%6}V^^SHq;uYK$#AV$u)*D&*Z;UWzpIHm<=18dtnyB)#Dr?T`_PpgcTG{(2)N)K6 z&w_aqwod47-@aDh>X-_)<8IIs5>1lr2=>n1AQq#gn{bL1=V$H)Yc4QS@)ORl+zsSE zMTMb;=P^1k{=NZ)OGH>I_m8R)JfdMH|79&M>(j&{a+cpze^>6PV6Y_Cf;keL>kLvQ zqst6=FXSK?5D7O004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00JvXL_t(o!|j;8Pm@s;#(${TCVWYWY1uUn7#Kto62wRt z3^+(wO#B;+2@XXVOk4~OIykuiLt|6^2qH7G94dG7n(+vnW8upf?S@kSof=0CzN;gCH%D-93Wz>xQyl;C^+Qv4$W`U(W(<>BGo?S~pjnvz6Z%GrQQ{qEOxv7hReU*ZBD#YO z0lmUed*8YnE6EzsvoY))4!YfFODpO#BKtLD+0S3~Rhiu-sUg2NYuCP^d<3d&dHene zZC-H;v~r)6mb+*a(0|ErFLu4r+_Wehyb|pqx|6biUL|d!KP#SVg(5Hh(UuM95CjfcY;8e;Ra|n|*9NonlO)LibK=YSb4*CjPz+|*kK{c#6{z9-WWcn|3qb@P zn2%|iFMFo{WOvhS9r&vkWj$)z?k0y>uK{0hl_N~CX(cZ+NjKMc8C};}U50gmO>zuJ z^Db@~ZcCrJNoRx`;UQ(lnsdp5p^*l=U9UHg{W}F-H;`>AGU6WeglvXSWAw%Sj|~4x Z`~p3i20ETM-aG&R002ovPDHLkV1jZ(BwGLg literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ccbdce4ab570ba75cb6b799d53d01295d948a737 GIT binary patch literal 446 zcmV;v0YUzWP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00A~hL_t(o!|jz%O9DX{ho4)ZW_0bZRv#vWLI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6!i6UaSX}0_x9RGE(Qe-2gld{|KGeeZNWmvmw9U+TvTvlaL9jLF-crM?(WSqS@tR( q6BHbqR004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00G}gL_t(&-tE}SO2a@D2H+ohbED$6#U~QGEQp)p!d+?U z0~9Iv0AdB7L2zd`?xoNRy`Uoa0$RH+X-XYeiIZm9WMWQI>6uyPkogF6CVv9(*s766 z9u2fGh6xj6v~Z1Mq~gIGppFTIVt(NQ`%!aFFjiu$`GG=om;`RuVyxLfA{x%UFOGn~ zT@)nu)0ty{CYl&v?z(nEzjvGqzMzO*`|2Lf@U~P@pzSPqD=$z((p8f}9p8@aP1tdD z2j_HUUC}|R(H(;m-^*M&&LyIwGVjMI&h%U-~gI%{8t+HuAgm2IC+qE5rY`SAobWm6+IZf1DV$}&_xBA zpqxWIhena-2)STShlV2{Fhp7(R3+mG2$c0fJyK9dA7qe%rura3aEkoto(y6TgBbK* zKvqQY6D=YDEk~5~(SjVLiYV)%1v#jy87;^`JO#rA=^N>DpKP(=wU#Rtk@ zY1CKBz(pD(Qn% z(ITwb5AxH~9WBD+WP^5v6)nQs%H9!$2M->^;|He*@J0#Ttjz!b002ovPDHLkV1lne B0CWHV literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_lock_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..cf149aa37f1f964b9dc2d7e0a58e5cbf5c974bba GIT binary patch literal 675 zcmV;U0$lxxP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00J9HL_t(&-tCz?O9Md=$N!p_2x@E-to#Umhad=+0kH}8 z63GV$60l0EU~ekH&Vbm9U=s2miXe6hz6z@(CdRdpJMVIj>|S;*M0ch+?q+X)H<{V{ z?*&jcVKz0==rC51zzUWT1@Ml0lyQzT^v3Zhi^$;(%*J1_iv_=NHt=E#qxln({=o!r z=nA9xJ_7#WoN(bVFdX}VWX(e zq{V?Mq(CL{oomN?@o`uiv!Xyu+J;-`o@!xKKnh3!O+Jt&QAU&&vi2B*62)CwFfaQM zk->Hn#Z6j}17!rI1vyYfOj_{VbF{a;y+m=87XR>V-xN6O3sAxK?9uqvp$Hn5lCF-k z?SVMz130m9E{s1}N~44pTDZdYko^{U+bfZ;fE17d`h!5ue=>a-v<{O#Z(BS=P0~a( z#eoW>KprHDowShURWBbstKjAz5!Sa+ehngaHIeL002ov JPDHLkV1hMEAEN*O literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..47f0e0d820c17fe1187dd79811a3c5fda163ab53 GIT binary patch literal 969 zcmV;)12+7LP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00TiuL_t(&-tC!LNL4`?fIrQJvZ7K;NpB0Hn1o0VMifK@ zy#+y1L=lFC1r_xiEs*zW7*V!JAP6m>3DNdgXhpP;rbrSkl%_3KR$7*crsji-=m0x!1dL%D`ouc1*-!6#btdvA2>prUgLMM!oLo`x_7cW&bF=X8Th)icXgGR7kN=OeP zc<|9@#P~t7SZJzI>bpi-NQ#FB14r2$Mi7 znQm&vH3D3tHlbNSC~#NA?iApvvaP zPU;*U2|s&}7Gb9Fvu`8YRA;p`&+6?M%A~p8V3cAxtX!cz8snp?91beh!(Wlg4UJ{7 zfmkUej++{kdZww5Szc)t4mA>`IL>KOI$0poNv7YRw7M>MaWl0>$KSrls_In361I<0 zW(<=lGu&_wkR%(Uqb`d4W~%YwqnZ{MMgAfA9Gb#=tJ|P%c|{Gd)v8djP669$P3Hm8 zI+LKU{ub*Q8@OJ;Gi{m2ED!V>Mj0i@004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00HJnL_t(&-tE}UOBGQV$MLUS>Aoy2b16a*YFeUh6BJQe z*+xNXFG&3%A{bW!MRXxb)Zd^R@ij}kNWQf)bR`OI%3IWF5f{`uXYR~7bH;_w@7X>) z_rp1JXU+^rBoc{4B9TZWHo4Cr@A$$Azxd55Ic6E8<~k?|`dL9~YMFi#adNuZ*J28_ zO=moq43i}>g&HH}nsbkhz#N5Qjk_*6RqTc0C=_4akuo7yr%)>--GHWyI10t63(hlR zj^ZzEQFF@qW&u*K(u$){JdYOi(Hb-#CFh~f5B+4ACXys+W`uKVxUMecwYKem zx=Wo69L53qplSL+ZP98rl6Mc<(liZuZtxrTpfgQVqbI1vJ?M|7soWEkzJVa!mOb_a zwO-#vJ?sg}x(B`2-W2PLI8WmE+rQGbedo~?&QTmU#s@x)=Zw%oiZrcc9j#6g2v)5J z&iOnm10pWwg*B)rT2R8^cz>}reGg~`An39>!ant#Z3Kb|V^FrlWJ6GzPez<2Zo2_N zCA*19RR6d}p-+0d%kvV5`~#&$9->E&5p04qBi$ z)Ca2wK>t(205g2%m^^uo*V!Z literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_apps_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d12d2e796dc04433f03e8eb14bc249ab6eb97c5d GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6io4SaSW-r_4bA#7lQ&1%fT1_|F7BG8_{v%>=nm|9H&)4(?fEt4f*1C*zSL^|9=Am zBNGdUfPw>%!SJDN_k>UFS1;m>+xm6MQJ{Scp00i_ I>zopr0QIgyZ~y=R literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_lock_open_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..a0fe0156f98a55a9e4ceaa68ff85521643c0396b GIT binary patch literal 881 zcmV-%1CIQOP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00QYrL_t(|+U=V^Z__{+#-FA%q)26eG8778>Qa?b2@rGm z4j}OX=vvW*FM#NdOI(z1fW!i7C#(t~78nphsajA7jSvIvgn&3gK87lT&#~{$clKS> z_kAZfe$UVEeE*&(1t=(vcZ?O#W(7A;$2H7h22%ij;Rkl{9s%AVa=k+?Vh!KHQnHIj zxZtk%X>6dMDt?e58aV5s{JS_5iXY?w?zkm>0#BvI5Aq34xFY`)HkIWwFucU18@<1k zOFjd`3;nk+t_|R)j^{6UgSYsAF2-?Y=pA#I#-{D5JFI8hxX&$@vsguE=)JdX%0D+` z<@t@3lz}mURs2cZ|1;(7loA^WIUUSrR$Re;qQ+;*ySIi2lE}_d+^>E$}z*=JP z%uCf>#b2)Sp$++!#F=MBy7mEAxnIbkQV=&2E06q|UQG<6>-qaJZ`8SK5C5cV`&j4x za;y9|@SN*IwPW&SuKHQ|0H0z4J}cLMi`9QDe+bRQu3F0Vt&G-60ho$i9V*u!#I8=~ zm6886Sk)YYp_$ey81Wzg0w4ea7?oIpk3EFBzk!g=5W8q#(X9AMGz%9V&j>zh=H$OF zS^iOOn?h(>k004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00QetL_t(|+U=V^Z__{+#-Fydq)26eG8778>Qa?b2@rGm z4j}OX=vvW*FM#NdOI(z1fW!i7C#(t~78nphsajA7jSvIvgn&3gK87lT&wuXDclKS> z_r1x9U;Fu;-~01e2|z({ykn$bQnE%wP(@FZ{qR-Xp*}M6P$pMXcdFSVrsO z5iYnZei|F-XNn)R5DlDlQT|;V3dIlF0q(dZejHDw#ShvOoNz_{DQqgsXJB}VNjG|b ztB`yKh8OxzVN4sq&#dP!c!Rh2fG);xCiRRtOk>mb&`s;vHtuuN+rP5I|i zW}e?z$ta9*tm04N{GS<5r;^x6$mw7{H{%NS6FHu}RhM73zG7CGbqQTAtB3P;0M-)4 zGcT2Q6@R(Rhc@JoCiXll(zy?~%>7a}m4djLn0e&q^oc|nT`%5`MWfCgd-x}v+s8Wh z$*t<2z;mt-)wao(x$I}v1AK}J_^h1&EtdbW`VyLn9krD6TRB&&1Yjz5bf}zv5IZ_u zeF^dFscJMe^R=IVBS8QJKmY_VEU^S1dk71^fskz>cG1A1S@DyJWvA>G!AH%U{MQxB zKWf{i5SmuxGcYvF)IPJ;BJo%d&qB)V z45j zzr$!DBLD&*00JNY0w92@Li~&KK4;QdrTRksC(yCl!EJqjz$$pEx&j?bMoUJw`}RE9-4xJf`Z~$$A3v0$;J4_lf3`{002ov JPDHLkV1izPl4$?{ literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bce161d005a26e785aa23a38218ae06e43280aa6 GIT binary patch literal 1257 zcmV=P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00d!4L_t(|+U;9eY)w%VU2WA&h-eKpHvJ>1ImX5mL4=SX zHAGF3_#`nmln{RK;X@=y1Rph~l&_){5o#u_QZcr~JQJNK!5-NRH2?BRAUleqRJ32Fj2387e@I%EyU=Q-;O0e6diOLNMjoq zrqjS2wt@LN4QyZ=*rd}yHrv1~agZ{o-(0JS{qN5+-4nDAQHHI+ zQJMm=NXHu|`Js4?$;32<7%QS~xJhmX_IM2a%vn5#X`hSyel+i^>O8EMatzKZkY9z1 zw(sqkD&&VE!$y8nJW*qy9L?kg)~k^pij7kFUGPPffv-rG891m)ekhJebQt0mdU$g8LXiXeWuAeaD6<^k7#bVdn;_Scy^QR$3-o*|`Mln=0b&Em+PUFx57p?v6XmLAHyzcd~b$ZZ0KF3*@l& z{jOr>6xMs;2%5WA#W7fA{JHb2m`xi+C6@cug1lfDYLOM|5(Dd5|5{s*3_}gHVjXN? zz2~2S&xWBA{!2UftzYtEjZ3Y*6>kIM8VC$bWag?UqL$kkrI0`;;~IwauiXq$VD?sl4a~$Ns;JW=A1>*m&+U^p3d6j>;?Ri zvM-)mmfg8jESkUllh#E&bDCapXnYh?vFQEflsK@T=NTw+YCcs`v6%9YjdPb{W9vH4 zz&syXi}_Tp45nGzfT9g04NGYbySElIxbNO8&O_DlSy`G&1ESN)Y<2R5=f$0jH9+l# z#fkk|RR%2XOf-qOcu{v@d24058Us^odvfPg$j`U02l^``er^D$tz2ep4!5uW&3 zD*c7FQE!8O!vTz>DK?RL;od8rV>~g9qT9URqPA8N;D}`rJHkq`RgFaKcapyst^cS( zGV#!ten*Y|S!sAS=3p#kN|8-kyTx7*r70YTaX22%SxaPf*uQi5YgAfip`*t$!;HP7 znwfo?XCAPQ&V~xzmai1EL3h|CD{}oh%U&me0X(0Q56(_X? z{-1!dbQ+k=HZVh{fgx-I{dF4P{}r({l;SzF$Eg+*7+3PkDIp9HAV7cs0er#_=WN)d Tv8ld300000NkvXXu0mjfLCH4e literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3451d98559c82b832d11b30c464fd7879d01c765 GIT binary patch literal 789 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 false @style/MySearchViewStyle + @color/accent + + + @integer/DRAWERTYPE_IMAGE + true