From 658660e0763adacc71f72b2c6a95f10b931a6461 Mon Sep 17 00:00:00 2001
From: chanu <cw8881@naver.com>
Date: Fri, 19 Apr 2024 07:20:22 +0900
Subject: [PATCH] =?UTF-8?q?#11=20[chore]=20:=20xml=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?cherry=20pick?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    | 13 +++++++------
 .../now/{ => compose}/feature/home/HomeViewModel.kt | 12 ++++++------
 .../now/{ => compose}/feature/util/DateUtils.kt     |  3 ++-
 .../com/sopt/now/compose/feature/util/KeyStorage.kt |  6 ++++++
 app/src/main/res/drawable/ic_gift_red_24.xml        | 12 ------------
 5 files changed, 21 insertions(+), 25 deletions(-)
 rename app/src/main/java/com/sopt/now/{ => compose}/feature/home/HomeViewModel.kt (91%)
 rename app/src/main/java/com/sopt/now/{ => compose}/feature/util/DateUtils.kt (93%)
 delete mode 100644 app/src/main/res/drawable/ic_gift_red_24.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 355e6af..ec109f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,18 +14,19 @@
         tools:targetApi="31">
         <activity
             android:name=".feature.auth.LoginActivity"
-            android:exported="true">
+            android:exported="true"></activity>
+        <activity
+            android:name=".feature.MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.NOWSOPTAndroid">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".feature.MainActivity"
-            android:exported="false"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.NOWSOPTAndroid" />
         <activity
             android:name=".feature.auth.SignUpActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/sopt/now/feature/home/HomeViewModel.kt b/app/src/main/java/com/sopt/now/compose/feature/home/HomeViewModel.kt
similarity index 91%
rename from app/src/main/java/com/sopt/now/feature/home/HomeViewModel.kt
rename to app/src/main/java/com/sopt/now/compose/feature/home/HomeViewModel.kt
index fbdd0d3..fc5c844 100644
--- a/app/src/main/java/com/sopt/now/feature/home/HomeViewModel.kt
+++ b/app/src/main/java/com/sopt/now/compose/feature/home/HomeViewModel.kt
@@ -1,11 +1,11 @@
-package com.sopt.now.feature.home
+package com.sopt.now.compose.feature.home
 
-import DateUtils
-import DateUtils.today
-import DateUtils.yesterday
 import androidx.lifecycle.ViewModel
-import com.sopt.now.R
-import com.sopt.now.feature.model.HomeSealedItem
+import com.sopt.now.compose.R
+import com.sopt.now.compose.feature.model.HomeSealedItem
+import com.sopt.now.compose.feature.util.DateUtils
+import com.sopt.now.compose.feature.util.DateUtils.today
+import com.sopt.now.compose.feature.util.DateUtils.yesterday
 import java.time.LocalDate
 
 class HomeViewModel : ViewModel() {
diff --git a/app/src/main/java/com/sopt/now/feature/util/DateUtils.kt b/app/src/main/java/com/sopt/now/compose/feature/util/DateUtils.kt
similarity index 93%
rename from app/src/main/java/com/sopt/now/feature/util/DateUtils.kt
rename to app/src/main/java/com/sopt/now/compose/feature/util/DateUtils.kt
index 9d1daaf..35084d3 100644
--- a/app/src/main/java/com/sopt/now/feature/util/DateUtils.kt
+++ b/app/src/main/java/com/sopt/now/compose/feature/util/DateUtils.kt
@@ -1,4 +1,5 @@
-import com.sopt.now.feature.util.DateKeyStorage
+package com.sopt.now.compose.feature.util
+
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 
diff --git a/app/src/main/java/com/sopt/now/compose/feature/util/KeyStorage.kt b/app/src/main/java/com/sopt/now/compose/feature/util/KeyStorage.kt
index c45510b..ab8860f 100644
--- a/app/src/main/java/com/sopt/now/compose/feature/util/KeyStorage.kt
+++ b/app/src/main/java/com/sopt/now/compose/feature/util/KeyStorage.kt
@@ -6,3 +6,9 @@ object KeyStorage {
     const val SEARCH = "search"
     const val MY_PAGE = "my_page"
 }
+
+object DateKeyStorage {
+    const val TODAY = 0
+    const val YESTERDAY = 1
+    const val NOTHING = 2
+}
diff --git a/app/src/main/res/drawable/ic_gift_red_24.xml b/app/src/main/res/drawable/ic_gift_red_24.xml
deleted file mode 100644
index e4bf7b0..0000000
--- a/app/src/main/res/drawable/ic_gift_red_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <group>
-    <clip-path android:pathData="M0,0h24v24h-24z" />
-    <path
-        android:pathData="M3,4.125C3,3.031 3.435,1.982 4.208,1.208C4.982,0.435 6.031,0 7.125,0C8.599,0 9.934,0.63 10.98,1.848C11.382,2.325 11.726,2.85 12,3.411C12.274,2.849 12.616,2.323 13.02,1.845C14.064,0.63 15.399,0 16.875,0C17.581,-0 18.275,0.181 18.891,0.526C19.507,0.871 20.025,1.368 20.393,1.97C20.762,2.573 20.97,3.259 20.998,3.965C21.025,4.67 20.871,5.371 20.55,6H21.375C22.824,6 24,7.176 24,8.625V11.625C24,12.672 23.386,13.576 22.5,13.998V21.375C22.5,22.071 22.223,22.739 21.731,23.231C21.239,23.723 20.571,24 19.875,24H4.125C3.429,24 2.761,23.723 2.269,23.231C1.777,22.739 1.5,22.071 1.5,21.375V13.998C0.613,13.575 0,12.672 0,11.625V8.625C0,7.176 1.176,6 2.625,6H3.45C3.162,5.438 3,4.8 3,4.125ZM10.875,14.25H3.75V21.375C3.75,21.582 3.918,21.75 4.125,21.75H10.875V14.25ZM13.125,14.25V21.75H19.875C19.975,21.75 20.07,21.711 20.14,21.64C20.211,21.57 20.25,21.475 20.25,21.375V14.25H13.125ZM13.125,8.25V12H21.375C21.475,12 21.57,11.96 21.64,11.89C21.711,11.82 21.75,11.724 21.75,11.625V8.625C21.75,8.526 21.711,8.43 21.64,8.36C21.57,8.29 21.475,8.25 21.375,8.25H13.125ZM2.625,8.25C2.526,8.25 2.43,8.29 2.36,8.36C2.29,8.43 2.25,8.526 2.25,8.625V11.625C2.25,11.832 2.418,12 2.625,12H10.875V8.25H2.625ZM7.125,2.25C6.628,2.25 6.151,2.448 5.799,2.799C5.448,3.151 5.25,3.628 5.25,4.125C5.25,4.622 5.448,5.099 5.799,5.451C6.151,5.802 6.628,6 7.125,6H10.589C10.239,4.773 9.776,3.898 9.271,3.31C8.627,2.557 7.899,2.25 7.125,2.25ZM13.411,6H16.875C17.372,6 17.849,5.802 18.201,5.451C18.552,5.099 18.75,4.622 18.75,4.125C18.75,3.628 18.552,3.151 18.201,2.799C17.849,2.448 17.372,2.25 16.875,2.25C16.101,2.25 15.375,2.557 14.73,3.31C14.224,3.898 13.761,4.773 13.411,6Z"
-        android:fillColor="#E47178" />
-  </group>
-</vector>