From d174e8e02b22e174445d6dd870f691b8828232fe Mon Sep 17 00:00:00 2001
From: melvinabraham <melvin.abraham1996@gmail.com>
Date: Sun, 26 Mar 2017 23:16:30 +0530
Subject: [PATCH] Changed Bottom Bar and Updated Gradle Version

---
 .idea/inspectionProfiles/Project_Default.xml   |  10 ++++++++++
 .idea/inspectionProfiles/profiles_settings.xml |   7 +++++++
 .idea/modules.xml                              |   1 +
 app/build.gradle                               |   2 +-
 app/src/main/res/drawable/ic_camera.png        | Bin 0 -> 753 bytes
 app/src/main/res/drawable/ic_home.png          | Bin 0 -> 1363 bytes
 app/src/main/res/drawable/ic_send.png          | Bin 0 -> 2629 bytes
 app/src/main/res/xml/menu_bottombar.xml        |  11 +++++------
 8 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 app/src/main/res/drawable/ic_camera.png
 create mode 100644 app/src/main/res/drawable/ic_home.png
 create mode 100644 app/src/main/res/drawable/ic_send.png

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..73f66f6
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintGradleCompatible" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fd03da7..dded10d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/SEProject.iml" filepath="$PROJECT_DIR$/SEProject.iml" />
       <module fileurl="file://$PROJECT_DIR$/SEProject.iml" filepath="$PROJECT_DIR$/SEProject.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
diff --git a/app/build.gradle b/app/build.gradle
index 92c0d73..0e7b67c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     })
 
 
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'com.google.firebase:firebase-auth:10.2.0'
     compile 'com.android.support:support-v4:24.2.1'
     testCompile 'junit:junit:4.12'
