From 7a7ade70ed5457e267774b4e386e71937cbd803f Mon Sep 17 00:00:00 2001 From: tomokisun Date: Wed, 27 Dec 2023 01:11:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20gender=20skip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenderSettingFeature/GenderSetting.swift | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift b/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift index 6006ed81..87e8fda0 100644 --- a/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift +++ b/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift @@ -23,6 +23,7 @@ public struct GenderSettingLogic { public enum Action { case onAppear case genderButtonTapped(BeMatch.Gender) + case skipButtonTapped case nextButtonTapped case updateGenderResponse(Result) case delegate(Delegate) @@ -62,6 +63,12 @@ public struct GenderSettingLogic { try await updateGender(input) })) } + + case .skipButtonTapped: + return .run { send in + await feedbackGenerator.impactOccurred() + await send(.delegate(.nextScreen)) + } case .updateGenderResponse(.success): state.isActivityIndicatorVisible = false @@ -122,12 +129,23 @@ public struct GenderSettingView: View { Spacer() - PrimaryButton( - String(localized: "Next", bundle: .module), - isLoading: viewStore.isActivityIndicatorVisible, - isDisabled: viewStore.selection == nil - ) { - store.send(.nextButtonTapped) + VStack(spacing: 0) { + PrimaryButton( + String(localized: "Next", bundle: .module), + isLoading: viewStore.isActivityIndicatorVisible, + isDisabled: viewStore.selection == nil + ) { + store.send(.nextButtonTapped) + } + + Button { + store.send(.skipButtonTapped) + } label: { + Text("Skip", bundle: .module) + .frame(height: 50) + .foregroundStyle(Color.white) + .font(.system(.subheadline, weight: .semibold)) + } } .padding(.horizontal, 16) } From 218d74aba28444269bbdad2be7f0f0181ed2ea98 Mon Sep 17 00:00:00 2001 From: tomokisun Date: Wed, 27 Dec 2023 01:14:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20gender?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenderSettingFeature/GenderSetting.swift | 4 ++-- .../Localizable.xcstrings | 21 +++++++++---------- .../Localizable.xcstrings | 4 ++++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift b/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift index 87e8fda0..98ea3c0e 100644 --- a/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift +++ b/Packages/BeMatch/Sources/GenderSettingFeature/GenderSetting.swift @@ -63,7 +63,7 @@ public struct GenderSettingLogic { try await updateGender(input) })) } - + case .skipButtonTapped: return .run { send in await feedbackGenerator.impactOccurred() @@ -137,7 +137,7 @@ public struct GenderSettingView: View { ) { store.send(.nextButtonTapped) } - + Button { store.send(.skipButtonTapped) } label: { diff --git a/Packages/BeMatch/Sources/GenderSettingFeature/Localizable.xcstrings b/Packages/BeMatch/Sources/GenderSettingFeature/Localizable.xcstrings index 869a60d3..a3d85b3b 100644 --- a/Packages/BeMatch/Sources/GenderSettingFeature/Localizable.xcstrings +++ b/Packages/BeMatch/Sources/GenderSettingFeature/Localizable.xcstrings @@ -1,17 +1,6 @@ { "sourceLanguage" : "en", "strings" : { - "BeMatch." : { - "extractionState" : "stale", - "localizations" : { - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "BeMatch." - } - } - } - }, "Female" : { "localizations" : { "ja" : { @@ -52,6 +41,16 @@ } } }, + "Skip" : { + "localizations" : { + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "ใ‚นใ‚ญใƒƒใƒ—" + } + } + } + }, "What's your gender?" : { "localizations" : { "ja" : { diff --git a/Packages/BeMatch/Sources/ProfileExternalFeature/Localizable.xcstrings b/Packages/BeMatch/Sources/ProfileExternalFeature/Localizable.xcstrings index 84782528..f679936d 100644 --- a/Packages/BeMatch/Sources/ProfileExternalFeature/Localizable.xcstrings +++ b/Packages/BeMatch/Sources/ProfileExternalFeature/Localizable.xcstrings @@ -1,7 +1,11 @@ { "sourceLanguage" : "en", "strings" : { + "๐Ÿ”— %@" : { + + }, "๐Ÿ”— BeRe.al/%@" : { + "extractionState" : "stale", "localizations" : { "ja" : { "stringUnit" : {