From 4608b3b82a65724f1145be07151f6eae63543d9d Mon Sep 17 00:00:00 2001
From: HyeseonBaek <konkukbhs@gmail.com>
Date: Wed, 10 Jan 2024 15:52:32 +0900
Subject: [PATCH] =?UTF-8?q?[mod]=20#232=20=EC=9C=84=EB=8B=88=ED=94=BC?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=B0=EB=84=88=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable/img_wineyfeed_banner1.xml    |  4 +--
 .../res/drawable/img_wineyfeed_banner2.xml    |  4 +--
 .../res/drawable/img_wineyfeed_banner3.xml    |  4 +--
 .../res/drawable/img_wineyfeed_banner4.xml    |  4 +--
 .../main/res/layout/item_wineyfeed_header.xml |  4 +--
 .../res/layout/layout_wineyfeed_banner1.xml   | 21 ++++++++--------
 .../res/layout/layout_wineyfeed_banner2.xml   | 15 ++++++-----
 .../res/layout/layout_wineyfeed_banner3.xml   | 16 ++++++------
 .../res/layout/layout_wineyfeed_banner4.xml   | 17 ++++++-------
 .../layout_wineyfeed_banner_instagram.xml     | 25 +++++++++----------
 app/src/main/res/values/strings.xml           | 10 ++++----
 11 files changed, 59 insertions(+), 65 deletions(-)

diff --git a/app/src/main/res/drawable/img_wineyfeed_banner1.xml b/app/src/main/res/drawable/img_wineyfeed_banner1.xml
index ceeaea1e5..3e47159dc 100644
--- a/app/src/main/res/drawable/img_wineyfeed_banner1.xml
+++ b/app/src/main/res/drawable/img_wineyfeed_banner1.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="85dp"
-    android:height="85dp"
+    android:width="60dp"
+    android:height="58dp"
     android:viewportWidth="85"
     android:viewportHeight="85">
   <group>
diff --git a/app/src/main/res/drawable/img_wineyfeed_banner2.xml b/app/src/main/res/drawable/img_wineyfeed_banner2.xml
index 59570ea2f..b7fbbf6dd 100644
--- a/app/src/main/res/drawable/img_wineyfeed_banner2.xml
+++ b/app/src/main/res/drawable/img_wineyfeed_banner2.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="137dp"
-    android:height="102dp"
+    android:width="83dp"
+    android:height="58dp"
     android:viewportWidth="137"
     android:viewportHeight="102">
   <path
diff --git a/app/src/main/res/drawable/img_wineyfeed_banner3.xml b/app/src/main/res/drawable/img_wineyfeed_banner3.xml
index 5b81bbb56..187687f7f 100644
--- a/app/src/main/res/drawable/img_wineyfeed_banner3.xml
+++ b/app/src/main/res/drawable/img_wineyfeed_banner3.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="132dp"
-    android:height="92dp"
+    android:width="88dp"
+    android:height="56dp"
     android:viewportWidth="132"
     android:viewportHeight="92">
   <path
diff --git a/app/src/main/res/drawable/img_wineyfeed_banner4.xml b/app/src/main/res/drawable/img_wineyfeed_banner4.xml
index 9e7f348c8..9e51496ba 100644
--- a/app/src/main/res/drawable/img_wineyfeed_banner4.xml
+++ b/app/src/main/res/drawable/img_wineyfeed_banner4.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="115dp"
-    android:height="45dp"
+    android:width="85dp"
+    android:height="33dp"
     android:viewportWidth="115"
     android:viewportHeight="45">
   <path
diff --git a/app/src/main/res/layout/item_wineyfeed_header.xml b/app/src/main/res/layout/item_wineyfeed_header.xml
index aa58bcfa4..b33406722 100644
--- a/app/src/main/res/layout/item_wineyfeed_header.xml
+++ b/app/src/main/res/layout/item_wineyfeed_header.xml
@@ -3,7 +3,5 @@
     <FrameLayout
         android:id="@+id/fl_wineyfeed_banner_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="10dp"
-        android:paddingVertical="12dp" />
+        android:layout_height="wrap_content" />
 </layout>
diff --git a/app/src/main/res/layout/layout_wineyfeed_banner1.xml b/app/src/main/res/layout/layout_wineyfeed_banner1.xml
index 49827c13b..3dcbeaa66 100644
--- a/app/src/main/res/layout/layout_wineyfeed_banner1.xml
+++ b/app/src/main/res/layout/layout_wineyfeed_banner1.xml
@@ -4,16 +4,16 @@
     android:id="@+id/cl_wineyfeed_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_gray50_fill_10_rect">
