Skip to content

Commit b366524

Browse files
Nguyen PhongNguyenPhongVN
Nguyen Phong
authored and
NguyenPhongVN
committed
update new architecture
Signed-off-by: Nguyen Phong <nguyenphong@Nguyens-Mac-mini.local> Signed-off-by: Nguyen Phong <nguyenphong.mobile.engineer@gmail.com>
1 parent ce4c5af commit b366524

File tree

59 files changed

+1357
-1160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1357
-1160
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎AdvanceApp/.DS_Store‎

6 KB
Binary file not shown.

‎AdvanceApp/SwiftUI/Todo+Combine+SwiftUI/.DS_Store‎

6 KB
Binary file not shown.

‎AdvanceApp/UIKit13+/.DS_Store‎

6 KB
Binary file not shown.

‎AdvanceApp/UIKit13+/TodoCombineUIKit13/.DS_Store‎

6 KB
Binary file not shown.

‎AdvanceApp/UIKit13+/TodoRxSwiftUIKit13/.DS_Store‎

10 KB
Binary file not shown.

‎AdvanceApp/UIKit13+/TodoRxSwiftUIKit13/TodoRxSwiftUIKit13.xcodeproj/project.pbxproj‎

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
87262A2127A4996D00C435E2 /* RootState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629EF27A4996D00C435E2 /* RootState.swift */; };
4040
87262A2227A4996D00C435E2 /* RootReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F027A4996D00C435E2 /* RootReducer.swift */; };
4141
87262A2327A4996D00C435E2 /* Realm+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F227A4996D00C435E2 /* Realm+.swift */; };
42-
87262A2427A4996D00C435E2 /* ViewTodoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F527A4996D00C435E2 /* ViewTodoModel.swift */; };
42+
87262A2427A4996D00C435E2 /* TodoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F527A4996D00C435E2 /* TodoModel.swift */; };
4343
87262A2527A4996D00C435E2 /* RealmTodoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F727A4996D00C435E2 /* RealmTodoModel.swift */; };
4444
87262A2627A4996D00C435E2 /* SocketModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629F927A4996D00C435E2 /* SocketModel.swift */; };
4545
87262A2727A4996D00C435E2 /* ButtonReloadMainTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 872629FB27A4996D00C435E2 /* ButtonReloadMainTableViewCell.swift */; };
@@ -49,16 +49,19 @@
4949
87262A2B27A4996D00C435E2 /* Alamofire+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87262A0027A4996D00C435E2 /* Alamofire+.swift */; };
5050
87262A2C27A4996D00C435E2 /* Socket+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87262A0127A4996D00C435E2 /* Socket+.swift */; };
5151
87262A2D27A4996D00C435E2 /* View+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87262A0327A4996D00C435E2 /* View+.swift */; };
52+
87282547298756E200BA6878 /* RxDataSources in Frameworks */ = {isa = PBXBuildFile; productRef = 87282546298756E200BA6878 /* RxDataSources */; };
53+
872825492987588100BA6878 /* Differentiator in Frameworks */ = {isa = PBXBuildFile; productRef = 872825482987588100BA6878 /* Differentiator */; };
54+
8728254C298759B500BA6878 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 8728254B298759B500BA6878 /* Realm */; };
55+
8728254E298759B500BA6878 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 8728254D298759B500BA6878 /* RealmSwift */; };
5256
8740815527A441F200E542C3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8740815427A441F200E542C3 /* Assets.xcassets */; };
5357
8740815827A441F200E542C3 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8740815727A441F200E542C3 /* Preview Assets.xcassets */; };
5458
8742E1C427A49162009A5827 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1C327A49162009A5827 /* ComposableArchitecture */; };
5559
8742E1C727A49197009A5827 /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1C627A49197009A5827 /* RxCocoa */; };
56-
8742E1CA27A491E0009A5827 /* Realm in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1C927A491E0009A5827 /* Realm */; };
57-
8742E1CC27A491E0009A5827 /* RealmSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1CB27A491E0009A5827 /* RealmSwift */; };
5860
8742E1DF27A4930B009A5827 /* Json in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1DE27A4930B009A5827 /* Json */; };
5961
8742E1E227A49329009A5827 /* ConvertSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 8742E1E127A49329009A5827 /* ConvertSwift */; };
6062
874411E327A4B5C200064E34 /* RxSwiftRequest in Frameworks */ = {isa = PBXBuildFile; productRef = 874411E227A4B5C200064E34 /* RxSwiftRequest */; };
6163
874411E527A4B5C200064E34 /* RxSwiftWebSocket in Frameworks */ = {isa = PBXBuildFile; productRef = 874411E427A4B5C200064E34 /* RxSwiftWebSocket */; };
64+
8768EBEB298A432A00CA9E35 /* BaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8768EBEA298A432A00CA9E35 /* BaseModel.swift */; };
6265
/* End PBXBuildFile section */
6366

