From bb8a8dee054935bd5c18e9318cb3c6860c95134a Mon Sep 17 00:00:00 2001 From: Arkadiusz Fal Date: Thu, 21 Oct 2021 11:30:33 +0200 Subject: [PATCH] Restructure model --- Model/{ => Accounts}/Account.swift | 0 Model/{ => Accounts}/AccountValidator.swift | 0 Model/{ => Accounts}/AccountsModel.swift | 0 Model/{ => Accounts}/Instance.swift | 0 Model/{ => Accounts}/InstancesModel.swift | 0 Model/{ => Applications}/InvidiousAPI.swift | 0 Model/{ => Applications}/PipedAPI.swift | 0 .../{ => Applications}/SponsorBlockAPI.swift | 0 Model/{ => Applications}/VideosAPI.swift | 0 Model/{ => Applications}/VideosApp.swift | 0 Model/{ => Player}/PlayerModel.swift | 0 Model/{ => Player}/PlayerQueue.swift | 0 Model/{ => Player}/PlayerQueueItem.swift | 0 Model/{ => Player}/PlayerStreams.swift | 0 Pearvidious.xcodeproj/project.pbxproj | 54 +++++++++++++------ 15 files changed, 38 insertions(+), 16 deletions(-) rename Model/{ => Accounts}/Account.swift (100%) rename Model/{ => Accounts}/AccountValidator.swift (100%) rename Model/{ => Accounts}/AccountsModel.swift (100%) rename Model/{ => Accounts}/Instance.swift (100%) rename Model/{ => Accounts}/InstancesModel.swift (100%) rename Model/{ => Applications}/InvidiousAPI.swift (100%) rename Model/{ => Applications}/PipedAPI.swift (100%) rename Model/{ => Applications}/SponsorBlockAPI.swift (100%) rename Model/{ => Applications}/VideosAPI.swift (100%) rename Model/{ => Applications}/VideosApp.swift (100%) rename Model/{ => Player}/PlayerModel.swift (100%) rename Model/{ => Player}/PlayerQueue.swift (100%) rename Model/{ => Player}/PlayerQueueItem.swift (100%) rename Model/{ => Player}/PlayerStreams.swift (100%) diff --git a/Model/Account.swift b/Model/Accounts/Account.swift similarity index 100% rename from Model/Account.swift rename to Model/Accounts/Account.swift diff --git a/Model/AccountValidator.swift b/Model/Accounts/AccountValidator.swift similarity index 100% rename from Model/AccountValidator.swift rename to Model/Accounts/AccountValidator.swift diff --git a/Model/AccountsModel.swift b/Model/Accounts/AccountsModel.swift similarity index 100% rename from Model/AccountsModel.swift rename to Model/Accounts/AccountsModel.swift diff --git a/Model/Instance.swift b/Model/Accounts/Instance.swift similarity index 100% rename from Model/Instance.swift rename to Model/Accounts/Instance.swift diff --git a/Model/InstancesModel.swift b/Model/Accounts/InstancesModel.swift similarity index 100% rename from Model/InstancesModel.swift rename to Model/Accounts/InstancesModel.swift diff --git a/Model/InvidiousAPI.swift b/Model/Applications/InvidiousAPI.swift similarity index 100% rename from Model/InvidiousAPI.swift rename to Model/Applications/InvidiousAPI.swift diff --git a/Model/PipedAPI.swift b/Model/Applications/PipedAPI.swift similarity index 100% rename from Model/PipedAPI.swift rename to Model/Applications/PipedAPI.swift diff --git a/Model/SponsorBlockAPI.swift b/Model/Applications/SponsorBlockAPI.swift similarity index 100% rename from Model/SponsorBlockAPI.swift rename to Model/Applications/SponsorBlockAPI.swift diff --git a/Model/VideosAPI.swift b/Model/Applications/VideosAPI.swift similarity index 100% rename from Model/VideosAPI.swift rename to Model/Applications/VideosAPI.swift diff --git a/Model/VideosApp.swift b/Model/Applications/VideosApp.swift similarity index 100% rename from Model/VideosApp.swift rename to Model/Applications/VideosApp.swift diff --git a/Model/PlayerModel.swift b/Model/Player/PlayerModel.swift similarity index 100% rename from Model/PlayerModel.swift rename to Model/Player/PlayerModel.swift diff --git a/Model/PlayerQueue.swift b/Model/Player/PlayerQueue.swift similarity index 100% rename from Model/PlayerQueue.swift rename to Model/Player/PlayerQueue.swift diff --git a/Model/PlayerQueueItem.swift b/Model/Player/PlayerQueueItem.swift similarity index 100% rename from Model/PlayerQueueItem.swift rename to Model/Player/PlayerQueueItem.swift diff --git a/Model/PlayerStreams.swift b/Model/Player/PlayerStreams.swift similarity index 100% rename from Model/PlayerStreams.swift rename to Model/Player/PlayerStreams.swift diff --git a/Pearvidious.xcodeproj/project.pbxproj b/Pearvidious.xcodeproj/project.pbxproj index c675af13..cc1f5edf 100644 --- a/Pearvidious.xcodeproj/project.pbxproj +++ b/Pearvidious.xcodeproj/project.pbxproj @@ -412,7 +412,6 @@ 376A33E32720CB35000C1D6B /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = ""; }; 376B2E0626F920D600B1D64D /* SignInRequiredView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInRequiredView.swift; sourceTree = ""; }; 376CD21526FBE18D001E1AC1 /* Instance+Fixtures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Instance+Fixtures.swift"; sourceTree = ""; }; - 37725DF327204139006D4D4B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 37732FEF2703A26300F04329 /* ValidationStatusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidationStatusView.swift; sourceTree = ""; }; 37732FF32703D32400F04329 /* Sidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sidebar.swift; sourceTree = ""; }; 377A20A82693C9A2002842B8 /* TypedContentAccessors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypedContentAccessors.swift; sourceTree = ""; }; @@ -642,6 +641,41 @@ path = Views; sourceTree = ""; }; + 3743B864272169E200261544 /* Applications */ = { + isa = PBXGroup; + children = ( + 37977582268922F600DD52A8 /* InvidiousAPI.swift */, + 3700155A271B0D4D0049C794 /* PipedAPI.swift */, + 37EAD86A267B9C5600D9E01B /* SponsorBlockAPI.swift */, + 37D526DD2720AC4400ED2F5E /* VideosAPI.swift */, + 376A33DF2720CAD6000C1D6B /* VideosApp.swift */, + ); + path = Applications; + sourceTree = ""; + }; + 3743B86527216A0600261544 /* Player */ = { + isa = PBXGroup; + children = ( + 37B767DA2677C3CA0098BAA8 /* PlayerModel.swift */, + 37319F0427103F94004ECCD0 /* PlayerQueue.swift */, + 37CC3F44270CE30600608308 /* PlayerQueueItem.swift */, + 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */, + ); + path = Player; + sourceTree = ""; + }; + 3743B86627216A1E00261544 /* Accounts */ = { + isa = PBXGroup; + children = ( + 376A33E32720CB35000C1D6B /* Account.swift */, + 37001562271B1F250049C794 /* AccountsModel.swift */, + 37484C3026FCB8F900287258 /* AccountValidator.swift */, + 378E50FA26FE8B9F00F49626 /* Instance.swift */, + 375DFB5726F9DA010013F468 /* InstancesModel.swift */, + ); + path = Accounts; + sourceTree = ""; + }; 3748186426A762300084E870 /* Fixtures */ = { isa = PBXGroup; children = ( @@ -836,20 +870,12 @@ 37D4B1B72672CFE300C925CA /* Model */ = { isa = PBXGroup; children = ( - 376A33E32720CB35000C1D6B /* Account.swift */, - 37001562271B1F250049C794 /* AccountsModel.swift */, - 37484C3026FCB8F900287258 /* AccountValidator.swift */, + 3743B86627216A1E00261544 /* Accounts */, + 3743B864272169E200261544 /* Applications */, + 3743B86527216A0600261544 /* Player */, 37AAF28F26740715007FC770 /* Channel.swift */, 37141672267A8E10006CA35D /* Country.swift */, - 378E50FA26FE8B9F00F49626 /* Instance.swift */, - 375DFB5726F9DA010013F468 /* InstancesModel.swift */, - 37977582268922F600DD52A8 /* InvidiousAPI.swift */, 371F2F19269B43D300E4A7AB /* NavigationModel.swift */, - 3700155A271B0D4D0049C794 /* PipedAPI.swift */, - 37B767DA2677C3CA0098BAA8 /* PlayerModel.swift */, - 37319F0427103F94004ECCD0 /* PlayerQueue.swift */, - 37CC3F44270CE30600608308 /* PlayerQueueItem.swift */, - 37DD87C6271C9CFE0027CBF9 /* PlayerStreams.swift */, 376578882685471400D4EA09 /* Playlist.swift */, 37BA794226DBA973002A0235 /* PlaylistsModel.swift */, 37C194C626F6A9C8005D3B96 /* RecentsModel.swift */, @@ -857,7 +883,6 @@ 373CFACA26966264003CB2C6 /* SearchQuery.swift */, 37EAD86E267B9ED100D9E01B /* Segment.swift */, 37CEE4BC2677B670005A1EFE /* SingleAssetStream.swift */, - 37EAD86A267B9C5600D9E01B /* SponsorBlockAPI.swift */, 37C7A1D4267BFD9D0010EAD6 /* SponsorBlockSegment.swift */, 3797758A2689345500DD52A8 /* Store.swift */, 37CEE4C02677B697005A1EFE /* Stream.swift */, @@ -865,8 +890,6 @@ 373CFADA269663F1003CB2C6 /* Thumbnail.swift */, 3705B181267B4E4900704544 /* TrendingCategory.swift */, 37D4B19626717E1500C925CA /* Video.swift */, - 37D526DD2720AC4400ED2F5E /* VideosAPI.swift */, - 376A33DF2720CAD6000C1D6B /* VideosApp.swift */, ); path = Model; sourceTree = ""; @@ -1448,7 +1471,6 @@ 37B767DC2677C3CA0098BAA8 /* PlayerModel.swift in Sources */, 3797758C2689345500DD52A8 /* Store.swift in Sources */, 37141674267A8E10006CA35D /* Country.swift in Sources */, - 37725DF62720420C006D4D4B /* AppDelegate.swift in Sources */, 37FD43E42704847C0073EE42 /* View+Fixtures.swift in Sources */, 37AAF2A126741C97007FC770 /* SubscriptionsView.swift in Sources */, 37732FF12703A26300F04329 /* ValidationStatusView.swift in Sources */,