Merge pull request #1046 from 0x1-company/find-friend

refactor: find friend
0x1-company · Dec 2, 2023 · b56df7c · b56df7c
2 parents 9fd62a8 + 016a120
commit b56df7c
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 31 deletions.
diff --git a/Packages/GodPackage/Package.swift b/Packages/GodPackage/Package.swift
@@ -19,6 +19,7 @@ let package = Package(
     .library(name: "CupertinoMessageFeature", targets: ["CupertinoMessageFeature"]),
     .library(name: "DeleteAccountFeature", targets: ["DeleteAccountFeature"]),
     .library(name: "EmailFeature", targets: ["EmailFeature"]),
+    .library(name: "FindFriendFeature", targets: ["FindFriendFeature"]),
     .library(name: "FindLocationFeature", targets: ["FindLocationFeature"]),
     .library(name: "ForceUpdateFeature", targets: ["ForceUpdateFeature"]),
     .library(name: "FriendRequestFeature", targets: ["FriendRequestFeature"]),
@@ -132,6 +133,12 @@ let package = Package(
       .product(name: "UIPasteboardClient", package: "CupertinoPackage"),
       .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
     ]),
+    .target(name: "FindFriendFeature", dependencies: [
+      .product(name: "Styleguide", package: "UIComponentPackage"),
+      .product(name: "ContactsClient", package: "CupertinoPackage"),
+      .product(name: "AnalyticsClient", package: "DependencyPackage"),
+      .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+    ]),
     .target(name: "FindLocationFeature", dependencies: [
       .product(name: "Styleguide", package: "UIComponentPackage"),
       .product(name: "AnalyticsClient", package: "DependencyPackage"),
@@ -235,6 +242,7 @@ let package = Package(
       "TutorialFeature",
     ]),
     .target(name: "OnboardFeature", dependencies: [
+      "FindFriendFeature",
       "ProfileStoryFeature",
       "InviteFriendFeature",
       "SchoolSettingFeature",
@@ -245,7 +253,6 @@ let package = Package(
       .product(name: "ProfileImage", package: "UIComponentPackage"),
       .product(name: "ActivityView", package: "UIComponentPackage"),
       .product(name: "StringHelpers", package: "DependencyPackage"),
-      .product(name: "ContactsClient", package: "CupertinoPackage"),
       .product(name: "ShareLinkClient", package: "DependencyPackage"),
       .product(name: "ShareLinkBuilder", package: "DependencyPackage"),
       .product(name: "UIPasteboardClient", package: "CupertinoPackage"),

diff --git a/...e/Sources/OnboardFeature/FindFriend.swift → ...ources/FindFriendFeature/FindFriend.swift b/...e/Sources/OnboardFeature/FindFriend.swift → ...ources/FindFriendFeature/FindFriend.swift
diff --git a/Packages/GodPackage/Sources/FindFriendFeature/Localizable.xcstrings b/Packages/GodPackage/Sources/FindFriendFeature/Localizable.xcstrings
@@ -0,0 +1,36 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "Find My Friends" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "友だちを探す"
+          }
+        }
+      }
+    },
+    "God cares intensely about your privacy.\nWeb will never text or spam your contacts." : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "あなたの個人情報は安全に管理されます。\nメールやスパムを送ることはありません。"
+          }
+        }
+      }
+    },
+    "God uses your contacts\nto find friends" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Godは友だちを見つけるために\n連絡先を利用します"
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}
diff --git a/Packages/GodPackage/Sources/OnboardFeature/Localizable.xcstrings b/Packages/GodPackage/Sources/OnboardFeature/Localizable.xcstrings
@@ -196,16 +196,6 @@
         }
       }
     },
-    "Find My Friends" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "友だちを探す"
-          }
-        }
-      }
-    },
     "Finished High School" : {
       "localizations" : {
         "ja" : {
@@ -269,28 +259,8 @@
         }
       }
     },
-    "God cares intensely about your privacy.\nWeb will never text or spam your contacts." : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "あなたの個人情報は安全に管理されます。\nメールやスパムを送ることはありません。"
-          }
-        }
-      }
-    },
     "God needs to find your school and suggest friends." : {
 
-    },
-    "God uses your contacts\nto find friends" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Godは友だちを見つけるために\n連絡先を利用します"
-          }
-        }
-      }
     },
     "godappteam" : {
       "localizations" : {

diff --git a/Packages/GodPackage/Sources/OnboardFeature/Onboard.swift b/Packages/GodPackage/Sources/OnboardFeature/Onboard.swift
@@ -1,4 +1,5 @@
 import ComposableArchitecture
+import FindFriendFeature
 import Contacts
 import ContactsClient
 import FirebaseAuth