6467
/* Begin PBXFileReference section */
@@ -94,7 +97,7 @@
9497
872629EF27A4996D00C435E2 /* RootState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootState.swift; sourceTree = "<group>"; };
9598
872629F027A4996D00C435E2 /* RootReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootReducer.swift; sourceTree = "<group>"; };
9699
872629F227A4996D00C435E2 /* Realm+.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Realm+.swift"; sourceTree = "<group>"; };
97-
872629F527A4996D00C435E2 /* ViewTodoModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewTodoModel.swift; sourceTree = "<group>"; };
100+
872629F527A4996D00C435E2 /* TodoModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoModel.swift; sourceTree = "<group>"; };
98101
872629F727A4996D00C435E2 /* RealmTodoModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmTodoModel.swift; sourceTree = "<group>"; };
99102
872629F927A4996D00C435E2 /* SocketModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SocketModel.swift; sourceTree = "<group>"; };
100103
872629FB27A4996D00C435E2 /* ButtonReloadMainTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonReloadMainTableViewCell.swift; sourceTree = "<group>"; };
@@ -107,6 +110,7 @@
107110
8740814D27A441F100E542C3 /* TodoRxSwiftUIKit13.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TodoRxSwiftUIKit13.app; sourceTree = BUILT_PRODUCTS_DIR; };
108111
8740815427A441F200E542C3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
109112
8740815727A441F200E542C3 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
113+
8768EBEA298A432A00CA9E35 /* BaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseModel.swift; sourceTree = "<group>"; };
110114
/* End PBXFileReference section */
111115

