From 5f9104d4da7dfbdeae43b50d236ce302ad194c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20B=C3=B6ttger?= Date: Fri, 25 Jul 2025 14:53:01 +0200 Subject: [PATCH] Refactoring --- QuickDrop.xcodeproj/project.pbxproj | 158 +++++++++++++----- QuickDrop/{ => Util}/AudioManager.swift | 0 QuickDrop/{ => Util}/ErrorAlertHandler.swift | 0 QuickDrop/{ => Util}/Localized.swift | 0 .../IssueViews/ApIsolationIssueView.swift | 0 .../IssueViews/FirewallIssueView.swift | 0 .../{ => View}/IssueViews/IssueView.swift | 0 .../IssueViews/NetworkFilterIssueView.swift | 0 QuickDrop/{ => View}/LicenseWindow.swift | 0 QuickDrop/{ => View}/SettingsView.swift | 0 QuickDrop/{ => View}/TutorialView.swift | 0 QuickDrop/{ => View}/WelcomeScreen.swift | 0 12 files changed, 112 insertions(+), 46 deletions(-) rename QuickDrop/{ => Util}/AudioManager.swift (100%) rename QuickDrop/{ => Util}/ErrorAlertHandler.swift (100%) rename QuickDrop/{ => Util}/Localized.swift (100%) rename QuickDrop/{ => View}/IssueViews/ApIsolationIssueView.swift (100%) rename QuickDrop/{ => View}/IssueViews/FirewallIssueView.swift (100%) rename QuickDrop/{ => View}/IssueViews/IssueView.swift (100%) rename QuickDrop/{ => View}/IssueViews/NetworkFilterIssueView.swift (100%) rename QuickDrop/{ => View}/LicenseWindow.swift (100%) rename QuickDrop/{ => View}/SettingsView.swift (100%) rename QuickDrop/{ => View}/TutorialView.swift (100%) rename QuickDrop/{ => View}/WelcomeScreen.swift (100%) diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index 854c8a6..0389fd3 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 70; + objectVersion = 56; objects = { /* Begin PBXBuildFile section */ @@ -55,6 +55,23 @@ EBC05C592E32C22200EECC18 /* Localized.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB96ED8E2D7F8103004B3FF1 /* Localized.swift */; }; EBC05C5B2E33937200EECC18 /* ErrorAlertHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */; }; EBC05C5C2E3394EF00EECC18 /* ErrorAlertHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */; }; + EBC05C712E33B57D00EECC18 /* Converter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C6D2E33B57D00EECC18 /* Converter.swift */; }; + EBC05C722E33B57D00EECC18 /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C6E2E33B57D00EECC18 /* Helper.swift */; }; + EBC05C732E33B57D00EECC18 /* PlusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C6F2E33B57D00EECC18 /* PlusView.swift */; }; + EBC05C782E33B58100EECC18 /* ActiveNetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C742E33B58100EECC18 /* ActiveNetworkInterface.swift */; }; + EBC05C792E33B58100EECC18 /* ApIsolation6Tester.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C752E33B58100EECC18 /* ApIsolation6Tester.swift */; }; + EBC05C7A2E33B58100EECC18 /* ApIsolationTester.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C762E33B58100EECC18 /* ApIsolationTester.swift */; }; + EBC05C7B2E33B58100EECC18 /* ActiveNetworkInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C742E33B58100EECC18 /* ActiveNetworkInterface.swift */; }; + EBC05C7C2E33B58100EECC18 /* ApIsolationTester.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C762E33B58100EECC18 /* ApIsolationTester.swift */; }; + EBC05C822E33B58300EECC18 /* ApIsolationIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7D2E33B58300EECC18 /* ApIsolationIssueView.swift */; }; + EBC05C832E33B58300EECC18 /* FirewallIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7E2E33B58300EECC18 /* FirewallIssueView.swift */; }; + EBC05C842E33B58300EECC18 /* IssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7F2E33B58300EECC18 /* IssueView.swift */; }; + EBC05C852E33B58300EECC18 /* NetworkFilterIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C802E33B58300EECC18 /* NetworkFilterIssueView.swift */; }; + EBC05C862E33B58300EECC18 /* NetworkFilterIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C802E33B58300EECC18 /* NetworkFilterIssueView.swift */; }; + EBC05C872E33B58300EECC18 /* IssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7F2E33B58300EECC18 /* IssueView.swift */; }; + EBC05C882E33B58300EECC18 /* FirewallIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7E2E33B58300EECC18 /* FirewallIssueView.swift */; }; + EBC05C892E33B58300EECC18 /* ApIsolationIssueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC05C7D2E33B58300EECC18 /* ApIsolationIssueView.swift */; }; + EBC05C8C2E33B59E00EECC18 /* timeIsNow.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EBC05C8A2E33B59E00EECC18 /* timeIsNow.mp3 */; }; EBCC27F92D80C9F90079C478 /* Zip.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBCC27F82D80C9F70079C478 /* Zip.swift */; }; EBD2A2172D2860C100BCB8E2 /* WelcomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */; }; /* End PBXBuildFile section */ @@ -224,38 +241,21 @@ EB96ED8A2D7F7CF4004B3FF1 /* SmallSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallSheetView.swift; sourceTree = ""; }; EB96ED8E2D7F8103004B3FF1 /* Localized.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Localized.swift; sourceTree = ""; }; EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorAlertHandler.swift; sourceTree = ""; }; + EBC05C6D2E33B57D00EECC18 /* Converter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Converter.swift; sourceTree = ""; }; + EBC05C6E2E33B57D00EECC18 /* Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Helper.swift; sourceTree = ""; }; + EBC05C6F2E33B57D00EECC18 /* PlusView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlusView.swift; sourceTree = ""; }; + EBC05C742E33B58100EECC18 /* ActiveNetworkInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActiveNetworkInterface.swift; sourceTree = ""; }; + EBC05C752E33B58100EECC18 /* ApIsolation6Tester.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApIsolation6Tester.swift; sourceTree = ""; }; + EBC05C762E33B58100EECC18 /* ApIsolationTester.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApIsolationTester.swift; sourceTree = ""; }; + EBC05C7D2E33B58300EECC18 /* ApIsolationIssueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApIsolationIssueView.swift; sourceTree = ""; }; + EBC05C7E2E33B58300EECC18 /* FirewallIssueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirewallIssueView.swift; sourceTree = ""; }; + EBC05C7F2E33B58300EECC18 /* IssueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueView.swift; sourceTree = ""; }; + EBC05C802E33B58300EECC18 /* NetworkFilterIssueView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkFilterIssueView.swift; sourceTree = ""; }; + EBC05C8A2E33B59E00EECC18 /* timeIsNow.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = timeIsNow.mp3; sourceTree = ""; }; EBCC27F82D80C9F70079C478 /* Zip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Zip.swift; sourceTree = ""; }; EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeScreen.swift; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */ - EBC05C632E3396CF00EECC18 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - ApIsolationIssueView.swift, - FirewallIssueView.swift, - IssueView.swift, - NetworkFilterIssueView.swift, - ); - target = 699DEBA02AB0573200115D22 /* QuickDropShareExtension */; - }; - EBC05C672E3396F300EECC18 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = { - isa = PBXFileSystemSynchronizedBuildFileExceptionSet; - membershipExceptions = ( - ActiveNetworkInterface.swift, - ApIsolationTester.swift, - ); - target = 699DEBA02AB0573200115D22 /* QuickDropShareExtension */; - }; -/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */ - -/* Begin PBXFileSystemSynchronizedRootGroup section */ - EB1A7E422DD4D8BD00A6D5A3 /* SelfTest */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (EBC05C672E3396F300EECC18 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = SelfTest; sourceTree = ""; }; - EB6E743F2DD5CBFB00331466 /* IssueViews */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (EBC05C632E3396CF00EECC18 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = IssueViews; sourceTree = ""; }; - EB7CD13B2D6F8B6500CB0CB5 /* Plus */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Plus; sourceTree = ""; }; - EBC05C582E32A21000EECC18 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = ""; }; -/* End PBXFileSystemSynchronizedRootGroup section */ - /* Begin PBXFrameworksBuildPhase section */ 699DEB9E2AB0573200115D22 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; @@ -318,7 +318,7 @@ 69DCF4822AB70D0600CBE2CC /* NearbyShare */, 698DFAEC29E353220064F247 /* Frameworks */, 69DA9A0F29E0BF5100A442DA /* Products */, - EBC05C582E32A21000EECC18 /* Resources */, + EBC05C8B2E33B59E00EECC18 /* Resources */, ); sourceTree = ""; }; @@ -336,16 +336,10 @@ isa = PBXGroup; children = ( 69DA9A1129E0BF5100A442DA /* AppDelegate.swift */, - EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */, - EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */, - EB7F54112D78E95C00989564 /* TutorialView.swift */, - EB1A7E422DD4D8BD00A6D5A3 /* SelfTest */, - EB7F54132D78E9E400989564 /* LicenseWindow.swift */, - EB6F62D62D91F4AC00534EC2 /* SettingsView.swift */, - EB36435F2D73A29F009CDFF8 /* AudioManager.swift */, - EB6E743F2DD5CBFB00331466 /* IssueViews */, - EB96ED8E2D7F8103004B3FF1 /* Localized.swift */, - EB7CD13B2D6F8B6500CB0CB5 /* Plus */, + EBC05C6A2E33B55100EECC18 /* View */, + EBC05C772E33B58100EECC18 /* SelfTest */, + EBC05C6B2E33B57100EECC18 /* Util */, + EBC05C702E33B57D00EECC18 /* Plus */, 69DA9A1329E0BF5200A442DA /* Assets.xcassets */, 69D2C33629E78DF400EC7E30 /* Localizable.stringsdict */, 69D2C32B29E77F2200EC7E30 /* Localizable.strings */, @@ -399,6 +393,67 @@ path = ProtobufSource; sourceTree = ""; }; + EBC05C6A2E33B55100EECC18 /* View */ = { + isa = PBXGroup; + children = ( + EBD2A2162D2860BE00BCB8E2 /* WelcomeScreen.swift */, + EB7F54112D78E95C00989564 /* TutorialView.swift */, + EB7F54132D78E9E400989564 /* LicenseWindow.swift */, + EB6F62D62D91F4AC00534EC2 /* SettingsView.swift */, + EBC05C812E33B58300EECC18 /* IssueViews */, + ); + path = View; + sourceTree = ""; + }; + EBC05C6B2E33B57100EECC18 /* Util */ = { + isa = PBXGroup; + children = ( + EB36435F2D73A29F009CDFF8 /* AudioManager.swift */, + EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */, + EB96ED8E2D7F8103004B3FF1 /* Localized.swift */, + ); + path = Util; + sourceTree = ""; + }; + EBC05C702E33B57D00EECC18 /* Plus */ = { + isa = PBXGroup; + children = ( + EBC05C6D2E33B57D00EECC18 /* Converter.swift */, + EBC05C6E2E33B57D00EECC18 /* Helper.swift */, + EBC05C6F2E33B57D00EECC18 /* PlusView.swift */, + ); + path = Plus; + sourceTree = ""; + }; + EBC05C772E33B58100EECC18 /* SelfTest */ = { + isa = PBXGroup; + children = ( + EBC05C742E33B58100EECC18 /* ActiveNetworkInterface.swift */, + EBC05C752E33B58100EECC18 /* ApIsolation6Tester.swift */, + EBC05C762E33B58100EECC18 /* ApIsolationTester.swift */, + ); + path = SelfTest; + sourceTree = ""; + }; + EBC05C812E33B58300EECC18 /* IssueViews */ = { + isa = PBXGroup; + children = ( + EBC05C7D2E33B58300EECC18 /* ApIsolationIssueView.swift */, + EBC05C7E2E33B58300EECC18 /* FirewallIssueView.swift */, + EBC05C7F2E33B58300EECC18 /* IssueView.swift */, + EBC05C802E33B58300EECC18 /* NetworkFilterIssueView.swift */, + ); + path = IssueViews; + sourceTree = ""; + }; + EBC05C8B2E33B59E00EECC18 /* Resources */ = { + isa = PBXGroup; + children = ( + EBC05C8A2E33B59E00EECC18 /* timeIsNow.mp3 */, + ); + path = Resources; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -448,12 +503,6 @@ 699DEBAD2AB0573200115D22 /* PBXTargetDependency */, 69DCF4972AB8BF7B00CBE2CC /* PBXTargetDependency */, ); - fileSystemSynchronizedGroups = ( - EB1A7E422DD4D8BD00A6D5A3 /* SelfTest */, - EB6E743F2DD5CBFB00331466 /* IssueViews */, - EB7CD13B2D6F8B6500CB0CB5 /* Plus */, - EBC05C582E32A21000EECC18 /* Resources */, - ); name = QuickDrop; packageProductDependencies = ( EB2F9BFD2DA05F48004010A2 /* BezelNotification */, @@ -566,6 +615,7 @@ 69DA9A1429E0BF5200A442DA /* Assets.xcassets in Resources */, 69D2C33829E78DF400EC7E30 /* Localizable.stringsdict in Resources */, 69D2C32D29E77F2200EC7E30 /* Localizable.strings in Resources */, + EBC05C8C2E33B59E00EECC18 /* timeIsNow.mp3 in Resources */, 69D2C32F29E7898C00EC7E30 /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -578,11 +628,17 @@ buildActionMask = 2147483647; files = ( EB96ED902D7F8114004B3FF1 /* Localized.swift in Sources */, + EBC05C862E33B58300EECC18 /* NetworkFilterIssueView.swift in Sources */, + EBC05C872E33B58300EECC18 /* IssueView.swift in Sources */, + EBC05C882E33B58300EECC18 /* FirewallIssueView.swift in Sources */, + EBC05C892E33B58300EECC18 /* ApIsolationIssueView.swift in Sources */, 699DEBA62AB0573200115D22 /* ShareViewController.swift in Sources */, EB96ED8B2D7F7CF7004B3FF1 /* SmallSheetView.swift in Sources */, EBCC27F92D80C9F90079C478 /* Zip.swift in Sources */, EB7CD1462D6FB0E800CB0CB5 /* Logger.swift in Sources */, EBC05C5C2E3394EF00EECC18 /* ErrorAlertHandler.swift in Sources */, + EBC05C7B2E33B58100EECC18 /* ActiveNetworkInterface.swift in Sources */, + EBC05C7C2E33B58100EECC18 /* ApIsolationTester.swift in Sources */, 691F53BB2ABB70840089FD92 /* DeviceListCell.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -594,6 +650,12 @@ EBD2A2172D2860C100BCB8E2 /* WelcomeScreen.swift in Sources */, EB3643602D73A2A2009CDFF8 /* AudioManager.swift in Sources */, EBC05C5B2E33937200EECC18 /* ErrorAlertHandler.swift in Sources */, + EBC05C712E33B57D00EECC18 /* Converter.swift in Sources */, + EBC05C722E33B57D00EECC18 /* Helper.swift in Sources */, + EBC05C732E33B57D00EECC18 /* PlusView.swift in Sources */, + EBC05C782E33B58100EECC18 /* ActiveNetworkInterface.swift in Sources */, + EBC05C792E33B58100EECC18 /* ApIsolation6Tester.swift in Sources */, + EBC05C7A2E33B58100EECC18 /* ApIsolationTester.swift in Sources */, EB96ED8C2D7F7E7B004B3FF1 /* SmallSheetView.swift in Sources */, EB7F54142D78E9E700989564 /* LicenseWindow.swift in Sources */, 69DA9A1229E0BF5100A442DA /* AppDelegate.swift in Sources */, @@ -601,6 +663,10 @@ EB7F54122D78E96000989564 /* TutorialView.swift in Sources */, EB96ED8F2D7F8105004B3FF1 /* Localized.swift in Sources */, EB7CD1452D6FB0C300CB0CB5 /* Logger.swift in Sources */, + EBC05C822E33B58300EECC18 /* ApIsolationIssueView.swift in Sources */, + EBC05C832E33B58300EECC18 /* FirewallIssueView.swift in Sources */, + EBC05C842E33B58300EECC18 /* IssueView.swift in Sources */, + EBC05C852E33B58300EECC18 /* NetworkFilterIssueView.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/QuickDrop/AudioManager.swift b/QuickDrop/Util/AudioManager.swift similarity index 100% rename from QuickDrop/AudioManager.swift rename to QuickDrop/Util/AudioManager.swift diff --git a/QuickDrop/ErrorAlertHandler.swift b/QuickDrop/Util/ErrorAlertHandler.swift similarity index 100% rename from QuickDrop/ErrorAlertHandler.swift rename to QuickDrop/Util/ErrorAlertHandler.swift diff --git a/QuickDrop/Localized.swift b/QuickDrop/Util/Localized.swift similarity index 100% rename from QuickDrop/Localized.swift rename to QuickDrop/Util/Localized.swift diff --git a/QuickDrop/IssueViews/ApIsolationIssueView.swift b/QuickDrop/View/IssueViews/ApIsolationIssueView.swift similarity index 100% rename from QuickDrop/IssueViews/ApIsolationIssueView.swift rename to QuickDrop/View/IssueViews/ApIsolationIssueView.swift diff --git a/QuickDrop/IssueViews/FirewallIssueView.swift b/QuickDrop/View/IssueViews/FirewallIssueView.swift similarity index 100% rename from QuickDrop/IssueViews/FirewallIssueView.swift rename to QuickDrop/View/IssueViews/FirewallIssueView.swift diff --git a/QuickDrop/IssueViews/IssueView.swift b/QuickDrop/View/IssueViews/IssueView.swift similarity index 100% rename from QuickDrop/IssueViews/IssueView.swift rename to QuickDrop/View/IssueViews/IssueView.swift diff --git a/QuickDrop/IssueViews/NetworkFilterIssueView.swift b/QuickDrop/View/IssueViews/NetworkFilterIssueView.swift similarity index 100% rename from QuickDrop/IssueViews/NetworkFilterIssueView.swift rename to QuickDrop/View/IssueViews/NetworkFilterIssueView.swift diff --git a/QuickDrop/LicenseWindow.swift b/QuickDrop/View/LicenseWindow.swift similarity index 100% rename from QuickDrop/LicenseWindow.swift rename to QuickDrop/View/LicenseWindow.swift diff --git a/QuickDrop/SettingsView.swift b/QuickDrop/View/SettingsView.swift similarity index 100% rename from QuickDrop/SettingsView.swift rename to QuickDrop/View/SettingsView.swift diff --git a/QuickDrop/TutorialView.swift b/QuickDrop/View/TutorialView.swift similarity index 100% rename from QuickDrop/TutorialView.swift rename to QuickDrop/View/TutorialView.swift diff --git a/QuickDrop/WelcomeScreen.swift b/QuickDrop/View/WelcomeScreen.swift similarity index 100% rename from QuickDrop/WelcomeScreen.swift rename to QuickDrop/View/WelcomeScreen.swift