diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000000000000000000000000000000000000..73f66f622d79567f6241ac3c65fb401a8b9a407e --- /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 0000000000000000000000000000000000000000..3b312839bf2e939fea3ebdef15630a4b33e57caf --- /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 fd03da75cfcf5d129472c3b73d7fabe7dae82874..dded10d14c672c230cbd4829a1c2c6317eeedf5c 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 92c0d73f054a0290b2814fd3343fc3cfdafce9a8..0e7b67ce5facbab57886660a2b6e7d7fc83158c9 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 Binary files /dev/null and b/app/src/main/res/drawable/ic_camera.png differ 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 Binary files /dev/null and b/app/src/main/res/drawable/ic_home.png differ 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 Binary files /dev/null and b/app/src/main/res/drawable/ic_send.png differ diff --git a/app/src/main/res/xml/menu_bottombar.xml b/app/src/main/res/xml/menu_bottombar.xml index 73f9985ff579295c9ac8c27badc8f57fc3b2202e..ecb5005432909425239e4a3a1ca9955c9b4c68b4 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" />