design : 공통 하단 버튼, 툴바 스타일 추가

boostcampwm-2022 · Nov 15, 2022 · 54c7a5e · 54c7a5e
1 parent 86978fb
commit 54c7a5e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/presentation/src/main/res/drawable/ic_bottom_nav_car.xml b/presentation/src/main/res/drawable/ic_bottom_nav_car.xml
@@ -5,5 +5,5 @@
  android:viewportHeight="224">
  <path
  android:pathData="M272,80H264L209.61,12.01C206.61,8.26 202.81,5.24 198.48,3.16C194.16,1.08 189.42,0 184.62,0H77.67C64.58,0 52.81,7.97 47.96,20.11L24,81.13C10.22,84.7 0,97.11 0,112V168C0,172.42 3.58,176 8,176H32C32,202.51 53.49,224 80,224C106.51,224 128,202.51 128,176H192C192,202.51 213.49,224 240,224C266.51,224 288,202.51 288,176H312C316.42,176 320,172.42 320,168V128C320,101.49 298.51,80 272,80ZM80,200C66.76,200 56,189.24 56,176C56,162.76 66.76,152 80,152C93.24,152 104,162.76 104,176C104,189.24 93.24,200 80,200ZM116,80H58.47L77.67,32H116V80ZM140,80V32H184.62L223.02,80H140ZM240,200C226.76,200 216,189.24 216,176C216,162.76 226.76,152 240,152C253.24,152 264,162.76 264,176C264,189.24 253.24,200 240,200Z"
- android:fillColor="#6A94FF"/>
+ android:fillColor="#000000"/>
 </vector>
diff --git a/presentation/src/main/res/values-night/styles.xml b/presentation/src/main/res/values-night/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="ThemeOverlay.App.Toolbar" parent="">
+ <item name="colorPrimary">@color/neutral10</item>
+ <item name="colorOnPrimary">?attr/colorOnBackground</item>
+ </style>
+</resources>
diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml
@@ -9,6 +9,9 @@
  <item name="colorSecondary">@color/secondaryLightColor</item>
  <item name="colorSecondaryVariant">@color/secondaryDarkColor</item>
  <item name="colorOnSecondary">@color/secondaryDarkTextColor</item>
+
+ <item name="android:colorBackground">@color/neutral10</item>
+ <item name="colorOnBackground">@color/neutral90</item>
  <!-- Status bar color. -->
  <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
  <!-- Customize your theme here. -->

diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
@@ -8,8 +8,13 @@
  <color name="secondaryLightColor">#fffe50</color>
  <color name="secondaryDarkColor">#c19b00</color>
 
- <color name="primaryTextColor">#000000</color>
- <color name="primaryDarkTextColor">#FFFFFF</color>
+ <color name="primaryTextColor">#FFFFFF</color>
+ <color name="primaryDarkTextColor">#000000</color>
  <color name="secondaryTextColor">#000000</color>
  <color name="secondaryDarkTextColor">#000000</color>
+
+ <color name="neutral99">#FEFBFF</color>
+ <color name="neutral90">#E4E2E6</color>
+ <color name="neutral10">#1B1B1F</color>
+
 </resources>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <style name="Theme.UCMC.BottomButton" parent="Widget.MaterialComponents.Button">
+ <item name="android:minHeight">56dp</item>
+ <item name="android:insetTop">0dp</item>
+ <item name="android:insetBottom">0dp</item>
+ <item name="cornerRadius">0dp</item>
+ <item name="android:textColor">?attr/colorOnPrimary</item>
+ <item name="android:textSize">@dimen/font_body_large</item>
+ <item name="android:textStyle">bold</item>
+ <item name="iconGravity">textStart</item>
+ <item name="iconPadding">@dimen/padding_medium</item>
+ </style>
+
+ <style name="Theme.UCMC.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary">
+ <item name="materialThemeOverlay">@style/ThemeOverlay.App.Toolbar</item>
+ </style>
+
+ <style name="ThemeOverlay.App.Toolbar" parent="">
+ <item name="colorPrimary">@color/neutral99</item>
+ <item name="colorOnPrimary">?attr/colorOnBackground</item>
+ </style>
+</resources>
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
@@ -9,9 +9,13 @@
  <item name="colorSecondary">@color/secondaryColor</item>
  <item name="colorSecondaryVariant">@color/secondaryDarkColor</item>
  <item name="colorOnSecondary">@color/secondaryTextColor</item>
+
+ <item name="android:colorBackground">@color/neutral99</item>
+ <item name="colorOnBackground">@color/neutral10</item>
  <!-- Status bar color. -->
  <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
  <!-- Customize your theme here. -->
+ <item name="toolbarStyle">@style/Theme.UCMC.Toolbar</item>
  </style>
 </resources>