112116
/* Begin PBXFrameworksBuildPhase section */
@@ -116,11 +120,13 @@
116120
files = (
117121
8742E1DF27A4930B009A5827 /* Json in Frameworks */,
118122
8742E1E227A49329009A5827 /* ConvertSwift in Frameworks */,
119-
8742E1CC27A491E0009A5827 /* RealmSwift in Frameworks */,
120-
8742E1CA27A491E0009A5827 /* Realm in Frameworks */,
121123
8742E1C727A49197009A5827 /* RxCocoa in Frameworks */,
122124
874411E327A4B5C200064E34 /* RxSwiftRequest in Frameworks */,
125+
872825492987588100BA6878 /* Differentiator in Frameworks */,
126+
87282547298756E200BA6878 /* RxDataSources in Frameworks */,
127+
8728254C298759B500BA6878 /* Realm in Frameworks */,
123128
874411E527A4B5C200064E34 /* RxSwiftWebSocket in Frameworks */,
129+
8728254E298759B500BA6878 /* RealmSwift in Frameworks */,
124130
8742E1C427A49162009A5827 /* ComposableArchitecture in Frameworks */,
125131
);
126132
runOnlyForDeploymentPostprocessing = 0;
@@ -256,7 +262,8 @@
256262
872629F427A4996D00C435E2 /* ViewModels */ = {
257263
isa = PBXGroup;
258264
children = (
259-
872629F527A4996D00C435E2 /* ViewTodoModel.swift */,
265+
872629F527A4996D00C435E2 /* TodoModel.swift */,
266+
8768EBEA298A432A00CA9E35 /* BaseModel.swift */,
260267
);
261268
path = ViewModels;
262269
sourceTree = "<group>";
@@ -366,12 +373,14 @@
366373
packageProductDependencies = (
367374
8742E1C327A49162009A5827 /* ComposableArchitecture */,
368375
8742E1C627A49197009A5827 /* RxCocoa */,
369-
8742E1C927A491E0009A5827 /* Realm */,
370-
8742E1CB27A491E0009A5827 /* RealmSwift */,
371376
8742E1DE27A4930B009A5827 /* Json */,
372377
8742E1E127A49329009A5827 /* ConvertSwift */,
373378
874411E227A4B5C200064E34 /* RxSwiftRequest */,
374379
874411E427A4B5C200064E34 /* RxSwiftWebSocket */,
380+
87282546298756E200BA6878 /* RxDataSources */,
381+
872825482987588100BA6878 /* Differentiator */,
382+
8728254B298759B500BA6878 /* Realm */,
383+
8728254D298759B500BA6878 /* RealmSwift */,
375384
);
376385
productName = TodoRxSwiftUIKit13;
377386
productReference = 8740814D27A441F100E542C3 /* TodoRxSwiftUIKit13.app */;
@@ -404,10 +413,11 @@
404413
packageReferences = (
405414
8742E1C227A49162009A5827 /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */,
406415
8742E1C527A49197009A5827 /* XCRemoteSwiftPackageReference "RxSwift" */,
407-
8742E1C827A491E0009A5827 /* XCRemoteSwiftPackageReference "realm-swift" */,
408416
8742E1D827A492EF009A5827 /* XCRemoteSwiftPackageReference "Networking" */,
409417
8742E1DD27A4930A009A5827 /* XCRemoteSwiftPackageReference "Json" */,
410418
8742E1E027A49329009A5827 /* XCRemoteSwiftPackageReference "SwiftExtension" */,
419+
87282545298756E200BA6878 /* XCRemoteSwiftPackageReference "RxDataSources" */,
420+
8728254A298759B500BA6878 /* XCRemoteSwiftPackageReference "realm-swift" */,
411421
);
412422
productRefGroup = 8740814E27A441F100E542C3 /* Products */;
413423
projectDirPath = "";
@@ -440,7 +450,7 @@
440450
87262A1B27A4996D00C435E2 /* LoginAction.swift in Sources */,
441451
87262A2727A4996D00C435E2 /* ButtonReloadMainTableViewCell.swift in Sources */,
442452
87262A0827A4996D00C435E2 /* MainState.swift in Sources */,
443-
87262A2427A4996D00C435E2 /* ViewTodoModel.swift in Sources */,
453+
87262A2427A4996D00C435E2 /* TodoModel.swift in Sources */,
444454
87262A1127A4996D00C435E2 /* RegisterAction.swift in Sources */,
445455
87262A1727A4996D00C435E2 /* AuthAction.swift in Sources */,
446456
87262A0427A4996D00C435E2 /* TodoApp.swift in Sources */,
@@ -469,6 +479,7 @@
469479
87262A0B27A4996D00C435E2 /* CounterState.swift in Sources */,
470480
87262A0727A4996D00C435E2 /* MainEnvironment.swift in Sources */,
471481
87262A2C27A4996D00C435E2 /* Socket+.swift in Sources */,
482+
8768EBEB298A432A00CA9E35 /* BaseModel.swift in Sources */,
472483
87262A0D27A4996D00C435E2 /* CounterEnvironment.swift in Sources */,
473484
87262A2927A4996D00C435E2 /* ActivityIndicatorViewController.swift in Sources */,
474485
87262A0F27A4996D00C435E2 /* AuthViewController.swift in Sources */,
@@ -683,6 +694,22 @@
683694
/* End XCConfigurationList section */
684695

685696
/* Begin XCRemoteSwiftPackageReference section */
697+
87282545298756E200BA6878 /* XCRemoteSwiftPackageReference "RxDataSources" */ = {
698+
isa = XCRemoteSwiftPackageReference;
699+
repositoryURL = "https://github.com/RxSwiftCommunity/RxDataSources";
700+
requirement = {
701+
kind = upToNextMajorVersion;
702+
minimumVersion = 5.0.0;
703+
};
704+
};
705+
8728254A298759B500BA6878 /* XCRemoteSwiftPackageReference "realm-swift" */ = {
706+
isa = XCRemoteSwiftPackageReference;
707+
repositoryURL = "https://github.com/realm/realm-swift.git";
708+
requirement = {
709+
kind = exactVersion;
710+
version = 10.34.1;
711+
};
712+
};
686713
8742E1C227A49162009A5827 /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */ = {
687714
isa = XCRemoteSwiftPackageReference;
688715
repositoryURL = "https://github.com/FullStack-Swift/rxswift-composable-architecture";
@@ -699,14 +726,6 @@
699726
version = 6.5.0;
700727
};
701728
};
702-
8742E1C827A491E0009A5827 /* XCRemoteSwiftPackageReference "realm-swift" */ = {
703-
isa = XCRemoteSwiftPackageReference;
704-
repositoryURL = "https://github.com/realm/realm-swift.git";
705-
requirement = {
706-
kind = exactVersion;
707-
version = 10.22.0;
708-
};
709-
};
710729
8742E1D827A492EF009A5827 /* XCRemoteSwiftPackageReference "Networking" */ = {
711730
isa = XCRemoteSwiftPackageReference;
712731
repositoryURL = "https://github.com/FullStack-Swift/Networking";
@@ -734,26 +753,36 @@
734753
/* End XCRemoteSwiftPackageReference section */
735754

736755
/* Begin XCSwiftPackageProductDependency section */
737-
8742E1C327A49162009A5827 /* ComposableArchitecture */ = {
756+
87282546298756E200BA6878 /* RxDataSources */ = {
738757
isa = XCSwiftPackageProductDependency;
739-
package = 8742E1C227A49162009A5827 /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */;
740-
productName = ComposableArchitecture;
758+
package = 87282545298756E200BA6878 /* XCRemoteSwiftPackageReference "RxDataSources" */;
759+
productName = RxDataSources;
741760
};
742-
8742E1C627A49197009A5827 /* RxCocoa */ = {
761+
872825482987588100BA6878 /* Differentiator */ = {
743762
isa = XCSwiftPackageProductDependency;
744-
package = 8742E1C527A49197009A5827 /* XCRemoteSwiftPackageReference "RxSwift" */;
745-
productName = RxCocoa;
763+
package = 87282545298756E200BA6878 /* XCRemoteSwiftPackageReference "RxDataSources" */;
764+
productName = Differentiator;
746765
};
747-
8742E1C927A491E0009A5827 /* Realm */ = {
766+
8728254B298759B500BA6878 /* Realm */ = {
748767
isa = XCSwiftPackageProductDependency;
749-
package = 8742E1C827A491E0009A5827 /* XCRemoteSwiftPackageReference "realm-swift" */;
768+
package = 8728254A298759B500BA6878 /* XCRemoteSwiftPackageReference "realm-swift" */;
750769
productName = Realm;
751770
};
752-
8742E1CB27A491E0009A5827 /* RealmSwift */ = {
771+
8728254D298759B500BA6878 /* RealmSwift */ = {
753772
isa = XCSwiftPackageProductDependency;
754-
package = 8742E1C827A491E0009A5827 /* XCRemoteSwiftPackageReference "realm-swift" */;
773+
package = 8728254A298759B500BA6878 /* XCRemoteSwiftPackageReference "realm-swift" */;
755774
productName = RealmSwift;
756775
};
776+
8742E1C327A49162009A5827 /* ComposableArchitecture */ = {
777+
isa = XCSwiftPackageProductDependency;
778+
package = 8742E1C227A49162009A5827 /* XCRemoteSwiftPackageReference "rxswift-composable-architecture" */;
779+
productName = ComposableArchitecture;
780+
};
781+
8742E1C627A49197009A5827 /* RxCocoa */ = {
782+
isa = XCSwiftPackageProductDependency;
783+
package = 8742E1C527A49197009A5827 /* XCRemoteSwiftPackageReference "RxSwift" */;
784+
productName = RxCocoa;
785+
};
757786
8742E1DE27A4930B009A5827 /* Json */ = {
758787
isa = XCSwiftPackageProductDependency;
759788
package = 8742E1DD27A4930A009A5827 /* XCRemoteSwiftPackageReference "Json" */;

0 commit comments

Comments
 (0)