From bc4a72aaed74c068accd53d9eacea84ca89ba3f5 Mon Sep 17 00:00:00 2001 From: Mateusz Drzazga Date: Fri, 14 May 2021 14:54:04 +0200 Subject: [PATCH] Remove settings button from the NavigationView --- .../forscience/whistlepunk/MainActivity.java | 4 ---- .../res/drawable-hdpi/ic_navigation_settings.png | Bin 1835 -> 0 bytes .../res/drawable-mdpi/ic_navigation_settings.png | Bin 1174 -> 0 bytes .../drawable-xhdpi/ic_navigation_settings.png | Bin 2640 -> 0 bytes .../drawable-xxhdpi/ic_navigation_settings.png | Bin 3926 -> 0 bytes .../main/res/menu/drawer_navigation_ext_link.xml | 5 ----- 6 files changed, 9 deletions(-) delete mode 100644 OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png delete mode 100644 OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png delete mode 100644 OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png delete mode 100644 OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xxhdpi/ic_navigation_settings.png diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java index 46ceb395..400e280b 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java +++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/MainActivity.java @@ -447,8 +447,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) { safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_science_kit_link)))); } else if (itemId == R.id.navigation_item_get_help) { safeStartActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.navigation_get_help_link)))); - } else if (itemId == R.id.navigation_item_settings) { - startActivity(new Intent(this, ArduinoSettingsActivity.class)); } else { drawerLayout.closeDrawers(); // Launch intents @@ -632,7 +630,6 @@ private void onAccountSwitched(AppAccount appAccount) { final Menu menu = navigationView.getMenu(); menu.findItem(R.id.navigation_item_get_science_kit).setVisible(true); menu.findItem(R.id.navigation_item_get_help).setVisible(true); - menu.findItem(R.id.navigation_item_settings).setVisible(false); } else { final String avatar = appAccount.getAccountAvatar(); if (StringUtils.isEmpty(avatar)) { @@ -667,7 +664,6 @@ private void onAccountSwitched(AppAccount appAccount) { final Menu menu = navigationView.getMenu(); menu.findItem(R.id.navigation_item_get_science_kit).setVisible(!appAccount.isMinor()); menu.findItem(R.id.navigation_item_get_help).setVisible(!appAccount.isMinor()); - menu.findItem(R.id.navigation_item_settings).setVisible(true); } // Clean up old files from previous exports. diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-hdpi/ic_navigation_settings.png deleted file mode 100644 index cca43a4e3bde76b0621afce7758604055ea70db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1835 zcmV+`2h{k9P){FSngWsojh7>uO~JdM8y{bfr`i@ zK@CLEssW@x3%%a1zxnR=^4+UIL-Zdu`MR?+znPt#ot@n)V>ep=5#arc(@Pzt?pcbd zd?wgvCDjF8xy|l$c{w*) zm{Q$L$*G8H1$1`>d|o$t3Upjcnbd`)m9GN1Dh_EGkTV9$u($Z@{;;rPWbsqaj_M6v zYQyA{W6T7CbMa!E-@7`2&5T5by}~`6OGPV3VAz*YkB7mD5TbKHaPdaw-D8)3`1YD} ziMo1x_=oQ=%$SnD;bMq&LVpy#Tge{cdK}-6pvS@X!}mTo@zbLRI!Z9{TShQ99 zkDWM*(RfJqkIJ?^R99CQB0hKmeP0B5ZGVfKnvDAoA6C$p)z#Iu&hF4|Z2LrVF6gg+ zz-ledp`!At!f-eoAV3DUO~RJ!w}P)1?Wm}lB>Td9$)3TD$6EcK?b>!+QcD?ro&*SI z`_(vOce#d$5O+wXCL%pUCSTq~N8nT3BASNJ;q)PS0&|V$QmdEKdjg^-Xbn%b=)y`EV(F zwxfVf09$1h&apL@l%U>HqD5P>YJ)39g_n$*b690WCplE;bXTE@=9@wxHYX|!Gj4B2GX9NIGNd=enwC^o z)3snWO6sucZNeRP6M}RmGmCH2GTjTq*hDn;pa2(dspjiG?vw$r63CShQqVugTW6LA zTKl51s`)6Qm>72<9ec)hk{pkK0_bNG$qnIbYxHik>S@~UtlRSbKAZ)sU9 zLS|u9ss;k!c!wdfOEf64Z}oXvfO!(mbi!~BRy&tIat13ohg*4ZI%mih*`_%VWucUO zlkPe_M|^}zT{s#U8dNPL{J$>O*p`tK6UL8iLv(&2x{rm{(^G+H3Mrlr8AK1Hk*?kr zvWenYXWGH@!+O&bFD^pFK*G+%(~~YfdQk1e5gvzAa|iYuw>kR>>FODoW2~ol65-Re z;+mSw(9geBL)QgNF6`NmUnj7&$B}C@$Q~DbTA$6w zGN`vy>rqd<%Y8jTat5mnGcIZo>c{cWpN@sB0OTm_Gz5H}HC8=Mr;Lymrt0lw?!~y! z%;JVsE=3J_&x%7~eFjH)9VW%EYB8_P=V`afuSBPeP=886pLa8IEAm!Ssv-#+<)LUc zT&pu=Yd|Ll|5ON|#FpSl+TIyL*6b4Z(Ul)L6I$?}lkW563te8t2`&eTa1j9tOT`Y$y0Mt?mc Z@Gn!5rANFcXiNYA002ovPDHLkV1nweT)O}O diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-mdpi/ic_navigation_settings.png deleted file mode 100644 index 7fe337f1dcfe4efb71a6fe4e097cfde4c40685cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1174 zcmV;H1Zn$;P)9(E6u#%ppTtli@voG$DHILu zLeNMw-I`Du>9mxBIzOc|!<3r1P&Y2SGf@*+RVbYqV5UYGik(qxi7QEf#3%_SEs;vZ zh>9Ddu_f)izI*)6g!}T^BGrZQCO7BabIx~u@3~6-$BX`n{hoNbzT((Bn5;UBS(9b` zL~LC?TNwUjHN1Z{1(7c}_Gch1inY?h(2gQAcEt`D)qeRM@RdZva zBf1@l#0J62*}InXpevqu-f`3grPzlW+#u#gP|ZZ~az68s7Z{GG_A9OPirHdCKLFDR zV>VmVTFz&`GPC2Zm;q!nhfo3%NFWQpFsQXT2mGtTgmPuXZklJbZZU*DW5C0BO z4t?0z6H8Uo6D1brtd#)9H z7(=yIF1*?$eAhuwI=v2<1BmQaF+cLXfnuP}!Pt}GXtLk%?w+?mHeq;z5iFBVV(8Wy ze$@dQX)WBbKSu&BmZF13D0JKA`T}zM6o1^2a5V94N2Cv>(MJ&G`M~bBj8|8%(qvjt z=MBH=V5%AO!c->>`nZspG(w?pz8DI(bt2jX>U0%RPAQAh+qX2lxcr$4R%~G4YK;xI zUg1dMEmr*YzZo=R#83=cw+tFGd3}5|TOBlal7kQWKd8*vucF@Xb;goUXvUjoJp=HW zyAx~dxU{?XV2kZIdr`tBw04@cP9xJBYiYgv)ZGjOwWl}P>MZInPznS=Hz8~Q+fkMk zE1euUIqzv8oVUy*>%p2%GE`+QIPDNt7~WH$u^{5XJL z;@AAJvp2ojIFK`pkK%rT0_z?w6>?1~L>qD6?)^zce@O)|-aGk&?d;gk oq23#WkGkICzyp`PI{(}GFZHITypesgQUCw|07*qoM6N<$f@AL^C;$Ke diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png b/OpenScienceJournal/whistlepunk_library/src/main/res/drawable-xhdpi/ic_navigation_settings.png deleted file mode 100644 index 8e377f0572b041bfd1c1bcae48d760387ca9cf72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2640 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 diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml index 201c0a11..519ca442 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml +++ b/OpenScienceJournal/whistlepunk_library/src/main/res/menu/drawer_navigation_ext_link.xml @@ -44,11 +44,6 @@ android:icon="@drawable/ic_notes_white_24dp" android:title="@string/navigation_item_testing_options" android:visibility="gone" /> -