diff --git a/app/src/main/res/drawable/ic_camera.png b/app/src/main/res/drawable/ic_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc691921d489ba8ef5693e7bc2278a34f37d3f86
GIT binary patch
literal 753
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4i*LmhMUEk>KPaqSkfJR9T^xl_H+M9WCckk
zdj$D1FjT2AFf_C<F#KX*U}$*3z))(y!0;-8fx&791A}<MoLzx73=9lRN#5=*4FB8v
z&+KPlU|=ut^mS!_$SftGq4y<q{Z0l3#w(sKjv*e$-(IoxxRS_l{Nwq#>GNDW^(*%}
znYBnw3>Hu^eIlakWV&P5iYo#Wy}do1yB$*kCT?YM%jRuzR#|vsi9$$1YRL7Oi8GS2
zo|`TyEB{xUS@hD}R)7EV-!}W7_x_KnZ=Lq`WVn`1yq~1$$NYx5>sA<Ow@m5S;T^Y@
z?}X@K@z%VV1!vE@I!tbUwKvw%XX0Wu9*cFc?T>oyoqbpRsKNHsluq3?@92Y)yq|KW
ze>$t4UVCDe!n0j_m$eFfJ7BxA#9`&}cdytI@AoRMxuRENlEl}l)icZR`GjIWPlpt_
z4W1{s4`&*`yRhVzzDvn&O}$ld-QQ0fJZ8VGBjN3}v@@>x8~hjFo^@pFk2$$K?0n}h
z>Z}V~FMsT7mcVtLr*mI!Wjqy{X}U71-Mw$dl~rDq6HG0fmbNIeu3L31Or6(rg~^U9
zQhS<gE>BwI<<PleiDaeYwS)s3a=TQwNSm&Tb=nwlOmeNz!uwOA%I{q0yuQM8>3uG(
z&oPlvd)?++1qy^N_xIgUy|em4YBRT=^pU#gm}{arF$_yK-3p#p^>T)n&6hJLCQV%F
zb6`iLsg<!=sb9a`g!zK{FE>0n#Qyoa>AZrtbz3!;__~`lD6wX<`25<X@}++5;yUKy
z+S<?z<46Mr1_sp<*NBpo#FA92<f7EXl2isG14DCN17lqyvk)UAD?<Y-LnCbiGb;lF
z)}8-6P&DM`r(~v8Vrnq3glO31DKvqBfk6^vLvVgtNqJ&XDuZK6ep0G}XKrG8YEWuo
VN@d~6R8Tr(@O1TaS?83{1OO5HFFgPN

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_home.png b/app/src/main/res/drawable/ic_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31970b38a1171b40b131dbd325fc650dd762459
GIT binary patch
literal 1363
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGSkfJR9T^xl_H+M9WCckk
zdj$D1FjT2AFf_C<F#KX*U}$*3z))(y!0;-8fx&791A}<MoLzx73=B+?0X`wF3=9mc
z>>Q(LGz5@C;Q#;sC+=5vFfcG|DhcunW?<mu6`VdpNMKTH%M<~=39XzQ&6D_fdpo$f
z+WPr;y1RL}J9~J!J9>F}db+r|S|{-F^|f<xHcjT|pV-35Q9o5sU`itgd(||dsWt2@
z#ZMO*8Z3NP%EDpmwkTTM(M_H)YO$LgM{SJBni-SV`$gB+#<0!|XE0wYUN5~|lzE1|
z`eLq*0Ifxwt-)H0ID>0r8MPO2wuVI4SMHoNW%9C>P1`0<+EFFv;OOAssKcb-;OHP1
ztFU=J0|NtNlDE6drnOn;UobE*a29w(7BevDDT6R$#Zvn+1_lQ95>H=O_J_<;0`juA
zH|5P{U|_WOba4!^IGvmzQPePTV&}|>g7cZg!pzESxFjqscJ8RGC|s5B<gvJbh>)1z
z(S=QcJ~2*{CI)&%xrwdja<i;tbzQ)-c+#dWEiuuatXERA5(?dPb7f<BM0=`!v9$#R
zx+y0M2b+lYq&*XxR$%C+oh=<LBHB~-jjzu`smJe}-ntVt=H>kUQv^~<zI^)TIOE0Z
z=kfv_St$Vp9vKoo9fmeaMp{x&oR7`8vEv7efVQEgrK;%7Nn1+X7Sy<<g_Zf~T`)Sf
zrzRxdKum<mwY$sPOY-z7Z3ix`jhZV~txHT<vv&3Il?xVb?3_4p<4)G)P1m-SEokcV
zo5QthSG5CI)ke)1uhZuouqeEgvY<&bxbaNp<%=R`W>{u_o3rzCO#|06{RoTdi;q+@
zxTfhv?@M~R>S}fa*R^%g`;&gQ_5Qf@E`gb$x588QOlUzi0|SF<iEBhjN@7W>RdP{k
zVo554k%6JPu7R<xky(h5k(Gggm7$@wfti(o!PooNq9_`2^HVa@Dls(}m_syZ|JcUM
zz`!60vLQG>t)x7$D3!r6B|j-u!8128JvAsbF{QHbWU37V0|SGntDnm{r-UW|$gwP$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/ic_send.png b/app/src/main/res/drawable/ic_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cf2f1be11057d4e42a75a02bfeebb69c33801e1
GIT binary patch
literal 2629
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
R9RmXcgQu&X%Q~loCIG>LwMhT~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/xml/menu_bottombar.xml b/app/src/main/res/xml/menu_bottombar.xml
index 73f9985..ecb5005 100644
--- a/app/src/main/res/xml/menu_bottombar.xml
+++ b/app/src/main/res/xml/menu_bottombar.xml
@@ -3,23 +3,22 @@
 
     <tab
         id="@+id/user_activity"
-        icon="@drawable/ic_favorites"
-        title="Favorites"
+        icon="@drawable/ic_home"
         activeColor="#FFFFFF"
 
         />
     <tab
         id="@+id/camera_activity"
-        icon="@drawable/ic_nearby"
-        title="Nearby"
+        icon="@drawable/ic_camera"
         activeColor="#FFFFFF"
+        barColorWhenSelected = "#9932CC"
 
         />
     <tab
         id="@+id/compose_mail"
-        icon="@drawable/ic_friends"
-        title="Friends"
+        icon="@drawable/ic_send"
         activeColor="#FFFFFF"
+        barColorWhenSelected="#000000"
 
         />
 
-- 
GitLab