Merge pull request #132 from droidknights/feature/z0/#131

하단 네비게이션 메뉴 구성의 변경
droidknights · Aug 31, 2020 · dae557a · dae557a
2 parents a2fd75c + e74e910
commit dae557a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 18 deletions.
diff --git a/androidapp/app/src/main/res/drawable/bottom_navigation_color_selector.xml b/androidapp/app/src/main/res/drawable/bottom_navigation_color_selector.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#00D0A8" android:state_pressed="true" />
-    <item android:color="#00D0A8" android:state_checked="true" />
-    <item android:color="#C7C7C7" />
+    <item android:color="@color/bottom_nav_selected" android:state_pressed="true" />
+    <item android:color="@color/bottom_nav_selected" android:state_checked="true" />
+    <item android:color="@color/bottom_nav_unselected" />
 </selector>
diff --git a/androidapp/app/src/main/res/drawable/ic_baseline_date_range_24.xml b/androidapp/app/src/main/res/drawable/ic_baseline_date_range_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/>
+</vector>
diff --git a/androidapp/app/src/main/res/drawable/ic_baseline_home_24.xml b/androidapp/app/src/main/res/drawable/ic_baseline_home_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/androidapp/app/src/main/res/layout/main_activity.xml b/androidapp/app/src/main/res/layout/main_activity.xml
@@ -14,7 +14,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:defaultNavHost="true"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/bottomNav"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -24,10 +24,6 @@
             android:id="@+id/bottomNav"
             android:layout_width="0dp"
             android:layout_height="@dimen/bottom_nav_height"
-            android:layout_marginLeft="@dimen/bottom_nav_horizontal_margin"
-            android:layout_marginRight="@dimen/bottom_nav_horizontal_margin"
-            android:layout_marginBottom="@dimen/bottom_nav_bottom_margin"
-            android:background="@drawable/bottom_navigation_background"
             android:elevation="8dp"
             app:itemIconTint="@drawable/bottom_navigation_color_selector"
             app:itemTextColor="@drawable/bottom_navigation_color_selector"

diff --git a/androidapp/app/src/main/res/menu/bottom_nav_menu.xml b/androidapp/app/src/main/res/menu/bottom_nav_menu.xml
@@ -2,15 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@id/infoFragment"
-        android:icon="@android:drawable/ic_menu_info_details"
-        android:title="스폰서" />
+        android:icon="@drawable/ic_baseline_home_24"
+        android:title="@string/menu_home_title" />
     <item
         android:id="@id/scheduleFragment"
-        android:icon="@android:drawable/ic_menu_agenda"
-        android:title="일정" />
-    <item
-        android:id="@id/mypageFragment"
-        android:icon="@drawable/ic_person_white_24dp"
-        android:title="설정" />
+        android:icon="@drawable/ic_baseline_date_range_24"
+        android:title="@string/menu_schedule_title" />
 
 </menu>
diff --git a/androidapp/app/src/main/res/values/colors.xml b/androidapp/app/src/main/res/values/colors.xml
@@ -9,6 +9,10 @@
     <color name="toolbar_background_white">#FFFFFF</color>
     <color name="toolbar_textColor_black">#000000</color>
 
+    <!--bottom navigation menu-->
+    <color name="bottom_nav_selected">#2e2e33</color>
+    <color name="bottom_nav_unselected">#d0d0d0</color>
+
     <!--sponsor tab-->
     <color name="sponsor_background_color">#303033</color>
 

diff --git a/androidapp/app/src/main/res/values/dimens.xml b/androidapp/app/src/main/res/values/dimens.xml
@@ -4,7 +4,7 @@
     <dimen name="SessionChip_horizontal_margin">8dp</dimen>
     <dimen name="SessionChip_vertical_margin">4dp</dimen>
 
-    <dimen name="bottom_nav_height">48dp</dimen>
+    <dimen name="bottom_nav_height">60dp</dimen>
     <dimen name="bottom_nav_horizontal_margin">30dp</dimen>
     <dimen name="bottom_nav_bottom_margin">12dp</dimen>
 

diff --git a/androidapp/app/src/main/res/values/strings.xml b/androidapp/app/src/main/res/values/strings.xml
@@ -1,7 +1,8 @@
 <resources>
     <string name="app_name">DroidKnights2020</string>
 
-    <string name="menu_schedule_title">일정</string>
+    <string name="menu_home_title">홈</string>
+    <string name="menu_schedule_title">스케줄</string>
     <string name="menu_settings_title">설정</string>
     <string name="menu_sponsor_title">스폰서</string>