[fix]: design color

Team-HMH · Jan 9, 2024 · a7be2f8 · a7be2f8
1 parent eaafd8e
commit a7be2f8
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 24 deletions.
diff --git a/app/src/main/res/layout/activity_sample.xml b/app/src/main/res/layout/activity_sample.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?white_btn">
+    android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/tv_main"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?textAppearanceDisplayLarge"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="nickname" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/core/designsystem/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml
@@ -3,6 +3,28 @@
     <style name="Base.Theme.HMH" parent="Theme.Material3.Light.NoActionBar">
         <item name="android:windowBackground">@color/blackground</item>
 
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/gray7</item>
+        <item name="colorPrimaryVariant">@color/gray8</item>
+        <item name="colorOnPrimary">@color/white_btn</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor">@color/blackground</item>
+
+        <item name="colorSecondary">@color/gray3</item>
+        <item name="colorSecondaryVariant">@color/gray4</item>
+        <item name="colorOnSecondary">@color/white_text</item>
+
+        <!-- Customize your theme here. -->
+        <item name="colorOnBackground">@color/white_text</item>
+        <!-- Bottom nav bar active indicator color set -->
+        <item name="colorSecondaryContainer">@color/white_text</item>
+        <item name="colorOnSecondaryContainer">@color/gray2</item>
+        <!-- FAB shape custom -->
+        <item name="floatingActionButtonStyle">
+            @style/Widget.Material3.FloatingActionButton.Surface
+        </item>
+        <!-- Gray Scale Theme -->
+        <item name="colorOnSurface">@color/blue_purple_button</item>
         <!-- Customize your theme here. -->
         <item name="blackground">@color/blackground</item>
         <item name="gray8">@color/gray8</item>
@@ -15,6 +37,12 @@
         <item name="gray1">@color/gray1</item>
         <item name="white_text">@color/white_text</item>
 
+        <!-- text color -->
+        <item name="android:textColor">@color/white_text</item>
+
+        <!-- button style -->
+        <item name="materialButtonStyle">@style/DefaultButtonStyle</item>
+
         <!-- Blue Purple Colors -->
         <item name="blue_purple_button">@color/blue_purple_button</item>
         <item name="blue_purple_line">@color/blue_purple_line</item>
@@ -48,12 +76,14 @@
         <item name="textAppearanceLabelMedium">@style/TextAppearance.Hmh.LabelMedium</item>
     </style>
 
-    <style name="Theme.HMH" parent="Base.Theme.HMH" />
-
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">#121212</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_background</item>
-        <item name="postSplashScreenTheme">@style/Theme.HMH</item>
+        <item name="postSplashScreenTheme">@style/Base.Theme.HMH</item>
+    </style>
+
+    <style name="DefaultButtonStyle" parent="Widget.Material3.Button">
+        <item name="backgroundTint">@color/blue_purple_button</item>
     </style>
 
 </resources>
diff --git a/core/designsystem/src/main/res/values/typography.xml b/core/designsystem/src/main/res/values/typography.xml
@@ -1,100 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="TextAppearance.Hmh" parent="">
-
-    </style>
     <!-- Display Large -->
-    <style name="TextAppearance.Hmh.DisplayLarge">
-        <item name="fontFamily">@font/pretendard_semibold</item>
+    <style name="TextAppearance.Hmh.DisplayLarge" parent="TextAppearance.Material3.DisplayLarge">
         <item name="android:textSize">31sp</item>
         <!-- Line spacing auto is default -->
     </style>
 
     <!-- Display Medium -->
-    <style name="TextAppearance.Hmh.DisplayMedium">
+    <style name="TextAppearance.Hmh.DisplayMedium" parent="TextAppearance.Material3.DisplayMedium">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">23sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Display Small -->
-    <style name="TextAppearance.Hmh.DisplaySmall">
+    <style name="TextAppearance.Hmh.DisplaySmall" parent="TextAppearance.Material3.DisplaySmall">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">21sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Headline Large -->
-    <style name="TextAppearance.Hmh.HeadlineLarge">
+    <style name="TextAppearance.Hmh.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
         <item name="fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">21sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Headline Medium -->
-    <style name="TextAppearance.Hmh.HeadlineMedium">
+    <style name="TextAppearance.Hmh.HeadlineMedium" parent="TextAppearance.Material3.HeadlineMedium">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">19sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Headline Small -->
-    <style name="TextAppearance.Hmh.HeadlineSmall">
+    <style name="TextAppearance.Hmh.HeadlineSmall" parent="TextAppearance.Material3.HeadlineSmall">
         <item name="fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">19sp</item>
         <item name="android:lineSpacingMultiplier">1.4</item>
     </style>
 
     <!-- Title Large -->
-    <style name="TextAppearance.Hmh.TitleLarge">
+    <style name="TextAppearance.Hmh.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">17sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Title Medium -->
-    <style name="TextAppearance.Hmh.TitleMedium">
+    <style name="TextAppearance.Hmh.TitleMedium" parent="TextAppearance.Material3.TitleMedium">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">15sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
     <!-- Title Medium -->
-    <style name="TextAppearance.Hmh.TitleSmall">
+    <style name="TextAppearance.Hmh.TitleSmall" parent="TextAppearance.Material3.TitleSmall">
         <item name="fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">15sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Body Large -->
-    <style name="TextAppearance.Hmh.BodyLarge">
+    <style name="TextAppearance.Hmh.BodyLarge" parent="TextAppearance.Material3.BodyLarge">
         <item name="fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">13sp</item>
     </style>
 
     <!-- Body Medium -->
-    <style name="TextAppearance.Hmh.BodyMedium">
+    <style name="TextAppearance.Hmh.BodyMedium" parent="TextAppearance.Material3.BodyMedium">
         <item name="fontFamily">@font/pretendard_regular</item>
         <item name="android:textSize">13sp</item>
         <item name="android:lineSpacingMultiplier">1.5</item>
     </style>
 
     <!-- Body Small -->
-    <style name="TextAppearance.Hmh.BodySmall">
+    <style name="TextAppearance.Hmh.BodySmall" parent="TextAppearance.Material3.BodySmall">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">12sp</item>
         <item name="android:lineSpacingMultiplier">1.4</item>
     </style>
 
     <!-- Label Large -->
-    <style name="TextAppearance.Hmh.LabelLarge">
+    <style name="TextAppearance.Hmh.LabelLarge" parent="TextAppearance.Material3.LabelLarge">
         <item name="fontFamily">@font/pretendard_semibold</item>
         <item name="android:textSize">11sp</item>
         <item name="android:lineSpacingMultiplier">1.4</item>
     </style>
 
     <!-- Label Medium -->
-    <style name="TextAppearance.Hmh.LabelMedium">
+    <style name="TextAppearance.Hmh.LabelMedium" parent="TextAppearance.Material3.LabelMedium">
         <item name="fontFamily">@font/pretendard_medium</item>
         <item name="android:textSize">11sp</item>
         <item name="android:lineSpacingMultiplier">1.4</item>