From 5fa99fa15495d6182b9a21a4688ef969525b955e Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 00:23:29 +0900 Subject: [PATCH 01/22] =?UTF-8?q?#231=20=EC=BD=94=EB=94=A9=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/NoticeUI/NoticeDetailView.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeDetailView.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeDetailView.swift index 083284e..41de2a5 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeDetailView.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeDetailView.swift @@ -32,9 +32,11 @@ public struct NoticeDetailView: View { Button { self.store.send(.bookmarkButtonTapped) } label: { - Image(self.store.isBookmarked - ? "bookmark-fill" - : "bookmark", bundle: Bundle.notices + Image( + self.store.isBookmarked + ? "bookmark-fill" + : "bookmark", + bundle: Bundle.notices ) } From a0adb567f5709067929ddd3345a7dd8a8f639e65 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 00:26:21 +0900 Subject: [PATCH 02/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=A7=80=EC=9B=90=EC=9D=84=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EC=95=B1=20=EC=A7=80=EC=9B=90=20=ED=83=80=EA=B2=9F=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KuringApp/KuringApp.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/KuringApp/KuringApp.xcodeproj/project.pbxproj b/KuringApp/KuringApp.xcodeproj/project.pbxproj index f3738be..3243706 100644 --- a/KuringApp/KuringApp.xcodeproj/project.pbxproj +++ b/KuringApp/KuringApp.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202406011840; + CURRENT_PROJECT_VERSION = 202408260240; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; @@ -402,7 +402,7 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -425,7 +425,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202406011840; + CURRENT_PROJECT_VERSION = 202408260240; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; @@ -437,7 +437,7 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 17.0; + IPHONEOS_DEPLOYMENT_TARGET = 17.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 7030c2f1104c938f5a125722b9258710e4349e49 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 02:44:14 +0900 Subject: [PATCH 03/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/UIKit/NoticeUI/NoticeRow.swift | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index 5dab41e..a699f2d 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -12,6 +12,9 @@ import ComposableArchitecture public struct NoticeRow: View { var rowType: NoticeRowType let notice: Notice + + /// 번역 노출 여부 + @State var showTranslation: Bool = false public init( notice: Notice, @@ -65,6 +68,8 @@ public struct NoticeRow: View { dateView } Spacer() + + translationButton } .padding(.top, 13) @@ -78,6 +83,7 @@ public struct NoticeRow: View { } .padding(.horizontal, 20) .padding(.bottom, 16) + case .important: HStack(alignment: .top, spacing: 0) { VStack(alignment: .leading, spacing: 4) { @@ -86,10 +92,13 @@ public struct NoticeRow: View { dateView } Spacer() + + translationButton } .padding(.horizontal, 20) .padding(.top, 13) .padding(.bottom, 16) + case .bookmark: ZStack { HStack(alignment: .top, spacing: 0) { @@ -98,6 +107,8 @@ public struct NoticeRow: View { dateView } Spacer() + + translationButton } .padding(.top, 16) @@ -111,6 +122,7 @@ public struct NoticeRow: View { } .padding(.horizontal, 20) .padding(.bottom, 16) + case .none: HStack(alignment: .top, spacing: 0) { VStack(alignment: .leading, spacing: 4) { @@ -118,6 +130,8 @@ public struct NoticeRow: View { dateView } Spacer() + + translationButton } .padding(.horizontal, 20) .padding(.vertical, 16) @@ -173,9 +187,31 @@ public struct NoticeRow: View { .compositingGroup() } + @ViewBuilder + private var translationButton: some View { + VStack { + Spacer() + if #available(iOS 17.4, *) { + Image(systemName: "translate") + .frame(width: 24) + .onTapGesture { + showTranslation.toggle() + } + .translationPresentation( + isPresented: $showTranslation, + text: notice.subject + ) + } else { + EmptyView() + } + Spacer() + } + } + private func separateWithDot(_ value: String) -> String { return value.replacingOccurrences(of: "-", with: ".") } + } #Preview { From bf7ab07c8ed200b19029cf567d5b0f0ad00b5551 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 02:44:56 +0900 Subject: [PATCH 04/22] =?UTF-8?q?#231=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index a699f2d..5c89e59 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -7,14 +7,15 @@ import Caches import Models import SwiftUI import ColorSet +import Translation import ComposableArchitecture public struct NoticeRow: View { - var rowType: NoticeRowType + let rowType: NoticeRowType let notice: Notice /// 번역 노출 여부 - @State var showTranslation: Bool = false + @State var showsTranslation: Bool = false public init( notice: Notice, @@ -195,10 +196,10 @@ public struct NoticeRow: View { Image(systemName: "translate") .frame(width: 24) .onTapGesture { - showTranslation.toggle() + showsTranslation.toggle() } .translationPresentation( - isPresented: $showTranslation, + isPresented: $showsTranslation, text: notice.subject ) } else { From 2cbcd0782203cd334e48abd33d47f3fb75dcffa1 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 02:51:53 +0900 Subject: [PATCH 05/22] =?UTF-8?q?#231=20=EB=8B=A8=EC=88=9C=20=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EB=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/SettingsUI/SettingList.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index b1af078..730befe 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -132,7 +132,7 @@ public struct SettingList: View { } header: { headerView("정보") } footer: { - Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 채수빈") + Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 채수빈".) .font(.footnote) .foregroundStyle(Color.Kuring.caption1) } From d92bc17410b421a73c968fe841ba3b0097f0e778 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 02:56:31 +0900 Subject: [PATCH 06/22] =?UTF-8?q?#231=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIKit/SettingsUI/SettingList.swift | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index 730befe..a43d6df 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -77,6 +77,27 @@ public struct SettingList: View { } .padding(.vertical, 9) + ZStack { + NavigationLink( + state: SettingsAppFeature.Path.State.appIconSelector( + AppIconSelectorFeature.State() + ) + ) { + EmptyView() + } + .opacity(0) + + HStack(spacing: 0) { + Text("번역") + Spacer() + Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue) + } + .font(.system(size: 16, weight: .medium)) + .kerning(0.15) + .foregroundStyle(Color.Kuring.body) + } + .padding(.vertical, 9) + Divider() .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0)) } header: { @@ -132,7 +153,7 @@ public struct SettingList: View { } header: { headerView("정보") } footer: { - Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 채수빈".) + Text("Designed by 김예은, 이소영.\nDeveloped by 박성수, 이건우, 최효원.\nManaged by 채수빈.") .font(.footnote) .foregroundStyle(Color.Kuring.caption1) } From dcac61f134063095adcc6828f4249b113e25c71f Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 03:02:41 +0900 Subject: [PATCH 07/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=A0=9C=EA=B3=B5=EC=9D=84=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?Userdefault=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Labs/Dependency/LeLabo.TestValue.swift | 4 ++++ package-kuring/Sources/Labs/Dependency/LeLabo.swift | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/package-kuring/Sources/Labs/Dependency/LeLabo.TestValue.swift b/package-kuring/Sources/Labs/Dependency/LeLabo.TestValue.swift index 7f78833..68928b9 100644 --- a/package-kuring/Sources/Labs/Dependency/LeLabo.TestValue.swift +++ b/package-kuring/Sources/Labs/Dependency/LeLabo.TestValue.swift @@ -18,6 +18,10 @@ extension LeLabo { }, set: { newValue, _ in status.isBetaAEnabled = newValue + }, getTranslationStatus: { + return true + }, + setTranslationStatus: { isActive in } ) }() diff --git a/package-kuring/Sources/Labs/Dependency/LeLabo.swift b/package-kuring/Sources/Labs/Dependency/LeLabo.swift index ce07fd8..6f3b2d1 100644 --- a/package-kuring/Sources/Labs/Dependency/LeLabo.swift +++ b/package-kuring/Sources/Labs/Dependency/LeLabo.swift @@ -26,6 +26,9 @@ public struct LeLabo { public var status: (Experiment) -> Bool public var set: (NewValue, Experiment) -> Void + + public var getTranslationStatus: () -> Bool + public var setTranslationStatus: (Bool) -> Void } extension LeLabo { @@ -36,6 +39,14 @@ extension LeLabo { }, set: { newValue, experiment in UserDefaults.standard.set(newValue, forKey: experiment.key) + }, + getTranslationStatus: { + let key = "com.kuring.service.lelabo.transltation" + return UserDefaults.standard.bool(forKey: key) + }, + setTranslationStatus: { isActive in + let key = "com.kuring.service.lelabo.transltation" + UserDefaults.standard.set(isActive, forKey: key) } ) } From 10d97da030530dc96e0d589ad2b0174005af4800 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 03:05:01 +0900 Subject: [PATCH 08/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=20=EC=BC=9C?= =?UTF-8?q?=EA=B8=B0=20=EB=81=84=EA=B8=B0=20=EC=98=B5=EC=85=98.=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/SettingsUI/SettingList.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index a43d6df..a59e2d2 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -90,7 +90,11 @@ public struct SettingList: View { HStack(spacing: 0) { Text("번역") Spacer() - Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue) + Text( + leLabo.getTranslationStatus() + ? "켜기" + : "끄기" + ) } .font(.system(size: 16, weight: .medium)) .kerning(0.15) From 5a04224a44fa0a01f998dc23f3be220aed1e1c92 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 03:18:55 +0900 Subject: [PATCH 09/22] =?UTF-8?q?#231=20=EC=8B=A4=ED=97=98=EC=8B=A4=20?= =?UTF-8?q?=EB=B2=88=EC=97=AD=20=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettingsFeatures/SettingList.swift | 17 ++++++++++- .../UIKit/SettingsUI/SettingList.swift | 30 ++++++++----------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/package-kuring/Sources/Features/SettingsFeatures/SettingList.swift b/package-kuring/Sources/Features/SettingsFeatures/SettingList.swift index f6ea460..60c78e1 100644 --- a/package-kuring/Sources/Features/SettingsFeatures/SettingList.swift +++ b/package-kuring/Sources/Features/SettingsFeatures/SettingList.swift @@ -22,6 +22,8 @@ public struct SettingListFeature { // TODO: 나중에 디펜던시로 public var currentAppIcon: KuringIcon? public var isCustomAlarmOn: Bool = false + + public var isActiveTranslationStatus: Bool public init( isCustomAlarmOn: Bool = true, @@ -31,6 +33,9 @@ public struct SettingListFeature { @Dependency(\.appIcons) var appIcons self.currentAppIcon = appIcon ?? appIcons.currentAppIcon + + @Dependency(\.leLabo) var leLabo + isActiveTranslationStatus = leLabo.getTranslationStatus() } } @@ -48,15 +53,25 @@ public struct SettingListFeature { case showFeedback case showOpensourceList } + + case transltationRowTapped } + @Dependency(\.leLabo) var leLabo + public var body: some ReducerOf { BindingReducer() - Reduce { _, action in + Reduce { state, action in switch action { case .binding, .delegate: return .none + + case .transltationRowTapped: + state.isActiveTranslationStatus.toggle() + leLabo.setTranslationStatus(state.isActiveTranslationStatus) + + return .none } } } diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index a59e2d2..7fa4050 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -56,24 +56,24 @@ public struct SettingList: View { .listRowBackground(Color.Kuring.bg) Section { + ZStack { - NavigationLink( - state: SettingsAppFeature.Path.State.appIconSelector( - AppIconSelectorFeature.State() - ) - ) { - EmptyView() - } - .opacity(0) - HStack(spacing: 0) { - Text("앱 아이콘 바꾸기") + Text("번역") Spacer() - Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue) + Text( + store.isActiveTranslationStatus + ? "켜기" + : "끄기" + ) } .font(.system(size: 16, weight: .medium)) .kerning(0.15) .foregroundStyle(Color.Kuring.body) + .contentShape(Rectangle()) + .onTapGesture { + store.send(.transltationRowTapped) + } } .padding(.vertical, 9) @@ -88,13 +88,9 @@ public struct SettingList: View { .opacity(0) HStack(spacing: 0) { - Text("번역") + Text("앱 아이콘 바꾸기") Spacer() - Text( - leLabo.getTranslationStatus() - ? "켜기" - : "끄기" - ) + Text(store.state.currentAppIcon?.korValue ?? KuringIcon.kuring_app.korValue) } .font(.system(size: 16, weight: .medium)) .kerning(0.15) From e1dc74ab73a34b4e7e760ecd500b950e7db72f07 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 03:31:55 +0900 Subject: [PATCH 10/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=9A=B0=EC=84=A0=20=EB=8F=99=EC=9E=91=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index 5c89e59..ab080ab 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -192,7 +192,8 @@ public struct NoticeRow: View { private var translationButton: some View { VStack { Spacer() - if #available(iOS 17.4, *) { + if #available(iOS 17.4, *), + UserDefaults.standard.bool(forKey: "com.kuring.service.lelabo.transltation") { Image(systemName: "translate") .frame(width: 24) .onTapGesture { From fc7d5ed192890ce29bdbaebf240a27daf0bc8e5b Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 03:32:27 +0900 Subject: [PATCH 11/22] =?UTF-8?q?#231=20=ED=8C=A8=ED=82=A4=EC=A7=80=20depe?= =?UTF-8?q?ndencies=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Package.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package-kuring/Package.swift b/package-kuring/Package.swift index 29693c0..734a825 100644 --- a/package-kuring/Package.swift +++ b/package-kuring/Package.swift @@ -60,8 +60,14 @@ let package = Package( .target( name: "NoticeUI", dependencies: [ - "NoticeFeatures", "SearchFeatures", "SubscriptionUI", "DepartmentUI", "SearchUI", "CommonUI", - "ColorSet", "Caches", + "NoticeFeatures", + "SearchFeatures", + "SubscriptionUI", + "DepartmentUI", + "SearchUI", + "CommonUI", + "ColorSet", + "Caches", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), .product(name: "ActivityUI", package: "package-activityui"), ], From 77299b56cb8c42efcdfe9368f3805c89107d1117 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 20:34:09 +0900 Subject: [PATCH 12/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20UI=20=EB=B0=98=EC=98=81=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index ab080ab..7493258 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -16,7 +16,8 @@ public struct NoticeRow: View { /// 번역 노출 여부 @State var showsTranslation: Bool = false - + @AppStorage("com.kuring.service.lelabo.transltation") private var transltationValue: Bool = false + public init( notice: Notice, bookmarked: Bool = false, @@ -193,7 +194,7 @@ public struct NoticeRow: View { VStack { Spacer() if #available(iOS 17.4, *), - UserDefaults.standard.bool(forKey: "com.kuring.service.lelabo.transltation") { + transltationValue { Image(systemName: "translate") .frame(width: 24) .onTapGesture { From 2e50f9119dc713c751104f60cacb0f5695b7d2ae Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 27 Aug 2024 20:41:15 +0900 Subject: [PATCH 13/22] =?UTF-8?q?#231=20=EB=B2=88=EC=97=AD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B5=9C=EC=86=8C=20=EC=A7=80=EC=9B=90=EB=B2=84?= =?UTF-8?q?=EC=A0=84=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=B6=84=EA=B8=B0?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIKit/SettingsUI/SettingList.swift | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index 7fa4050..2915183 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -56,26 +56,27 @@ public struct SettingList: View { .listRowBackground(Color.Kuring.bg) Section { - - ZStack { - HStack(spacing: 0) { - Text("번역") - Spacer() - Text( - store.isActiveTranslationStatus - ? "켜기" - : "끄기" - ) - } - .font(.system(size: 16, weight: .medium)) - .kerning(0.15) - .foregroundStyle(Color.Kuring.body) - .contentShape(Rectangle()) - .onTapGesture { - store.send(.transltationRowTapped) + if #available(iOS 17.4, *) { + ZStack { + HStack(spacing: 0) { + Text("번역") + Spacer() + Text( + store.isActiveTranslationStatus + ? "켜기" + : "끄기" + ) + } + .font(.system(size: 16, weight: .medium)) + .kerning(0.15) + .foregroundStyle(Color.Kuring.body) + .contentShape(Rectangle()) + .onTapGesture { + store.send(.transltationRowTapped) + } } + .padding(.vertical, 9) } - .padding(.vertical, 9) ZStack { NavigationLink( From 5d8fb9a407e786253f5a017fd1ef737c200b2be7 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Wed, 28 Aug 2024 00:20:20 +0900 Subject: [PATCH 14/22] =?UTF-8?q?#231=20=EC=95=B1=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B9=8C=EB=93=9C=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KuringApp/KuringApp.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/KuringApp/KuringApp.xcodeproj/project.pbxproj b/KuringApp/KuringApp.xcodeproj/project.pbxproj index 3243706..ea1bae6 100644 --- a/KuringApp/KuringApp.xcodeproj/project.pbxproj +++ b/KuringApp/KuringApp.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202408260240; + CURRENT_PROJECT_VERSION = 202408281220; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; @@ -402,12 +402,12 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.2.1; + MARKETING_VERSION = 2.3.0; PRODUCT_BUNDLE_IDENTIFIER = com.kuring.service; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -425,7 +425,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = KuringApp/KuringApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202408260240; + CURRENT_PROJECT_VERSION = 202408281220; DEVELOPMENT_ASSET_PATHS = "\"KuringApp/Preview Content\""; DEVELOPMENT_TEAM = 38PD5AHVVF; ENABLE_PREVIEWS = YES; @@ -437,12 +437,12 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; - IPHONEOS_DEPLOYMENT_TARGET = 17.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.2.1; + MARKETING_VERSION = 2.3.0; PRODUCT_BUNDLE_IDENTIFIER = com.kuring.service; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; From b5cd48b2aeffd4caec16e03b3b2bc0c25b42b98a Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Wed, 28 Aug 2024 21:56:36 +0900 Subject: [PATCH 15/22] =?UTF-8?q?#231=20`=EB=A6=AC=EB=B7=B0=20=EB=B0=98?= =?UTF-8?q?=EC=98=81`=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/Labs/Dependency/LeLabo.swift | 4 ++-- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-kuring/Sources/Labs/Dependency/LeLabo.swift b/package-kuring/Sources/Labs/Dependency/LeLabo.swift index 6f3b2d1..bef7944 100644 --- a/package-kuring/Sources/Labs/Dependency/LeLabo.swift +++ b/package-kuring/Sources/Labs/Dependency/LeLabo.swift @@ -41,11 +41,11 @@ extension LeLabo { UserDefaults.standard.set(newValue, forKey: experiment.key) }, getTranslationStatus: { - let key = "com.kuring.service.lelabo.transltation" + let key = "com.kuring.service.lelabo.translation" return UserDefaults.standard.bool(forKey: key) }, setTranslationStatus: { isActive in - let key = "com.kuring.service.lelabo.transltation" + let key = "com.kuring.service.lelabo.translation" UserDefaults.standard.set(isActive, forKey: key) } ) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index 7493258..fe11d73 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -16,7 +16,7 @@ public struct NoticeRow: View { /// 번역 노출 여부 @State var showsTranslation: Bool = false - @AppStorage("com.kuring.service.lelabo.transltation") private var transltationValue: Bool = false + @AppStorage("com.kuring.service.lelabo.translation") private var transltationValue: Bool = false public init( notice: Notice, From 3daf0d9f023401f480853317c773ffcea0e09d5c Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Wed, 28 Aug 2024 21:57:19 +0900 Subject: [PATCH 16/22] =?UTF-8?q?#231=20UX=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/SettingsUI/SettingList.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift index 2915183..7421153 100644 --- a/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift +++ b/package-kuring/Sources/UIKit/SettingsUI/SettingList.swift @@ -63,8 +63,8 @@ public struct SettingList: View { Spacer() Text( store.isActiveTranslationStatus - ? "켜기" - : "끄기" + ? "끄기" + : "켜기" ) } .font(.system(size: 16, weight: .medium)) From f3228aa72325c3ca16d082c9fc8e4f99ad92ecec Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Thu, 29 Aug 2024 02:01:51 +0900 Subject: [PATCH 17/22] =?UTF-8?q?#231=20`CI=20=EC=8B=A4=ED=8C=A8`=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index fe11d73..d52b064 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -7,7 +7,9 @@ import Caches import Models import SwiftUI import ColorSet +#if canImport(Translation) import Translation +#endif import ComposableArchitecture public struct NoticeRow: View { From 5b609cbe1d0bf3bbaf12bdf8bcf8285b89cddf26 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 10 Sep 2024 01:47:25 +0900 Subject: [PATCH 18/22] =?UTF-8?q?#231=20=EC=A0=84=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index d52b064..fe11d73 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -7,9 +7,7 @@ import Caches import Models import SwiftUI import ColorSet -#if canImport(Translation) import Translation -#endif import ComposableArchitecture public struct NoticeRow: View { From 37a06829f3bac0e074de9e1f3232353e400ce4e5 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 10 Sep 2024 02:22:07 +0900 Subject: [PATCH 19/22] =?UTF-8?q?#231=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Package.resolved | 284 -------------------------------- package-kuring/Package.swift | 2 +- 2 files changed, 1 insertion(+), 285 deletions(-) delete mode 100644 package-kuring/Package.resolved diff --git a/package-kuring/Package.resolved b/package-kuring/Package.resolved deleted file mode 100644 index 01421e1..0000000 --- a/package-kuring/Package.resolved +++ /dev/null @@ -1,284 +0,0 @@ -{ - "pins" : [ - { - "identity" : "abseil-cpp-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/abseil-cpp-binary.git", - "state" : { - "revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c", - "version" : "1.2022062300.0" - } - }, - { - "identity" : "app-check", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/app-check.git", - "state" : { - "revision" : "3e464dad87dad2d29bb29a97836789bf0f8f67d2", - "version" : "10.18.1" - } - }, - { - "identity" : "combine-schedulers", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/combine-schedulers", - "state" : { - "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb", - "version" : "1.0.0" - } - }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk", - "state" : { - "revision" : "f91c8167141d0279726c6f6d9d4a47c026785cbc", - "version" : "10.21.0" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "cb8617fab75d181270a1d8f763f26b15c73e2e1e", - "version" : "10.21.0" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117", - "version" : "9.3.0" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3", - "version" : "7.12.1" - } - }, - { - "identity" : "grpc-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/grpc-binary.git", - "state" : { - "revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98", - "version" : "1.49.1" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "76135c9f4e1ac85459d5fec61b6f76ac47ab3a4c", - "version" : "3.3.1" - } - }, - { - "identity" : "interop-ios-for-google-sdks", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/interop-ios-for-google-sdks.git", - "state" : { - "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648", - "version" : "100.0.0" - } - }, - { - "identity" : "ios-maps", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ku-ring/ios-maps", - "state" : { - "branch" : "main", - "revision" : "d0a83b7c3e6b69d77647001f17f162e1090e9489" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "9d108e9112aa1d65ce508facf804674546116d9c", - "version" : "1.22.3" - } - }, - { - "identity" : "lottie-spm", - "kind" : "remoteSourceControl", - "location" : "https://github.com/airbnb/lottie-spm.git", - "state" : { - "revision" : "3bd43e12d6fb54654366a61f7cfaca787318b8ce", - "version" : "4.4.1" - } - }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692", - "version" : "2.30909.0" - } - }, - { - "identity" : "package-activityui", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ku-ring/package-activityui", - "state" : { - "branch" : "main", - "revision" : "a8404f0e2d72873eace8f192589d542cbddea0b9" - } - }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e", - "version" : "2.3.1" - } - }, - { - "identity" : "swift-case-paths", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-case-paths", - "state" : { - "revision" : "bba1111185863c9288c5f047770f421c3b7793a4", - "version" : "1.1.3" - } - }, - { - "identity" : "swift-clocks", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-clocks", - "state" : { - "revision" : "a8421d68068d8f45fbceb418fbf22c5dad4afd33", - "version" : "1.0.2" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "branch" : "main", - "revision" : "ca8b4ab855f4b8075c1fd29eb50db756b1688e61" - } - }, - { - "identity" : "swift-composable-architecture", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-composable-architecture", - "state" : { - "branch" : "main", - "revision" : "94faadf363dc5074b5b6f30b9dc1631d01d68418" - } - }, - { - "identity" : "swift-concurrency-extras", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-concurrency-extras", - "state" : { - "revision" : "bb5059bde9022d69ac516803f4f227d8ac967f71", - "version" : "1.1.0" - } - }, - { - "identity" : "swift-custom-dump", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-custom-dump", - "state" : { - "revision" : "aedcf6f4cd486ccef5b312ccac85d4b3f6e58605", - "version" : "1.1.2" - } - }, - { - "identity" : "swift-dependencies", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-dependencies", - "state" : { - "revision" : "c31b1445c4fae49e6fdb75496b895a3653f6aefc", - "version" : "1.1.5" - } - }, - { - "identity" : "swift-identified-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-identified-collections", - "state" : { - "revision" : "d1e45f3e1eee2c9193f5369fa9d70a6ddad635e8", - "version" : "1.0.0" - } - }, - { - "identity" : "swift-perception", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-perception", - "state" : { - "revision" : "42240120b2a8797595433288ab4118f8042214c3", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8", - "version" : "1.25.2" - } - }, - { - "identity" : "swift-syntax", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-syntax", - "state" : { - "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version" : "509.0.2" - } - }, - { - "identity" : "swiftformat", - "kind" : "remoteSourceControl", - "location" : "https://github.com/nicklockwood/SwiftFormat", - "state" : { - "revision" : "fef156a6135e584985ed26713dd2e9ee41f952cb", - "version" : "0.53.0" - } - }, - { - "identity" : "swiftui-navigation", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swiftui-navigation", - "state" : { - "revision" : "78f9d72cf667adb47e2040aa373185c88c63f0dc", - "version" : "1.2.0" - } - }, - { - "identity" : "the-satellite", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ku-ring/the-satellite", - "state" : { - "branch" : "main", - "revision" : "66bfb1c8d3ae2848a67d0e75ce9e4e782645daf2" - } - }, - { - "identity" : "xctest-dynamic-overlay", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", - "state" : { - "revision" : "b58e6627149808b40634c4552fcf2f44d0b3ca87", - "version" : "1.1.0" - } - } - ], - "version" : 2 -} diff --git a/package-kuring/Package.swift b/package-kuring/Package.swift index 734a825..9535dcd 100644 --- a/package-kuring/Package.swift +++ b/package-kuring/Package.swift @@ -39,7 +39,7 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.1.5"), .package(url: "https://github.com/apple/swift-collections.git", branch: "main"), .package(url: "https://github.com/ku-ring/the-satellite", branch: "main"), - .package(url: "https://github.com/ku-ring/ios-maps", branch: "main"), + .package(url: "https://github.com/ku-ring/ios-maps", branch: "2.2.0"), .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.50.4"), .package(url: "https://github.com/ku-ring/package-activityui", branch: "main"), .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.21.0"), From 4b1632d0b8dc1f0ab6cbc4b3d935fa7cb5cdf0e0 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Tue, 10 Sep 2024 03:00:46 +0900 Subject: [PATCH 20/22] =?UTF-8?q?#231=20"main"=20>=20"2.2.0"=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 13479bc..eaa615e 100644 --- a/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/KuringApp/KuringApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -96,7 +96,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/ku-ring/ios-maps", "state" : { - "branch" : "main", + "branch" : "2.2.0", "revision" : "d234480483b635145b356615e289313e693a029c" } }, From 193df7033e98f14314ef358563d5b819f2d3e0e7 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Wed, 11 Sep 2024 23:13:22 +0900 Subject: [PATCH 21/22] =?UTF-8?q?#231=20kuring-bot=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-kuring/Package.swift | 2 ++ package-kuring/Sources/UIKit/BotUI/BotView.swift | 1 - package-kuring/Sources/UIKit/BotUI/SendPopup.swift | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-kuring/Package.swift b/package-kuring/Package.swift index 9535dcd..2d14b08 100644 --- a/package-kuring/Package.swift +++ b/package-kuring/Package.swift @@ -68,6 +68,8 @@ let package = Package( "CommonUI", "ColorSet", "Caches", + "BotUI", + "BotFeatures", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), .product(name: "ActivityUI", package: "package-activityui"), ], diff --git a/package-kuring/Sources/UIKit/BotUI/BotView.swift b/package-kuring/Sources/UIKit/BotUI/BotView.swift index 1ec86c4..052629a 100644 --- a/package-kuring/Sources/UIKit/BotUI/BotView.swift +++ b/package-kuring/Sources/UIKit/BotUI/BotView.swift @@ -4,7 +4,6 @@ // import SwiftUI -import Networks import ColorSet import SwiftData import BotFeatures diff --git a/package-kuring/Sources/UIKit/BotUI/SendPopup.swift b/package-kuring/Sources/UIKit/BotUI/SendPopup.swift index ab09b37..0b14877 100644 --- a/package-kuring/Sources/UIKit/BotUI/SendPopup.swift +++ b/package-kuring/Sources/UIKit/BotUI/SendPopup.swift @@ -6,7 +6,6 @@ import SwiftUI import ComposableArchitecture import ColorSet -import Networks import Dependencies struct SendPopup: View { From 4a982a5c49e459a6bb77332d3bbd19d04aff5e83 Mon Sep 17 00:00:00 2001 From: GeonWoo Date: Wed, 11 Sep 2024 23:40:11 +0900 Subject: [PATCH 22/22] #231 ci --- package-kuring/Package.swift | 1 + package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package-kuring/Package.swift b/package-kuring/Package.swift index 2d14b08..7145e34 100644 --- a/package-kuring/Package.swift +++ b/package-kuring/Package.swift @@ -70,6 +70,7 @@ let package = Package( "Caches", "BotUI", "BotFeatures", + "DepartmentFeatures", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), .product(name: "ActivityUI", package: "package-activityui"), ], diff --git a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift index fe11d73..d52b064 100644 --- a/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift +++ b/package-kuring/Sources/UIKit/NoticeUI/NoticeRow.swift @@ -7,7 +7,9 @@ import Caches import Models import SwiftUI import ColorSet +#if canImport(Translation) import Translation +#endif import ComposableArchitecture public struct NoticeRow: View {