Feature#86

CommonWallet.xcodeproj/project.pbxproj

@@ -13,7 +13,6 @@
 		871073B42990B7A600A0518C /* AllLogView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 871073B32990B7A600A0518C /* AllLogView.swift */; };
 		871073B92990CDBE00A0518C /* DateCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 871073B82990CDBE00A0518C /* DateCalculator.swift */; };
 		871F09EC2A11945000F96394 /* ShareNumberManaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 871F09EB2A11945000F96394 /* ShareNumberManaging.swift */; };
-		871F09EE2A11979600F96394 /* MainTabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 871F09ED2A11979600F96394 /* MainTabViewModel.swift */; };
 		8724AD8E29FDF50A0023AEC5 /* LaunchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8724AD8D29FDF50A0023AEC5 /* LaunchViewModel.swift */; };
 		872652F3297B92A8002C76D6 /* FirebaseErrorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872652F2297B92A8002C76D6 /* FirebaseErrorManager.swift */; };
 		872652F6297BB8AB002C76D6 /* SignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872652F5297BB8AB002C76D6 /* SignInViewModel.swift */; };
@@ -44,6 +43,7 @@
 		87402F4929F37B960007320D /* AuthManaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87402F4829F37B960007320D /* AuthManaging.swift */; };
 		874613A62A2954A50068383B /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874613A52A2954A50068383B /* ImagePicker.swift */; };
 		874A988529F206DB007CFB74 /* UserDefaultsError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874A988429F206DB007CFB74 /* UserDefaultsError.swift */; };
+		874C19802A5933AB002812D5 /* MainTabViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874C197F2A5933AB002812D5 /* MainTabViewModel.swift */; };
 		874DBA062A2C1392000E1FD1 /* Userdefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874DBA052A2C1392000E1FD1 /* Userdefaults.swift */; };
 		874DBA082A2C1FF8000E1FD1 /* StorageManaging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 874DBA072A2C1FF8000E1FD1 /* StorageManaging.swift */; };
 		874EF932297CB4C600C94233 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 874EF931297CB4C600C94233 /* GoogleService-Info.plist */; };
@@ -69,7 +69,6 @@
 		87830E73297A1ACB00184A7C /* CreateUserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87830E71297A1ACB00184A7C /* CreateUserTests.swift */; };
 		87830E74297A1B9E00184A7C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D7C297A1790005CCB6F /* AppDelegate.swift */; };
 		87830E75297A1BA100184A7C /* CommonWalletApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D49297A1369005CCB6F /* CommonWalletApp.swift */; };
-		87830E7B297A1C6A00184A7C /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D4B297A1369005CCB6F /* ContentView.swift */; };
 		87830E7D297A201F00184A7C /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87830E7C297A201F00184A7C /* SignInView.swift */; };
 		87830E7E297A201F00184A7C /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87830E7C297A201F00184A7C /* SignInView.swift */; };
 		87830E80297A20DB00184A7C /* CreateUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87830E7F297A20DB00184A7C /* CreateUserView.swift */; };
@@ -113,7 +112,6 @@
 		87E5E9342A2E9857002CF7B2 /* MyNameEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87E5E9332A2E9857002CF7B2 /* MyNameEditView.swift */; };
 		87E5E9362A2E9880002CF7B2 /* MyNameEditViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87E5E9352A2E9880002CF7B2 /* MyNameEditViewModel.swift */; };
 		87EE8D4A297A1369005CCB6F /* CommonWalletApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D49297A1369005CCB6F /* CommonWalletApp.swift */; };
-		87EE8D4C297A1369005CCB6F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D4B297A1369005CCB6F /* ContentView.swift */; };
 		87EE8D4E297A136A005CCB6F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 87EE8D4D297A136A005CCB6F /* Assets.xcassets */; };
 		87EE8D51297A136A005CCB6F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 87EE8D50297A136A005CCB6F /* Preview Assets.xcassets */; };
 		87EE8D65297A136A005CCB6F /* CommonWalletUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87EE8D64297A136A005CCB6F /* CommonWalletUITests.swift */; };
