Skip to content

Structure improvements #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volodymyr-chekyrta merged 1 commit into from
Mar 23, 2023
Merged

Structure improvements #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Authorization/Authorization.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
020C31BD290AADA700D6DEA2 /* Base */,
071009C528D1D9FA00344290 /* Login */,
07169462296D93E000E3DED6 /* Registration */,
02F3BFE4292533720051930C /* AuthorizationRouter.swift */,
);
path = Presentation;
sourceTree = "<group>";
Expand Down Expand Up @@ -187,7 +188,6 @@
0770DE6F28D0C08E006D8A5D /* SwiftGen */,
071009CC28D1E24000344290 /* Presentation */,
0770DE6D28D0C035006D8A5D /* Localizable.strings */,
02F3BFE4292533720051930C /* AuthorizationRouter.swift */,
);
path = Authorization;
sourceTree = "<group>";
Expand Down
0 ...n/Authorization/AuthorizationRouter.swift → ...on/Presentation/AuthorizationRouter.swift
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions Core/Core.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
072787B628D37A0E002E9142 /* Validator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 072787B528D37A0E002E9142 /* Validator.swift */; };
07460FE1294B706200F70538 /* CollectionExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07460FE0294B706200F70538 /* CollectionExtension.swift */; };
07460FE3294B72D700F70538 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07460FE2294B72D700F70538 /* Notification.swift */; };
0770DE1928D0847D006D8A5D /* RouterProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE1828D0847D006D8A5D /* RouterProtocol.swift */; };
0770DE1928D0847D006D8A5D /* BaseRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE1828D0847D006D8A5D /* BaseRouter.swift */; };
0770DE2528D08FBA006D8A5D /* AppStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2428D08FBA006D8A5D /* AppStorage.swift */; };
0770DE2A28D0929E006D8A5D /* HTTPTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2928D0929E006D8A5D /* HTTPTask.swift */; };
0770DE2C28D092B3006D8A5D /* NetworkLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE2B28D092B3006D8A5D /* NetworkLogger.swift */; };
Expand Down Expand Up @@ -215,7 +215,7 @@
07460FE0294B706200F70538 /* CollectionExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionExtension.swift; sourceTree = "<group>"; };
07460FE2294B72D700F70538 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
0770DE0828D07831006D8A5D /* Core.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0770DE1828D0847D006D8A5D /* RouterProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterProtocol.swift; sourceTree = "<group>"; };
0770DE1828D0847D006D8A5D /* BaseRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseRouter.swift; sourceTree = "<group>"; };
0770DE2428D08FBA006D8A5D /* AppStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStorage.swift; sourceTree = "<group>"; };
0770DE2928D0929E006D8A5D /* HTTPTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPTask.swift; sourceTree = "<group>"; };
0770DE2B28D092B3006D8A5D /* NetworkLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkLogger.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -351,6 +351,8 @@
02CF46C92954A42100A698EE /* Persistence */ = {
isa = PBXGroup;
children = (
02A4833629B8A8F800D33F33 /* CoreDataModel.xcdatamodeld */,
02A4833429B8A73400D33F33 /* CorePersistence.swift */,
02CF46C729546AA200A698EE /* NoCachedDataError.swift */,
);
path = Persistence;
Expand All @@ -360,7 +362,7 @@
isa = PBXGroup;
children = (
CFC84955299FAC4D0055E497 /* Combine */,
0770DE1828D0847D006D8A5D /* RouterProtocol.swift */,
0770DE1828D0847D006D8A5D /* BaseRouter.swift */,
0727876F28D23411002E9142 /* Config.swift */,
0231CDBD2922422D00032416 /* CSSInjector.swift */,
02280F5A294B4E6F0032823A /* Connectivity.swift */,
Expand Down Expand Up @@ -458,8 +460,6 @@
0770DE5D28D0B209006D8A5D /* Localizable.strings */,
0770DE5128D0ADFF006D8A5D /* Assets.xcassets */,
071009CF28D1E3A600344290 /* Constants.swift */,
02A4833429B8A73400D33F33 /* CorePersistence.swift */,
02A4833629B8A8F800D33F33 /* CoreDataModel.xcdatamodeld */,
);
path = Core;
sourceTree = "<group>";
Expand Down Expand Up @@ -796,7 +796,7 @@
0259104A29C4A5B6004B5A55 /* UserSettings.swift in Sources */,
021D925028DC89D100ACC565 /* UserProfile.swift in Sources */,
071009D028D1E3A600344290 /* Constants.swift in Sources */,
0770DE1928D0847D006D8A5D /* RouterProtocol.swift in Sources */,
0770DE1928D0847D006D8A5D /* BaseRouter.swift in Sources */,
0284DBFE28D48C5300830893 /* CourseItem.swift in Sources */,
0248C92329C075EF00DC8402 /* CourseBlockModel.swift in Sources */,
072787B628D37A0E002E9142 /* Validator.swift in Sources */,
Expand Down
0 Core/Core/Configuration/RouterProtocol.swift → Core/Core/Configuration/BaseRouter.swift
View file
Open in desktop
File renamed without changes.
0 ...modeld/CoreDataModel.xcdatamodel/contents → ...modeld/CoreDataModel.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 Core/Core/CorePersistence.swift → ...re/Data/Persistence/CorePersistence.swift
View file
Open in desktop
File renamed without changes.
14 changes: 11 additions & 3 deletions Course/Course.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0208666A29CC6D8000BC05B2 /* Persistence */ = {
isa = PBXGroup;
children = (
02280F5F294B50030032823A /* CoursePersistence.swift */,
02280F5C294B4FDA0032823A /* CourseCoreModel.xcdatamodeld */,
);
path = Persistence;
sourceTree = "<group>";
};
023812E5297AC8EB0087098F /* CourseTests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -193,9 +202,6 @@
02B6B3B528E1D10700232911 /* Domain */,
02EAE2CA28E1F0A700529644 /* Presentation */,
02B6B3B428E1C49400232911 /* Localizable.strings */,
02F3BFDC29252E900051930C /* CourseRouter.swift */,
02280F5C294B4FDA0032823A /* CourseCoreModel.xcdatamodeld */,
02280F5F294B50030032823A /* CoursePersistence.swift */,
);
path = Course;
sourceTree = "<group>";
Expand All @@ -220,6 +226,7 @@
02B6B3B828E1D12900232911 /* Data */ = {
isa = PBXGroup;
children = (
0208666A29CC6D8000BC05B2 /* Persistence */,
02B6B3BF28E1DB8800232911 /* Model */,
02B6B3B928E1D13500232911 /* Network */,
02B6B3BB28E1D14F00232911 /* CourseRepository.swift */,
Expand Down Expand Up @@ -276,6 +283,7 @@
02DFC65029ACC20A00EA4BB9 /* Handouts */,
070019A928F6F59D00D5FC78 /* Unit */,
070019AA28F6F79E00D5FC78 /* Video */,
02F3BFDC29252E900051930C /* CourseRouter.swift */,
);
path = Presentation;
sourceTree = "<group>";
Expand Down
0 ...deld/CourseCoreModel.xcdatamodel/contents → ...deld/CourseCoreModel.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 Course/Course/CoursePersistence.swift → .../Data/Persistence/CoursePersistence.swift
View file
Open in desktop
File renamed without changes.
0 Course/Course/CourseRouter.swift → ...se/Course/Presentation/CourseRouter.swift
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions Dashboard/Dashboard.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0208666929CC6D0F00BC05B2 /* Persistence */ = {
isa = PBXGroup;
children = (
02A48B19295ACE3D0033D5E0 /* DashboardPersistence.swift */,
02A48B16295ACE200033D5E0 /* DashboardCoreModel.xcdatamodeld */,
);
path = Persistence;
sourceTree = "<group>";
};
027DB33628D8D851002B6862 /* Domain */ = {
isa = PBXGroup;
children = (
Expand All @@ -111,6 +120,7 @@
027DB33A28D8DB45002B6862 /* Data */ = {
isa = PBXGroup;
children = (
0208666929CC6D0F00BC05B2 /* Persistence */,
027DB33728D8D9E3002B6862 /* Network */,
027DB33C28D8DB5E002B6862 /* DashboardRepository.swift */,
);
Expand Down Expand Up @@ -154,29 +164,19 @@
027DB33A28D8DB45002B6862 /* Data */,
027DB33628D8D851002B6862 /* Domain */,
02F6EF3F28D9ECA200835477 /* Presentation */,
02F3BFE029252FCB0051930C /* DashboardRouter.swift */,
02F6EF4528D9ECC500835477 /* Localizable.strings */,
02A48B16295ACE200033D5E0 /* DashboardCoreModel.xcdatamodeld */,
02A48B19295ACE3D0033D5E0 /* DashboardPersistence.swift */,
);
path = Dashboard;
sourceTree = "<group>";
};
02F6EF3F28D9ECA200835477 /* Presentation */ = {
isa = PBXGroup;
children = (
02F6EF4028D9ECAB00835477 /* Dashboard */,
);
path = Presentation;
sourceTree = "<group>";
};
02F6EF4028D9ECAB00835477 /* Dashboard */ = {
isa = PBXGroup;
children = (
027DB33228D8BDBA002B6862 /* DashboardView.swift */,
027DB34428D8E9D2002B6862 /* DashboardViewModel.swift */,
02F3BFE029252FCB0051930C /* DashboardRouter.swift */,
);
path = Dashboard;
path = Presentation;
sourceTree = "<group>";
};
02F6EF4628D9ED0C00835477 /* SwiftGen */ = {
Expand Down
0 ...d/DashboardCoreModel.xcdatamodel/contents → ...d/DashboardCoreModel.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...oard/Dashboard/DashboardPersistence.swift → ...ta/Persistence/DashboardPersistence.swift
View file
Open in desktop
File renamed without changes.
0 Dashboard/Dashboard/DashboardRouter.swift → ...hboard/Presentation/DashboardRouter.swift
View file
Open in desktop
File renamed without changes.
0 ...resentation/Dashboard/DashboardView.swift → ...ashboard/Presentation/DashboardView.swift
View file
Open in desktop
File renamed without changes.
0 ...tation/Dashboard/DashboardViewModel.swift → ...ard/Presentation/DashboardViewModel.swift
View file
Open in desktop
File renamed without changes.
14 changes: 11 additions & 3 deletions Discovery/Discovery.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
0208666829CC6CD600BC05B2 /* Persistence */ = {
isa = PBXGroup;
children = (
029737412949FB3B0051696B /* DiscoveryPersistence.swift */,
0297373E2949FB070051696B /* DiscoveryCoreModel.xcdatamodeld */,
);
path = Persistence;
sourceTree = "<group>";
};
022D04882976D7E100E0059B /* DiscoveryTests */ = {
isa = PBXGroup;
children = (
Expand All @@ -115,6 +124,7 @@
children = (
0284DBFA28D4832D00830893 /* Network */,
0284DC0228D4922900830893 /* DiscoveryRepository.swift */,
0208666829CC6CD600BC05B2 /* Persistence */,
);
path = Data;
sourceTree = "<group>";
Expand Down Expand Up @@ -150,6 +160,7 @@
0283347828D49A8700C828FC /* DiscoveryViewModel.swift */,
CFC849422996A5150055E497 /* SearchView.swift */,
CFC849442996A52A0055E497 /* SearchViewModel.swift */,
02F3BFDE29252F2F0051930C /* DiscoveryRouter.swift */,
);
path = Presentation;
sourceTree = "<group>";
Expand Down Expand Up @@ -182,11 +193,8 @@
0284DBF828D4831000830893 /* Data */,
0284DC0428D4996F00830893 /* Domain */,
070019A228F6EF2700D5FC78 /* Presentation */,
02F3BFDE29252F2F0051930C /* DiscoveryRouter.swift */,
02EF39D928D86A380058F6BD /* Localizable.strings */,
CFC8494E299A66080055E497 /* Localizable.stringsdict */,
0297373E2949FB070051696B /* DiscoveryCoreModel.xcdatamodeld */,
029737412949FB3B0051696B /* DiscoveryPersistence.swift */,
);
path = Discovery;
sourceTree = "<group>";
Expand Down
0 ...d/DiscoveryCoreModel.xcdatamodel/contents → ...d/DiscoveryCoreModel.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...very/Discovery/DiscoveryPersistence.swift → ...ta/Persistence/DiscoveryPersistence.swift
View file
Open in desktop
File renamed without changes.
0 Discovery/Discovery/DiscoveryRouter.swift → ...covery/Presentation/DiscoveryRouter.swift
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Profile/Profile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
021D925328DC92E900ACC565 /* Domain */,
021D924428DC631800ACC565 /* Presentation */,
021D926128DDADE600ACC565 /* Localizable.strings */,
02F3BFE6292539850051930C /* ProfileRouter.swift */,
);
path = Profile;
sourceTree = "<group>";
Expand All @@ -171,6 +170,7 @@
0203DC3D29AE79F80017BD05 /* Profile */,
0203DC3C29AE79EB0017BD05 /* EditProfile */,
0262149029AE5793008BD75A /* DeleteAccount */,
02F3BFE6292539850051930C /* ProfileRouter.swift */,
);
path = Presentation;
sourceTree = "<group>";
Expand Down
0 Profile/Profile/ProfileRouter.swift → .../Profile/Presentation/ProfileRouter.swift
View file
Open in desktop
File renamed without changes.