Committing before trying to add shortcuts

Author: xan-m

Infini-iOS/ContentView.swift

@@ -105,7 +105,7 @@ struct ContentView: View {
 							.foregroundColor(Color.gray)
 					}
 				))
-				.background(Color.black)
+				//.background(Color.black)
 				.navigationBarTitleDisplayMode(.inline)
 			}
 			.gesture(drag)
@@ -122,9 +122,9 @@ struct MainView: View {
 	var body: some View {
 		switch pageSwitcher.currentPage {
 		case .dfu:
-			DFU_Page()
+			DFUView()
 		case .status:
-			DeviceView()
+			StatusView()
 		case .settings:
 			Settings_Page()
 		}

Infini-iOS/View Components/BLEConnectView.swift

@@ -47,37 +47,7 @@ struct Connect: View {
 				}
 			}
 
-			Spacer()/*
-			if scanOrStopScan {
-				Button(action: {
-					self.bleManager.startScanning()
-					self.scanOrStopScan.toggle()
-				}) {
-					Text("Scan")
-						.padding()
-						.padding(.vertical, 7)
-						.frame(maxWidth: .infinity, alignment: .center)
-						.background(Color.gray)
-						.foregroundColor(Color.white)
-						.cornerRadius(10)
-						.padding(.horizontal, 20)
-				}
-			} else {
-			
-				Button(action: {
-					self.bleManager.stopScanning()
-					self.scanOrStopScan.toggle()
-				}) {
-					Text("Stop Scanning")
-						.padding()
-						.padding(.vertical, 7)
-						.frame(maxWidth: .infinity, alignment: .center)
-						.background(Color.gray)
-						.foregroundColor(Color.white)
-						.cornerRadius(10)
-						.padding(.horizontal, 20)
-				}
-			}*/
+			Spacer()
 		}
 	}
 }

Infini-iOS/View Components/BLEStatusView.swift

@@ -8,7 +8,7 @@
 import Foundation
 import SwiftUI
 
-struct DeviceView: View {
+struct StatusView: View {
 
 	@EnvironmentObject var bleManager: BLEManager
 
@@ -19,11 +19,10 @@ struct DeviceView: View {
 				.padding()
 				.frame(maxWidth: .infinity, alignment: .leading)
 
-			
-
-			StatusTabs().environmentObject(bleManager)
 			Spacer()
 			if bleManager.isConnectedToPinetime {
+				StatusTabs().environmentObject(bleManager)
+
 				Button(action: {
 					self.bleManager.disconnect()
 				}) {
@@ -35,6 +34,7 @@ struct DeviceView: View {
 						.foregroundColor(Color.white)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)
+						.padding(.bottom)
 				}
 			} else {
 				Text("Disconnected")
@@ -45,7 +45,16 @@ struct DeviceView: View {
 					.foregroundColor(Color.gray)
 					.cornerRadius(10)
 					.padding(.horizontal, 20)
+					.padding(.bottom)
 			}
 		}//.padding()
 	}
 }
+
+struct StatusView_Previews: PreviewProvider {
+	static var previews: some View {
+		StatusView()
+			.environmentObject(PageSwitcher())
+			.environmentObject(BLEManager())
+	}
+}

Infini-iOS/View Components/DFU/DFUProgressBar.swift

@@ -31,3 +31,11 @@ struct DFUProgressBar: View {
 		}
 	}
 }
+
+struct DFUProgressBar_Previews: PreviewProvider {
+	static var previews: some View {
+		DFUProgressBar()
+			.environmentObject(PageSwitcher())
+			.environmentObject(DFU_Updater())
+	}
+}

Infini-iOS/View Components/DFU/DFUView.swift

@@ -8,7 +8,7 @@
 import Foundation
 import SwiftUI
 
-struct DFU_Page: View {
+struct DFUView: View {
 
 	@EnvironmentObject var bleManager: BLEManager
 	@ObservedObject var dfuUpdater = DFU_Updater()
@@ -96,6 +96,7 @@ struct DFU_Page: View {
 						.foregroundColor(firmwareSelected ? Color.white : Color.gray)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)
+						.padding(.bottom)
 				}.disabled(!firmwareSelected)
 			} else {
 				Button(action:{
@@ -111,8 +112,17 @@ struct DFU_Page: View {
 						.foregroundColor(firmwareSelected ? Color.white : Color.gray)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)
+						.padding(.bottom)
 				}.disabled(!firmwareSelected)
 			}
 		}
 	}
 }
+
+struct DFUView_Previews: PreviewProvider {
+	static var previews: some View {
+		DFUView()
+			.environmentObject(BLEManager())
+			.environmentObject(DFU_Updater())
+	}
+}

Infini-iOS/View Components/SettingsView.swift

@@ -13,6 +13,7 @@ import SwiftUI
 struct Settings_Page: View {
 
 	@EnvironmentObject var bleManager: BLEManager
+	@Environment(\.colorScheme) var colorScheme
 
 	@AppStorage("watchNotifications") var watchNotifications: Bool = true
 	@AppStorage("autoconnect") var autoconnect: Bool = false
@@ -34,14 +35,14 @@ struct Settings_Page: View {
 							print(autoconnectUUID)
 						} label: {
 							Text("Use Current Device for Autoconnect")
-								.foregroundColor(Color.white)
+								.foregroundColor(colorScheme == .dark ? Color.white : Color.black)
 						}
 						Button {
 							autoconnectUUID = ""
 							print(autoconnectUUID)
 						} label: {
 							Text("Clear Autoconnect Device")
-								.foregroundColor(Color.white)
+								.foregroundColor(colorScheme == .dark ? Color.white : Color.black)
 						}
 					}