Merge pull request #718 from 0x1-company/fix

Fix
0x1-company · Oct 9, 2023 · bbb19ac · bbb19ac
2 parents fcf8efb + 81a6e06
commit bbb19ac
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 48 deletions.
diff --git a/Packages/GodPackage/Sources/GodFeature/ShareTheApp.swift b/Packages/GodPackage/Sources/GodFeature/ShareTheApp.swift
@@ -9,7 +9,7 @@ public struct ShareTheAppLogic: Reducer {
   public init() {}
 
   public struct State: Equatable {
-    var currentUser: God.CurrentUserQuery.Data.CurrentUser?
+    var shareURL = URL(string: "https://godapp.jp")!
     public init() {}
   }
 
@@ -35,26 +35,26 @@ public struct ShareTheAppLogic: Reducer {
         }
 
       case .shareTheAppButtonTapped:
+        return .run { _ in
+//          await openURL(url)
+        }
+      case let .currentUserResponse(.success(data)):
         guard
-          let schoolName = state.currentUser?.school?.name,
-          let username = state.currentUser?.username
+          let schoolName = data.currentUser.school?.name,
+          let username = data.currentUser.username
         else { return .none }
         let text = """
         \(schoolName)向けの新しいアプリダウンロードしてみて！
-        https://godapp.jp/invite/\(username)?utm_source=line&utm_campaign=invite
+        https://godapp.jp/invite/\(username)?utm_source=line&utm_campaign=share_the_app
         """
-        guard let url = URL(string: "https://line.me/R/share?text=\(text)")
+        guard let shareURL = URL(string: "https://line.me/R/share?text=\(text)")
         else { return .none }
-
-        return .run { _ in
-          await openURL(url)
-        }
-      case let .currentUserResponse(.success(data)):
-        state.currentUser = data.currentUser
+
+        state.shareURL = shareURL
+
         return .none
 
       case .currentUserResponse(.failure):
-        state.currentUser = nil
         return .none
       }
     }
@@ -69,33 +69,30 @@ public struct ShareTheAppView: View {
   }
 
   public var body: some View {
-    ZStack {
-      Color.godService
-        .ignoresSafeArea()
-      VStack(spacing: 20) {
-        Image(ImageResource.upsideDownFace)
-          .resizable()
-          .aspectRatio(1, contentMode: .fit)
-          .frame(width: 100)
+    WithViewStore(store, observe: { $0 }) { viewStore in
+      ZStack {
+        Color.godService
+          .ignoresSafeArea()
+        VStack(spacing: 20) {
+          Text("Get more\nfriends to play")
+            .font(.title2)
+            .foregroundStyle(Color.white)
 
-        Text("Get more\nfriends to play", bundle: .module)
-          .font(.title2)
-          .foregroundStyle(Color.white)
-
-        ShareLink(
-          item: URL(string: "https://godapp.jp")!
-        ) {
-          Text("Share the app", bundle: .module)
-            .bold()
-            .frame(width: 188, height: 54)
-            .background(Color.white)
-            .clipShape(Capsule())
+          ShareLink(
+            item: viewStore.shareURL
+          ) {
+            Text("Share the app")
+              .bold()
+              .frame(width: 188, height: 54)
+              .background(Color.white)
+              .clipShape(Capsule())
+          }
+          .buttonStyle(HoldDownButtonStyle())
         }
-        .buttonStyle(HoldDownButtonStyle())
+        .multilineTextAlignment(.center)
       }
-      .multilineTextAlignment(.center)
+      .task { await store.send(.onTask).finish() }
     }
-    .task { await store.send(.onTask).finish() }
   }
 }
 

diff --git a/Packages/GodPackage/Sources/OnboardFeature/SchoolSetting.swift b/Packages/GodPackage/Sources/OnboardFeature/SchoolSetting.swift
@@ -95,7 +95,7 @@ public struct SchoolSettingView: View {
                   Text(school.usersCount.description)
                     .bold()
                     .foregroundColor(Color.godService)
-                  Text("MEMBERS")
+                  Text("MEMBERS", bundle: .module)
                     .foregroundColor(Color.godTextSecondaryLight)
                 }
                 .font(.footnote)

diff --git a/Packages/GodPackage/Sources/ProfileShareFeature/ProfileShare.swift b/Packages/GodPackage/Sources/ProfileShareFeature/ProfileShare.swift
@@ -14,7 +14,7 @@ public struct ProfileShareLogic: Reducer {
   public struct State: Equatable {
     var lineURL = URL(string: "https://godapp.jp")!
     var shareURL = URL(string: "https://godapp.jp")!
-    var invitationText = ""
+    var smsText = ""
     var currentUser: God.CurrentUserQuery.Data.CurrentUser?
     @PresentationState var destination: Destination.State?
     @PresentationState var message: CupertinoMessageLogic.State?
@@ -51,19 +51,12 @@ public struct ProfileShareLogic: Reducer {
         return .none
 
       case .contentButtonTapped(.line):
-        guard
-          let text = state.invitationText.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed),
-          let url = URL(string: "https://line.me/R/share?text=\(text)")
-        else { return .none }
-        return .run { _ in
+        return .run { [url = state.lineURL] _ in
           await openURL(url)
         }
 
       case .contentButtonTapped(.messages):
-        state.message = .init(
-          recipients: [],
-          body: state.invitationText
-        )
+        state.message = .init(recipients: [], body: state.smsText)
         return .none
 
       case .closeButtonTapped:
@@ -78,10 +71,19 @@ public struct ProfileShareLogic: Reducer {
           let shareURL = URL(string: "https://godapp.jp/add/\(username)?utm_source=share&utm_campaign=profile")
         else { return .none }
         state.shareURL = shareURL
-        state.invitationText = """
+        state.smsText = """
+        \(schoolName)向けの新しいアプリダウンロードしてみて！
+        https://godapp.jp/add/\(username)?utm_source=sms&utm_campaign=profile
+        """
+        let lineText = """
         \(schoolName)向けの新しいアプリダウンロードしてみて！
         https://godapp.jp/add/\(username)?utm_source=line&utm_campaign=profile
         """
+        guard
+          let text = lineText.addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed),
+          let lineURL = URL(string: "https://line.me/R/share?text=\(text)")
+        else { return .none }
+        state.lineURL = lineURL
         return .none
 
       default:

diff --git a/Packages/UIComponentPackage/Sources/GodActionSheet/Localizable.xcstrings b/Packages/UIComponentPackage/Sources/GodActionSheet/Localizable.xcstrings
@@ -2,7 +2,14 @@
   "sourceLanguage" : "en",
   "strings" : {
     "Close" : {
-
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "閉じる"
+          }
+        }
+      }
     }
   },
   "version" : "1.0"