Merge pull request #23 from 0x1-company/gender-skip

feat: 🎸 gender skip
0x1-company · Dec 26, 2023 · c857327 · c857327
2 parents 59a025e + 218d74a
commit c857327
Showing 3 changed files with 38 additions and 17 deletions.
diff --git 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<BeMatch.UpdateGenderMutation.Data, Error>)
     case delegate(Delegate)
@@ -63,6 +64,12 @@ public struct GenderSettingLogic {
           }))
         }
 
+      case .skipButtonTapped:
+        return .run { send in
+          await feedbackGenerator.impactOccurred()
+          await send(.delegate(.nextScreen))
+        }
+
       case .updateGenderResponse(.success):
         state.isActivityIndicatorVisible = false
         return .send(.delegate(.nextScreen))
@@ -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)
       }

diff --git 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
@@ -1,7 +1,11 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "🔗 %@" : {
+
+    },
     "🔗 BeRe.al/%@" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ja" : {
           "stringUnit" : {