Merge pull request #21 from sieren/update-ios-12

Update ios 12
sieren · Oct 29, 2023 · 7f9e45b · 7f9e45b
2 parents 0ce962e + bee73fe
commit 7f9e45b
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 55 deletions.
diff --git a/midimittr.xcodeproj/project.pbxproj b/midimittr.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -281,7 +281,7 @@
 				TargetAttributes = {
 					694947DB19DD7A4E00A6E65C = {
 						CreatedOnToolsVersion = 6.0.1;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1500;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -292,10 +292,9 @@
 			};
 			buildConfigurationList = 694947D719DD7A4E00A6E65C /* Build configuration list for PBXProject "midimittr" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@@ -513,7 +512,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/midimittr/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -525,7 +524,7 @@
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "midimittr/midimittr-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -552,7 +551,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/midimittr/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -563,7 +562,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "midimittr/midimittr-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

diff --git a/midimittr.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/midimittr.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,34 +1,32 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "MarqueeLabel",
-        "repositoryURL": "https://github.com/cbpowell/MarqueeLabel",
-        "state": {
-          "branch": null,
-          "revision": "d92fe1583dbf43fa3b70229a49fa7da6b36750d4",
-          "version": "4.0.5"
-        }
-      },
-      {
-        "package": "NotificationBannerSwift",
-        "repositoryURL": "https://github.com/Daltron/NotificationBanner",
-        "state": {
-          "branch": null,
-          "revision": "2ce5c49d8ee4865f01a3ce3bbe078664c78c7a3c",
-          "version": "3.0.6"
-        }
-      },
-      {
-        "package": "SnapKit",
-        "repositoryURL": "https://github.com/SnapKit/SnapKit",
-        "state": {
-          "branch": null,
-          "revision": "d458564516e5676af9c70b4f4b2a9178294f1bc6",
-          "version": "5.0.1"
-        }
+  "pins" : [
+    {
+      "identity" : "marqueelabel",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/cbpowell/MarqueeLabel",
+      "state" : {
+        "revision" : "ae3cf7c647dd7f67f1946658285f5f0ce2476caf",
+        "version" : "4.4.0"
       }
-    ]
-  },
-  "version": 1
+    },
+    {
+      "identity" : "notificationbanner",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Daltron/NotificationBanner",
+      "state" : {
+        "revision" : "1406ac60bcab58074fc969e9b4cb804679832c8e",
+        "version" : "3.2.1"
+      }
+    },
+    {
+      "identity" : "snapkit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SnapKit/SnapKit",
+      "state" : {
+        "revision" : "f222cbdf325885926566172f6f5f06af95473158",
+        "version" : "5.6.0"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/...roj/project.xcworkspace/xcuserdata/sierenmusic.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/sierenmusic.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/midimittr.xcodeproj/xcuserdata/sierenmusic.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/midimittr.xcodeproj/xcuserdata/sierenmusic.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -133,5 +133,53 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "630EBA4E-FFAD-4990-BD36-114517D24E93"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "midimittr/BLEAdvertViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "16"
+            endingLineNumber = "16"
+            landmarkName = "viewWillAppear(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "522A1A3E-CB4F-4508-A975-07236FB7E6A6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "midimittr/BLEAdvertViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "17"
+            endingLineNumber = "17"
+            landmarkName = "viewWillAppear(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4E05D13A-8146-4DE2-A773-8F07AA78B710"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "midimittr/BLEAdvertViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "10"
+            endingLineNumber = "10"
+            landmarkName = "viewWillAppear(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/midimittr/AppDelegate.swift b/midimittr/AppDelegate.swift
@@ -2,6 +2,7 @@
 
 import UIKit
 import NotificationBannerSwift
+import CoreAudioKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, PeerTalkConnectionProtocol {
@@ -12,7 +13,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, PeerTalkConnectionProtoco
   let appDefaults = [String: AnyObject]()
 
   func application(_ application: UIApplication,
-                   didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+                   didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     registerSettingsBundle()
     appContext.peerTalkBridge.connectionViewDelegate = self
     //swiftlint:disable:next force_cast
@@ -31,6 +32,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, PeerTalkConnectionProtoco
     let root = self.window?.rootViewController as! NavController
     //swiftlint:disable:next force_cast
     let tabController = root.viewControllers[0] as! TabController
+    tabController.viewControllers![1] = CABTMIDILocalPeripheralViewController()
     switch shortcutItem.type {
     case "com.matt.midimittr.advertise":
       tabController.selectedIndex = 1

diff --git a/midimittr/BLEAdvertViewController.swift b/midimittr/BLEAdvertViewController.swift
@@ -3,18 +3,17 @@
 import UIKit
 import CoreAudioKit
 
-class BLEAdvertViewController: UIViewController {
+class BLEAdvertViewController: CABTMIDILocalPeripheralViewController {
 
-  private var bleVC = CABTMIDILocalPeripheralViewController()
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    bleVC.view.frame = self.view.frame
-    view.addSubview(bleVC.view)
-  }
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
+//    for subView in view.subviews {
+//      subView.removeFromSuperview()
+//    }
+//    var bleVC = CABTMIDILocalPeripheralViewController()
+ //   bleVC.view.frame = self.view.frame
+//    view.addSubview(bleVC.view)
     self.navigationController!.navigationBar.topItem?.title = "Bluetooth Advertising"
   }
 }
diff --git a/midimittr/Base.lproj/MainNew.storyboard b/midimittr/Base.lproj/MainNew.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="i92-3K-T0V">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="i92-3K-T0V">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -136,7 +136,7 @@
         <!--Advertising-->
         <scene sceneID="Q3q-2Y-tpF">
             <objects>
-                <viewController title="Advertising" id="MGW-dE-Ylo" customClass="BLEAdvertViewController" customModule="midimittr" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Advertising" id="MGW-dE-Ylo" customClass="CABTMIDILocalPeripheralViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="RUh-Km-0aY"/>
                         <viewControllerLayoutGuide type="bottom" id="brl-cJ-ULG"/>

diff --git a/midimittr/NavController.swift b/midimittr/NavController.swift
@@ -13,8 +13,8 @@ class NavController: UINavigationController {
     //swiftlint:disable:next force_cast
     let tabController = self.viewControllers[0] as! TabController
     tabController.appContext = appContext
-    let attributeThin = [ NSAttributedStringKey.font: UIFont.systemFont(ofSize: 18, weight: .light) ]
-    let attributeBold = [ NSAttributedStringKey.font: UIFont.systemFont(ofSize: 18, weight: .bold) ]
+    let attributeThin = [ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 18, weight: .light) ]
+    let attributeBold = [ NSAttributedString.Key.font: UIFont.systemFont(ofSize: 18, weight: .bold) ]
     let midiStr = NSMutableAttributedString(string: "midi", attributes: attributeThin)
     let mittrStr = NSAttributedString(string: "mittr", attributes: attributeBold)
     midiStr.append(mittrStr)

diff --git a/midimittr/NavControllerExtensions.swift b/midimittr/NavControllerExtensions.swift
@@ -17,10 +17,12 @@ extension UINavigationController {
     if #available(iOS 12.0, *) {
         let userInterfaceStyle = traitCollection.userInterfaceStyle
         if userInterfaceStyle == .dark {
+          self.view.backgroundColor = UIColor.DarkColors.backgroundColor
           self.navigationBar.tintColor = UIColor.DarkColors.tintColor
           self.self.navigationBar.backgroundColor = UIColor.DarkColors.backgroundColor
         }
         if userInterfaceStyle == .light {
+          self.view.backgroundColor = UIColor.LightColors.backgroundColor
           self.navigationBar.tintColor = UIColor.LightColors.tintColor
           self.self.navigationBar.backgroundColor = UIColor.LightColors.backgroundColor
         }

diff --git a/midimittr/TabController.swift b/midimittr/TabController.swift
@@ -31,15 +31,15 @@ class TabController: UITabBarController {
   }
 
   @objc func openSettings() {
-    UIApplication.shared.openURL(URL(string: UIApplicationOpenSettingsURLString)!)
+    UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
   }
 
   @objc func openWebPage() {
     let url = URL(string: "http://www.s-r-n.de/midimittr")!
     let alert = UIAlertController(title: "midiMittr Website",
                                   message: "Open midiMittr Website?", preferredStyle: .alert)
     alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) in
-      UIApplication.shared.openURL(url)
+      UIApplication.shared.open(url, options: [:], completionHandler: nil)
     }))
     alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
     present(alert, animated: false, completion: nil)