#175 [chore] bottom navigation 아이콘+명칭 바꾸기

Team-Sopetit · Jun 17, 2024 · 64dd8bd · 64dd8bd
1 parent 4c30b12
commit 64dd8bd
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 41 deletions.
diff --git a/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt
@@ -28,9 +28,9 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
     private fun setBottomNavigationClickListener() {
         binding.bnvMain.setOnItemSelectedListener { item ->
             when (item.itemId) {
-                R.id.bottom_navigation_daily_routine -> changeFragment(OngoingRoutineFragment())
+                R.id.bottom_navigation_ongoing -> changeFragment(OngoingRoutineFragment())
                 R.id.bottom_navigation_home -> changeFragment(HomeFragment())
-                R.id.bottom_navigation_happiness_routine -> changeFragment(HappyMyRoutineFragment())
+                R.id.bottom_navigation_achievement -> changeFragment(HappyMyRoutineFragment())
                 else -> true
             }
         }

diff --git a/app/src/main/res/drawable/ic_achievement_default.xml b/app/src/main/res/drawable/ic_achievement_default.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.617,3C17.105,3 17.575,3.178 17.941,3.501C18.306,3.823 18.542,4.268 18.602,4.752L18.758,6H19.426C19.765,6 20.1,6.075 20.406,6.22C20.712,6.365 20.983,6.576 21.198,6.838C21.413,7.1 21.567,7.407 21.649,7.736C21.731,8.065 21.739,8.408 21.672,8.74L21.471,9.745C21.321,10.494 20.963,11.185 20.437,11.739C19.911,12.293 19.239,12.687 18.499,12.875C17.991,13.955 17.222,14.891 16.262,15.599C15.302,16.307 14.181,16.765 12.999,16.931V19H15.999C16.264,19 16.519,19.105 16.706,19.293C16.894,19.48 16.999,19.735 16.999,20C16.999,20.265 16.894,20.52 16.706,20.707C16.519,20.895 16.264,21 15.999,21H8C7.735,21 7.48,20.895 7.293,20.707C7.105,20.52 7,20.265 7,20C7,19.735 7.105,19.48 7.293,19.293C7.48,19.105 7.735,19 8,19H11V16.931C9.819,16.764 8.698,16.306 7.738,15.598C6.778,14.89 6.01,13.954 5.502,12.875C4.762,12.687 4.09,12.293 3.564,11.739C3.038,11.185 2.68,10.494 2.53,9.745L2.329,8.739C2.263,8.407 2.271,8.064 2.353,7.735C2.435,7.407 2.589,7.1 2.803,6.838C3.018,6.576 3.288,6.365 3.595,6.22C3.901,6.075 4.235,6 4.574,6H5.242L5.398,4.752C5.458,4.268 5.694,3.823 6.059,3.501C6.425,3.178 6.895,3 7.383,3H16.617ZM19.427,8H19.007L19.124,8.93C19.174,9.336 19.191,9.738 19.174,10.133C19.304,9.95 19.404,9.745 19.468,9.523L19.51,9.353L19.71,8.347C19.725,8.273 19.711,8.197 19.67,8.133C19.63,8.07 19.566,8.024 19.493,8.007L19.427,8ZM4.991,8H4.573C4.53,8 4.488,8.009 4.449,8.028C4.41,8.046 4.376,8.073 4.348,8.106C4.321,8.139 4.301,8.178 4.291,8.22C4.281,8.261 4.28,8.305 4.288,8.347L4.489,9.352C4.547,9.641 4.663,9.905 4.825,10.132C4.808,9.738 4.825,9.336 4.875,8.93L4.991,8Z"
+      android:fillColor="#4A4A4A"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_achievement_variant.xml b/app/src/main/res/drawable/ic_achievement_variant.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.617,3C17.105,3 17.575,3.178 17.941,3.501C18.306,3.823 18.542,4.268 18.602,4.752L18.758,6H19.426C19.765,6 20.1,6.075 20.406,6.22C20.712,6.365 20.983,6.576 21.198,6.838C21.413,7.1 21.567,7.407 21.649,7.736C21.731,8.065 21.739,8.408 21.672,8.74L21.471,9.745C21.321,10.494 20.963,11.185 20.437,11.739C19.911,12.293 19.239,12.687 18.499,12.875C17.991,13.955 17.222,14.891 16.262,15.599C15.302,16.307 14.181,16.765 12.999,16.931V19H15.999C16.264,19 16.519,19.105 16.706,19.293C16.894,19.48 16.999,19.735 16.999,20C16.999,20.265 16.894,20.52 16.706,20.707C16.519,20.895 16.264,21 15.999,21H8C7.735,21 7.48,20.895 7.293,20.707C7.105,20.52 7,20.265 7,20C7,19.735 7.105,19.48 7.293,19.293C7.48,19.105 7.735,19 8,19H11V16.931C9.819,16.764 8.698,16.306 7.738,15.598C6.778,14.89 6.01,13.954 5.502,12.875C4.762,12.687 4.09,12.293 3.564,11.739C3.038,11.185 2.68,10.494 2.53,9.745L2.329,8.739C2.263,8.407 2.271,8.064 2.353,7.735C2.435,7.407 2.589,7.1 2.803,6.838C3.018,6.576 3.288,6.365 3.595,6.22C3.901,6.075 4.235,6 4.574,6H5.242L5.398,4.752C5.458,4.268 5.694,3.823 6.059,3.501C6.425,3.178 6.895,3 7.383,3H16.617ZM19.427,8H19.007L19.124,8.93C19.174,9.336 19.191,9.738 19.174,10.133C19.304,9.95 19.404,9.745 19.468,9.523L19.51,9.353L19.71,8.347C19.725,8.273 19.711,8.197 19.67,8.133C19.63,8.07 19.566,8.024 19.493,8.007L19.427,8ZM4.991,8H4.573C4.53,8 4.488,8.009 4.449,8.028C4.41,8.046 4.376,8.073 4.348,8.106C4.321,8.139 4.301,8.178 4.291,8.22C4.281,8.261 4.28,8.305 4.288,8.347L4.489,9.352C4.547,9.641 4.663,9.905 4.825,10.132C4.808,9.738 4.825,9.336 4.875,8.93L4.991,8Z"
+      android:fillColor="#CACDD2"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_happiness_routine_default.xml b/app/src/main/res/drawable/ic_happiness_routine_default.xml
diff --git a/app/src/main/res/drawable/ic_happiness_routine_variant.xml b/app/src/main/res/drawable/ic_happiness_routine_variant.xml
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_achievement.xml b/app/src/main/res/drawable/selector_bottom_navigation_achievement.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_achievement_default" android:state_checked="true"/>
+    <item android:drawable="@drawable/ic_achievement_variant" android:state_checked="false"/>
+</selector>
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_happiness_routine.xml b/app/src/main/res/drawable/selector_bottom_navigation_happiness_routine.xml
diff --git a/...e/selector_bottom_navigation_progress.xml → ...le/selector_bottom_navigation_ongoing.xml b/...e/selector_bottom_navigation_progress.xml → ...le/selector_bottom_navigation_ongoing.xml
diff --git a/app/src/main/res/menu/bottom_navigation.xml b/app/src/main/res/menu/bottom_navigation.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:id="@+id/bottom_navigation_daily_routine"
-        android:icon="@drawable/selector_bottom_navigation_progress"
-        android:title="@string/bottom_navigation_daily_routine" />
+        android:id="@+id/bottom_navigation_ongoing"
+        android:icon="@drawable/selector_bottom_navigation_ongoing"
+        android:title="@string/bottom_navigation_ongoing" />
     <item
         android:id="@+id/bottom_navigation_home"
         android:icon="@drawable/selector_bottom_navigation_home"
         android:title="@string/bottom_navigation_home" />
     <item
-        android:id="@+id/bottom_navigation_happiness_routine"
-        android:icon="@drawable/selector_bottom_navigation_happiness_routine"
-        android:title="@string/bottom_navigation_happiness_routine" />
+        android:id="@+id/bottom_navigation_achievement"
+        android:icon="@drawable/selector_bottom_navigation_achievement"
+        android:title="@string/bottom_navigation_achievement" />
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -88,9 +88,9 @@
     <string name="splash_content">하루를 바꾸는 가장 사소한 루틴</string>
 
     <!-- bottom navigation -->
-    <string name="bottom_navigation_daily_routine">데일리 루틴</string>
+    <string name="bottom_navigation_ongoing">진행중</string>
     <string name="bottom_navigation_home">홈</string>
-    <string name="bottom_navigation_happiness_routine">행복 루틴</string>
+    <string name="bottom_navigation_achievement">달성도</string>
 
     <!-- setting -->
     <string name="setting_title">설정</string>