From e53cbd9ae032918086172bf3f592960518f15cf8 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 21 Mar 2024 21:17:21 +0900 Subject: [PATCH 01/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20SettingView=20?= =?UTF-8?q?=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=99=84=EC=A0=84=20?= =?UTF-8?q?=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/swiftpm/Package.resolved | 2 +- .../Sources/UIKit/SettingsUI/SettingList.swift | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 73057177..5ee15329 100644 --- a/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "7f5095b25e2d0a629176f0ebc41ee16d8e7d8c6c0e326ede18f4df4abbe75d63", + "originHash" : "a70bf5bcda18b73a91398005590ea6f3e124d517cc68deffb3c56506da7c3f07", "pins" : [ { "identity" : "abseil-cpp-binary", diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index f4635dad..0297c875 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -27,13 +27,13 @@ public struct SettingList: View { Spacer() Toggle("", isOn: $store.isCustomAlarmOn) .labelsHidden() - .tint(Color.accentColor) + .tint(ColorSet.primary) } } header: { headerView("공지 구독") } - .tint(.black) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) Section { HStack(spacing: 0) { @@ -89,8 +89,8 @@ public struct SettingList: View { .font(.footnote) .foregroundStyle(ColorSet.caption1) } - .tint(.black) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) Section { Button { @@ -134,6 +134,7 @@ public struct SettingList: View { headerView("쿠링 실험실") } .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) Section { Button { @@ -141,12 +142,11 @@ public struct SettingList: View { } label: { itemView("icon_instagram", "인스타그램") } - } header: { headerView("SNS") } - .tint(.black) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) Section { Button { @@ -157,10 +157,11 @@ public struct SettingList: View { } header: { headerView("피드백") } - .tint(.black) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) } .listStyle(.plain) + .background(ColorSet.bg) .navigationTitle("더보기") .navigationBarTitleDisplayMode(.inline) } From c5290aceaf672da7636e4baab64f8391ac9eed25 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 21 Mar 2024 21:33:09 +0900 Subject: [PATCH 02/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=8B=A4=ED=97=98?= =?UTF-8?q?=EC=8B=A4=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/Labs/ExperimentList.swift | 5 +++++ package-kuring/Sources/Labs/Experiments/AppIconDetail.swift | 3 ++- .../Sources/UIKit/SettingsUI/AppIconSelector.swift | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/package-kuring/Sources/Labs/ExperimentList.swift b/package-kuring/Sources/Labs/ExperimentList.swift index 8658ba8f..2db94286 100644 --- a/package-kuring/Sources/Labs/ExperimentList.swift +++ b/package-kuring/Sources/Labs/ExperimentList.swift @@ -3,6 +3,7 @@ // See the 'License.txt' file for licensing information. // +import ColorSet import ComposableArchitecture @Reducer @@ -39,6 +40,7 @@ public struct ExperimentList: View { } .padding(.vertical, 9) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) NavigationLink( state: LabAppFeature.Path.State.appIcon( @@ -49,8 +51,11 @@ public struct ExperimentList: View { } .padding(.vertical, 9) .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) } .listStyle(.plain) + .background(ColorSet.bg) + } public init(store: StoreOf) { diff --git a/package-kuring/Sources/Labs/Experiments/AppIconDetail.swift b/package-kuring/Sources/Labs/Experiments/AppIconDetail.swift index 6a28b077..2d2c2428 100644 --- a/package-kuring/Sources/Labs/Experiments/AppIconDetail.swift +++ b/package-kuring/Sources/Labs/Experiments/AppIconDetail.swift @@ -3,6 +3,7 @@ // See the 'License.txt' file for licensing information. // +import ColorSet import ComposableArchitecture @Reducer @@ -61,7 +62,7 @@ public struct AppIconDetailView: View { Text(store.description) Toggle("기능 활성화", isOn: $store.isEnabled) - .tint(Color.accentColor) + .tint(ColorSet.primary) } } .navigationTitle(store.title) diff --git a/package-kuring/Sources/UIKit/SettingsUI/AppIconSelector.swift b/package-kuring/Sources/UIKit/SettingsUI/AppIconSelector.swift index aa157a7a..4c98472b 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/AppIconSelector.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/AppIconSelector.swift @@ -4,6 +4,7 @@ // import SwiftUI +import ColorSet import SettingsFeatures import ComposableArchitecture @@ -26,7 +27,7 @@ public struct AppIconSelector: View { store.send(.appIconSelected(icon)) } label: { Text(icon.korValue) - .foregroundStyle(.black) + .foregroundStyle(ColorSet.body) } if icon == store.state.selectedIcon { @@ -38,7 +39,9 @@ public struct AppIconSelector: View { } } .listRowSeparator(.hidden) + .listRowBackground(ColorSet.bg) } + .background(ColorSet.bg) .listStyle(.plain) .toolbar { ToolbarItem(placement: .topBarTrailing) { From 4beee614f265098a1072afd0e22c245ef76c0ef6 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 21 Mar 2024 21:58:24 +0900 Subject: [PATCH 03/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=EA=B5=AC=EB=8F=85=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=8B=A4?= =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubscriptionUI/SubscriptionSegment.swift | 11 +++++---- .../SubscriptionUI/SubscriptionView.swift | 23 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionSegment.swift b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionSegment.swift index 7502b4a5..34a880e9 100644 --- a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionSegment.swift +++ b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionSegment.swift @@ -4,24 +4,25 @@ // import SwiftUI +import ColorSet struct SubscriptionSegment: View { let title: String let isSelected: Bool - + var body: some View { VStack { Text(title) .font(.system(size: 16, weight: .bold)) .foregroundStyle( isSelected - ? Color.accentColor - : Color.black.opacity(0.3) + ? ColorSet.primary + : ColorSet.caption1.opacity(0.3) ) - + Rectangle() .foregroundStyle( - Color.accentColor + ColorSet.primary .opacity(isSelected ? 1 : 0) ) .frame(height: 1.5) diff --git a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift index d86704af..46170b2f 100644 --- a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift +++ b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift @@ -5,6 +5,7 @@ import Models import SwiftUI +import ColorSet import DepartmentFeatures import SubscriptionFeatures import ComposableArchitecture @@ -17,7 +18,7 @@ struct SubscriptionView: View { HStack { Text("알림 받고 싶은 \n카테고리를 선택해주세요") .font(.system(size: 24, weight: .bold)) - .foregroundStyle(Color(red: 0.1, green: 0.12, blue: 0.15)) + .foregroundStyle(ColorSet.title) } .padding(.top, 32) .padding(.bottom, 60) @@ -59,13 +60,13 @@ struct SubscriptionView: View { RoundedRectangle(cornerRadius: 8) .inset(by: 1) .stroke( - isSelected ? Color.accentColor : Color.clear, + isSelected ? ColorSet.primary : Color.clear, lineWidth: isSelected ? 2 : 0 ) .fill( isSelected - ? Color.accentColor.opacity(0.1) - : Color.black.opacity(0.03) + ? ColorSet.primary.opacity(0.1) + : ColorSet.gray100 ) VStack { @@ -75,8 +76,8 @@ struct SubscriptionView: View { .font(.system(size: 16, weight: .semibold)) .foregroundStyle( isSelected - ? Color.accentColor - : Color(red: 0.32, green: 0.32, blue: 0.32) + ? ColorSet.primary + : ColorSet.body ) } .padding() @@ -101,7 +102,7 @@ struct SubscriptionView: View { Text("아직 추가된 학과가 없어요.\n관심 학과를 추가하고 공지를 확인해 보세요!") .font(.system(size: 16, weight: .medium)) .multilineTextAlignment(.center) - .foregroundStyle(Color(red: 0.68, green: 0.69, blue: 0.71)) + .foregroundStyle(ColorSet.caption2) Spacer() } @@ -172,11 +173,15 @@ struct SubscriptionView: View { .padding(.horizontal, 50) .padding(.vertical, 16) .frame(height: 50, alignment: .center) - .background(Color.accentColor) + .background(ColorSet.primary) .cornerRadius(100) .background { LinearGradient( - gradient: Gradient(colors: [.white.opacity(0.1), .white]), + gradient: Gradient(colors: [ + ColorSet.bg.opacity(0.1), + ColorSet.bg.opacity(0.1), + ColorSet.primary.opacity(0.1) + ]), startPoint: .top, endPoint: .bottom ) .offset(x: 0, y: -32) From 626a1ecb33c669963079715263f7e647c82fc095 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 21 Mar 2024 22:12:15 +0900 Subject: [PATCH 04/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/SearchUI/SearchView.swift | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/package-kuring/Sources/UIKit/SearchUI/SearchView.swift b/package-kuring/Sources/UIKit/SearchUI/SearchView.swift index f0f8f14e..95988b26 100644 --- a/package-kuring/Sources/UIKit/SearchUI/SearchView.swift +++ b/package-kuring/Sources/UIKit/SearchUI/SearchView.swift @@ -50,14 +50,14 @@ public struct SearchView: View { } label: { Image(systemName: "xmark") .frame(width: 16, height: 16) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.gray400) } } } } .padding(.horizontal, 16) .padding(.vertical, 7) - .background(Color(red: 0.95, green: 0.95, blue: 0.96)) + .background(ColorSet.gray100) .cornerRadius(20) } @@ -66,7 +66,7 @@ public struct SearchView: View { /// 최근 검색어 Text("최근검색어") .font(.system(size: 14, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) Spacer() @@ -76,8 +76,7 @@ public struct SearchView: View { } label: { Text("전체삭제") .font(.system(size: 12)) - .foregroundStyle(Color.caption1) - .foregroundColor(Color(red: 0.56, green: 0.56, blue: 0.56)) + .foregroundStyle(ColorSet.caption1) } } .padding(.top, 20) @@ -93,10 +92,10 @@ public struct SearchView: View { } label: { Text(recent) .font(.system(size: 14)) - .foregroundStyle(Color.accentColor) + .foregroundStyle(ColorSet.primary) .padding(.horizontal, 12) .padding(.vertical, 4) - .background(Color.accentColor.opacity(0.1)) + .background(ColorSet.primary.opacity(0.1)) .cornerRadius(20) } } @@ -109,7 +108,7 @@ public struct SearchView: View { HStack { Text("검색결과") .font(.system(size: 14, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) .padding(.top, 20) .padding(.bottom, 12) @@ -121,7 +120,7 @@ public struct SearchView: View { .foregroundColor(.clear) .frame(height: 50) .padding(.horizontal, 20) - .background(Color(red: 0.95, green: 0.95, blue: 0.96)) + .background(ColorSet.gray100) .cornerRadius(10) .overlay { HStack { @@ -182,6 +181,7 @@ public struct SearchView: View { } } .padding(.horizontal, 20) + .background(ColorSet.bg) .bind($store.focus, to: $focus) .sheet( item: $store.scope( @@ -194,10 +194,9 @@ public struct SearchView: View { } } - @ViewBuilder private func SegmentView(_ title: String, isSelect: Bool) -> some View { RoundedRectangle(cornerRadius: 10) - .foregroundColor(isSelect ? .white : .clear) + .foregroundStyle(isSelect ? ColorSet.bg : .clear) .shadow( color: .black.opacity(isSelect ? 0.1 : 0), radius: 6, x: 0, y: 0 @@ -207,13 +206,12 @@ public struct SearchView: View { .font(.system(size: 16, weight: isSelect ? .bold : .medium)) .foregroundStyle( isSelect - ? Color.accentColor - : Color.caption1.opacity(0.6) + ? ColorSet.primary + : ColorSet.caption1 ) } } - @ViewBuilder private var beforePhaseView: some View { VStack { Group { From 0a4a7d7930296850c7bd4f8af1dfad9ed5e4b92a Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 21 Mar 2024 22:56:04 +0900 Subject: [PATCH 05/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=98=A8=EB=B3=B4?= =?UTF-8?q?=EB=94=A9=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepartmentUI/DepartmentSelector.swift | 1 + .../MyDepartmentSelector/CompletionView.swift | 41 +++++++++++-------- .../ConfirmationView.swift | 13 ++++-- .../DepartmentSelector.swift | 10 +++-- .../MyDepartmentSelector.swift | 3 +- .../OnboardingView/OnboardingView.swift | 12 ++++-- 6 files changed, 50 insertions(+), 30 deletions(-) diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift index 466585e5..709cebfd 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift @@ -5,6 +5,7 @@ import Models import SwiftUI +import ColorSet import DepartmentFeatures import ComposableArchitecture diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/CompletionView.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/CompletionView.swift index 32229512..37635359 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/CompletionView.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/CompletionView.swift @@ -9,28 +9,33 @@ import ColorSet struct CompletionView: View { var body: some View { - VStack(spacing: 12) { - Text(StringSet.title_complete.rawValue) - .font(.system(size: 24, weight: .bold)) - .foregroundStyle(.primary) - - Text(StringSet.description_complete.rawValue) - .font(.system(size: 15, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) - .multilineTextAlignment(.center) - + HStack { Spacer() - - LottieView(animation: .named("success.json", bundle: Bundle.onboarding)) - .playing() - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: 150, height: 150) - .clipped() - + VStack(spacing: 12) { + Text(StringSet.title_complete.rawValue) + .font(.system(size: 24, weight: .bold)) + .foregroundStyle(ColorSet.primary) + + Text(StringSet.description_complete.rawValue) + .font(.system(size: 15, weight: .medium)) + .foregroundStyle(ColorSet.caption1) + .multilineTextAlignment(.center) + + Spacer() + + LottieView(animation: .named("success.json", bundle: Bundle.onboarding)) + .playing() + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: 150, height: 150) + .clipped() + + Spacer() + } Spacer() } .padding(.top, 124) + .background(ColorSet.bg) } } diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/ConfirmationView.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/ConfirmationView.swift index ffff1dfe..ed4dd345 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/ConfirmationView.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/ConfirmationView.swift @@ -13,9 +13,11 @@ struct ConfirmationView: View { var body: some View { VStack { HStack(spacing: 0) { + Spacer() + Text(department.korName) .font(.system(size: 24, weight: .bold)) - .foregroundStyle(Color.accentColor) + .foregroundStyle(ColorSet.primary) Text( department.korName.last == "공" @@ -23,22 +25,25 @@ struct ConfirmationView: View { : "를" ) .font(.system(size: 24, weight: .bold)) - .foregroundStyle(.primary) + .foregroundStyle(ColorSet.primary) + + Spacer() } Text(StringSet.title_confirm.rawValue) .font(.system(size: 24, weight: .bold)) - .foregroundStyle(.primary) + .foregroundStyle(ColorSet.primary) Text(StringSet.description_confirm.rawValue) .font(.system(size: 15, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) .multilineTextAlignment(.center) .padding(.top, 12) Spacer() } .padding(.top, 124) + .background(ColorSet.bg) } } diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift index d1b45e47..4343a790 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift @@ -46,7 +46,8 @@ class DepartmentFinder { correctResults.append(department) } } - results = correctResults +// results = correctResults + results = [.emptyDepartment, .emptyDepartment] } } @@ -61,11 +62,11 @@ struct DepartmentSelector: View { VStack(alignment: .leading, spacing: 16) { Text(StringSet.title_select.rawValue) .font(.system(size: 24, weight: .bold)) - .foregroundStyle(.primary) + .foregroundStyle(ColorSet.title) Text(StringSet.description_select.rawValue) .font(.system(size: 15, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) HStack(alignment: .center, spacing: 12) { Image(systemName: "magnifyingglass") @@ -88,7 +89,7 @@ struct DepartmentSelector: View { } .padding(.horizontal, 16) .padding(.vertical, 7) - .background(Color(red: 0.95, green: 0.95, blue: 0.96)) + .background(ColorSet.gray100) .cornerRadius(20) .padding(.bottom, 16) @@ -105,5 +106,6 @@ struct DepartmentSelector: View { Spacer() } + .background(ColorSet.bg) } } diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/MyDepartmentSelector.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/MyDepartmentSelector.swift index c967f5ae..a3efd6e5 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/MyDepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/MyDepartmentSelector.swift @@ -44,7 +44,7 @@ struct MyDepartmentSelector: View { selectedDepartment = nil } .font(.system(size: 16, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) .padding(.vertical, 20) } else { Button(StringSet.button_start.rawValue) { @@ -54,6 +54,7 @@ struct MyDepartmentSelector: View { } } .padding(.horizontal, 20) + .background(ColorSet.bg) .onChange(of: selectedDepartment) { _, _ in guard selectedDepartment != nil else { return } currentStep = .selectDepartment.id diff --git a/package-kuring/Sources/UIKit/OnboardingUI/OnboardingView/OnboardingView.swift b/package-kuring/Sources/UIKit/OnboardingUI/OnboardingView/OnboardingView.swift index 8d9b013b..e85e358d 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/OnboardingView/OnboardingView.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/OnboardingView/OnboardingView.swift @@ -4,6 +4,7 @@ // import SwiftUI +import ColorSet public struct OnboardingView: View { @Environment(\.dismiss) private var dismiss @@ -13,6 +14,7 @@ public struct OnboardingView: View { public var body: some View { if showsDepartmentSelector { MyDepartmentSelector() + .background(ColorSet.bg) } else { VStack(spacing: 0) { HStack { @@ -37,7 +39,7 @@ public struct OnboardingView: View { .frame(width: 8, height: 8) .foregroundStyle( currentGuidance == guidance - ? Color.accentColor + ? ColorSet.primary : Color(.systemGroupedBackground) ) } @@ -56,14 +58,18 @@ public struct OnboardingView: View { dismiss() } .font(.system(size: 16, weight: .medium)) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) .padding(.vertical, 20) } .padding(.horizontal, 20) + .background(ColorSet.bg) } } - public init() { } + public init() { + UIPageControl.appearance().currentPageIndicatorTintColor = UIColor(ColorSet.primary) + UIPageControl.appearance().pageIndicatorTintColor = UIColor(ColorSet.gray200) + } } #Preview { From f0ef914389de7697848efde772abb7a77b5073e0 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 00:07:30 +0900 Subject: [PATCH 06/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EA=B3=B5=EC=A7=80?= =?UTF-8?q?=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIKit/DepartmentUI/DepartmentEditor.swift | 5 ++- .../Sources/UIKit/NoticeUI/NoticeList.swift | 35 +++++++++---------- .../DepartmentSelector.swift | 3 +- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentEditor.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentEditor.swift index eafa5a15..459571aa 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentEditor.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentEditor.swift @@ -31,7 +31,6 @@ public struct DepartmentEditor: View { .focused($focus, equals: .search) .autocorrectionDisabled() .bind($store.focus, to: self.$focus) - .background(ColorSet.gray300) if !store.searchText.isEmpty { Image(systemName: "xmark") @@ -45,7 +44,7 @@ public struct DepartmentEditor: View { } .padding(.horizontal, 16) .padding(.vertical, 7) - .background(Color(red: 0.95, green: 0.95, blue: 0.96)) + .background(ColorSet.gray100) .cornerRadius(20) .padding(.bottom, 16) @@ -94,7 +93,7 @@ public struct DepartmentEditor: View { Button("전체 삭제") { store.send(.deleteAllMyDepartmentButtonTapped) } - .tint(.accentColor) + .tint(ColorSet.primary) .disabled(store.myDepartments.isEmpty) } } diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift index c226611f..f57edfcd 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift @@ -10,10 +10,19 @@ import ComposableArchitecture struct NoticeList: View { @Bindable var store: StoreOf - + var body: some View { ScrollView { - LazyVStack(spacing: 0) { + VStack(spacing: 0) { + if self.store.provider.category == .학과 { + DepartmentSelectorLink( + department: self.store.provider, + isLoading: $store.isLoading.sending(\.loadingChanged) + ) { + self.store.send(.changeDepartmentButtonTapped) + } + } + ForEach(self.store.currentNotices, id: \.id) { notice in ZStack { NavigationLink( @@ -29,7 +38,7 @@ struct NoticeList: View { .opacity(0) Section { - LazyVStack(spacing: 0) { + VStack(spacing: 0) { NoticeRow( notice: notice, bookmarked: self.store.bookmarkIDs.contains(notice.id) @@ -48,10 +57,11 @@ struct NoticeList: View { Button { self.store.send(.bookmarkTapped(notice)) } label: { - Image(systemName: self.store.bookmarkIDs.contains(notice.id) - ? "bookmark.slash" - : "bookmark" - ) + Image( + systemName: self.store.bookmarkIDs.contains(notice.id) + ? "bookmark.slash" + : "bookmark" + ) } .tint(Color.accentColor) } @@ -60,17 +70,6 @@ struct NoticeList: View { .frame(height: 1) } - } header: { - if self.store.provider.category == .학과 { - DepartmentSelectorLink( - department: self.store.provider, - isLoading: $store.isLoading.sending(\.loadingChanged) - ) { - self.store.send(.changeDepartmentButtonTapped) - } - } else { - EmptyView() - } } .navigationTitle("") diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift index 4343a790..16970b3c 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift @@ -46,8 +46,7 @@ class DepartmentFinder { correctResults.append(department) } } -// results = correctResults - results = [.emptyDepartment, .emptyDepartment] + results = correctResults } } From 5beae15c6b1200bb1915b611653d2c4e06bfd05a Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 00:26:34 +0900 Subject: [PATCH 07/11] =?UTF-8?q?[=EC=B6=94=EA=B0=80]=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=98=81=EC=97=AD=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIKit/SearchUI/SearchDetailView.swift | 1 + .../Sources/UIKit/SearchUI/SearchView.swift | 30 ++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/package-kuring/Sources/UIKit/SearchUI/SearchDetailView.swift b/package-kuring/Sources/UIKit/SearchUI/SearchDetailView.swift index 13011db2..6017b7d3 100644 --- a/package-kuring/Sources/UIKit/SearchUI/SearchDetailView.swift +++ b/package-kuring/Sources/UIKit/SearchUI/SearchDetailView.swift @@ -16,6 +16,7 @@ public struct StaffDetailView: View { Text(store.staff.name) .font(.system(size: 20, weight: .bold)) .listRowSeparator(.hidden) + .padding(.top, 22) Text("\(store.staff.deptName) · \(store.staff.collegeName)") .foregroundStyle(.secondary) diff --git a/package-kuring/Sources/UIKit/SearchUI/SearchView.swift b/package-kuring/Sources/UIKit/SearchUI/SearchView.swift index 95988b26..b6954763 100644 --- a/package-kuring/Sources/UIKit/SearchUI/SearchView.swift +++ b/package-kuring/Sources/UIKit/SearchUI/SearchView.swift @@ -144,23 +144,33 @@ public struct SearchView: View { case .notice: if let notices = store.resultNotices, !notices.isEmpty { List(notices, id: \.self) { notice in - NavigationLink( - state: NoticeAppFeature.Path.State.detail( - NoticeDetailFeature.State(notice: notice) - ) - ) { + ZStack { + NavigationLink( + state: NoticeAppFeature.Path.State.detail( + NoticeDetailFeature.State(notice: notice) + ) + ) { + EmptyView() + } + .opacity(0) + VStack(alignment: .leading) { Text(notice.subject) - + HStack { Text(notice.postedDate) - + Spacer() } } } + .padding(.horizontal, 12) + .padding(.vertical, 22) + .listRowInsets(EdgeInsets()) + .background(ColorSet.bg) } .listStyle(.plain) + .listRowBackground(ColorSet.bg) } else { beforePhaseView } @@ -171,10 +181,15 @@ public struct SearchView: View { store.send(.staffRowSelected(staff)) } label: { StaffRow(staff: staff) + .padding(.horizontal, 12) + .padding(.vertical, 22) } .buttonStyle(.plain) + .listRowInsets(EdgeInsets()) + .background(ColorSet.bg) } .listStyle(.plain) + .listRowBackground(ColorSet.bg) } else { beforePhaseView } @@ -227,6 +242,7 @@ public struct SearchView: View { public init(store: StoreOf) { self.store = store +// UITableView } } From 1383057028787a22be437477af628cf11d0de708 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 00:36:32 +0900 Subject: [PATCH 08/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=95=B1=20?= =?UTF-8?q?=EC=A0=84=EC=97=AD=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=8B=A4?= =?UTF-8?q?=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=A0=84=EB=B6=80=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Labs/Experiments/BetaADetail.swift | 3 ++- .../UIKit/BookmarkUI/BookmarkList.swift | 21 ++++++++++++------- .../UIKit/DepartmentUI/DepartmentRow.swift | 2 +- .../DepartmentUI/DepartmentSelector.swift | 21 ++++++++++++------- .../NoticeUI/DepartmentSelectorLink.swift | 3 ++- .../Sources/UIKit/NoticeUI/NoticeList.swift | 3 ++- .../Sources/UIKit/NoticeUI/NoticeRow.swift | 6 +----- .../Common/KuringButtonStyle.swift | 7 ++++--- .../DepartmentSelector.swift | 2 +- .../UIKit/SettingsUI/FeedbackView.swift | 6 +++--- .../UIKit/SettingsUI/OpenSourceList.swift | 2 +- .../SubscriptionUI/SubscriptionView.swift | 2 +- 12 files changed, 46 insertions(+), 32 deletions(-) diff --git a/package-kuring/Sources/Labs/Experiments/BetaADetail.swift b/package-kuring/Sources/Labs/Experiments/BetaADetail.swift index 54bb6bfe..01ac4771 100644 --- a/package-kuring/Sources/Labs/Experiments/BetaADetail.swift +++ b/package-kuring/Sources/Labs/Experiments/BetaADetail.swift @@ -3,6 +3,7 @@ // See the 'License.txt' file for licensing information. // +import ColorSet import ComposableArchitecture @Reducer @@ -60,7 +61,7 @@ public struct BetaADetailView: View { Text(store.description) Toggle("기능 활성화", isOn: $store.isEnabled) - .tint(Color.accentColor) + .tint(ColorSet.primary) } } .navigationTitle(store.title) diff --git a/package-kuring/Sources/UIKit/BookmarkUI/BookmarkList.swift b/package-kuring/Sources/UIKit/BookmarkUI/BookmarkList.swift index b281e714..f000a746 100644 --- a/package-kuring/Sources/UIKit/BookmarkUI/BookmarkList.swift +++ b/package-kuring/Sources/UIKit/BookmarkUI/BookmarkList.swift @@ -80,11 +80,11 @@ public struct BookmarkList: View { topBlurButton( "삭제하기", fontColor: store.selectedIDs.isEmpty - ? Color.accentColor.opacity(0.4) - : .white, + ? ColorSet.primary.opacity(0.4) + : .white, backgroundColor: store.selectedIDs.isEmpty - ? Color.accentColor.opacity(0.15) - : Color.accentColor + ? ColorSet.primary.opacity(0.15) + : ColorSet.primary ) } .padding(.horizontal, 20) @@ -122,7 +122,7 @@ public struct BookmarkList: View { ) } .disabled(store.bookmarkedNotices.isEmpty) - .foregroundStyle(Color.accentColor) + .foregroundStyle(ColorSet.primary) } } } @@ -143,8 +143,15 @@ public struct BookmarkList: View { .background(backgroundColor) .cornerRadius(100) .background { - LinearGradient(gradient: Gradient(colors: [.white.opacity(0.1), .white]), startPoint: .top, endPoint: .bottom) - .offset(x: 0, y: -32) + LinearGradient( + gradient: Gradient(colors: [ + ColorSet.bg.opacity(0.1), + ColorSet.bg.opacity(0.1), + ColorSet.primary.opacity(0.1) + ]), + startPoint: .top, endPoint: .bottom + ) + .offset(x: 0, y: -32) } } } diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentRow.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentRow.swift index f44b63cf..809b631a 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentRow.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentRow.swift @@ -28,7 +28,7 @@ public struct DepartmentRow: View { case .delete: Button(action: action) { Text("삭제") - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1) } case let .radio(isSelected): Button(action: action) { diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift index 709cebfd..79b2552e 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift @@ -17,7 +17,7 @@ public struct DepartmentSelector: View { HStack(alignment: .center, spacing: 10) { Text("대표 학과 선택") .font(.system(size: 18, weight: .bold)) - .foregroundStyle(Color.black) + .foregroundStyle(ColorSet.title) } .padding(.horizontal, 20) .padding(.top, 24) @@ -40,8 +40,8 @@ public struct DepartmentSelector: View { ) .foregroundStyle( department == store.currentDepartment - ? Color.accentColor - : Color.black.opacity(0.1) + ? ColorSet.primary + : ColorSet.gray200 ) .frame(width: 20, height: 20) } @@ -59,8 +59,8 @@ public struct DepartmentSelector: View { } label: { topBlurButton( "내 학과 편집하기", - fontColor: Color.accentColor, - backgroundColor: Color.accentColor.opacity(0.15) + fontColor: ColorSet.body, + backgroundColor: ColorSet.primary ) } .padding(.horizontal, 20) @@ -83,8 +83,15 @@ public struct DepartmentSelector: View { .background(backgroundColor) .cornerRadius(100) .background { - LinearGradient(gradient: Gradient(colors: [.white.opacity(0.1), .white]), startPoint: .top, endPoint: .bottom) - .offset(x: 0, y: -32) + LinearGradient( + gradient: Gradient(colors: [ + ColorSet.bg.opacity(0.1), + ColorSet.bg.opacity(0.1), + ColorSet.primary.opacity(0.1) + ]), + startPoint: .top, endPoint: .bottom + ) + .offset(x: 0, y: -32) } } diff --git a/package-kuring/Sources/UIKit/NoticeUI/DepartmentSelectorLink.swift b/package-kuring/Sources/UIKit/NoticeUI/DepartmentSelectorLink.swift index 6ed8da0a..56fb8283 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/DepartmentSelectorLink.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/DepartmentSelectorLink.swift @@ -5,6 +5,7 @@ import Models import SwiftUI +import ColorSet struct DepartmentSelectorLink: View { let department: NoticeProvider @@ -15,7 +16,7 @@ struct DepartmentSelectorLink: View { HStack { Text(department.korName) .font(.system(size: 18, weight: .semibold)) - .foregroundStyle(Color.black.opacity(0.8)) + .foregroundStyle(ColorSet.title) Spacer() diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift index f57edfcd..28ecb9b5 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeList.swift @@ -4,6 +4,7 @@ // import SwiftUI +import ColorSet import DepartmentUI import NoticeFeatures import ComposableArchitecture @@ -63,7 +64,7 @@ struct NoticeList: View { : "bookmark" ) } - .tint(Color.accentColor) + .tint(ColorSet.primary) } Divider() diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index 55022f00..dd4dfa19 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -110,7 +110,6 @@ public struct NoticeRow: View { } } - @ViewBuilder private var importantTagView: some View { Text("중요") .font(.system(size: 12, weight: .semibold)) @@ -126,14 +125,12 @@ public struct NoticeRow: View { ) } - @ViewBuilder private var titleView: some View { Text(notice.subject) .font(.system(size: 15, weight: .medium)) .foregroundStyle(ColorSet.body) } - @ViewBuilder private var dateView: some View { // TODO: - 정보 재구성 Text(notice.postedDate) @@ -141,12 +138,11 @@ public struct NoticeRow: View { .foregroundStyle(ColorSet.caption1) } - @ViewBuilder private var bookmarkView: some View { ZStack { RoundedRectangle(cornerRadius: 2) .compositingGroup() - .foregroundStyle(Color.accentColor) + .foregroundStyle(ColorSet.primary) .frame(width: 16, height: 21) RoundedRectangle(cornerRadius: 2) diff --git a/package-kuring/Sources/UIKit/OnboardingUI/Common/KuringButtonStyle.swift b/package-kuring/Sources/UIKit/OnboardingUI/Common/KuringButtonStyle.swift index 100d2a1c..565f7372 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/Common/KuringButtonStyle.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/Common/KuringButtonStyle.swift @@ -4,6 +4,7 @@ // import SwiftUI +import ColorSet // TODO: 디자인 시스템으로 이동 struct KuringButtonStyle: ButtonStyle { @@ -18,7 +19,7 @@ struct KuringButtonStyle: ButtonStyle { .foregroundStyle( onEnabled ? .white - : Color.accentColor.opacity(0.4) + : ColorSet.primary.opacity(0.4) ) Spacer() @@ -28,8 +29,8 @@ struct KuringButtonStyle: ButtonStyle { .frame(height: 50, alignment: .center) .background( onEnabled - ? Color.accentColor - : Color.accentColor.opacity(0.15) + ? ColorSet.primary + : ColorSet.primary.opacity(0.15) ) .cornerRadius(100) } diff --git a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift index 16970b3c..ffaf54d8 100644 --- a/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/OnboardingUI/MyDepartmentSelector/DepartmentSelector.swift @@ -79,7 +79,7 @@ struct DepartmentSelector: View { if !finder.text.isEmpty { Image(systemName: "xmark") .frame(width: 16, height: 16) - .foregroundStyle(Color.caption1.opacity(0.6)) + .foregroundStyle(ColorSet.caption1.opacity(0.6)) .onTapGesture { finder.text = "" focus = false diff --git a/package-kuring/Sources/UIKit/SettingsUI/FeedbackView.swift b/package-kuring/Sources/UIKit/SettingsUI/FeedbackView.swift index 594a7e2c..b6918cfd 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/FeedbackView.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/FeedbackView.swift @@ -75,10 +75,10 @@ public struct FeedbackView: View { "피드백 보내기", fontColor: store.isSendable ? .white - : Color.accentColor.opacity(0.4), + : ColorSet.primary.opacity(0.4), backgroundColor: store.isSendable - ? Color.accentColor - : Color.accentColor.opacity(0.15) + ? ColorSet.primary + : ColorSet.primary.opacity(0.15) ) } .allowsHitTesting(store.isSendable) diff --git a/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift b/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift index 218045ac..b366bfcd 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift @@ -37,7 +37,7 @@ public struct OpenSourceList: View { .frame(maxWidth: .infinity) } .buttonStyle(.bordered) - .tint(Color.accentColor) + .tint(ColorSet.primary) Text(opensource.license) .font(.footnote) diff --git a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift index 46170b2f..ff794a6e 100644 --- a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift +++ b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift @@ -125,7 +125,7 @@ struct SubscriptionView: View { Spacer() Image(systemName: isSelected ? "checkmark.circle.fill" : "circle") - .foregroundStyle(isSelected ? Color.accentColor : Color.black.opacity(0.1)) + .foregroundStyle(isSelected ? ColorSet.primary : Color.black.opacity(0.1)) .frame(width: 20, height: 20) } .padding(.horizontal, 21.5) From cbc20f7fd4ff405575b055fa5ed993083293d50f Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 00:44:09 +0900 Subject: [PATCH 09/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EB=8B=A4=ED=81=AC?= =?UTF-8?q?=EB=AA=A8=EB=93=9C=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/DepartmentUI/DepartmentSelector.swift | 2 +- package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift index 79b2552e..e0e8bcc0 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift @@ -47,7 +47,7 @@ public struct DepartmentSelector: View { } .padding(.horizontal, 20) .padding(.vertical, 12) - .background(.white) + .background(ColorSet.bg) .onTapGesture { store.send(.selectDepartment(id: department.id)) } diff --git a/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift b/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift index b366bfcd..08a81965 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/OpenSourceList.swift @@ -4,6 +4,7 @@ // import SwiftUI +import ColorSet import SettingsFeatures import ComposableArchitecture From cf9e9fc8e14b2c569feaed5926283de37dffb84a Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 00:55:24 +0900 Subject: [PATCH 10/11] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=BB=AC=EB=9F=AC?= =?UTF-8?q?=20=EC=83=89=EC=83=81=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/DepartmentUI/DepartmentSelector.swift | 2 +- .../Sources/UIKit/SubscriptionUI/SubscriptionView.swift | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift index e0e8bcc0..3a49428d 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift @@ -29,7 +29,7 @@ public struct DepartmentSelector: View { HStack { Text(department.korName) .font(.system(size: 16, weight: .medium)) - .foregroundStyle(.black) + .foregroundStyle(ColorSet.body) Spacer() diff --git a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift index ff794a6e..b4d9905c 100644 --- a/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift +++ b/package-kuring/Sources/UIKit/SubscriptionUI/SubscriptionView.swift @@ -120,7 +120,7 @@ struct SubscriptionView: View { HStack { Text(department.korName) .font(.system(size: 16, weight: .semibold)) - .foregroundStyle(.black) + .foregroundStyle(ColorSet.body) Spacer() @@ -190,6 +190,7 @@ struct SubscriptionView: View { } } .padding(.horizontal, 20) + .background(ColorSet.bg) // TODO: TCA에 따라 외부에서 구현 .navigationTitle("푸시 알림 설정") .navigationBarTitleDisplayMode(.inline) From 11f84ccf2f99d43a670283ed6c5b5644f392d54c Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Fri, 22 Mar 2024 01:04:45 +0900 Subject: [PATCH 11/11] =?UTF-8?q?[=EC=82=AD=EC=A0=9C]=20=EA=B0=9C=EB=B0=9C?= =?UTF-8?q?=EC=9A=A9=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/DepartmentUI/DepartmentSelector.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift index 3a49428d..132d3da0 100644 --- a/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift +++ b/package-kuring/Sources/UIKit/DepartmentUI/DepartmentSelector.swift @@ -47,7 +47,6 @@ public struct DepartmentSelector: View { } .padding(.horizontal, 20) .padding(.vertical, 12) - .background(ColorSet.bg) .onTapGesture { store.send(.selectDepartment(id: department.id)) }