[Fix/#5] 다른 컬러 적용

GO-SOPT-ANDROID · May 12, 2023 · 2d82f3c · 2d82f3c
1 parent 7d3d45b
commit 2d82f3c
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 25 deletions.
diff --git a/app/src/main/res/drawable/sel_nav_color.xml b/app/src/main/res/drawable/sel_nav_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_selected="false" />
+    <item android:color="@color/peach_400" android:state_selected="true" />
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,9 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/bnv_main"
         android:layout_width="0dp"
-        android:layout_height="56dp"
+        android:layout_height="wrap_content"
+        app:itemIconTint="@drawable/sel_nav_color"
+        app:itemTextColor="@drawable/sel_nav_color"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -20,7 +20,7 @@
         android:id="@+id/btn_delete_item"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="?attr/colorPrimaryVariant"
+        android:backgroundTint="?attr/colorPrimary"
         android:text="삭제하기"
         app:layout_constraintTop_toBottomOf="@id/rv"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/item_top.xml b/app/src/main/res/layout/item_top.xml
@@ -4,36 +4,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary">
+    android:background="@color/beige_50">
 
 
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="0dp"
-        android:src="@drawable/ic_music"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/nanum_gothic_bold"
+        android:padding="10dp"
+        android:paddingStart="30dp"
         android:textSize="30sp"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="노래 리스트" />
-
-    <ImageView
-        android:layout_width="50dp"
-        android:layout_height="0dp"
-        android:src="@drawable/ic_music"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        tools:text="USER LIST" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.GOSOPTAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">#ECCDB4</item>
+        <item name="colorPrimaryVariant">#FEA1A1</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,6 +3,24 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 
+    <color name="peach_50">#FFF7F2F2</color>
+    <color name="peach_100">#FFEED8D8</color>
+    <color name="peach_200">#FFE8B9B9</color>
+    <color name="peach_300">#FFE19999</color>
+    <color name="peach_400">#FFD77A7A</color>
+    <color name="peach_500">#FFFEA1A1</color>
+    <color name="peach_600">#FFD57171</color>
+    <color name="peach_700">#FFB84242</color>
+
+    <color name="beige_50">#FFF8F3EA</color>
+    <color name="beige_100">#FFF1E1D2</color>
+    <color name="beige_200">#FFE9CEB9</color>
+    <color name="beige_300">#FFE1BCA0</color>
+    <color name="beige_400">#FFD8A987</color>
+    <color name="beige_500">#FFECCDB4</color>
+    <color name="beige_600">#FFCEA97F</color>
+    <color name="beige_700">#FFAF844B</color>
+
     <color name="red_50">#fde0dc</color>
     <color name="red_100">#f9bdbb</color>
     <color name="red_200">#f69988</color>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.GOSOPTAndroid" parent="Theme.Material3.Light.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">#EFE464</item>
-        <item name="colorPrimaryVariant">@color/yellow_500</item>
+        <item name="colorPrimary">@color/peach_500</item>
+        <item name="colorPrimaryVariant">@color/beige_500</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>