🔀 :: (#423) Widget 다크모드 대응

team-xquare · Mar 13, 2023 · 261c59c · 261c59c
2 parents bb9dd7d + 300d10c
commit 261c59c
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 28 deletions.
diff --git a/Application/Widget/Sources/Meal/XquareMealWidget.swift b/Application/Widget/Sources/Meal/XquareMealWidget.swift
@@ -89,7 +89,7 @@ struct XquareMealWidgetEntryView: View {
 }
 
 struct SmallXquareMealWidgetView: View {
-
+    @Environment(\.colorScheme) var colorScheme
     let entry: XquareMealWidgetProvider.Entry
     var mealMenu: MealMenuEntity?
 
@@ -99,29 +99,48 @@ struct SmallXquareMealWidgetView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            Text(entry.mealTime.rawValue)
-                .sdText(type: .body4, textColor: .GrayScale.gray900)
-                .padding(.trailing, 10)
-                .padding(.top, 3)
-            Text(entry.date.toString(format: .fullDate))
-                .sdText(type: .caption, textColor: .GrayScale.gray600)
-                .padding(.bottom, 10)
-            if mealMenu?.menu ?? [] != [""] {
-                Text("\(mealMenu?.menu?.joined(separator: ", ") ?? "") (\(mealMenu?.kcal ?? ""))")
-                    .sdText(type: .caption, textColor: .GrayScale.gray900)
+        ZStack {
+            if colorScheme == .light {
+                Color.white.ignoresSafeArea()
             } else {
-                Text("등록된 정보가 없습니다.")
-                    .sdText(type: .caption, textColor: .GrayScale.gray900)
+                Color.GrayScale.gray900.ignoresSafeArea()
             }
-            Spacer()
+            VStack(alignment: .leading, spacing: 0) {
+                Text(entry.mealTime.rawValue)
+                    .sdText(
+                        type: .body4,
+                        textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                    )
+                    .padding(.trailing, 10)
+                    .padding(.top, 3)
+                Text(entry.date.toString(format: .fullDate))
+                    .sdText(
+                        type: .caption,
+                        textColor: colorScheme == .light ? .GrayScale.gray600 : .GrayScale.gray500
+                    )
+                    .padding(.bottom, 10)
+                if mealMenu?.menu ?? [] != [""] {
+                    Text("\(mealMenu?.menu?.joined(separator: ", ") ?? "") (\(mealMenu?.kcal ?? ""))")
+                        .sdText(
+                            type: .caption,
+                            textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                        )
+                } else {
+                    Text("등록된 정보가 없습니다.")
+                        .sdText(
+                            type: .caption,
+                            textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                        )
+                }
+                Spacer()
+            }
+            .padding(10)
         }
-        .padding(10)
     }
 }
 
 struct MediumXquareMealWidgetView: View {
-
+    @Environment(\.colorScheme) var colorScheme
     let entry: XquareMealWidgetProvider.Entry
     var mealMenu: MealMenuEntity?
 
@@ -136,23 +155,36 @@ struct MediumXquareMealWidgetView: View {
                 .frame(height: 10)
             HStack(spacing: 0) {
                 Text(entry.mealTime.rawValue)
-                    .sdText(type: .body4, textColor: .GrayScale.gray900)
+                    .sdText(
+                        type: .body4,
+                        textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                    )
                     .padding(.trailing, 10)
                 Text(entry.date.toString(format: .fullDate))
-                    .sdText(type: .caption, textColor: .GrayScale.gray600)
+                    .sdText(
+                        type: .caption,
+                        textColor: colorScheme == .light ? .GrayScale.gray600 : .GrayScale.gray500
+                    )
                 Spacer()
             }
             .padding(.bottom, 10)
             if mealMenu?.menu ?? [] != [""] {
                 Text("\(mealMenu?.menu?.joined(separator: ", ") ?? "") (\(mealMenu?.kcal ?? ""))")
-                    .sdText(type: .caption, textColor: .GrayScale.gray900)
+                    .sdText(
+                        type: .caption,
+                        textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                    )
             } else {
                 Text("등록된 정보가 없습니다.")
-                    .sdText(type: .caption, textColor: .GrayScale.gray900)
+                    .sdText(
+                        type: .caption,
+                        textColor: colorScheme == .light ? .GrayScale.gray900 : .GrayScale.gray100
+                    )
             }
             Spacer()
         }
         .padding(24)
+        .background(colorScheme == .light ? .white : .GrayScale.gray900)
     }
 }
 struct XquareMealWidget: Widget {

diff --git a/Application/Widget/Sources/Schedule/ScheduleWidgetCell.swift b/Application/Widget/Sources/Schedule/ScheduleWidgetCell.swift
@@ -3,17 +3,28 @@ import SwiftUI
 import SemicolonDesign
 
 struct ScheduleWidgetCell: View {
+    @Environment(\.colorScheme) var colorScheme
     let schedule: String
 
     var body: some View {
         HStack(spacing: 0) {
-            Color.Primary.purple400
-                .frame(width: 4, height: 27)
-                .cornerRadius(4)
-                .padding(.trailing, 2)
+            if colorScheme == .light {
+                Color.Primary.purple400
+                    .frame(width: 4, height: 27)
+                    .cornerRadius(4)
+                    .padding(.trailing, 2)
+            } else {
+                Color.Primary.purple900
+                    .frame(width: 4, height: 27)
+                    .cornerRadius(4)
+                    .padding(.trailing, 2)
+            }
             HStack {
                 Text(schedule)
-                    .sdText(type: .caption, textColor: .Primary.purple400)
+                    .sdText(
+                        type: .caption,
+                        textColor: colorScheme == .light ? .Primary.purple400 : .Primary.purple900
+                    )
                     .padding(.leading, 10)
                 Spacer()
             }

diff --git a/Application/Widget/Sources/Schedule/XquareScheduleWidget.swift b/Application/Widget/Sources/Schedule/XquareScheduleWidget.swift
@@ -53,14 +53,21 @@ struct ScheduleEntry: TimelineEntry {
 }
 
 struct XquareScheduleWidgetEntryView: View {
+    @Environment(\.colorScheme) var colorScheme
     var entry: XquareScheduleWidgetProvider.Entry
 
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             Text(entry.date.toString(format: "E요일"))
-                .sdText(type: .caption, textColor: .black)
+                .sdText(
+                    type: .caption,
+                    textColor: colorScheme == .light ? .black : .white
+                )
             Text(entry.date.toString(format: "dd일"))
-                .sdText(type: .heading4, textColor: .black)
+                .sdText(
+                    type: .heading4,
+                    textColor: colorScheme == .light ? .black : .white
+                )
                 .padding(.bottom, 5)
             if entry.schedule != [] {
                 ForEach(entry.schedule, id: \.id) { schedule in
@@ -79,6 +86,7 @@ struct XquareScheduleWidgetEntryView: View {
             Spacer()
         }
         .padding([.top, .leading], 16)
+        .background(colorScheme == .light ? .white : .GrayScale.gray900)
     }
 }