Merge branch 'develop' into feature/alarm-box-ui

TeamDMU · Feb 21, 2024 · 4f5dce6 · 4f5dce6
2 parents cc48389 + bc8d673
commit 4f5dce6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -25,6 +25,8 @@
             android:layout_height="60dp"
             android:layout_gravity="bottom|center_horizontal"
             android:elevation="30dp"
+            app:itemTextAppearanceActive="@style/BottomNavigationStyle"
+            app:itemTextAppearanceInactive="@style/BottomNavigationStyle"
             app:labelVisibilityMode="labeled"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"></style>
-
+    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar" />
+
     <style name="Colors_Widget.MaterialComponents.Chip.Choice" parent="Widget.MaterialComponents.Chip.Choice">
         <item name="android:layout_width">80dp</item>
         <item name="android:layout_height">wrap_content</item>
@@ -24,4 +23,9 @@
         <item name="android:textAlignment">center</item>
         <item name="android:textColor">@color/black</item>
     </style>
+
+    <style name="BottomNavigationStyle">
+        <item name="android:fontFamily">@font/pretendard_medium</item>
+        <item name="android:textSize">@dimen/font_size_12</item>
+    </style>
 </resources>