- more bugfixes

- last commit before overhauling HRM/Battery page

Author: xan-m

Infini-iOS/BLE/BLEManager.swift

@@ -86,6 +86,7 @@ class BLEManager: NSObject, ObservableObject, CBCentralManagerDelegate {
 		if infiniTime != nil {
 			myCentral.cancelPeripheralConnection(infiniTime)
 			firstConnect = true
+			isConnectedToPinetime = false
 		}
 	}
 

Infini-iOS/ContentView.swift

@@ -25,7 +25,6 @@ struct ContentView: View {
 	}
 
 
-	
 	var body: some View {
 		let drag = DragGesture()
 			.onEnded {
@@ -41,6 +40,7 @@ struct ContentView: View {
 				//	pageSwitcher.connectViewLoad = true
 				}
 			}
+		
 		return NavigationView {
 			GeometryReader { geometry in
 				ZStack(alignment: .leading) {
@@ -52,9 +52,12 @@ struct ContentView: View {
 						.offset(x: self.pageSwitcher.showMenu ? geometry.size.width/2 : 0)
 						.disabled(self.pageSwitcher.showMenu ? true : false)
 						.onAppear(){
-							if autoconnect && bleManager.isSwitchedOn {
-								self.bleManager.startScanning()
-							}
+							// if autoconnect is set, start scan ASAP, but give bleManager half a second to start up
+							DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
+								if autoconnect && bleManager.isSwitchedOn {
+									self.bleManager.startScanning()
+								}
+							})
 							if (autoconnect && autoconnectUUID == "") || (!autoconnect && !bleManager.isConnectedToPinetime) {
 								DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
 									withAnimation {

Infini-iOS/Settings/SettingsView.swift

@@ -27,17 +27,26 @@ struct Settings_Page: View {
 				.padding()
 			Form {
 				Section(header: Text("Connection")) {
-					Toggle("Autoconnect to Nearest PineTime", isOn: $autoconnect)
+					Toggle("Autoconnect to PineTime", isOn: $autoconnect)
 					if autoconnect {
-					Text("Autoconnect is currently experimental! Connection is made based on device UUID, which I am only sort of sure is static.").foregroundColor(Color.red)
-					}
-					Button {
-						autoconnectUUID = bleManager.setAutoconnectUUID
-						print(autoconnectUUID)
-					} label: {
-						Text("Select Current Device for Autoconnect")
+						Text("Autoconnect is currently experimental! Connection is made based on device UUID, which I am only sort of sure is static.").foregroundColor(Color.red)
+						Button {
+							autoconnectUUID = bleManager.setAutoconnectUUID
+							print(autoconnectUUID)
+						} label: {
+							Text("Use Current Device for Autoconnect")
+								.foregroundColor(Color.white)
+						}
+						Button {
+							autoconnectUUID = ""
+							print(autoconnectUUID)
+						} label: {
+							Text("Clear Autoconnect Device")
+								.foregroundColor(Color.white)
+						}
 					}
 
+
 				}
 				Section(header: Text("Notifications")) {
 					Toggle("Enable Watch Notifications", isOn: $watchNotifications)

Infini-iOS/View Components/BLEConnectView.swift

@@ -35,7 +35,9 @@ struct Connect: View {
 				HStack {
 					Button(action: {
 						self.bleManager.deviceToConnect = peripheral.peripheralHash
-						self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.peripheralHash]!)
+						if !self.bleManager.isConnectedToPinetime {
+							self.bleManager.connect(peripheral: self.bleManager.peripheralDictionary[peripheral.peripheralHash]!)
+						}
 						presentation.wrappedValue.dismiss()
 					}) {
 						Text(peripheral.name)

Infini-iOS/View Components/BLEStatusView.swift

@@ -50,18 +50,14 @@ struct DeviceView: View {
 						.padding(.horizontal, 20)
 				}
 			} else {
-				Button(action: {
-					self.bleManager.disconnect()
-				}) {
-					Text("Disconnect from PineTime")
-						.padding()
-						.padding(.vertical, 7)
-						.frame(maxWidth: .infinity, alignment: .center)
-						.background(Color.darkGray)
-						.foregroundColor(Color.gray)
-						.cornerRadius(10)
-						.padding(.horizontal, 20)
-				}.disabled(true)
+				Text("Disconnected")
+					.padding()
+					.padding(.vertical, 7)
+					.frame(maxWidth: .infinity, alignment: .center)
+					.background(Color.darkGray)
+					.foregroundColor(Color.gray)
+					.cornerRadius(10)
+					.padding(.horizontal, 20)
 			}
 		}//.padding()
 	}

Infini-iOS/View Components/SideMenu.swift

@@ -59,16 +59,18 @@ struct SideMenu: View {
 
 			Spacer()
 			HStack {
-				Button(action: {
-					pageSwitcher.connectViewLoad = true
-					pageSwitcher.showMenu = false
-				}) {
-					Image(systemName: "radiowaves.right")
-						.foregroundColor(.gray)
-						.imageScale(.large)
-					Text("Connect to PineTime")
-						.foregroundColor(.gray)
-						.padding(5)
+				if !self.bleManager.isConnectedToPinetime {
+					Button(action: {
+						pageSwitcher.connectViewLoad = true
+						pageSwitcher.showMenu = false
+					}) {
+						Image(systemName: "radiowaves.right")
+							.foregroundColor(.gray)
+							.imageScale(.large)
+						Text("Connect to PineTime")
+							.foregroundColor(.gray)
+							.padding(5)
+					}
 				}
 			}
 				.padding(.top, 100)