diff --git a/App/Moda/Info.plist b/App/Moda/Info.plist index 851a574..118ae21 100644 --- a/App/Moda/Info.plist +++ b/App/Moda/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 1.4.0.0 + 1.4.0.1 GoogleServiceFileName $(ENV_GOOGLE_INFO_PLIST) ITSAppUsesNonExemptEncryption diff --git a/App/Moda/Sources/Root/Home/Components/Routine/HomeRoutineCore.swift b/App/Moda/Sources/Root/Home/Components/Routine/HomeRoutineCore.swift index 3909058..51228c1 100644 --- 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 index 0e31aaf..8f20c46 100644 --- 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 index 9163282..ac5f969 100644 --- a/App/ModaWidget/Info.plist +++ b/App/ModaWidget/Info.plist @@ -15,7 +15,7 @@ CFBundleShortVersionString 1.4.0 CFBundleVersion - 1.4.0.0 + 1.4.0.1 NSExtension NSExtensionPointIdentifier