Merge pull request #1008 from 0x1-company/refactor-school

refactor: 💡 school setting feature
0x1-company · Nov 21, 2023 · df46180 · df46180
2 parents e7564e9 + 22d5da9
commit df46180
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 35 deletions.
diff --git a/Packages/GodPackage/Package.swift b/Packages/GodPackage/Package.swift
@@ -41,6 +41,7 @@ let package = Package(
     .library(name: "ProfileShareFeature", targets: ["ProfileShareFeature"]),
     .library(name: "ProfileStoryFeature", targets: ["ProfileStoryFeature"]),
     .library(name: "RevealFeature", targets: ["RevealFeature"]),
+    .library(name: "SchoolSettingFeature", targets: ["SchoolSettingFeature"]),
     .library(name: "ShareScreenshotFeature", targets: ["ShareScreenshotFeature"]),
     .library(name: "ShopFeature", targets: ["ShopFeature"]),
     .library(name: "TutorialFeature", targets: ["TutorialFeature"]),
@@ -223,17 +224,15 @@ let package = Package(
       "HowItWorksFeature",
       "ProfileStoryFeature",
       "InviteFriendFeature",
+      "SchoolSettingFeature",
       "CupertinoMessageFeature",
-      .product(name: "Constants", package: "DependencyPackage"),
       .product(name: "AsyncValue", package: "DependencyPackage"),
       .product(name: "PhotosClient", package: "CupertinoPackage"),
       .product(name: "SocialShare", package: "UIComponentPackage"),
       .product(name: "ProfileImage", package: "UIComponentPackage"),
       .product(name: "ActivityView", package: "UIComponentPackage"),
       .product(name: "StringHelpers", package: "DependencyPackage"),
       .product(name: "ContactsClient", package: "CupertinoPackage"),
-      .product(name: "RoundedCorner", package: "UIComponentPackage"),
-      .product(name: "AnalyticsClient", package: "DependencyPackage"),
       .product(name: "ShareLinkBuilder", package: "DependencyPackage"),
       .product(name: "UIPasteboardClient", package: "CupertinoPackage"),
       .product(name: "UserDefaultsClient", package: "CupertinoPackage"),
@@ -242,7 +241,6 @@ let package = Package(
       .product(name: "UserNotificationClient", package: "CupertinoPackage"),
       .product(name: "FirebaseStorageClient", package: "DependencyPackage"),
       .product(name: "PhoneNumberDependencies", package: "DependencyPackage"),
-      .product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
       .product(name: "FirebaseDynamicLinkClient", package: "DependencyPackage"),
     ], resources: [.copy("onboarding.json")]),
     .target(name: "PlayAgainFeature", dependencies: [
@@ -305,6 +303,15 @@ let package = Package(
       .product(name: "AnalyticsClient", package: "DependencyPackage"),
       .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
     ]),
+    .target(name: "SchoolSettingFeature", dependencies: [
+      .product(name: "Constants", package: "DependencyPackage"),
+      .product(name: "GodClient", package: "DependencyPackage"),
+      .product(name: "Styleguide", package: "UIComponentPackage"),
+      .product(name: "RoundedCorner", package: "UIComponentPackage"),
+      .product(name: "AnalyticsClient", package: "DependencyPackage"),
+      .product(name: "CachedAsyncImage", package: "swiftui-cached-async-image"),
+      .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
+    ]),
     .target(name: "ShareScreenshotFeature", dependencies: [
       .product(name: "AsyncValue", package: "DependencyPackage"),
       .product(name: "PhotosClient", package: "CupertinoPackage"),

diff --git a/Packages/GodPackage/Sources/OnboardFeature/Localizable.xcstrings b/Packages/GodPackage/Sources/OnboardFeature/Localizable.xcstrings
@@ -329,16 +329,6 @@
         }
       }
     },
-    "If your school is not found, add it here" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "学校が見つからない場合はここから追加する"
-          }
-        }
-      }
-    },
     "Imported from Contacts" : {
       "localizations" : {
         "ja" : {
@@ -389,16 +379,6 @@
         }
       }
     },
-    "MEMBERS" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "人"
-          }
-        }
-      }
-    },
     "Next" : {
       "localizations" : {
         "ja" : {
@@ -459,16 +439,6 @@
         }
       }
     },
-    "Pick your school" : {
-      "localizations" : {
-        "ja" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "あなたの高校を選択"
-          }
-        }
-      }
-    },
     "Please allow access" : {
 
     },

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

diff --git a/Packages/GodPackage/Sources/SchoolSettingFeature/Assets.xcassets/Contents.json b/Packages/GodPackage/Sources/SchoolSettingFeature/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...ts.xcassets/school.imageset/Contents.json → ...ts.xcassets/school.imageset/Contents.json b/...ts.xcassets/school.imageset/Contents.json → ...ts.xcassets/school.imageset/Contents.json
diff --git a/...ssets.xcassets/school.imageset/school.svg → ...ssets.xcassets/school.imageset/school.svg b/...ssets.xcassets/school.imageset/school.svg → ...ssets.xcassets/school.imageset/school.svg
diff --git a/Packages/GodPackage/Sources/SchoolSettingFeature/Localizable.xcstrings b/Packages/GodPackage/Sources/SchoolSettingFeature/Localizable.xcstrings
@@ -0,0 +1,36 @@
+{
+  "sourceLanguage" : "en",
+  "strings" : {
+    "If your school is not found, add it here" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "学校が見つからない場合はここから追加する"
+          }
+        }
+      }
+    },
+    "MEMBERS" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "人"
+          }
+        }
+      }
+    },
+    "Pick your school" : {
+      "localizations" : {
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "あなたの高校を選択"
+          }
+        }
+      }
+    }
+  },
+  "version" : "1.0"
+}
diff --git a/...ources/OnboardFeature/SchoolSetting.swift → .../SchoolSettingFeature/SchoolSetting.swift b/...ources/OnboardFeature/SchoolSetting.swift → .../SchoolSettingFeature/SchoolSetting.swift
@@ -33,6 +33,10 @@ public struct SchoolSettingLogic {
   @Dependency(\.openURL) var openURL
   @Dependency(\.godClient) var godClient
   @Dependency(\.analytics) var analytics
+
+  enum Cancel {
+    case school
+  }
 
   public var body: some Reducer<State, Action> {
     Reduce<State, Action> { state, action in
@@ -45,6 +49,7 @@ public struct SchoolSettingLogic {
         } catch: { error, send in
           await send(.schoolsResponse(.failure(error)))
         }
+        .cancellable(id: Cancel.school, cancelInFlight: true)
 
       case .onAppear:
         analytics.logScreen(screenName: "SchoolSetting", of: self)
@@ -56,7 +61,10 @@ public struct SchoolSettingLogic {
         }
 
       case let .schoolButtonTapped(id):
-        return .send(.delegate(.nextScreen(id: id)))
+        return .run { send in
+          analytics.setUserProperty(key: .schoolId, value: id)
+          await send(.delegate(.nextScreen(id: id)))
+        }
 
       case let .schoolsResponse(.success(data)):
         state.schools = data.schools.edges.map(\.node)