홈 루틴 버그 수정

ghkdemrdus · Nov 20, 2024 · 34ad957 · 34ad957
1 parent 7d878c9
commit 34ad957
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/App/Moda/Info.plist b/App/Moda/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0.0</string>
+	<string>1.4.0.1</string>
 	<key>GoogleServiceFileName</key>
 	<string>$(ENV_GOOGLE_INFO_PLIST)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/App/Moda/Sources/Root/Home/Components/Routine/HomeRoutineCore.swift b/App/Moda/Sources/Root/Home/Components/Routine/HomeRoutineCore.swift
@@ -38,7 +38,7 @@ struct HomeRoutineCore: Reducer {
       // HomeRoutine에 Id가 존재하면 Month는 Done이기 때문에
       let done = homeRoutines.map(\.id)
       let monthsNotDone = months.filter { !done.contains($0.id) }
-      let weekdaysNotDone = weekdays.filter { !$0.duration.isContain(weekday: Weekday.allCases[currentDateIdx]) }
+      let weekdaysNotDone = weekdays.filter { !$0.duration.isContain(weekday: Weekday.allCases[currentDateIdx]) && !done.contains($0.id) }
       return monthsNotDone + weekdaysNotDone
     }
 
@@ -199,7 +199,7 @@ struct HomeRoutineCore: Reducer {
         return nil
       }
 
-      if !$0.duration.isContain(weekday: Weekday.allCases[currentDateIdx]) && !isDone {
+      if $0.duration.isWeekday && !$0.duration.isContain(weekday: Weekday.allCases[currentDateIdx]) && !isDone {
         return nil
       }
 

diff --git a/App/Moda/Sources/Root/Routine/Components/RoutineGroupView.swift b/App/Moda/Sources/Root/Routine/Components/RoutineGroupView.swift
@@ -15,7 +15,7 @@ struct RoutineGroupView: View {
 
   var body: some View {
     VStack(spacing: 0) {
-      HStack(spacing: 4) {
+      HStack(spacing: 8) {
         routine.emoji.image
           .resizable()
           .frame(size: 24)

diff --git a/App/ModaWidget/Info.plist b/App/ModaWidget/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.0.0</string>
+	<string>1.4.0.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>