Merge pull request #1018 from 0x1-company/refactor-profile

refactor: profile feature dependencies
0x1-company · Nov 23, 2023 · 15f9089 · 15f9089
2 parents 12e26f7 + 5115670
commit 15f9089
Showing 29 changed files with 327 additions and 230 deletions.
diff --git a/Packages/GodPackage/Package.swift b/Packages/GodPackage/Package.swift
@@ -37,7 +37,9 @@ let package = Package(
     .library(name: "PlayAgainFeature", targets: ["PlayAgainFeature"]),
     .library(name: "PollFeature", targets: ["PollFeature"]),
     .library(name: "ProfileEditFeature", targets: ["ProfileEditFeature"]),
+    .library(name: "ProfileExternalFeature", targets: ["ProfileExternalFeature"]),
     .library(name: "ProfileFeature", targets: ["ProfileFeature"]),
+    .library(name: "ProfileSharedFeature", targets: ["ProfileSharedFeature"]),
     .library(name: "ProfileShareFeature", targets: ["ProfileShareFeature"]),
     .library(name: "ProfileStoryFeature", targets: ["ProfileStoryFeature"]),
     .library(name: "RevealFeature", targets: ["RevealFeature"]),
@@ -71,11 +73,11 @@ let package = Package(
       .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
     ]),
     .target(name: "ActivityFeature", dependencies: [
-      "ProfileFeature",
+      "ProfileExternalFeature",
     ]),
     .target(name: "AddFeature", dependencies: [
-      "ProfileFeature",
       "FriendRequestFeature",
+      "ProfileExternalFeature",
       .product(name: "Constants", package: "DependencyPackage"),
       .product(name: "GodClient", package: "DependencyPackage"),
       .product(name: "Styleguide", package: "UIComponentPackage"),
@@ -217,6 +219,7 @@ let package = Package(
       "GodFeature",
       "InboxFeature",
       "AboutFeature",
+      "ProfileFeature",
       "ActivityFeature",
       "TutorialFeature",
     ]),
@@ -268,15 +271,25 @@ let package = Package(
       .product(name: "UserDefaultsClient", package: "CupertinoPackage"),
       .product(name: "FirebaseStorageClient", package: "DependencyPackage"),
     ]),
+    .target(name: "ProfileExternalFeature", dependencies: [
+      "ProfileSharedFeature",
+      .product(name: "AsyncValue", package: "DependencyPackage"),
+      .product(name: "AnalyticsClient", package: "DependencyPackage"),
+    ]),
     .target(name: "ProfileFeature", dependencies: [
       "ShopFeature",
       "ProfileEditFeature",
       "ProfileShareFeature",
-      .product(name: "AsyncValue", package: "DependencyPackage"),
-      .product(name: "AnalyticsClient", package: "DependencyPackage"),
+      "ProfileExternalFeature",
       .product(name: "UIPasteboardClient", package: "CupertinoPackage"),
       .product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
     ]),
+    .target(name: "ProfileSharedFeature", dependencies: [
+      .product(name: "God", package: "DependencyPackage"),
+      .product(name: "Styleguide", package: "UIComponentPackage"),
+      .product(name: "ProfileImage", package: "UIComponentPackage"),
+      .product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
+    ]),
     .target(name: "ProfileShareFeature", dependencies: [
       "ProfileStoryFeature",
       "CupertinoMessageFeature",

diff --git a/Packages/GodPackage/Sources/ActivityFeature/Activity.swift b/Packages/GodPackage/Sources/ActivityFeature/Activity.swift
@@ -3,7 +3,7 @@ import AsyncValue
 import ComposableArchitecture
 import God
 import GodClient
-import ProfileFeature
+import ProfileExternalFeature
 import ProfileImage
 import SwiftUI
 

diff --git a/Packages/GodPackage/Sources/AddFeature/Add.swift b/Packages/GodPackage/Sources/AddFeature/Add.swift
@@ -6,7 +6,7 @@ import ContactsClient
 import CupertinoMessageFeature
 import God
 import GodClient
-import ProfileFeature
+import ProfileExternalFeature
 import ProfileStoryFeature
 import SearchField
 import ShareLinkBuilder

diff --git a/Packages/GodPackage/Sources/ProfileExternalFeature/Localizable.xcstrings b/Packages/GodPackage/Sources/ProfileExternalFeature/Localizable.xcstrings
@@ -0,0 +1,149 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "" : {
+
+    },
+    "Are you sure?" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "本当に大丈夫？"
+          }
+        }
+      }
+    },
+    "Block" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ブロック"
+          }
+        }
+      }
+    },
+    "Block User" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ブロックする"
+          }
+        }
+      }
+    },
+    "Bullying" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "いじめの可能性がある"
+          }
+        }
+      }
+    },
+    "Cancel" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "キャンセル"
+          }
+        }
+      }
+    },
+    "Does not go to my school" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "この学校の生徒ではない"
+          }
+        }
+      }
+    },
+    "Inappropriate photo" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "不適切な写真を設定している"
+          }
+        }
+      }
+    },
+    "May be under 13 years old" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "13歳未満のユーザーである"
+          }
+        }
+      }
+    },
+    "Other" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "その他"
+          }
+        }
+      }
+    },
+    "Please select a reason" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "理由を選択してください"
+          }
+        }
+      }
+    },
+    "Pretending to be someone else" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "なりすましをしている"
+          }
+        }
+      }
+    },
+    "Profile" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "プロフィール"
+          }
+        }
+      }
+    },
+    "Report User" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "報告する"
+          }
+        }
+      }
+    },
+    "You won't see this user again in the app." : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "このユーザーはアプリ内で二度と表示されません。"
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}
diff --git a/...rces/ProfileFeature/ProfileExternal.swift → ...fileExternalFeature/ProfileExternal.swift b/...rces/ProfileFeature/ProfileExternal.swift → ...fileExternalFeature/ProfileExternal.swift
@@ -4,6 +4,7 @@ import ComposableArchitecture
 import God
 import GodClient
 import SwiftUI
+import ProfileSharedFeature
 
 @Reducer
 public struct ProfileExternalLogic {