+    android:background="@color/gray_50">
 
     <TextView
         android:id="@+id/tv_wineyfeed_banner_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="15dp"
         android:text="@string/wineyfeed_banner1_title"
-        android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
+        android:textAppearance="@style/TextAppearance.WINEY.body_b_14"
         android:textColor="@color/gray_900"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -22,21 +22,20 @@
         android:id="@+id/tv_wineyfeed_banner_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="15dp"
+        android:layout_marginTop="1dp"
         android:text="@string/wineyfeed_banner1_subtitle"
         android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
         android:textColor="@color/gray_500"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/tv_wineyfeed_banner_title"
-        app:layout_constraintTop_toBottomOf="@id/tv_wineyfeed_banner_title" />
+        app:layout_constraintStart_toStartOf="@id/tv_wineyfeed_banner_title" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="9dp"
-        android:layout_marginBottom="7dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginEnd="11dp"
+        android:layout_marginBottom="6dp"
         android:src="@drawable/img_wineyfeed_banner1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_wineyfeed_banner2.xml b/app/src/main/res/layout/layout_wineyfeed_banner2.xml
index 61c9fd3da..7e844bd08 100644
--- a/app/src/main/res/layout/layout_wineyfeed_banner2.xml
+++ b/app/src/main/res/layout/layout_wineyfeed_banner2.xml
@@ -4,14 +4,14 @@
     android:id="@+id/cl_wineyfeed_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_gray50_fill_10_rect">
+    android:background="@color/gray_50">
 
     <TextView
         android:id="@+id/tv_wineyfeed_banner_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="15dp"
         android:text="@string/wineyfeed_banner2_subtitle"
         android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
         android:textColor="@color/gray_500"
@@ -22,10 +22,10 @@
         android:id="@+id/tv_wineyfeed_banner_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="15dp"
         android:text="@string/wineyfeed_banner2_title"
-        android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
+        android:textAppearance="@style/TextAppearance.WINEY.body_b_14"
         android:textColor="@color/gray_900"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_wineyfeed_banner_desc"
@@ -34,9 +34,8 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="13dp"
+        android:layout_marginEnd="8dp"
         android:src="@drawable/img_wineyfeed_banner2"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/layout_wineyfeed_banner3.xml b/app/src/main/res/layout/layout_wineyfeed_banner3.xml
index 504069cbb..eaacfa484 100644
--- a/app/src/main/res/layout/layout_wineyfeed_banner3.xml
+++ b/app/src/main/res/layout/layout_wineyfeed_banner3.xml
@@ -4,14 +4,14 @@
     android:id="@+id/cl_wineyfeed_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_gray50_fill_10_rect">
+    android:background="@color/gray_50">
 
     <TextView
         android:id="@+id/tv_wineyfeed_banner_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="15dp"
         android:text="@string/wineyfeed_banner3_subtitle"
         android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
         android:textColor="@color/gray_500"
@@ -22,10 +22,10 @@
         android:id="@+id/tv_wineyfeed_banner_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="15dp"
         android:text="@string/wineyfeed_banner3_title"
-        android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
+        android:textAppearance="@style/TextAppearance.WINEY.body_b_14"
         android:textColor="@color/gray_900"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_wineyfeed_banner_desc"
@@ -34,8 +34,8 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="7dp"
+        android:layout_marginBottom="15dp"
         android:src="@drawable/img_wineyfeed_banner3"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_wineyfeed_banner4.xml b/app/src/main/res/layout/layout_wineyfeed_banner4.xml
index e08044396..1c7ef7699 100644
--- a/app/src/main/res/layout/layout_wineyfeed_banner4.xml
+++ b/app/src/main/res/layout/layout_wineyfeed_banner4.xml
@@ -4,14 +4,14 @@
     android:id="@+id/cl_wineyfeed_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_gray50_fill_10_rect">
+    android:background="@color/gray_50">
 
     <TextView
         android:id="@+id/tv_wineyfeed_banner_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="15dp"
         android:text="@string/wineyfeed_banner4_subtitle"
         android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
         android:textColor="@color/gray_500"
@@ -22,10 +22,10 @@
         android:id="@+id/tv_wineyfeed_banner_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="15dp"
         android:text="@string/wineyfeed_banner4_title"