@@ -151,7 +149,6 @@
 		871073B32990B7A600A0518C /* AllLogView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllLogView.swift; sourceTree = "<group>"; };
 		871073B82990CDBE00A0518C /* DateCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateCalculator.swift; sourceTree = "<group>"; };
 		871F09EB2A11945000F96394 /* ShareNumberManaging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareNumberManaging.swift; sourceTree = "<group>"; };
-		871F09ED2A11979600F96394 /* MainTabViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabViewModel.swift; sourceTree = "<group>"; };
 		871F09F12A12E4D600F96394 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8724AD8D29FDF50A0023AEC5 /* LaunchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchViewModel.swift; sourceTree = "<group>"; };
 		872652F2297B92A8002C76D6 /* FirebaseErrorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseErrorManager.swift; sourceTree = "<group>"; };
@@ -169,6 +166,7 @@
 		87402F4829F37B960007320D /* AuthManaging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthManaging.swift; sourceTree = "<group>"; };
 		874613A52A2954A50068383B /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
 		874A988429F206DB007CFB74 /* UserDefaultsError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsError.swift; sourceTree = "<group>"; };
+		874C197F2A5933AB002812D5 /* MainTabViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainTabViewModel.swift; sourceTree = "<group>"; };
 		874DBA052A2C1392000E1FD1 /* Userdefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Userdefaults.swift; sourceTree = "<group>"; };
 		874DBA072A2C1FF8000E1FD1 /* StorageManaging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageManaging.swift; sourceTree = "<group>"; };
 		874EF931297CB4C600C94233 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -224,7 +222,6 @@
 		87E5E9352A2E9880002CF7B2 /* MyNameEditViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyNameEditViewModel.swift; sourceTree = "<group>"; };
 		87EE8D46297A1369005CCB6F /* CommonWallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CommonWallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		87EE8D49297A1369005CCB6F /* CommonWalletApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonWalletApp.swift; sourceTree = "<group>"; };
-		87EE8D4B297A1369005CCB6F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		87EE8D4D297A136A005CCB6F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		87EE8D50297A136A005CCB6F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		87EE8D56297A136A005CCB6F /* CommonWalletTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CommonWalletTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -289,40 +286,43 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		871F09EF2A11979F00F96394 /* View */ = {
+		8724AD8C29FDF4E40023AEC5 /* ViewModels */ = {
 			isa = PBXGroup;
 			children = (
-				87ABC58029908B17003E94F3 /* MainTabView.swift */,
+				8724AD8D29FDF50A0023AEC5 /* LaunchViewModel.swift */,
 			);
-			path = View;
+			path = ViewModels;
 			sourceTree = "<group>";
 		};
-		871F09F02A1197A700F96394 /* ViewMdels */ = {
+		87402F3F29F377210007320D /* Protocol */ = {
 			isa = PBXGroup;
 			children = (
-				871F09ED2A11979600F96394 /* MainTabViewModel.swift */,
+				87402F4829F37B960007320D /* AuthManaging.swift */,
+				87402F4229F377D70007320D /* FireStoreUserManaging.swift */,
+				87402F4029F377C40007320D /* FireStoreTransactionManaging.swift */,
+				87402F4629F37B040007320D /* FireStorePartnerManaging.swift */,
+				871F09EB2A11945000F96394 /* ShareNumberManaging.swift */,
+				874DBA072A2C1FF8000E1FD1 /* StorageManaging.swift */,
 			);
-			path = ViewMdels;
+			path = Protocol;
 			sourceTree = "<group>";
 		};
-		8724AD8C29FDF4E40023AEC5 /* ViewModels */ = {
+		874C19792A58D6F6002812D5 /* Models */ = {
 			isa = PBXGroup;
 			children = (
-				8724AD8D29FDF50A0023AEC5 /* LaunchViewModel.swift */,
+				87830E6A297A1A6000184A7C /* Firebase */,
+				87ABC57B29907C54003E94F3 /* UserDefaults */,
+				87D1A05329E770E30058A98F /* Error */,
+				87C162DB2A2ACE9300382061 /* Domain */,
+				8702F3F22A51068E002925A0 /* CoreData */,
 			);
-			path = ViewModels;
+			path = Models;
 			sourceTree = "<group>";
 		};
-		87402F3F29F377210007320D /* Protocol */ = {
+		874C197A2A58D885002812D5 /* Protocol */ = {
 			isa = PBXGroup;
 			children = (
-				87402F4829F37B960007320D /* AuthManaging.swift */,
-				87402F4229F377D70007320D /* FireStoreUserManaging.swift */,
-				87402F4029F377C40007320D /* FireStoreTransactionManaging.swift */,
-				87402F4629F37B040007320D /* FireStorePartnerManaging.swift */,
 				87402F4429F378330007320D /* UserDefaultsManaging.swift */,
-				871F09EB2A11945000F96394 /* ShareNumberManaging.swift */,
-				874DBA072A2C1FF8000E1FD1 /* StorageManaging.swift */,
 			);
 			path = Protocol;
 			sourceTree = "<group>";
@@ -382,15 +382,13 @@
 			path = ViewModel;
 			sourceTree = "<group>";
 		};
-		87830E6A297A1A6000184A7C /* Models */ = {
+		87830E6A297A1A6000184A7C /* Firebase */ = {
 			isa = PBXGroup;
 			children = (
 				87402F3F29F377210007320D /* Protocol */,
-				87D1A05329E770E30058A98F /* Error */,
 				874EF943297D0F3700C94233 /* Firebase */,
-				87ABC57B29907C54003E94F3 /* General */,
 			);
-			path = Models;
+			path = Firebase;
 			sourceTree = "<group>";
 		};
 		87830E76297A1C1900184A7C /* Frameworks */ = {
@@ -518,14 +516,15 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		87ABC57B29907C54003E94F3 /* General */ = {
+		87ABC57B29907C54003E94F3 /* UserDefaults */ = {
 			isa = PBXGroup;
 			children = (
+				874C197A2A58D885002812D5 /* Protocol */,
 				874EF93B297CFC3900C94233 /* UserDefaultsManager.swift */,
 				874EF93E297D04DF00C94233 /* UserDefaultsKey.swift */,
 				879310232A2FF28200FDD061 /* ImageNameProperty.swift */,
 			);
-			path = General;
+			path = UserDefaults;
 			sourceTree = "<group>";
 		};
 		87ABC57C29907CD3003E94F3 /* Sceans */ = {
@@ -541,15 +540,15 @@
 			path = Sceans;
 			sourceTree = "<group>";
 		};
-		87ABC57D29907DA2003E94F3 /* Source */ = {
+		87ABC57D29907DA2003E94F3 /* ViewTools */ = {
 			isa = PBXGroup;
 			children = (
 				876EE23B2A26AEFC0073F1C3 /* WebView */,
 				87C0BADC2A03C52400A02978 /* Flip.swift */,
 				874613A52A2954A50068383B /* ImagePicker.swift */,
 				87DDCDCB2A18373200F51DC8 /* PKHUDView.swift */,
 			);
-			path = Source;
+			path = ViewTools;
 			sourceTree = "<group>";
 		};
 		87ABC58229908B65003E94F3 /* Log */ = {
@@ -582,8 +581,8 @@
 		87C0BADB2A03C50200A02978 /* MainTab */ = {
 			isa = PBXGroup;
 			children = (
-				871F09EF2A11979F00F96394 /* View */,
-				871F09F02A1197A700F96394 /* ViewMdels */,
+				87ABC58029908B17003E94F3 /* MainTabView.swift */,
+				874C197F2A5933AB002812D5 /* MainTabViewModel.swift */,
 			);
 			path = MainTab;
 			sourceTree = "<group>";
@@ -640,12 +639,9 @@
 				874EF931297CB4C600C94233 /* GoogleService-Info.plist */,
 				87EE8D49297A1369005CCB6F /* CommonWalletApp.swift */,
 				87EE8D7C297A1790005CCB6F /* AppDelegate.swift */,
-				87EE8D4B297A1369005CCB6F /* ContentView.swift */,
-				87830E6A297A1A6000184A7C /* Models */,
-				8702F3F22A51068E002925A0 /* CoreData */,
-				87C162DB2A2ACE9300382061 /* Domain */,
+				874C19792A58D6F6002812D5 /* Models */,
 				87ABC57C29907CD3003E94F3 /* Sceans */,
-				87ABC57D29907DA2003E94F3 /* Source */,
+				87ABC57D29907DA2003E94F3 /* ViewTools */,
 				874EF93D297D040000C94233 /* Extentions */,
 				87EE8D4D297A136A005CCB6F /* Assets.xcassets */,
 				87EE8D4F297A136A005CCB6F /* Preview Content */,
@@ -832,11 +828,11 @@
 			files = (
 				87402F4329F377D70007320D /* FireStoreUserManaging.swift in Sources */,
 				879310242A2FF28200FDD061 /* ImageNameProperty.swift in Sources */,
-				871F09EE2A11979600F96394 /* MainTabViewModel.swift in Sources */,
 				874EF93F297D04DF00C94233 /* UserDefaultsKey.swift in Sources */,
 				87E5E9342A2E9857002CF7B2 /* MyNameEditView.swift in Sources */,
 				87EE8D7D297A1790005CCB6F /* AppDelegate.swift in Sources */,
 				872B9FDB2A42F9B100D15A84 /* FetchPartnerError.swift in Sources */,
+				874C19802A5933AB002812D5 /* MainTabViewModel.swift in Sources */,
 				874EF93A297CC8B200C94233 /* FireStoreUserManager.swift in Sources */,
 				87830E80297A20DB00184A7C /* CreateUserView.swift in Sources */,
 				879379E2298B4C8D00D3A47B /* PartnerNameEditView.swift in Sources */,
@@ -869,7 +865,6 @@
 				872652F6297BB8AB002C76D6 /* SignInViewModel.swift in Sources */,
 				87391E50298A189900897A96 /* String.swift in Sources */,
 				87F53FE0297EA44E00293176 /* FireStoreTransactionManager.swift in Sources */,
-				87EE8D4C297A1369005CCB6F /* ContentView.swift in Sources */,
 				87CDAABC297E6ADB00F52887 /* AccountView.swift in Sources */,
 				879379E0298B444500D3A47B /* ConnectPartnerView.swift in Sources */,
 				879379EF298BBDB800D3A47B /* PartnerNameEditViewModel.swift in Sources */,
@@ -924,7 +919,6 @@
 				8737FCEA297E0BDF0064E40D /* LaunchScreen.swift in Sources */,
 				87830E70297A1AB900184A7C /* SignInTests.swift in Sources */,
 				87F53FE1297EA44E00293176 /* FireStoreTransactionManager.swift in Sources */,
-				87830E7B297A1C6A00184A7C /* ContentView.swift in Sources */,
 				87C162DC2A2ACEA300382061 /* Transaction.swift in Sources */,
 				87CDAAC0297E8CF900F52887 /* AddTransactionView.swift in Sources */,
 				87CDAAB6297E5C8000F52887 /* CommonWalletViewModel.swift in Sources */,
@@ -1018,7 +1012,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1072,7 +1066,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

CommonWallet/AppDelegate.swift

@@ -11,7 +11,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
   func application(_ application: UIApplication,
                    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
     FirebaseApp.configure()
-
     return true
   }
 }

CommonWallet/CoreData/TransactionData.swift → CommonWallet/Models/CoreData/TransactionData.swift

@@ -53,21 +53,20 @@ final public class TransactionData: ObservableObject {
     private var addSnapShotListenerCount: Int = 0
 
     init() {
-        fetchTransactions()
+        realtimeFetchTransactions()
     }
 
-    private func fetchTransactions() {
+    private func realtimeFetchTransactions() {
 
         fireStoreTransactionManager.fetchTransactions(myUserId: myUserId, partnerUserId: partnerUserId, completion: { [weak self] transactions, error in
 
             if let error = error {
                 print(error)
-            }
-
-            guard let transactions = transactions else {
                 return
             }
 
+            guard let transactions = transactions else { return }
+
             // トランザクションを時系列ごとに並べ替える
             let sortedTransactions = transactions.sorted(by: { (a, b) -> Bool in
                 return a.createdAt > b.createdAt

CommonWallet/Models/Domain/Partner.swift

@@ -0,0 +1,15 @@
+//
+//  Partner.swift
+//  CommonWallet
+//
+
+import Foundation
+
+struct Partner {
+    var userId: String?
+    var userName: String
+    var modifiedName: String?
+    var shareNumber: String?
+    var iconPath: String?
+    var iconData: Data?
+}