From a69a75cb07dfdcfefd91196dccc15500655373af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20B=C3=B6ttger?= Date: Sun, 19 Oct 2025 14:01:02 +0200 Subject: [PATCH] Refactoring --- QuickDrop.xcodeproj/project.pbxproj | 48 ++++++++++++++----- .../xcshareddata/swiftpm/Package.resolved | 6 +-- .../SelfTest/ActiveNetworkInterface.swift | 0 .../SelfTest/ApIsolation6Tester.swift | 0 .../SelfTest/ApIsolationTester.swift | 0 .../ViewModel}/ReceiveModel.swift | 0 .../ViewModel}/SendModel.swift | 0 QuickDropiOS/{ => View}/ContentView.swift | 0 QuickDropiOS/{ => View}/FilePicker.swift | 0 QuickDropiOS/{ => View}/PieProgressView.swift | 0 QuickDropiOS/{ => View}/UIAlert.swift | 0 .../{ => Helpers}/Attachments.swift | 0 12 files changed, 39 insertions(+), 15 deletions(-) rename QuickDrop/{ => Util}/SelfTest/ActiveNetworkInterface.swift (100%) rename QuickDrop/{ => Util}/SelfTest/ApIsolation6Tester.swift (100%) rename QuickDrop/{ => Util}/SelfTest/ApIsolationTester.swift (100%) rename {QuickDropiOS => QuickDrop/ViewModel}/ReceiveModel.swift (100%) rename {QuickDropiOS => QuickDrop/ViewModel}/SendModel.swift (100%) rename QuickDropiOS/{ => View}/ContentView.swift (100%) rename QuickDropiOS/{ => View}/FilePicker.swift (100%) rename QuickDropiOS/{ => View}/PieProgressView.swift (100%) rename QuickDropiOS/{ => View}/UIAlert.swift (100%) rename ShareExtension/{ => Helpers}/Attachments.swift (100%) diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index dcf7236..496af5d 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -439,7 +439,7 @@ isa = PBXGroup; children = ( 699DEBA52AB0573200115D22 /* ShareViewController.swift */, - EB950B732E520954002D68FA /* Attachments.swift */, + EB644B872EA50827006C2E6C /* Helpers */, EB950B762E521712002D68FA /* AttachmentDetails.swift */, EB5C371E2E36693D0052EFD7 /* View */, 699DEBAA2AB0573200115D22 /* Info.plist */, @@ -479,7 +479,7 @@ children = ( 69DA9A1129E0BF5100A442DA /* AppDelegate.swift */, EB1325D22E701D8900FD749C /* Settings.swift */, - EB1325EA2E7025D900FD749C /* SelfTest */, + EB644B852EA507CF006C2E6C /* ViewModel */, EBC05C6A2E33B55100EECC18 /* View */, EBC05C6B2E33B57100EECC18 /* Util */, EBC05C702E33B57D00EECC18 /* Plus */, @@ -572,6 +572,34 @@ path = Model; sourceTree = ""; }; + EB644B852EA507CF006C2E6C /* ViewModel */ = { + isa = PBXGroup; + children = ( + EB979F902E50CA23008B8C5C /* SendModel.swift */, + EB97A00E2E511120008B8C5C /* ReceiveModel.swift */, + ); + path = ViewModel; + sourceTree = ""; + }; + EB644B862EA50807006C2E6C /* View */ = { + isa = PBXGroup; + children = ( + EB979F8E2E50CA23008B8C5C /* ContentView.swift */, + EB979F8F2E50CA23008B8C5C /* FilePicker.swift */, + EB97A0192E51EA9C008B8C5C /* UIAlert.swift */, + EB979F992E50CAA6008B8C5C /* PieProgressView.swift */, + ); + path = View; + sourceTree = ""; + }; + EB644B872EA50827006C2E6C /* Helpers */ = { + isa = PBXGroup; + children = ( + EB950B732E520954002D68FA /* Attachments.swift */, + ); + path = Helpers; + sourceTree = ""; + }; EB950B6C2E5206E2002D68FA /* iOSShareExtension */ = { isa = PBXGroup; children = ( @@ -588,12 +616,7 @@ EB97A0162E51DF4F008B8C5C /* Info.plist */, EB1325FC2E7034B000FD749C /* InfoPlist.xcstrings */, EB979F8D2E50CA23008B8C5C /* Configuration.swift */, - EB979F8E2E50CA23008B8C5C /* ContentView.swift */, - EB979F8F2E50CA23008B8C5C /* FilePicker.swift */, - EB979F902E50CA23008B8C5C /* SendModel.swift */, - EB97A00E2E511120008B8C5C /* ReceiveModel.swift */, - EB97A0192E51EA9C008B8C5C /* UIAlert.swift */, - EB979F992E50CAA6008B8C5C /* PieProgressView.swift */, + EB644B862EA50807006C2E6C /* View */, EB979F912E50CA23008B8C5C /* QuickDropiOS.entitlements */, EB979F922E50CA23008B8C5C /* QuickDropiOSApp.swift */, ); @@ -623,6 +646,7 @@ EB886E662E4F2F7C0052B7D9 /* License.swift */, EB36435F2D73A29F009CDFF8 /* AudioManager.swift */, EBC05C5A2E33936C00EECC18 /* ErrorAlertHandler.swift */, + EB1325EA2E7025D900FD749C /* SelfTest */, ); path = Util; sourceTree = ""; @@ -1243,8 +1267,8 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_BUILD = 77; - SHARED_VERSION = 2.4.3; + SHARED_BUILD = 80; + SHARED_VERSION = 2.5.1; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1306,8 +1330,8 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; - SHARED_BUILD = 77; - SHARED_VERSION = 2.4.3; + SHARED_BUILD = 80; + SHARED_VERSION = 2.5.1; STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; diff --git a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ac685d3..eb4b2f4 100644 --- a/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/QuickDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -52,7 +52,7 @@ "location" : "https://github.com/leonboe1/LUI.git", "state" : { "branch" : "main", - "revision" : "5aeb4ccc20cd29728f44182e182998c1033d03e8" + "revision" : "01e8a88be6a2ee107bcee5923865bd0daf681743" } }, { @@ -87,8 +87,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "2547102afd04fe49f1b286090f13ebce07284980", - "version" : "1.31.1" + "revision" : "c6fe6442e6a64250495669325044052e113e990c", + "version" : "1.32.0" } }, { diff --git a/QuickDrop/SelfTest/ActiveNetworkInterface.swift b/QuickDrop/Util/SelfTest/ActiveNetworkInterface.swift similarity index 100% rename from QuickDrop/SelfTest/ActiveNetworkInterface.swift rename to QuickDrop/Util/SelfTest/ActiveNetworkInterface.swift diff --git a/QuickDrop/SelfTest/ApIsolation6Tester.swift b/QuickDrop/Util/SelfTest/ApIsolation6Tester.swift similarity index 100% rename from QuickDrop/SelfTest/ApIsolation6Tester.swift rename to QuickDrop/Util/SelfTest/ApIsolation6Tester.swift diff --git a/QuickDrop/SelfTest/ApIsolationTester.swift b/QuickDrop/Util/SelfTest/ApIsolationTester.swift similarity index 100% rename from QuickDrop/SelfTest/ApIsolationTester.swift rename to QuickDrop/Util/SelfTest/ApIsolationTester.swift diff --git a/QuickDropiOS/ReceiveModel.swift b/QuickDrop/ViewModel/ReceiveModel.swift similarity index 100% rename from QuickDropiOS/ReceiveModel.swift rename to QuickDrop/ViewModel/ReceiveModel.swift diff --git a/QuickDropiOS/SendModel.swift b/QuickDrop/ViewModel/SendModel.swift similarity index 100% rename from QuickDropiOS/SendModel.swift rename to QuickDrop/ViewModel/SendModel.swift diff --git a/QuickDropiOS/ContentView.swift b/QuickDropiOS/View/ContentView.swift similarity index 100% rename from QuickDropiOS/ContentView.swift rename to QuickDropiOS/View/ContentView.swift diff --git a/QuickDropiOS/FilePicker.swift b/QuickDropiOS/View/FilePicker.swift similarity index 100% rename from QuickDropiOS/FilePicker.swift rename to QuickDropiOS/View/FilePicker.swift diff --git a/QuickDropiOS/PieProgressView.swift b/QuickDropiOS/View/PieProgressView.swift similarity index 100% rename from QuickDropiOS/PieProgressView.swift rename to QuickDropiOS/View/PieProgressView.swift diff --git a/QuickDropiOS/UIAlert.swift b/QuickDropiOS/View/UIAlert.swift similarity index 100% rename from QuickDropiOS/UIAlert.swift rename to QuickDropiOS/View/UIAlert.swift diff --git a/ShareExtension/Attachments.swift b/ShareExtension/Helpers/Attachments.swift similarity index 100% rename from ShareExtension/Attachments.swift rename to ShareExtension/Helpers/Attachments.swift