#11 [chore] : xml 코드 cherry pick

NOW-SOPT-ANDROID · Apr 18, 2024 · 658660e · 658660e
1 parent 6f767b7
commit 658660e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git 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/...om/sopt/now/feature/home/HomeViewModel.kt → ...now/compose/feature/home/HomeViewModel.kt b/...om/sopt/now/feature/home/HomeViewModel.kt → ...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/...va/com/sopt/now/feature/util/DateUtils.kt → ...opt/now/compose/feature/util/DateUtils.kt b/...va/com/sopt/now/feature/util/DateUtils.kt → ...opt/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
@@ -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