From c0397858ee339deaa90683a45e1dc0c49f1dae20 Mon Sep 17 00:00:00 2001 From: maskara Date: Tue, 16 May 2017 17:20:42 +0200 Subject: [PATCH] With icons in navigation drawer --- .../hamburger/NavigationBaseFragment.java | 13 +- .../ic_exit_to_app_black_24dp.png | Bin 0 -> 251 bytes .../drawable-hdpi/ic_feedback_black_24dp.png | Bin 0 -> 149 bytes .../ic_file_upload_black_24dp.png | Bin 0 -> 139 bytes .../ic_info_outline_black_24dp.png | Bin 0 -> 487 bytes .../ic_location_on_black_24dp.png | Bin 0 -> 376 bytes .../drawable-hdpi/ic_settings_black_24dp.png | Bin 0 -> 453 bytes .../ic_exit_to_app_black_24dp.png | Bin 0 -> 171 bytes .../drawable-mdpi/ic_feedback_black_24dp.png | Bin 0 -> 127 bytes .../ic_file_upload_black_24dp.png | Bin 0 -> 114 bytes .../ic_info_outline_black_24dp.png | Bin 0 -> 323 bytes .../ic_location_on_black_24dp.png | Bin 0 -> 263 bytes .../drawable-mdpi/ic_settings_black_24dp.png | Bin 0 -> 322 bytes .../ic_exit_to_app_black_24dp.png | Bin 0 -> 246 bytes .../drawable-xhdpi/ic_feedback_black_24dp.png | Bin 0 -> 187 bytes .../ic_file_upload_black_24dp.png | Bin 0 -> 144 bytes .../ic_info_outline_black_24dp.png | Bin 0 -> 640 bytes .../ic_location_on_black_24dp.png | Bin 0 -> 457 bytes .../drawable-xhdpi/ic_settings_black_24dp.png | Bin 0 -> 557 bytes .../ic_exit_to_app_black_24dp.png | Bin 0 -> 354 bytes .../ic_feedback_black_24dp.png | Bin 0 -> 246 bytes .../ic_file_upload_black_24dp.png | Bin 0 -> 175 bytes .../ic_info_outline_black_24dp.png | Bin 0 -> 940 bytes .../ic_location_on_black_24dp.png | Bin 0 -> 683 bytes .../ic_settings_black_24dp.png | Bin 0 -> 827 bytes .../ic_exit_to_app_black_24dp.png | Bin 0 -> 432 bytes .../ic_feedback_black_24dp.png | Bin 0 -> 311 bytes .../ic_file_upload_black_24dp.png | Bin 0 -> 214 bytes .../ic_info_outline_black_24dp.png | Bin 0 -> 1256 bytes .../ic_location_on_black_24dp.png | Bin 0 -> 868 bytes .../ic_settings_black_24dp.png | Bin 0 -> 1073 bytes .../main/res/drawable/hamburger_item_bg.xml | 15 ++ .../res/layout/navigation_drawer_menu.xml | 171 +++++++++++++----- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 1 + 35 files changed, 152 insertions(+), 49 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_feedback_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_location_on_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_file_upload_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_location_on_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_feedback_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_file_upload_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png create mode 100644 app/src/main/res/drawable/hamburger_item_bg.xml diff --git a/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java b/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java index ddfc88d736..bcd115fccf 100644 --- a/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java @@ -10,6 +10,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -31,22 +32,22 @@ public class NavigationBaseFragment extends Fragment { ImageView pictureOfTheDay; @BindView(R.id.upload_item) - TextView uploadItem; + LinearLayout uploadItem; @BindView(R.id.nearby_item) - TextView nearbyItem; + LinearLayout nearbyItem; @BindView(R.id.about_item) - TextView aboutItem; + LinearLayout aboutItem; @BindView(R.id.settings_item) - TextView settingsItem; + LinearLayout settingsItem; @BindView(R.id.feedback_item) - TextView feedbackItem; + LinearLayout feedbackItem; @BindView(R.id.logout_item) - TextView logoutItem; + LinearLayout logoutItem; private DrawerLayout drawerLayout; private RelativeLayout drawerPane; diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ad0f63e5b8a97d5951f1b4e8576dadee1ed7b06c GIT binary patch literal 251 zcmV7p6eU`=zZX-N|=GVrD^) zClqF&$Jv?-QOwy=^+Y}F$nfc4Bot;$_dOXQ9RzHI`#%>oY-)%aZoJrjFFFv3NmVRr z2?Sa`S#md3dQVyL$W)m~R+X1#=Sa*{6V0AVQq>n#Elps}Q)srP(H~^4sXZe4&|XbV z{WbCr8*-?%{P#rkbYwX65AuY=z)4@Wr^6vI^9JtMV7dP`o`V1Y002ovPDHLkV1iCn BWIO-> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f03168559b3ca90ff3223edcca99bdeb69fab070 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8jHioZNCo5DOB;C`40v2F#hkaU{$pwX`Q{|-xzl;s!!o(ZPixsi1yiwa(I*%-G}&=ob-s4h wtig%3lvSkUmTbzJB}oB>DmdKI;Vst0I{<%xc~qF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5e5b9fc4ac45134e7fc93da768e8730bd06734f5 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8kf)1dNCo5DGaGpw3^|ws-A=CP z`DLzH68?wnq{+mZb$^po%d51{T(_3?`MN-a%`0UAi`$|E6)p&|G$EzyQ~7y`l#B_A h(*qAb&7M%bkXz5?Z!+^^k2av`44$rjF6*2UngDS-P=?%O3jv@aJa6HGW<0ceyC!`rEoc~?j{U=`ic|b z9N*QPsMv*+MQv@1i8kR%)UIh1`=XoCqqIYBOKErvea{GWZ!y>;D~RpT`=%tUi9cM8 zjMJd-5IZXpx*;AQpQG66NVp4e3Hh{Q=T<@);yl@>u@F125nkF002ovPDHLkV1kFY-~<2w literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..df1f34062be8c86f602d304efdb738fbb4e4b4ea GIT binary patch literal 376 zcmV-;0f+vHP)Wg(Tpj&bdAc8oEppaIOE(LXPbaD_uiXgfuI0y=Ui?$Rg z3N9|rijvq&CiQlchlhJevpDqnjrr%mb8?c{t6qzumxlIL6n!zIh8Gl(U}e3LlM0Ef;V2BeJSjZb=;SQ|z+u z4yaibL-bf>PG6*TZCbM}(t2i;JWOXDi<+RJrJZgbD4Fy&xy-!MTym*5Ce+-mj<=}R zs*bfH=Sq2RG}Riq#p042E*7&*ne}3EUJe(E*_zBou{bA(tHo?vL#bs|A+IvyeHm7t#M^wEtHOK?m*3tk?OFDx*kh6Lst!v$eu1NdssLB&DM32-Q z^h4~jZ>A+~7n2>4r=NU@Dq}tg9ji`Suql$(%vHn+eg}v!7dsOm%)+nCb00000NkvXXu0mjfkE75f literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dee407b59836072bd89a0f869c53cc8e47f3f7b7 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iB2O2`kP60Ri9HGv9;zO$xA`F2 zY~NKip@`{&YFE_;0j&cQmak%SZDZ!)T9OgL`NY;CL-7rhUE5<0T@KzKTjw-n9DJK;XQ(;) zfIpl+%uiyUOU4g>nI)^(6eNVC+VV9N7512(jy6 ZU}$NyaNHmn{TXN?gQu&X%Q~loCID#lCawSg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f2954bd746cb090d74a9e549d8a7efe041ed1c GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP60R39AK+9G*e{&s5ci5fY}sT-yed|rRg0)~VyRe(RxP5| ziKSu?+iDTDUGbuL5L2~?+LgFdoQk=|C}Pxj7RQRtyXcJ~MwepHsvL@iJ?s4SCH8$Y z6AQgYt#Ro~-1uQ)CSvZwj!tLSm1hyxCe}LeCL$stVz6(6)`@$smX==JIoA4R{{X3C VfQx`Hg^K_H002ovPDHLkV1oM>kN^Mx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..92a0738278340a3707c072c4eb2747f2c6eccc8b GIT binary patch literal 263 zcmV+i0r>ujP)%xAWI(lU{PeAyA|mddA|zESzU6&jX$3$)8* zAXMjbPo~N*e?q_c++P^{2o3Uiqz(3r^UJ%?gH$G!s??Kvp(9D0Lt<}X{nb)u;o#H? zPYd-&D;=ok>a~4q+{_KGt+nl?)Sqo>pkti>Mn^*@rlyWH=gOrG`3LhIsfL;XzrFwf N002ovPDHLkV1mC(bHxAv literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c59419c02b6273e09063a0529d2239784818207f GIT binary patch literal 322 zcmV-I0lof-P)J%}fHzV<>iUk{yCv=|P(yFM9CIKrv6;vdj!^e)OQ=oM~3L z3Hov zYMc*TMS6^4Y*s#v8YK}AT(ig&XB4{J=afm7xZ$2C{CQWp)PoCx)G7YcXPY7T1DnU) UWG_v5V*mgE07*qoM6N<$f<$+V!T$2{8En0ePbXTEv8+xH$tl7$*|>0Q(JcpPKIn>;M1&07*qoM6N<$f)PV!8UO$Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..63bec23315f1d4c4239102fb5ff07c23815834fd GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DCQlc~kP61Pmkjw1IqSf^O2*--OcVX9fx*LjPh=D zd*wSN?p5*vrXT4G>e==kXJI?nu-}8BMNYz=xteK~RK%78rw8U{~SKbLh*2~7YkkxJ_T literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..41694c101b646ba0a0382831d12c8a234bfb4cba GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Da8DPo#88fEO5na|OlO{3G z*yIPEVO{WsIjnKnVT>2DMzkql!ApMPMO=L<#3I9oI}LubOO+CNvScYxqQ)LKcQkDr zB9h}Xp02N~GG)+JIYyNnkc)PDZOnzu*#; zB8R%~1(i4Rl0>e>Eb#WLtxfOV(#vvo;8MrfX8# zOJwj-6bRC^RW#U^^>`Uk%GqUlp=9>%y-#&$qZ(w=qV2=#%SNueJg~}R_Q4VL}5`+@9~aM z91c`Iph*TZkfp^?^`Dp^0y)$Ij}vN48)8+LhbiruA|j3sO47|fb;`I*GKou>Ivq)^ z4u=V1QQ;ad;<{u73-W9;3T-}Qiy5qW$_D4g=4Y%kOJdS2(WFCW8GK5uatHXvo3W`#|5$P3?j&0QK~)Y2$Rv{Aw* zt}sHyW_X9Xc*`^uI>SEdVUK3{=X2zcmz$VjA35zYO|VhkqkuPz5NZhpT_#XQ8wIt< zaCZtNJYkNp!aS=eVIFrY$l@BEEhCFNxZ6zp-nNE}SGe0j#vHZyp@55o%lL?#K9EtO3&`m_C3}e+HYnXu4p0vV9HBz@ zQ4ja1)FfX}7u!ryu|?FyA~p07k@kREnxKsmJ~Kg09VbUd&M|821~RTwYZ=c_ho{uu z6fN{$iz)ihEV~G?%Pf8B9DfUE>0?(5!v?H>8`7pQS~rX*00000NkvXXu0mjfjSt0v literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e84e188a1de15564930f961aefb5e591b2fa34ec GIT binary patch literal 557 zcmV+|0@D47P)Nkla9V}f0{{|82kXi@9MRd@?$weK4A^ju7 zLRBcZi6~YV4Y?x0YCBk^ee93}@A5qN9`;=V`Fy9md5-r894+Q7Vwa zKGHbsTJ3CbB>k$}G!3du63TIxO+;yvI}8$@RV#hZwGsJa1 zG(UeLOQIW*%YP$A_S8JsifkZzY=a`Er-+B1U^vMR;-MW*pvdqV@zg66vq)lJDKSEJ zw`0sxb4<_B;v8FuS(#q`)kg&}+hPL6xOrb?GQ?%fExvFHL!Kq|$LU4WPhFXQ&M?@z zxR1mtVOeOIy~lo>;tz)rETgf>fK;}TNLegBvB^KiQ=u3Ot|-Y( z2Uu+mzU3;1m}L#YE?|a1uJMlWb*&qR^Q=+kG@*msHr|$gaEk##XL&}z6#u1a9Hidf vu2=2VHre2#z3N8+Q5wRd6(rV6I@-ivWBUX&LwAlh00000NkvXXu0mjfs0IG% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..53b79d4c7b9cdad40cb666c5bb30ed44daa143a9 GIT binary patch literal 354 zcmV-o0iFJdP)3fpZFa4cDyL4)iGZOvQJns;a8`1-tx#POU72+yDRo07*qoM6N<$g3C0W AH~;_u literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e68ceb906ae6b9192e3bfe3b5b77139d8f871f8f GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_IkQFhEy=Vz2eAq$Uws7;r6cb z74B0Oxqm2W3e~9+a^%pvvO_#c(DQ%fnc1~JPCPnpXZRf|fP6E-N(i{Hi$zB#mC!UpTGM%;a!Y zGG&6}K4&&lhN&+lMT~$lE8cFB$_QZo8ns~J5*DeK4$M;|UwD47&hU;%lDT5BqA=j` rf@6-o%~I^9d|5z&BgJ!y-&Qlv?EZPH<*5`i&?5|S|nb&%Fb3ug|-}yriBQ0#W+tVLn7qpS_ zP~Tf$6T85n@f^2^MgWjr<#oZ@0>}sr4gL3m|Lx7MUUi92n}IH1@O1TaS?83{1OQ8~ BM!^68 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3847a9fe74774d3593dd694cff48ccca13cdec5a GIT binary patch literal 940 zcmV;d15^BoP)mdcfcOtJM6uO{+z8D@UxkKMBq1+Buz@6?P#P0jG1VJo zr4$sRhK5k2Z=fXRN~6nW@y^{1KD~XI=}gYdoFjX&pWp3sm>a@9yM-m0@&}6isAEB(Qj;>qRst`p9~=6q zAu7LO=u+TQ_K7Dd@dg8*_ZUX>5!&WBSSti4^<9Bi7`TY2+y<+KU=~psWnX%OzQeO# z$Y%%reeR=-{wJ-1^+Iq9eT6F#>jwG=^_&zcppV__#9BjN7F^M%z)NCy=&SoFTsf2ppC<<**2_ZI5@SJo9Db@pv9Dwel>@Q2Y|A^pR+ zXm)h0I4$&8t(hXy6*cz3S)t(J`aO{jqc{F(SB1>4AMjd@E;uWs|KhZ2{;};ky2AQ2 z)rxDxD$`NJH=PukQuA$!?4zc}-&3$&Xn>Du{t5dULsafqFEod!oWp?rpGSuiRtueB z&+LQNE+8tK3|cF6gtuz;3+FNP08y#Yj|~U-15sJR*io8@$}eQs#}cB_phN-_NT5>I zKj|$a=v*bC1q7WMgQRsN@Unzi63g)%L1&Ybq;ZC~2s(dqkQ990An0_M#V3gY=Ga5f z`5TXvN})=^4!0;^!e^R~NT^Pc418W7q3m*(v-Aa=K4XNz?fnc_RXp{J*(OZ^8ac7(2N>$@cY O0000L6B4wV&>Lp(J~?z>aHJdBBezTh(_h2 z2 zWl@4t;f%A2vMfcT|HoQF4ki3PTq#q?u`fQ?yB~SzE}qo0g*>#$3A`9Xo_dW34aj5l zI2%L(EigpSPD3oBfF9zgm=$E{CvC*o6{nqfWNC>5IB5wu3zh6u#U!%SjFWEb*Qq3( zY8H^O+c+6T#@aCHK*pZqWX7_}F-+o?^`6E_5*Zr8W*8Y-#K{IS)PqegGV}{4YgrD| zhYW4t1BrN|fC&S2CJ0_jT*fX5mM8@W+BApuRO}mAY)5y{! z)oI3=MwVJ|Qo>rmrSBllt~i|m7k`~n9KApREiz0meT>`06 zl!7Kix5q+Fq6=w?Bq2zRX%{Q=l9q~JFAfaD-fMk(ql{OMJp*hZ8Le@FKzb36b`fRvPbJZ#ihbmi`-huQ`v`H+dnnz5 zIO;AGB7BE9YM!%LJ&ic*2`mcPKpgfvmoR!03D^-c43Z$hAhR4H0ecmL8#qMtu}v3c zWQvny2hqm?F??uNd0r4z>Rub{-SwiV_KcJlc$@G(Y7OnY{oYXaZ@4M{dXjJ$v z`$eh=sKvO?Cei3I?)A;6Md`CXq2t(8SWgZw6G7n$pCQ&JiDGgU(}=YRim_lq5{{Tt>$z%L(Sw8>(002ovPDHLk FV1g%Ge~AD9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e30632b6b1dc6d3b8e1c7556a9f73e231851051f GIT binary patch literal 432 zcmV;h0Z;ykP)Q*LDW#NB5A+;4Q?5K`4y@^Lb;E`dIs-k^@$0`)8kp@^!iLhwtjC@G(##BWRM%4) znibU@n*!{q?%WjMM0MrY_zL*@!2kgS5I_I{49g67rckh~fcf`zmJu-jaiwJgy!^S= zG69|_|BU4U-16=r!~^_<;O`+n!4HTh!~@)fcz~A>4{#FV0Zu|Zz)6S)I0 zK*6#D3YHyEFadOg#*gV^^a{-azQ_XBZxk@&BjU$g{QB_#=lbyg-}>=@8K0T|slW5A zAAe)ZwSGLnxqdw0G5gJ3umrc)s|c3y5tHS9!~|fD_4Sxl54r^qKmY**NdMyNp(((Q z>efvG7F5?UH1zuYJ!F0Xf61t(Y@1mBl?jX`^uY&dV95km9V_;n0zNo*EH0gWrIb=i aDfIC5 z0U~ZGtWyrOOR&voRMJSkp!#RyOTj~JZRJag?=gM9e&fdWnKN&)aSFYa7jweIF5ED9(-rq)o#eL=sSjs1Ouy8ie7Nt+ zCG$5b4h;=l>JA5{v-mK_v2q9~0Qo5gW-~A{vGA-j0dmTLES35cCKiq#D;Nb79^|V# zG%zsw9^hAhFoW;La^`I}8;)5?Z)i?AV4J?P;aFat9jp8~+vsaPW=t_b`#$_!a$ddG x?&W9C`ToCZEfxyuV-isA&dY@l3kvio2ZwliL$%Lg^W_`Nd;nAh@ zH}Bba%6i?WXWQp^$Vi?nQYuVQYjTiaO5|Ya5bOdoS`-Boyc#4JlYk-$ZVeoaN-YWk s5H&!lrhpY0`CndqJXiEO^YQ;zbrQ36Ec&9=#Xzp}boFyt=akR{0EMJP4gdfE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c1e2a03a4bc540419ce1165d5dedd8d5345fdec2 GIT binary patch literal 1256 zcmVP)W$LQv#I8j8T_{yf~=m$~;IXzu5?eh%l+bI*O5LnIQ3L?S-g zNEKIT<0XBJGshx}%rQL6n2^)65BytPpur(aAq3mzkx5L*!vp z0a@Ola>x)hq%a~$J)clM5drmH23z#q<|xU<0`*qKPGo7Si~n z%wqBU&0hSlj{%E?RDuuU7MJcXB=Jj%b`&x_e(Xp;ExUAT@Y|(jm(qjWZ(B;_Uor&Y z6!R#Nv*chaGsx+GPf(5^TbQOC&z>U}Plh0!MlPf-JUW9CsUc{WQ6klNkmN0L=W$Hb zI`=E``6_{H*O2>uGL!}iknh%)aH)U^vHJHyC=I|j;!5~HKCWcN1R5Z;2B2BgU%-W! zczBp#L#PcDi)Yo>;Taa!Y@Ptv;<}7l4r)8NeQGlwNF& zYb9ky8`z|cGKQ@=tt4)=frR*F&DNq;5;NLBOdDlk)i+CZzQKZh$R zK8n3)UuX^N7uDk=aj8xWGC(Sn1_~Jx)mdCiFf4{?52b-lQTv8C9#o@5E)leAD3OzR z)Fn^Gaf%@QAdedG1kbj}b8XCXgrFSb3rcL@n*sbhFEP*Qfd2Kr_;5}_cz_aF;&K3M ze+ebhM9$XHgOZ`06n-hB6D318YwImEMS(?`<%O>vfHEvXL&vNpLe#!|zDLp9b&_k9T z*x5;~c-Pf0-68_APCn*}yr+}vWZ1(d62yp+WD|SHaD&H;+SWI+mO!0l8Wm6`sU`&F zbfE&s6E+i?YKBohW{8u7EWu?ypnS+US>hOx&jq=;y2>EuNMckT2YAG1l*`QUkZ)PT z3X$L_jr@gjkUknXOq>;|goD)5%rkl!W0nOLm}QJ!o^qco2Ph^Ii9{k1-~0zqnGDmx SqDLYC0000 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7c2217e4651ee42cb7d34855d6b00689221ba304 GIT binary patch literal 868 zcmV-q1DpJbP)lK}w6qBBfbcPhRZBN@$Z3j(}cM(SiSVhj==W*POA^dwA zCq9ho}Ic7~9tX9@0t@$f{k9i$P08#mp$RigB>jv~84aI+|~t5{5+$i5)BCW@?q z#VHioT|zSru^JWwrePLb8%0*YqJ$z_C%AuNy?{2swSpa?gQigy+}FWw;?pRy9|`Vr z6xnqwCQ)QF1ox3?ko6Izmee3SgA9EVXr~<_xMxs+k3Nq~)d?=ged9Vk#8!rl>+}i* z9DIt5P0`P0HKviV&v5Z7GPlkIrx>8r?I5R_WF471kBcYipjaBf$(P7K=5RBL{9_b1 z`&mQIwK;&J3FO>OTs@DRdjV(PBFDbN-7CnkGq}ssL{7CR;*ZymQ^Ulf#IMMq-zXE4 zbI74{#HPScC~$Wv5~G(;;9e$Xb0}b6@dz>ad=-X(E+cQKWJW*;eVj19DdHaJE~yoYws`=myh@6ki{ z1A9r4L$ne0+8icj-a^=WlhnyEgN)6PBZaCgB14N*NvY#(7=ApDlVX=qM3+gmJh#v` z-6BuQRk(+?=pGe%z)>Ec|LFlo=@BFTe?ENDOXxEq##k{R3pG`V_=<^3NWfR4)j)KkE?kf% zU}CHb1trze6>4h;sTD;rtpyq(711_6TOXmFPeL**CLQm0&Kbrt$^HG8P44Zq_ne-d zIYT6GB9TZWvWW>Kq@TD8Z%rbKCJFFT3Q=|)UTQ^@t;I_ZBg!7bOS=$dFXN?m5M}%E z(wB&`ukq3!h_Yz{ypu!>x)$#=AqKVLoh^t#k5E8sIL>$MVhOq3&gY0hM`8YgceIr|YY&iqQ@`QK~6 zQos?!gFYj`%4WoqwqT*0?-5V>feMW6L_F#x3@zbr#H0S91|$0r&w3vNHzOXl4y8E9 z5Dz;}9F@lr$I={PD~(h#??P2Hv5k*OBaS_R%D0F^Gwfz5bE%<=S;V1HRE7}izM+=? zvXWuMx}&JnaTc-a1LhN^j9$d5v#dlZNx#*%UxG%$>Lq+a5(6c?YW(obN2{C>#Hd#& z!B{)f219oRCRP~?=PB;R(sE89s&->)k9y|05eEzCQO)~HF|~}eY5{Q-jsl(y{dFJ0 zLg+*>%Tom8#bC&-wqj#@$W=cjZ_b3=su3H_Ay*wEUqWZ2%FD7H{2O^AAiF$gQgUe1!CaxCt9AAy+*GP?%|S8#ZFe%*GOO> z#bLy_Ugb>^^dZI#kVL7TbBI;FloO_cKI?z#>rnXuv2KJ_AwQf^#JVG>3?mNBvWI0k zCeFQ%8(UwY@+jh1ntry^Op?+IC23&?1EdS}PEAbz5c&FESu5gU4Th($JgXZci}?%j zAcuGCUqC#n17l^3BOc^%YUO^!lkUMvz+uFL`muJC2Zudosl~w?NY31kB51DEg_A{d zo(4V7yWC2^CMFTbCfGp0ZS3d#oLeiEIC_%o8Q~cgkx|9lh(m9&kc<=^oYC)hXq9s6 z($m<(9mL4iY&qBmXe3*lJNfX^nst-}xU1(FC+XyRa$C!w;mW?1+!pg9Cm5oZ0(uZJ z=)Phh(s literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/hamburger_item_bg.xml b/app/src/main/res/drawable/hamburger_item_bg.xml new file mode 100644 index 0000000000..cdd5456023 --- /dev/null +++ b/app/src/main/res/drawable/hamburger_item_bg.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/navigation_drawer_menu.xml b/app/src/main/res/layout/navigation_drawer_menu.xml index 9b0e5cfb28..71d093e1ed 100644 --- a/app/src/main/res/layout/navigation_drawer_menu.xml +++ b/app/src/main/res/layout/navigation_drawer_menu.xml @@ -1,6 +1,7 @@ - + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + - + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + - + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + - + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + - + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 19959021f3..60164d6bfe 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,4 +22,5 @@ #77000000 #44000000 + #f5f5f5 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d48714b16a..2194587a7f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,4 +3,5 @@ 4dp 8dp 240dp + 18sp