From f34392041f3fbb11279166611bcf2ccfaface891 Mon Sep 17 00:00:00 2001 From: Deniz Duezgoeren Date: Sun, 13 Oct 2019 16:53:08 +0200 Subject: [PATCH] Added testing menu, made layout changes, optimised DataFetcher.swift, removed Alamofire dependency --- AvH Plan.xcodeproj/project.pbxproj | 8 +- .../xcshareddata/xcschemes/AvH Plan.xcscheme | 22 +- AvH Plan/Base.lproj/Main.storyboard | 18 +- AvH Plan/ColourPickerView.swift | 4 + AvH Plan/CoursePickerViewController.swift | 5 + AvH Plan/CustomizationViewController.swift | 49 + AvH Plan/DataFetcher.swift | 97 +- AvH Plan/MenuViewController.swift | 13 +- AvH Plan/PlanViewController.swift | 24 +- AvH Plan/de.lproj/Localizable.strings | 5 + AvH Plan/en.lproj/Localizable.strings | 5 + Podfile | 13 +- Podfile.lock | 10 +- Pods/Alamofire/LICENSE | 19 - Pods/Alamofire/README.md | 242 - Pods/Alamofire/Source/AFError.swift | 460 -- Pods/Alamofire/Source/Alamofire.swift | 465 -- .../Source/DispatchQueue+Alamofire.swift | 37 - Pods/Alamofire/Source/MultipartFormData.swift | 580 -- .../Source/NetworkReachabilityManager.swift | 238 - Pods/Alamofire/Source/Notifications.swift | 55 - Pods/Alamofire/Source/ParameterEncoding.swift | 483 -- Pods/Alamofire/Source/Request.swift | 660 -- Pods/Alamofire/Source/Response.swift | 567 -- .../Source/ResponseSerialization.swift | 715 --- Pods/Alamofire/Source/Result.swift | 300 - Pods/Alamofire/Source/ServerTrustPolicy.swift | 307 - Pods/Alamofire/Source/SessionDelegate.swift | 725 --- Pods/Alamofire/Source/SessionManager.swift | 899 --- Pods/Alamofire/Source/TaskDelegate.swift | 466 -- Pods/Alamofire/Source/Timeline.swift | 136 - Pods/Alamofire/Source/Validation.swift | 321 - Pods/Manifest.lock | 10 +- Pods/Pods.xcodeproj/project.pbxproj | 5290 ++++++++--------- .../xcschemes/Pods-AvH Plan.xcscheme | 2 +- .../xcschemes/SQLite.swift.xcscheme | 2 +- .../xcschemes/SwiftSoup.xcscheme | 2 +- ...lamofire.xcscheme => Toast-Swift.xcscheme} | 28 +- .../xcschemes/xcschememanagement.plist | 10 +- .../Alamofire/Alamofire-dummy.m | 5 - .../Alamofire/Alamofire.modulemap | 6 - .../Pods-AvH Plan-acknowledgements.markdown | 47 +- .../Pods-AvH Plan-acknowledgements.plist | 59 +- .../Pods-AvH Plan/Pods-AvH Plan-frameworks.sh | 4 +- .../Pods-AvH Plan.debug.xcconfig | 6 +- .../Pods-AvH Plan.release.xcconfig | 6 +- .../Pods-AvH PlanTests.debug.xcconfig | 6 +- .../Pods-AvH PlanTests.release.xcconfig | 6 +- .../Pods-AvH PlanUITests.debug.xcconfig | 6 +- .../Pods-AvH PlanUITests.release.xcconfig | 6 +- .../Toast-Swift-Info.plist} | 2 +- .../Toast-Swift/Toast-Swift-dummy.m | 5 + .../Toast-Swift-prefix.pch} | 0 .../Toast-Swift-umbrella.h} | 4 +- .../Toast-Swift/Toast-Swift.modulemap | 6 + .../Toast-Swift.xcconfig} | 5 +- Pods/Toast-Swift/LICENSE | 20 + Pods/Toast-Swift/README.md | 135 + Pods/Toast-Swift/Toast/Toast.swift | 782 +++ 59 files changed, 3865 insertions(+), 10543 deletions(-) delete mode 100644 Pods/Alamofire/LICENSE delete mode 100644 Pods/Alamofire/README.md delete mode 100644 Pods/Alamofire/Source/AFError.swift delete mode 100644 Pods/Alamofire/Source/Alamofire.swift delete mode 100644 Pods/Alamofire/Source/DispatchQueue+Alamofire.swift delete mode 100644 Pods/Alamofire/Source/MultipartFormData.swift delete mode 100644 Pods/Alamofire/Source/NetworkReachabilityManager.swift delete mode 100644 Pods/Alamofire/Source/Notifications.swift delete mode 100644 Pods/Alamofire/Source/ParameterEncoding.swift delete mode 100644 Pods/Alamofire/Source/Request.swift delete mode 100644 Pods/Alamofire/Source/Response.swift delete mode 100644 Pods/Alamofire/Source/ResponseSerialization.swift delete mode 100644 Pods/Alamofire/Source/Result.swift delete mode 100644 Pods/Alamofire/Source/ServerTrustPolicy.swift delete mode 100644 Pods/Alamofire/Source/SessionDelegate.swift delete mode 100644 Pods/Alamofire/Source/SessionManager.swift delete mode 100644 Pods/Alamofire/Source/TaskDelegate.swift delete mode 100644 Pods/Alamofire/Source/Timeline.swift delete mode 100644 Pods/Alamofire/Source/Validation.swift rename Pods/Pods.xcodeproj/xcuserdata/kduez.xcuserdatad/xcschemes/{Alamofire.xcscheme => Toast-Swift.xcscheme} (79%) delete mode 100644 Pods/Target Support Files/Alamofire/Alamofire-dummy.m delete mode 100644 Pods/Target Support Files/Alamofire/Alamofire.modulemap rename Pods/Target Support Files/{Alamofire/Alamofire-Info.plist => Toast-Swift/Toast-Swift-Info.plist} (96%) create mode 100644 Pods/Target Support Files/Toast-Swift/Toast-Swift-dummy.m rename Pods/Target Support Files/{Alamofire/Alamofire-prefix.pch => Toast-Swift/Toast-Swift-prefix.pch} (100%) rename Pods/Target Support Files/{Alamofire/Alamofire-umbrella.h => Toast-Swift/Toast-Swift-umbrella.h} (62%) create mode 100644 Pods/Target Support Files/Toast-Swift/Toast-Swift.modulemap rename Pods/Target Support Files/{Alamofire/Alamofire.xcconfig => Toast-Swift/Toast-Swift.xcconfig} (66%) create mode 100644 Pods/Toast-Swift/LICENSE create mode 100644 Pods/Toast-Swift/README.md create mode 100644 Pods/Toast-Swift/Toast/Toast.swift diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj index 59cda09..5ceda92 100644 --- a/AvH Plan.xcodeproj/project.pbxproj +++ b/AvH Plan.xcodeproj/project.pbxproj @@ -461,24 +461,24 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AvH Plan/Pods-AvH Plan-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", "${BUILT_PRODUCTS_DIR}/MagazineLayout/MagazineLayout.framework", "${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework", "${BUILT_PRODUCTS_DIR}/SQLite.swift/SQLite.framework", "${BUILT_PRODUCTS_DIR}/SwiftSoup/SwiftSoup.framework", + "${BUILT_PRODUCTS_DIR}/Toast-Swift/Toast_Swift.framework", "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MagazineLayout.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLite.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftSoup.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast_Swift.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -722,7 +722,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "denizd.AvH-Plan"; + PRODUCT_BUNDLE_IDENTIFIER = com.denizd.substitutionplan; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -742,7 +742,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = "denizd.AvH-Plan"; + PRODUCT_BUNDLE_IDENTIFIER = com.denizd.substitutionplan; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/AvH Plan.xcodeproj/xcshareddata/xcschemes/AvH Plan.xcscheme b/AvH Plan.xcodeproj/xcshareddata/xcschemes/AvH Plan.xcscheme index 7d55367..0dee797 100644 --- a/AvH Plan.xcodeproj/xcshareddata/xcschemes/AvH Plan.xcscheme +++ b/AvH Plan.xcodeproj/xcshareddata/xcschemes/AvH Plan.xcscheme @@ -27,6 +27,15 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + @@ -49,17 +58,6 @@ - - - - - - - - @@ -240,6 +242,7 @@