-        android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
+        android:textAppearance="@style/TextAppearance.WINEY.body_b_14"
         android:textColor="@color/gray_900"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="@id/tv_wineyfeed_banner_desc"
@@ -34,9 +34,8 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="31dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="26dp"
+        android:layout_marginVertical="19dp"
+        android:layout_marginEnd="17dp"
         android:src="@drawable/img_wineyfeed_banner4"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_wineyfeed_banner_instagram.xml b/app/src/main/res/layout/layout_wineyfeed_banner_instagram.xml
index 43d756168..e6bc0a824 100644
--- a/app/src/main/res/layout/layout_wineyfeed_banner_instagram.xml
+++ b/app/src/main/res/layout/layout_wineyfeed_banner_instagram.xml
@@ -1,21 +1,20 @@
 <?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:id="@+id/cl_wineyfeed_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shape_gray700_fill_5_rect">
+    android:background="@color/gray_700">
 
 
     <TextView
         android:id="@+id/tv_wineyfeed_banner_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:layout_marginStart="20dp"
-        android:text="@string/wineyfeed_banner_insta_title"
-        android:textAppearance="@style/TextAppearance.WINEY.Headline_b_18_xl"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="15dp"
+        android:text="@string/wineyfeed_head"
+        android:textAppearance="@style/TextAppearance.WINEY.body_b_14"
         android:textColor="@color/gray_0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -25,20 +24,20 @@
         android:id="@+id/tv_wineyfeed_banner_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="2dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginBottom="18dp"
-        android:text="@string/wineyfeed_banner_insta_subtitle"
+        android:layout_marginBottom="15dp"
+        android:text="@string/wineyfeed_sub"
         android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
         android:textColor="@color/gray_200"
-        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_wineyfeed_banner_title" />
 
     <ImageView
-        android:layout_width="127dp"
-        android:layout_height="79dp"
-        android:layout_marginEnd="9dp"
+        android:layout_width="95dp"
+        android:layout_height="56dp"
+        android:layout_marginEnd="10dp"
         android:src="@drawable/img_insta"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca58adb63..10c7e8a0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
 
     <!-- winey feed -->
     <string name="wineyfeed_head">위니와 절약을 더 쉽고 재밌게!</string>
-    <string name="wineyfeed_sub">절약한 소비를 피드에 올리고\n사람들과 소통해요</string>
+    <string name="wineyfeed_sub">절약한 소비를 피드에 올리고 사람들과 소통해요</string>
     <string name="wineyfeed_nickname">부자가 되고싶어</string>
     <string name="wineyfeed_title">교통비를 아끼기 위해 대중교통 대신</string>
     <string name="wineyfeed_money">원 절약</string>
@@ -15,13 +15,13 @@
     <string name="wineyfeed_banner_insta_title">무슨 앱인지 궁금하다면?</string>
     <string name="wineyfeed_banner_insta_subtitle">위니 공식 인스타에서\n더 재밌게 사용하는 법 알아보기!</string>
     <string name="wineyfeed_banner1_title">위니와 절약을 더 쉽고 재밌게!</string>
-    <string name="wineyfeed_banner1_subtitle">절약한 소비를 피드에 올리고\n사람들과 소통해요</string>
+    <string name="wineyfeed_banner1_subtitle">절약한 소비를 피드에 올리고 사람들과 소통해요</string>
     <string name="wineyfeed_banner2_subtitle">하단 버튼을 통해</string>
-    <string name="wineyfeed_banner2_title">나만의 절약방법을 사람들과\n공유할 수 있어요</string>
+    <string name="wineyfeed_banner2_title">나만의 절약방법을 사람들과 공유할 수 있어요</string>
     <string name="wineyfeed_banner3_subtitle">서로의 절약방법을 피드백해요</string>
-    <string name="wineyfeed_banner3_title">좋아요를 눌러 서로의 절약을\n응원해주세요!</string>
+    <string name="wineyfeed_banner3_title">좋아요를 눌러 서로의 절약을 응원해주세요!</string>
     <string name="wineyfeed_banner4_subtitle">찾기 힘든 국가기관 금융혜택도</string>
-    <string name="wineyfeed_banner4_title">위니 추천피드에서\n한번에 볼 수 있어요!</string>
+    <string name="wineyfeed_banner4_title">위니 추천피드에서 한번에 볼 수 있어요!</string>
 
     <string name="wineyfeed_fab_save">절약했어요</string>
     <string name="wineyfeed_fab_consume">낭비했어요</string>