diff --git a/Packages/BeMatch/Sources/SettingsFeature/Settings.swift b/Packages/BeMatch/Sources/SettingsFeature/Settings.swift index dc8add3f..988e96f4 100644 --- a/Packages/BeMatch/Sources/SettingsFeature/Settings.swift +++ b/Packages/BeMatch/Sources/SettingsFeature/Settings.swift @@ -29,6 +29,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profile, action: \.destination.profile) + ) { store in + NavigationStack { + ProfileView(store: store) + } + } Button { store.send(.editProfileButtonTapped) @@ -40,6 +47,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) + ) { store in + NavigationStack { + ProfileEditView(store: store) + } + } Button { store.send(.membershipStatusButtonTapped) @@ -51,6 +65,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), + destination: MembershipStatusView.init(store:) + ) } header: { Text("PROFILE", bundle: .module) } @@ -66,6 +84,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), + content: TutorialView.init(store:) + ) Link(destination: store.faqURL) { LabeledContent { @@ -100,6 +122,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), + destination: PushNotificationSettingsView.init(store:) + ) Button { store.send(.otherButtonTapped) @@ -111,6 +137,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.other, action: \.destination.other), + destination: SettingsOtherView.init(store:) + ) } header: { Text("Settings", bundle: .module) } @@ -197,36 +227,6 @@ public struct SettingsView: View { } .presentationDetents([.medium, .large]) } - .fullScreenCover( - item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), - content: TutorialView.init(store:) - ) - .fullScreenCover( - item: $store.scope(state: \.destination?.profile, action: \.destination.profile) - ) { store in - NavigationStack { - ProfileView(store: store) - } - } - .fullScreenCover( - item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) - ) { store in - NavigationStack { - ProfileEditView(store: store) - } - } - .navigationDestination( - store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), - destination: MembershipStatusView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.other, action: \.destination.other), - destination: SettingsOtherView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), - destination: PushNotificationSettingsView.init(store:) - ) } } diff --git a/Packages/MatchCore/Sources/ProfileEditLogic/Localizable.xcstrings b/Packages/MatchCore/Sources/ProfileEditLogic/Localizable.xcstrings index b79fc45a..4ee76997 100644 --- a/Packages/MatchCore/Sources/ProfileEditLogic/Localizable.xcstrings +++ b/Packages/MatchCore/Sources/ProfileEditLogic/Localizable.xcstrings @@ -86,6 +86,7 @@ } }, "Short Comment" : { + "extractionState" : "stale", "localizations" : { "ja" : { "stringUnit" : { diff --git a/Packages/PicMatch/Sources/SettingsFeature/Settings.swift b/Packages/PicMatch/Sources/SettingsFeature/Settings.swift index 8649e0b7..5fd3c3ba 100644 --- a/Packages/PicMatch/Sources/SettingsFeature/Settings.swift +++ b/Packages/PicMatch/Sources/SettingsFeature/Settings.swift @@ -29,6 +29,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profile, action: \.destination.profile) + ) { store in + NavigationStack { + ProfileView(store: store) + } + } Button { store.send(.editProfileButtonTapped) @@ -40,6 +47,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) + ) { store in + NavigationStack { + ProfileEditView(store: store) + } + } Button { store.send(.membershipStatusButtonTapped) @@ -51,6 +65,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), + destination: MembershipStatusView.init(store:) + ) } header: { Text("PROFILE", bundle: .module) } @@ -66,6 +84,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), + content: TutorialView.init(store:) + ) Link(destination: store.faqURL) { LabeledContent { @@ -100,6 +122,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), + destination: PushNotificationSettingsView.init(store:) + ) Button { store.send(.otherButtonTapped) @@ -111,6 +137,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.other, action: \.destination.other), + destination: SettingsOtherView.init(store:) + ) } header: { Text("Settings", bundle: .module) } @@ -197,36 +227,6 @@ public struct SettingsView: View { } .presentationDetents([.medium, .large]) } - .fullScreenCover( - item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), - content: TutorialView.init(store:) - ) - .fullScreenCover( - item: $store.scope(state: \.destination?.profile, action: \.destination.profile) - ) { store in - NavigationStack { - ProfileView(store: store) - } - } - .fullScreenCover( - item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) - ) { store in - NavigationStack { - ProfileEditView(store: store) - } - } - .navigationDestination( - store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), - destination: MembershipStatusView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.other, action: \.destination.other), - destination: SettingsOtherView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), - destination: PushNotificationSettingsView.init(store:) - ) } } diff --git a/Packages/TapMatch/Sources/SettingsFeature/Settings.swift b/Packages/TapMatch/Sources/SettingsFeature/Settings.swift index 5af56625..8afdb5b6 100644 --- a/Packages/TapMatch/Sources/SettingsFeature/Settings.swift +++ b/Packages/TapMatch/Sources/SettingsFeature/Settings.swift @@ -29,6 +29,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profile, action: \.destination.profile) + ) { store in + NavigationStack { + ProfileView(store: store) + } + } Button { store.send(.editProfileButtonTapped) @@ -40,6 +47,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) + ) { store in + NavigationStack { + ProfileEditView(store: store) + } + } Button { store.send(.membershipStatusButtonTapped) @@ -51,6 +65,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), + destination: MembershipStatusView.init(store:) + ) } header: { Text("PROFILE", bundle: .module) } @@ -66,6 +84,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), + content: TutorialView.init(store:) + ) Link(destination: store.faqURL) { LabeledContent { @@ -100,6 +122,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), + destination: PushNotificationSettingsView.init(store:) + ) Button { store.send(.otherButtonTapped) @@ -111,6 +137,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.other, action: \.destination.other), + destination: SettingsOtherView.init(store:) + ) } header: { Text("Settings", bundle: .module) } @@ -197,36 +227,6 @@ public struct SettingsView: View { } .presentationDetents([.medium, .large]) } - .fullScreenCover( - item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), - content: TutorialView.init(store:) - ) - .fullScreenCover( - item: $store.scope(state: \.destination?.profile, action: \.destination.profile) - ) { store in - NavigationStack { - ProfileView(store: store) - } - } - .fullScreenCover( - item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) - ) { store in - NavigationStack { - ProfileEditView(store: store) - } - } - .navigationDestination( - store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), - destination: MembershipStatusView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.other, action: \.destination.other), - destination: SettingsOtherView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), - destination: PushNotificationSettingsView.init(store:) - ) } } diff --git a/Packages/TenMatch/Sources/SettingsFeature/Settings.swift b/Packages/TenMatch/Sources/SettingsFeature/Settings.swift index f911376d..951c521f 100644 --- a/Packages/TenMatch/Sources/SettingsFeature/Settings.swift +++ b/Packages/TenMatch/Sources/SettingsFeature/Settings.swift @@ -29,6 +29,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profile, action: \.destination.profile) + ) { store in + NavigationStack { + ProfileView(store: store) + } + } Button { store.send(.editProfileButtonTapped) @@ -40,6 +47,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) + ) { store in + NavigationStack { + ProfileEditView(store: store) + } + } Button { store.send(.membershipStatusButtonTapped) @@ -51,6 +65,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), + destination: MembershipStatusView.init(store:) + ) } header: { Text("PROFILE", bundle: .module) } @@ -66,6 +84,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), + content: TutorialView.init(store:) + ) Link(destination: store.faqURL) { LabeledContent { @@ -100,6 +122,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), + destination: PushNotificationSettingsView.init(store:) + ) Button { store.send(.otherButtonTapped) @@ -111,6 +137,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.other, action: \.destination.other), + destination: SettingsOtherView.init(store:) + ) } header: { Text("Settings", bundle: .module) } @@ -197,36 +227,6 @@ public struct SettingsView: View { } .presentationDetents([.medium, .large]) } - .fullScreenCover( - item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), - content: TutorialView.init(store:) - ) - .fullScreenCover( - item: $store.scope(state: \.destination?.profile, action: \.destination.profile) - ) { store in - NavigationStack { - ProfileView(store: store) - } - } - .fullScreenCover( - item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) - ) { store in - NavigationStack { - ProfileEditView(store: store) - } - } - .navigationDestination( - store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), - destination: MembershipStatusView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.other, action: \.destination.other), - destination: SettingsOtherView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), - destination: PushNotificationSettingsView.init(store:) - ) } } diff --git a/Packages/Trinket/Sources/SettingsFeature/Settings.swift b/Packages/Trinket/Sources/SettingsFeature/Settings.swift index ad7127bd..afde141c 100644 --- a/Packages/Trinket/Sources/SettingsFeature/Settings.swift +++ b/Packages/Trinket/Sources/SettingsFeature/Settings.swift @@ -29,6 +29,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profile, action: \.destination.profile) + ) { store in + NavigationStack { + ProfileView(store: store) + } + } Button { store.send(.editProfileButtonTapped) @@ -40,6 +47,13 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) + ) { store in + NavigationStack { + ProfileEditView(store: store) + } + } Button { store.send(.membershipStatusButtonTapped) @@ -51,6 +65,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), + destination: MembershipStatusView.init(store:) + ) } header: { Text("PROFILE", bundle: .module) } @@ -66,6 +84,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .fullScreenCover( + item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), + content: TutorialView.init(store:) + ) Link(destination: store.faqURL) { LabeledContent { @@ -100,6 +122,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), + destination: PushNotificationSettingsView.init(store:) + ) Button { store.send(.otherButtonTapped) @@ -111,6 +137,10 @@ public struct SettingsView: View { .foregroundStyle(Color.primary) } } + .navigationDestination( + store: store.scope(state: \.$destination.other, action: \.destination.other), + destination: SettingsOtherView.init(store:) + ) } header: { Text("Settings", bundle: .module) } @@ -197,36 +227,6 @@ public struct SettingsView: View { } .presentationDetents([.medium, .large]) } - .fullScreenCover( - item: $store.scope(state: \.destination?.tutorial, action: \.destination.tutorial), - content: TutorialView.init(store:) - ) - .fullScreenCover( - item: $store.scope(state: \.destination?.profile, action: \.destination.profile) - ) { store in - NavigationStack { - ProfileView(store: store) - } - } - .fullScreenCover( - item: $store.scope(state: \.destination?.profileEdit, action: \.destination.profileEdit) - ) { store in - NavigationStack { - ProfileEditView(store: store) - } - } - .navigationDestination( - store: store.scope(state: \.$destination.membershipStatus, action: \.destination.membershipStatus), - destination: MembershipStatusView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.other, action: \.destination.other), - destination: SettingsOtherView.init(store:) - ) - .navigationDestination( - store: store.scope(state: \.$destination.pushNotificationSettings, action: \.destination.pushNotificationSettings), - destination: PushNotificationSettingsView.init(store:) - ) } }