2q(kWF5>aRw3j~e{SUS?
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
diff --git a/app/src/main/res/drawable/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/drawable/ic_dashboard_black_24dp.xml
rename to app/src/main/res/drawable/ic_dashboard_black_24dp.xml
diff --git a/app/src/main/res/drawable/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/drawable/ic_home_black_24dp.xml
rename to app/src/main/res/drawable/ic_home_black_24dp.xml
diff --git a/app/src/main/res/drawable/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/drawable/ic_notifications_black_24dp.xml
rename to app/src/main/res/drawable/ic_notifications_black_24dp.xml
diff --git a/app/src/main/res/drawable/drawable/person.png b/app/src/main/res/drawable/person.png
similarity index 100%
rename from app/src/main/res/drawable/drawable/person.png
rename to app/src/main/res/drawable/person.png
diff --git a/app/src/main/res/drawable/drawable/search.png b/app/src/main/res/drawable/search.png
similarity index 100%
rename from app/src/main/res/drawable/drawable/search.png
rename to app/src/main/res/drawable/search.png
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 0000000..b425c77
--- /dev/null
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,24 @@
+
+
From 0562c9bc3371801bcb8f90087c940020a967b47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=A3=AB?=
=?UTF-8?q?=E5=A5=87?= <1045352474@qq.com>
Date: Thu, 24 Oct 2019 10:13:10 +0800
Subject: [PATCH 05/12] Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/res/layout/activity_main.xml
---
app/src/main/res/menu/bottom_nav_menu.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index b425c77..a35d70f 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -4,7 +4,7 @@
+ android:title="Home" />
-
Date: Thu, 24 Oct 2019 10:22:34 +0800
Subject: [PATCH 06/12] star
---
app/src/main/res/mipmap-hdpi/star.jpg | Bin 0 -> 1298 bytes
app/src/main/res/mipmap-xhdpi/picture.jpg | Bin 0 -> 4690 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 app/src/main/res/mipmap-hdpi/star.jpg
create mode 100644 app/src/main/res/mipmap-xhdpi/picture.jpg
diff --git a/app/src/main/res/mipmap-hdpi/star.jpg b/app/src/main/res/mipmap-hdpi/star.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2d6aeb44bd42901a943732dbbb6edf3354e23fd5
GIT binary patch
literal 1298
zcmex=
z&EU+y#K;IjP{7Q}3<7K{EX=IzZ0zhH%)!ac$-%+J!OqUb%f-db0|e}xeEhsTd>}T+
z5Ri6|E+FFJVCMj-APxLKz#z!MV8dX;%&5e`B*@4t$oT&VgFMi!tUw=uJOu@eOw25-
zY(OV*aRU`>6#zP)nVAXbSXLGmpz2znJOhg$tB|6hBb#twBD+$dh*9Ijg&fLG8xM*G
zUHqV8oK)1r$t5N(At|M*rmmr>WnyY(ZeeNV?BeR??&0Yb91<+v*#~fzWVs-^OvvRzW@073*;|G24;x2;66k1mmttz
zOu#r`VF&q(k*OSrnFU!`6%E;h90S=C3x$=88aYIqCNA7~kW<+>=!0ld(M2vX6_bam
zA3RP=bTj1sSZN4{e#Xk+Y
z9g?h5%W&fPz0Iqm=4$M`GN~(i+ne2ahikh-0@m&L->wR2fa&7yx)#7|p}dVBL~)r6I&Ot*_%^Be-6@fM@ZY=BRkKcU$!ZUwzK%mAd`n
zUtrhWGM4P-iN6oAOFZuTGwZMRVSS0zBc=eXLzy{;nRUl<>>iUc~yrGNZ)?$Wtfwf_tW(f2JE3o$pH20x@B$c@whWo
zIg~Mkhe7**jsI_x>|1Ob^KR*$xS|u5QX1X%_w67yH`nHQlKy
T5*WX4zM4p&D+4mF|9=wz_U8s(
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xhdpi/picture.jpg b/app/src/main/res/mipmap-xhdpi/picture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..161d12d38ba8ec6482900c58777ee94ee3e06393
GIT binary patch
literal 4690
zcmbW3c|6qLzsEmgEMsrVSVCmq%bv)5k*(518e5TUA%rj@lO@p5xR
zdH8tw`1T5nUyvUL6M*sY2?z@a2nunGk6%PoSV&~=d+#TE-S>KNvJi|9w%6kSX6%mu
z90vFTzEFq)zy*gu;ShEQAjk2QheNan^>2f4LAiN&IW7qZavBi#aomSOxj4@9aC387
z-{RB*+;E=#hjlG@4>)@BDTIsZCFVYXDO$d1LpTjlmGrMfB=HM~OGru`R8~<{Q`ays
zG%`MBa@^{qwT-Qv{i*ZL7tk)QZtgz5e*OVh1A`)OL`BD7Vs9p=+(}JK&&b5(J;*O8
zd{|UmUQt=~^x5<3nmR%~v7zzpyQX$hM`u@ePw%I%--bs<$Hpfn=P3(|OUvJX{QQTu
z`D<&Nz61XLv&RJip#O>WUu6G-3(n!<;%LClx5owHis2L}oSWycF7JK|M?UZH0}6VH
zFfq&ACvV#L74@B{h$|680^&*r^UAb6w11KP@4%A&Uu6FU_TOBSfDjbI5f2InkN|VM
zJadU<6n~A1UtOS9T%>hpNA)3vK@=&P4FnDwN|#4lz7wdad0dY(MV!0`iHW{&&h56m
ztO4$&t^rQ3TPEnzO!kPi49=bmnDo|u_L?eWiMWDCb`3l|uOdaXm%t&)`zt=N2Jhbl
z&+od(>>FG18dOX&ACO6p<#kqQJ<0~iFR)aP4LNL^byTTs`yZj=!bFx(#wm;Wtq01>
z&6x>qQO1^5-=*)=y}2Wzzg(w9q_SppCqD=rGbik3ESpa=%dzD7+R2gy=0Hbuf)N1>
zuXM;ih)v$wB3w2-5Ot&^>b>l#Gq=m4vw`0MU32wg9fKK#!p0db%JC;@N;y0D3pB&E
zpU53L`jtxN`n_Y_zV?4VW&B0sy&IuYN8^1Tp!X<4epn@=oAOdPPPAPP)R0?~rK-@?
zn{{a<%7vyj)~iW2;GX9~@Y;=T{`Ht)6zK`K7Excn&GcvDTFEO&S&aGmx3k~``I2Ur
zyPXDZ#ZwaMFjDThKKfO+;cX;yIM{n*<G5bYaj
zbmif~Sg4rf96DcwUq?_&V7gl{0Jix_b8C(za+%qr!Yp9}J|)Q1<2(x0`_3mGzygWB0k0V1E8F>O~~nr#n*ATj5^5*f!}_a$dAtV|FzKnT|g|Or_#KVpDgQ
z#)tk-$F_AJ^jcl1Y9!^1@62P9%??m^
zY@<`>+(!%=-3;}B^WnlcgE+yEndO;!!YOGzTj@o#-t&zlDKS&f;Pfw<=wW5>pZl$*`>U>DdxBHYu3n>O81XS1Rd(&J~sN2~o(nq_vitUI)7)U6ad@8Uzo~ANL~{wED=-CgW}-x
zu}K9_MbT@h+a*E91qU*HsyHf$tu9K@ajYjK38|bWZ2lKCv;ArWWwQ+`D
zd3|#rdBAJFHH(N90h1k?hPKzZ=pm*~uipUGEjEjs5Ol
z44GE#3G%N;>PvQKRMB5UuY7pZLMVFtuI_CHsoTIwT?nW6-0!jlH<#ugZ#IymhHZ1)
zd*>w#;IQo$hV@89yzr76=INwbhkg7jSh7=w7?11s@%h}p;C(WgfR$9(veSnZ7Jt!h
zs3#j}Gsj+I12Bedwmlno?fu|qf?7kC_-<&9soJ|s6$Mx6RqaP&Ln`>P#>^FR%;LL>
zm|l*KlQSf2FrxD%b;f;Kp-*V&7-rc<$^|WhkWYe