diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index ae1049fc..56f28686 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -1331,6 +1331,37 @@ path = "Unstable Features"; sourceTree = ""; }; + 990D2AFD2A19566C0055D93C /* SwiftUI */ = { + isa = PBXGroup; + children = ( + 1F07F553295458D800F7BE95 /* Generated */, + 1FAFC5B72927E06C00B8D837 /* App */, + 1FB96FEA292C1704007E68D1 /* Manager */, + 1FB96FC1292A6D6C007E68D1 /* Helper */, + 1FAFC5C22927E17100B8D837 /* Protocols */, + 1FAFC5B02927E01400B8D837 /* Views */, + 1F6E08DD29280AF1005059C0 /* View Extensions */, + 1FB84BA72928E073006A5CF4 /* View Components */, + ); + path = SwiftUI; + sourceTree = ""; + }; + 990D2AFE2A1956740055D93C /* UIKit */ = { + isa = PBXGroup; + children = ( + BFE6325822A83BA800F30809 /* Authentication */, + BFB6B21C2318700D0022A802 /* News */, + BF9ABA4322DCFF33008935CF /* Browse */, + BF3D64A022E7FAD800E9056B /* App Detail */, + BFBBE2E2229320A2002097FA /* My Apps */, + BFDB69FB22A9A7A6007EA6D6 /* Settings */, + BF56D2AD23DF9E170006506D /* App IDs */, + BFC84A4B2421A13000853474 /* Sources */, + BFD2478D2284C4C700981D42 /* Components */, + ); + path = UIKit; + sourceTree = ""; + }; 99F87D1429D8E3F100B40039 /* Generated */ = { isa = PBXGroup; children = ( @@ -1906,37 +1937,22 @@ BFD2476C2284B9A500981D42 /* AltStore */ = { isa = PBXGroup; children = ( - 990D2AE02A1910920055D93C /* Unstable Features */, - 1FAFC5B72927E06C00B8D837 /* App */, - 1FB96FC1292A6D6C007E68D1 /* Helper */, - 1F07F553295458D800F7BE95 /* Generated */, - 1FB96FEA292C1704007E68D1 /* Manager */, - 1FAFC5C22927E17100B8D837 /* Protocols */, - 1FAFC5B02927E01400B8D837 /* Views */, - 1FB84BA72928E073006A5CF4 /* View Components */, - 1F6E08DD29280AF1005059C0 /* View Extensions */, - B39F16112918D7B5002E9404 /* Consts */, BF219A7E22CAC431007676A6 /* AltStore.entitlements */, + BFD247732284B9A500981D42 /* Main.storyboard */, BFD2476D2284B9A500981D42 /* AppDelegate.swift */, BF4B78FD24B3D1DB008AB4AC /* SceneDelegate.swift */, - BFD247732284B9A500981D42 /* Main.storyboard */, BFE338E722F10E56002E24B9 /* LaunchViewController.swift */, BF41B805233423AE00C593A3 /* TabBarController.swift */, - BFE6325822A83BA800F30809 /* Authentication */, - BFB6B21C2318700D0022A802 /* News */, - BF9ABA4322DCFF33008935CF /* Browse */, - BF3D64A022E7FAD800E9056B /* App Detail */, - BFBBE2E2229320A2002097FA /* My Apps */, - BFDB69FB22A9A7A6007EA6D6 /* Settings */, + 990D2AFE2A1956740055D93C /* UIKit */, + 990D2AFD2A19566C0055D93C /* SwiftUI */, + 990D2AE02A1910920055D93C /* Unstable Features */, + B39F16112918D7B5002E9404 /* Consts */, BFD2478A2284C49000981D42 /* Managing Apps */, - BF56D2AD23DF9E170006506D /* App IDs */, - BFC84A4B2421A13000853474 /* Sources */, - BF0DCA642433BDE200E3A595 /* Analytics */, - BFF00D2E2501BD4B00746320 /* Intents */, BFDB6A0922AAEDA1007EA6D6 /* Operations */, - BFD2478D2284C4C700981D42 /* Components */, - BF3D648922E79A7700E9056B /* Types */, BFD2479D2284FBBD00981D42 /* Extensions */, + BFF00D2E2501BD4B00746320 /* Intents */, + BF0DCA642433BDE200E3A595 /* Analytics */, + BF3D648922E79A7700E9056B /* Types */, BFD247962284D7C100981D42 /* Resources */, BF6C8FA8242935CA00125131 /* Dependencies */, BFD247972284D7D800981D42 /* Supporting Files */, diff --git a/AltStore/App/SideStoreUIApp.swift b/AltStore/SwiftUI/App/SideStoreUIApp.swift similarity index 100% rename from AltStore/App/SideStoreUIApp.swift rename to AltStore/SwiftUI/App/SideStoreUIApp.swift diff --git a/AltStore/Generated/Assets.swift b/AltStore/SwiftUI/Generated/Assets.swift similarity index 100% rename from AltStore/Generated/Assets.swift rename to AltStore/SwiftUI/Generated/Assets.swift diff --git a/AltStore/Generated/Localizations.swift b/AltStore/SwiftUI/Generated/Localizations.swift similarity index 100% rename from AltStore/Generated/Localizations.swift rename to AltStore/SwiftUI/Generated/Localizations.swift diff --git a/AltStore/Helper/DateFormatterHelper.swift b/AltStore/SwiftUI/Helper/DateFormatterHelper.swift similarity index 100% rename from AltStore/Helper/DateFormatterHelper.swift rename to AltStore/SwiftUI/Helper/DateFormatterHelper.swift diff --git a/AltStore/Helper/SideloadingManager.swift b/AltStore/SwiftUI/Helper/SideloadingManager.swift similarity index 100% rename from AltStore/Helper/SideloadingManager.swift rename to AltStore/SwiftUI/Helper/SideloadingManager.swift diff --git a/AltStore/Manager/NotificationManager.swift b/AltStore/SwiftUI/Manager/NotificationManager.swift similarity index 100% rename from AltStore/Manager/NotificationManager.swift rename to AltStore/SwiftUI/Manager/NotificationManager.swift diff --git a/AltStore/Manager/OutputCapturer.swift b/AltStore/SwiftUI/Manager/OutputCapturer.swift similarity index 100% rename from AltStore/Manager/OutputCapturer.swift rename to AltStore/SwiftUI/Manager/OutputCapturer.swift diff --git a/AltStore/Protocols/Filterable.swift b/AltStore/SwiftUI/Protocols/Filterable.swift similarity index 100% rename from AltStore/Protocols/Filterable.swift rename to AltStore/SwiftUI/Protocols/Filterable.swift diff --git a/AltStore/Protocols/NavigationTab.swift b/AltStore/SwiftUI/Protocols/NavigationTab.swift similarity index 100% rename from AltStore/Protocols/NavigationTab.swift rename to AltStore/SwiftUI/Protocols/NavigationTab.swift diff --git a/AltStore/Protocols/ViewModel.swift b/AltStore/SwiftUI/Protocols/ViewModel.swift similarity index 100% rename from AltStore/Protocols/ViewModel.swift rename to AltStore/SwiftUI/Protocols/ViewModel.swift diff --git a/AltStore/View Components/AppIconView.swift b/AltStore/SwiftUI/View Components/AppIconView.swift similarity index 100% rename from AltStore/View Components/AppIconView.swift rename to AltStore/SwiftUI/View Components/AppIconView.swift diff --git a/AltStore/View Components/AppPillButton.swift b/AltStore/SwiftUI/View Components/AppPillButton.swift similarity index 100% rename from AltStore/View Components/AppPillButton.swift rename to AltStore/SwiftUI/View Components/AppPillButton.swift diff --git a/AltStore/View Components/AppRowView.swift b/AltStore/SwiftUI/View Components/AppRowView.swift similarity index 100% rename from AltStore/View Components/AppRowView.swift rename to AltStore/SwiftUI/View Components/AppRowView.swift diff --git a/AltStore/View Components/AppScreenshot.swift b/AltStore/SwiftUI/View Components/AppScreenshot.swift similarity index 100% rename from AltStore/View Components/AppScreenshot.swift rename to AltStore/SwiftUI/View Components/AppScreenshot.swift diff --git a/AltStore/View Components/AsyncFallibleButton.swift b/AltStore/SwiftUI/View Components/AsyncFallibleButton.swift similarity index 100% rename from AltStore/View Components/AsyncFallibleButton.swift rename to AltStore/SwiftUI/View Components/AsyncFallibleButton.swift diff --git a/AltStore/View Components/FileExplorer.swift b/AltStore/SwiftUI/View Components/FileExplorer.swift similarity index 100% rename from AltStore/View Components/FileExplorer.swift rename to AltStore/SwiftUI/View Components/FileExplorer.swift diff --git a/AltStore/View Components/HintView.swift b/AltStore/SwiftUI/View Components/HintView.swift similarity index 100% rename from AltStore/View Components/HintView.swift rename to AltStore/SwiftUI/View Components/HintView.swift diff --git a/AltStore/View Components/ModalNavigationLink.swift b/AltStore/SwiftUI/View Components/ModalNavigationLink.swift similarity index 100% rename from AltStore/View Components/ModalNavigationLink.swift rename to AltStore/SwiftUI/View Components/ModalNavigationLink.swift diff --git a/AltStore/View Components/ObservableScrollView.swift b/AltStore/SwiftUI/View Components/ObservableScrollView.swift similarity index 100% rename from AltStore/View Components/ObservableScrollView.swift rename to AltStore/SwiftUI/View Components/ObservableScrollView.swift diff --git a/AltStore/View Components/RatingStars.swift b/AltStore/SwiftUI/View Components/RatingStars.swift similarity index 100% rename from AltStore/View Components/RatingStars.swift rename to AltStore/SwiftUI/View Components/RatingStars.swift diff --git a/AltStore/View Components/RoundedTextField.swift b/AltStore/SwiftUI/View Components/RoundedTextField.swift similarity index 100% rename from AltStore/View Components/RoundedTextField.swift rename to AltStore/SwiftUI/View Components/RoundedTextField.swift diff --git a/AltStore/View Extensions/EnvironmentValues.swift b/AltStore/SwiftUI/View Extensions/EnvironmentValues.swift similarity index 100% rename from AltStore/View Extensions/EnvironmentValues.swift rename to AltStore/SwiftUI/View Extensions/EnvironmentValues.swift diff --git a/AltStore/View Extensions/Modifiers.swift b/AltStore/SwiftUI/View Extensions/Modifiers.swift similarity index 100% rename from AltStore/View Extensions/Modifiers.swift rename to AltStore/SwiftUI/View Extensions/Modifiers.swift diff --git a/AltStore/View Extensions/Styles/FilledButtonStyle.swift b/AltStore/SwiftUI/View Extensions/Styles/FilledButtonStyle.swift similarity index 100% rename from AltStore/View Extensions/Styles/FilledButtonStyle.swift rename to AltStore/SwiftUI/View Extensions/Styles/FilledButtonStyle.swift diff --git a/AltStore/View Extensions/Styles/PillButtonProgressViewStyle.swift b/AltStore/SwiftUI/View Extensions/Styles/PillButtonProgressViewStyle.swift similarity index 100% rename from AltStore/View Extensions/Styles/PillButtonProgressViewStyle.swift rename to AltStore/SwiftUI/View Extensions/Styles/PillButtonProgressViewStyle.swift diff --git a/AltStore/View Extensions/Styles/PillButtonStyle.swift b/AltStore/SwiftUI/View Extensions/Styles/PillButtonStyle.swift similarity index 100% rename from AltStore/View Extensions/Styles/PillButtonStyle.swift rename to AltStore/SwiftUI/View Extensions/Styles/PillButtonStyle.swift diff --git a/AltStore/View Extensions/UIView Representables/ActivityView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/ActivityView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/ActivityView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/ActivityView.swift diff --git a/AltStore/View Extensions/UIView Representables/AppStoreProductView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/AppStoreProductView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/AppStoreProductView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/AppStoreProductView.swift diff --git a/AltStore/View Extensions/UIView Representables/DocumentPicker.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/DocumentPicker.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/DocumentPicker.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/DocumentPicker.swift diff --git a/AltStore/View Extensions/UIView Representables/FilePreviewView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/FilePreviewView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/FilePreviewView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/FilePreviewView.swift diff --git a/AltStore/View Extensions/UIView Representables/MailComposeView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/MailComposeView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/MailComposeView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/MailComposeView.swift diff --git a/AltStore/View Extensions/UIView Representables/SafariView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/SafariView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/SafariView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/SafariView.swift diff --git a/AltStore/View Extensions/UIView Representables/SiriShortcutSetupView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/SiriShortcutSetupView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/SiriShortcutSetupView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/SiriShortcutSetupView.swift diff --git a/AltStore/View Extensions/UIView Representables/VisualEffectView.swift b/AltStore/SwiftUI/View Extensions/UIView Representables/VisualEffectView.swift similarity index 100% rename from AltStore/View Extensions/UIView Representables/VisualEffectView.swift rename to AltStore/SwiftUI/View Extensions/UIView Representables/VisualEffectView.swift diff --git a/AltStore/Views/App Detail/AppDetailView.swift b/AltStore/SwiftUI/Views/App Detail/AppDetailView.swift similarity index 100% rename from AltStore/Views/App Detail/AppDetailView.swift rename to AltStore/SwiftUI/Views/App Detail/AppDetailView.swift diff --git a/AltStore/Views/App Detail/AppPermissionsGrid.swift b/AltStore/SwiftUI/Views/App Detail/AppPermissionsGrid.swift similarity index 100% rename from AltStore/Views/App Detail/AppPermissionsGrid.swift rename to AltStore/SwiftUI/Views/App Detail/AppPermissionsGrid.swift diff --git a/AltStore/Views/App Detail/AppScreenshotsPreview.swift b/AltStore/SwiftUI/Views/App Detail/AppScreenshotsPreview.swift similarity index 100% rename from AltStore/Views/App Detail/AppScreenshotsPreview.swift rename to AltStore/SwiftUI/Views/App Detail/AppScreenshotsPreview.swift diff --git a/AltStore/Views/App Detail/AppScreenshotsScrollView.swift b/AltStore/SwiftUI/Views/App Detail/AppScreenshotsScrollView.swift similarity index 100% rename from AltStore/Views/App Detail/AppScreenshotsScrollView.swift rename to AltStore/SwiftUI/Views/App Detail/AppScreenshotsScrollView.swift diff --git a/AltStore/Views/App Detail/AppVersionHistoryView.swift b/AltStore/SwiftUI/Views/App Detail/AppVersionHistoryView.swift similarity index 100% rename from AltStore/Views/App Detail/AppVersionHistoryView.swift rename to AltStore/SwiftUI/Views/App Detail/AppVersionHistoryView.swift diff --git a/AltStore/Views/App Detail/WriteAppReviewView.swift b/AltStore/SwiftUI/Views/App Detail/WriteAppReviewView.swift similarity index 100% rename from AltStore/Views/App Detail/WriteAppReviewView.swift rename to AltStore/SwiftUI/Views/App Detail/WriteAppReviewView.swift diff --git a/AltStore/Views/Browse/AddSourceView.swift b/AltStore/SwiftUI/Views/Browse/AddSourceView.swift similarity index 100% rename from AltStore/Views/Browse/AddSourceView.swift rename to AltStore/SwiftUI/Views/Browse/AddSourceView.swift diff --git a/AltStore/Views/Browse/BrowseAppPreviewView.swift b/AltStore/SwiftUI/Views/Browse/BrowseAppPreviewView.swift similarity index 100% rename from AltStore/Views/Browse/BrowseAppPreviewView.swift rename to AltStore/SwiftUI/Views/Browse/BrowseAppPreviewView.swift diff --git a/AltStore/Views/Browse/BrowseView.swift b/AltStore/SwiftUI/Views/Browse/BrowseView.swift similarity index 100% rename from AltStore/Views/Browse/BrowseView.swift rename to AltStore/SwiftUI/Views/Browse/BrowseView.swift diff --git a/AltStore/Views/Browse/ConfirmAddSourceView.swift b/AltStore/SwiftUI/Views/Browse/ConfirmAddSourceView.swift similarity index 100% rename from AltStore/Views/Browse/ConfirmAddSourceView.swift rename to AltStore/SwiftUI/Views/Browse/ConfirmAddSourceView.swift diff --git a/AltStore/Views/Browse/SourcesView.swift b/AltStore/SwiftUI/Views/Browse/SourcesView.swift similarity index 100% rename from AltStore/Views/Browse/SourcesView.swift rename to AltStore/SwiftUI/Views/Browse/SourcesView.swift diff --git a/AltStore/Views/My Apps/AppAction.swift b/AltStore/SwiftUI/Views/My Apps/AppAction.swift similarity index 100% rename from AltStore/Views/My Apps/AppAction.swift rename to AltStore/SwiftUI/Views/My Apps/AppAction.swift diff --git a/AltStore/Views/My Apps/AppIDsView.swift b/AltStore/SwiftUI/Views/My Apps/AppIDsView.swift similarity index 100% rename from AltStore/Views/My Apps/AppIDsView.swift rename to AltStore/SwiftUI/Views/My Apps/AppIDsView.swift diff --git a/AltStore/Views/My Apps/MyAppsView.swift b/AltStore/SwiftUI/Views/My Apps/MyAppsView.swift similarity index 100% rename from AltStore/Views/My Apps/MyAppsView.swift rename to AltStore/SwiftUI/Views/My Apps/MyAppsView.swift diff --git a/AltStore/Views/My Apps/MyAppsViewModel.swift b/AltStore/SwiftUI/Views/My Apps/MyAppsViewModel.swift similarity index 100% rename from AltStore/Views/My Apps/MyAppsViewModel.swift rename to AltStore/SwiftUI/Views/My Apps/MyAppsViewModel.swift diff --git a/AltStore/Views/News/NewsItemView.swift b/AltStore/SwiftUI/Views/News/NewsItemView.swift similarity index 100% rename from AltStore/Views/News/NewsItemView.swift rename to AltStore/SwiftUI/Views/News/NewsItemView.swift diff --git a/AltStore/Views/News/NewsView.swift b/AltStore/SwiftUI/Views/News/NewsView.swift similarity index 100% rename from AltStore/Views/News/NewsView.swift rename to AltStore/SwiftUI/Views/News/NewsView.swift diff --git a/AltStore/Views/News/NewsViewModel.swift b/AltStore/SwiftUI/Views/News/NewsViewModel.swift similarity index 100% rename from AltStore/Views/News/NewsViewModel.swift rename to AltStore/SwiftUI/Views/News/NewsViewModel.swift diff --git a/AltStore/Views/Onboarding/AppIconsShowcase.swift b/AltStore/SwiftUI/Views/Onboarding/AppIconsShowcase.swift similarity index 100% rename from AltStore/Views/Onboarding/AppIconsShowcase.swift rename to AltStore/SwiftUI/Views/Onboarding/AppIconsShowcase.swift diff --git a/AltStore/Views/Onboarding/OnboardingStepView.swift b/AltStore/SwiftUI/Views/Onboarding/OnboardingStepView.swift similarity index 100% rename from AltStore/Views/Onboarding/OnboardingStepView.swift rename to AltStore/SwiftUI/Views/Onboarding/OnboardingStepView.swift diff --git a/AltStore/Views/Onboarding/OnboardingView.swift b/AltStore/SwiftUI/Views/Onboarding/OnboardingView.swift similarity index 100% rename from AltStore/Views/Onboarding/OnboardingView.swift rename to AltStore/SwiftUI/Views/Onboarding/OnboardingView.swift diff --git a/AltStore/Views/RootView.swift b/AltStore/SwiftUI/Views/RootView.swift similarity index 100% rename from AltStore/Views/RootView.swift rename to AltStore/SwiftUI/Views/RootView.swift diff --git a/AltStore/Views/Settings/AdvancedSettingsView.swift b/AltStore/SwiftUI/Views/Settings/AdvancedSettingsView.swift similarity index 100% rename from AltStore/Views/Settings/AdvancedSettingsView.swift rename to AltStore/SwiftUI/Views/Settings/AdvancedSettingsView.swift diff --git a/AltStore/Views/Settings/AppIconsView.swift b/AltStore/SwiftUI/Views/Settings/AppIconsView.swift similarity index 100% rename from AltStore/Views/Settings/AppIconsView.swift rename to AltStore/SwiftUI/Views/Settings/AppIconsView.swift diff --git a/AltStore/Views/Settings/ConnectAppleIDView.swift b/AltStore/SwiftUI/Views/Settings/ConnectAppleIDView.swift similarity index 100% rename from AltStore/Views/Settings/ConnectAppleIDView.swift rename to AltStore/SwiftUI/Views/Settings/ConnectAppleIDView.swift diff --git a/AltStore/Views/Settings/DevModeView.swift b/AltStore/SwiftUI/Views/Settings/DevModeView.swift similarity index 100% rename from AltStore/Views/Settings/DevModeView.swift rename to AltStore/SwiftUI/Views/Settings/DevModeView.swift diff --git a/AltStore/Views/Settings/ErrorLogView.swift b/AltStore/SwiftUI/Views/Settings/ErrorLogView.swift similarity index 100% rename from AltStore/Views/Settings/ErrorLogView.swift rename to AltStore/SwiftUI/Views/Settings/ErrorLogView.swift diff --git a/AltStore/Views/Settings/LicensesView.swift b/AltStore/SwiftUI/Views/Settings/LicensesView.swift similarity index 100% rename from AltStore/Views/Settings/LicensesView.swift rename to AltStore/SwiftUI/Views/Settings/LicensesView.swift diff --git a/AltStore/Views/Settings/RefreshAttemptsView.swift b/AltStore/SwiftUI/Views/Settings/RefreshAttemptsView.swift similarity index 100% rename from AltStore/Views/Settings/RefreshAttemptsView.swift rename to AltStore/SwiftUI/Views/Settings/RefreshAttemptsView.swift diff --git a/AltStore/Views/Settings/SettingsView.swift b/AltStore/SwiftUI/Views/Settings/SettingsView.swift similarity index 100% rename from AltStore/Views/Settings/SettingsView.swift rename to AltStore/SwiftUI/Views/Settings/SettingsView.swift diff --git a/AltStore/App Detail/AppContentViewController.swift b/AltStore/UIKit/App Detail/AppContentViewController.swift similarity index 100% rename from AltStore/App Detail/AppContentViewController.swift rename to AltStore/UIKit/App Detail/AppContentViewController.swift diff --git a/AltStore/App Detail/AppContentViewControllerCells.swift b/AltStore/UIKit/App Detail/AppContentViewControllerCells.swift similarity index 100% rename from AltStore/App Detail/AppContentViewControllerCells.swift rename to AltStore/UIKit/App Detail/AppContentViewControllerCells.swift diff --git a/AltStore/App Detail/AppViewController.swift b/AltStore/UIKit/App Detail/AppViewController.swift similarity index 100% rename from AltStore/App Detail/AppViewController.swift rename to AltStore/UIKit/App Detail/AppViewController.swift diff --git a/AltStore/App Detail/PermissionPopoverViewController.swift b/AltStore/UIKit/App Detail/PermissionPopoverViewController.swift similarity index 100% rename from AltStore/App Detail/PermissionPopoverViewController.swift rename to AltStore/UIKit/App Detail/PermissionPopoverViewController.swift diff --git a/AltStore/App IDs/AppIDsViewController.swift b/AltStore/UIKit/App IDs/AppIDsViewController.swift similarity index 100% rename from AltStore/App IDs/AppIDsViewController.swift rename to AltStore/UIKit/App IDs/AppIDsViewController.swift diff --git a/AltStore/Authentication/Authentication.storyboard b/AltStore/UIKit/Authentication/Authentication.storyboard similarity index 100% rename from AltStore/Authentication/Authentication.storyboard rename to AltStore/UIKit/Authentication/Authentication.storyboard diff --git a/AltStore/Authentication/AuthenticationViewController.swift b/AltStore/UIKit/Authentication/AuthenticationViewController.swift similarity index 100% rename from AltStore/Authentication/AuthenticationViewController.swift rename to AltStore/UIKit/Authentication/AuthenticationViewController.swift diff --git a/AltStore/Authentication/InstructionsViewController.swift b/AltStore/UIKit/Authentication/InstructionsViewController.swift similarity index 100% rename from AltStore/Authentication/InstructionsViewController.swift rename to AltStore/UIKit/Authentication/InstructionsViewController.swift diff --git a/AltStore/Authentication/RefreshAltStoreViewController.swift b/AltStore/UIKit/Authentication/RefreshAltStoreViewController.swift similarity index 100% rename from AltStore/Authentication/RefreshAltStoreViewController.swift rename to AltStore/UIKit/Authentication/RefreshAltStoreViewController.swift diff --git a/AltStore/Authentication/SelectTeamViewController.swift b/AltStore/UIKit/Authentication/SelectTeamViewController.swift similarity index 100% rename from AltStore/Authentication/SelectTeamViewController.swift rename to AltStore/UIKit/Authentication/SelectTeamViewController.swift diff --git a/AltStore/Browse/BrowseCollectionViewCell.swift b/AltStore/UIKit/Browse/BrowseCollectionViewCell.swift similarity index 100% rename from AltStore/Browse/BrowseCollectionViewCell.swift rename to AltStore/UIKit/Browse/BrowseCollectionViewCell.swift diff --git a/AltStore/Browse/BrowseCollectionViewCell.xib b/AltStore/UIKit/Browse/BrowseCollectionViewCell.xib similarity index 100% rename from AltStore/Browse/BrowseCollectionViewCell.xib rename to AltStore/UIKit/Browse/BrowseCollectionViewCell.xib diff --git a/AltStore/Browse/BrowseViewController.swift b/AltStore/UIKit/Browse/BrowseViewController.swift similarity index 100% rename from AltStore/Browse/BrowseViewController.swift rename to AltStore/UIKit/Browse/BrowseViewController.swift diff --git a/AltStore/Browse/ScreenshotCollectionViewCell.swift b/AltStore/UIKit/Browse/ScreenshotCollectionViewCell.swift similarity index 100% rename from AltStore/Browse/ScreenshotCollectionViewCell.swift rename to AltStore/UIKit/Browse/ScreenshotCollectionViewCell.swift diff --git a/AltStore/Components/AppBannerView.swift b/AltStore/UIKit/Components/AppBannerView.swift similarity index 100% rename from AltStore/Components/AppBannerView.swift rename to AltStore/UIKit/Components/AppBannerView.swift diff --git a/AltStore/Components/AppBannerView.xib b/AltStore/UIKit/Components/AppBannerView.xib similarity index 100% rename from AltStore/Components/AppBannerView.xib rename to AltStore/UIKit/Components/AppBannerView.xib diff --git a/AltStore/Components/AppIconImageView.swift b/AltStore/UIKit/Components/AppIconImageView.swift similarity index 100% rename from AltStore/Components/AppIconImageView.swift rename to AltStore/UIKit/Components/AppIconImageView.swift diff --git a/AltStore/Components/BackgroundTaskManager.swift b/AltStore/UIKit/Components/BackgroundTaskManager.swift similarity index 100% rename from AltStore/Components/BackgroundTaskManager.swift rename to AltStore/UIKit/Components/BackgroundTaskManager.swift diff --git a/AltStore/Components/BannerCollectionViewCell.swift b/AltStore/UIKit/Components/BannerCollectionViewCell.swift similarity index 100% rename from AltStore/Components/BannerCollectionViewCell.swift rename to AltStore/UIKit/Components/BannerCollectionViewCell.swift diff --git a/AltStore/Components/Button.swift b/AltStore/UIKit/Components/Button.swift similarity index 100% rename from AltStore/Components/Button.swift rename to AltStore/UIKit/Components/Button.swift diff --git a/AltStore/Components/CollapsingTextView.swift b/AltStore/UIKit/Components/CollapsingTextView.swift similarity index 100% rename from AltStore/Components/CollapsingTextView.swift rename to AltStore/UIKit/Components/CollapsingTextView.swift diff --git a/AltStore/Components/ForwardingNavigationController.swift b/AltStore/UIKit/Components/ForwardingNavigationController.swift similarity index 100% rename from AltStore/Components/ForwardingNavigationController.swift rename to AltStore/UIKit/Components/ForwardingNavigationController.swift diff --git a/AltStore/Components/NavigationBar.swift b/AltStore/UIKit/Components/NavigationBar.swift similarity index 100% rename from AltStore/Components/NavigationBar.swift rename to AltStore/UIKit/Components/NavigationBar.swift diff --git a/AltStore/Components/PillButton.swift b/AltStore/UIKit/Components/PillButton.swift similarity index 100% rename from AltStore/Components/PillButton.swift rename to AltStore/UIKit/Components/PillButton.swift diff --git a/AltStore/Components/TextCollectionReusableView.swift b/AltStore/UIKit/Components/TextCollectionReusableView.swift similarity index 100% rename from AltStore/Components/TextCollectionReusableView.swift rename to AltStore/UIKit/Components/TextCollectionReusableView.swift diff --git a/AltStore/Components/ToastView.swift b/AltStore/UIKit/Components/ToastView.swift similarity index 100% rename from AltStore/Components/ToastView.swift rename to AltStore/UIKit/Components/ToastView.swift diff --git a/AltStore/My Apps/InstalledAppsCollectionHeaderView.swift b/AltStore/UIKit/My Apps/InstalledAppsCollectionHeaderView.swift similarity index 100% rename from AltStore/My Apps/InstalledAppsCollectionHeaderView.swift rename to AltStore/UIKit/My Apps/InstalledAppsCollectionHeaderView.swift diff --git a/AltStore/My Apps/InstalledAppsCollectionHeaderView.xib b/AltStore/UIKit/My Apps/InstalledAppsCollectionHeaderView.xib similarity index 100% rename from AltStore/My Apps/InstalledAppsCollectionHeaderView.xib rename to AltStore/UIKit/My Apps/InstalledAppsCollectionHeaderView.xib diff --git a/AltStore/My Apps/MyAppsComponents.swift b/AltStore/UIKit/My Apps/MyAppsComponents.swift similarity index 100% rename from AltStore/My Apps/MyAppsComponents.swift rename to AltStore/UIKit/My Apps/MyAppsComponents.swift diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/UIKit/My Apps/MyAppsViewController.swift similarity index 100% rename from AltStore/My Apps/MyAppsViewController.swift rename to AltStore/UIKit/My Apps/MyAppsViewController.swift diff --git a/AltStore/My Apps/UpdateCollectionViewCell.swift b/AltStore/UIKit/My Apps/UpdateCollectionViewCell.swift similarity index 100% rename from AltStore/My Apps/UpdateCollectionViewCell.swift rename to AltStore/UIKit/My Apps/UpdateCollectionViewCell.swift diff --git a/AltStore/My Apps/UpdateCollectionViewCell.xib b/AltStore/UIKit/My Apps/UpdateCollectionViewCell.xib similarity index 100% rename from AltStore/My Apps/UpdateCollectionViewCell.xib rename to AltStore/UIKit/My Apps/UpdateCollectionViewCell.xib diff --git a/AltStore/News/NewsCollectionViewCell.swift b/AltStore/UIKit/News/NewsCollectionViewCell.swift similarity index 100% rename from AltStore/News/NewsCollectionViewCell.swift rename to AltStore/UIKit/News/NewsCollectionViewCell.swift diff --git a/AltStore/News/NewsCollectionViewCell.xib b/AltStore/UIKit/News/NewsCollectionViewCell.xib similarity index 100% rename from AltStore/News/NewsCollectionViewCell.xib rename to AltStore/UIKit/News/NewsCollectionViewCell.xib diff --git a/AltStore/News/NewsViewController.swift b/AltStore/UIKit/News/NewsViewController.swift similarity index 100% rename from AltStore/News/NewsViewController.swift rename to AltStore/UIKit/News/NewsViewController.swift diff --git a/AltStore/Settings/AboutPatreonHeaderView.xib b/AltStore/UIKit/Settings/AboutPatreonHeaderView.xib similarity index 100% rename from AltStore/Settings/AboutPatreonHeaderView.xib rename to AltStore/UIKit/Settings/AboutPatreonHeaderView.xib diff --git a/AltStore/Settings/AnisetteManager.swift b/AltStore/UIKit/Settings/AnisetteManager.swift similarity index 100% rename from AltStore/Settings/AnisetteManager.swift rename to AltStore/UIKit/Settings/AnisetteManager.swift diff --git a/AltStore/Settings/Error Log/ErrorLogTableViewCell.swift b/AltStore/UIKit/Settings/Error Log/ErrorLogTableViewCell.swift similarity index 100% rename from AltStore/Settings/Error Log/ErrorLogTableViewCell.swift rename to AltStore/UIKit/Settings/Error Log/ErrorLogTableViewCell.swift diff --git a/AltStore/Settings/Error Log/ErrorLogViewController.swift b/AltStore/UIKit/Settings/Error Log/ErrorLogViewController.swift similarity index 100% rename from AltStore/Settings/Error Log/ErrorLogViewController.swift rename to AltStore/UIKit/Settings/Error Log/ErrorLogViewController.swift diff --git a/AltStore/Settings/InsetGroupTableViewCell.swift b/AltStore/UIKit/Settings/InsetGroupTableViewCell.swift similarity index 100% rename from AltStore/Settings/InsetGroupTableViewCell.swift rename to AltStore/UIKit/Settings/InsetGroupTableViewCell.swift diff --git a/AltStore/Settings/LicensesViewController.swift b/AltStore/UIKit/Settings/LicensesViewController.swift similarity index 100% rename from AltStore/Settings/LicensesViewController.swift rename to AltStore/UIKit/Settings/LicensesViewController.swift diff --git a/AltStore/Settings/PatreonComponents.swift b/AltStore/UIKit/Settings/PatreonComponents.swift similarity index 100% rename from AltStore/Settings/PatreonComponents.swift rename to AltStore/UIKit/Settings/PatreonComponents.swift diff --git a/AltStore/Settings/PatreonViewController.swift b/AltStore/UIKit/Settings/PatreonViewController.swift similarity index 100% rename from AltStore/Settings/PatreonViewController.swift rename to AltStore/UIKit/Settings/PatreonViewController.swift diff --git a/AltStore/Settings/RefreshAttemptsViewController.swift b/AltStore/UIKit/Settings/RefreshAttemptsViewController.swift similarity index 100% rename from AltStore/Settings/RefreshAttemptsViewController.swift rename to AltStore/UIKit/Settings/RefreshAttemptsViewController.swift diff --git a/AltStore/Settings/Settings.storyboard b/AltStore/UIKit/Settings/Settings.storyboard similarity index 100% rename from AltStore/Settings/Settings.storyboard rename to AltStore/UIKit/Settings/Settings.storyboard diff --git a/AltStore/Settings/SettingsHeaderFooterView.swift b/AltStore/UIKit/Settings/SettingsHeaderFooterView.swift similarity index 100% rename from AltStore/Settings/SettingsHeaderFooterView.swift rename to AltStore/UIKit/Settings/SettingsHeaderFooterView.swift diff --git a/AltStore/Settings/SettingsHeaderFooterView.xib b/AltStore/UIKit/Settings/SettingsHeaderFooterView.xib similarity index 100% rename from AltStore/Settings/SettingsHeaderFooterView.xib rename to AltStore/UIKit/Settings/SettingsHeaderFooterView.xib diff --git a/AltStore/Settings/SettingsViewController.swift b/AltStore/UIKit/Settings/SettingsViewController.swift similarity index 100% rename from AltStore/Settings/SettingsViewController.swift rename to AltStore/UIKit/Settings/SettingsViewController.swift diff --git a/AltStore/Sources/SourcesViewController.swift b/AltStore/UIKit/Sources/SourcesViewController.swift similarity index 100% rename from AltStore/Sources/SourcesViewController.swift rename to AltStore/UIKit/Sources/SourcesViewController.swift diff --git a/swiftgen.yml b/swiftgen.yml index 8fffff13..21119635 100644 --- a/swiftgen.yml +++ b/swiftgen.yml @@ -14,10 +14,10 @@ strings: - inputs: AltStore/Resources/en.lproj/Localizable.strings outputs: templateName: structured-swift5 - output: AltStore/Generated/Localizations.swift + output: AltStore/SwiftUI/Generated/Localizations.swift xcassets: inputs: AltStore/Resources/Assets.xcassets outputs: templateName: swift5 - output: AltStore/Generated/Assets.swift + output: AltStore/SwiftUI/Generated/Assets.swift