- Some quick UI color stuff -- I hadn't seen it in light mode yet and…

… noticed some pretty glaring issues!
InfiniTimeOrg · Aug 21, 2021 · 1535293 · 1535293
1 parent dbb598a
commit 1535293
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 45 deletions.
diff --git a/Infini-iOS/Utilities/ColorPalette.swift b/Infini-iOS/Utilities/ColorPalette.swift
@@ -13,4 +13,6 @@ import SwiftUI
 extension Color {
 	static let darkGray = Color(red: 50 / 255, green: 50 / 255, blue: 50 / 255)
 	static let darkestGray = Color(red: 25 / 255, green: 25 / 255, blue: 25 / 255)
+	static let lightGray = Color(red: 200 / 255, green: 200 / 255, blue: 200 / 255)
+
 }
diff --git a/Infini-iOS/View Components/BLEStatusView.swift b/Infini-iOS/View Components/BLEStatusView.swift
@@ -11,6 +11,7 @@ import SwiftUI
 struct StatusView: View {
 
 	@EnvironmentObject var bleManager: BLEManager
+	@Environment(\.colorScheme) var colorScheme
 
 	var body: some View {
 		VStack (spacing: 10){
@@ -30,7 +31,7 @@ struct StatusView: View {
 						.padding()
 						.padding(.vertical, 7)
 						.frame(maxWidth: .infinity, alignment: .center)
-						.background(Color.gray)
+						.background(colorScheme == .dark ? Color.darkGray : Color.gray)
 						.foregroundColor(Color.white)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)
@@ -41,8 +42,8 @@ struct StatusView: View {
 					.padding()
 					.padding(.vertical, 7)
 					.frame(maxWidth: .infinity, alignment: .center)
-					.background(Color.darkGray)
-					.foregroundColor(Color.gray)
+					.background(colorScheme == .dark ? Color.gray : Color.lightGray)
+					.foregroundColor(colorScheme == .dark ? Color.gray : Color.white)
 					.cornerRadius(10)
 					.padding(.horizontal, 20)
 					.padding(.bottom)

diff --git a/Infini-iOS/View Components/DFU/DFUView.swift b/Infini-iOS/View Components/DFU/DFUView.swift
@@ -92,7 +92,7 @@ struct DFUView: View {
 						.padding()
 						.padding(.vertical, 7)
 						.frame(maxWidth: .infinity, alignment: .center)
-						.background(firmwareSelected ? Color.gray : Color.darkGray)
+						.background(colorScheme == .dark ? (firmwareSelected ? Color.darkGray : Color.darkestGray) : (firmwareSelected ? Color.gray : Color.lightGray))
 						.foregroundColor(firmwareSelected ? Color.white : Color.gray)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)
@@ -108,7 +108,7 @@ struct DFUView: View {
 						.padding()
 						.padding(.vertical, 7)
 						.frame(maxWidth: .infinity, alignment: .center)
-						.background(firmwareSelected ? Color.gray : Color.darkGray)
+						.background(colorScheme == .dark ? (firmwareSelected ? Color.darkGray : Color.darkestGray) : (firmwareSelected ? Color.gray : Color.lightGray))
 						.foregroundColor(firmwareSelected ? Color.white : Color.gray)
 						.cornerRadius(10)
 						.padding(.horizontal, 20)

diff --git a/Infini-iOS/View Components/SideMenu.swift b/Infini-iOS/View Components/SideMenu.swift
@@ -77,6 +77,7 @@ struct SideMenu: View {
 			VStack (alignment: .center, spacing:10) {
 				Text("STATUS")
 					.font(.headline)
+					.foregroundColor(Color.gray)
 
 
 				if bleManager.isSwitchedOn {

diff --git a/Infini-iOS/View Components/Status View Components/StatusViewTabs.swift b/Infini-iOS/View Components/Status View Components/StatusViewTabs.swift
@@ -14,53 +14,46 @@ struct StatusTabs: View {
 
 	@EnvironmentObject var bleManager: BLEManager
 	@State var trueIfHeart = true
-
+	@State var trueIfBat = false
+	@Environment(\.colorScheme) var colorScheme
+
 	var body: some View{
 		VStack {
-			if !bleManager.isConnectedToPinetime {
-				Text("Disconnected")
-					.foregroundColor(Color.white)
+			HStack {
+				Button (action: {
+					self.trueIfHeart = true
+					self.trueIfBat = false
+				}) {
+				(Text(Image(systemName: "heart"))
+					.foregroundColor(Color.pink) +
+				Text(": " + String(format: "%.0f", bleManager.heartBPM))
+					.foregroundColor(Color.white))
+					.frame(maxWidth:.infinity, alignment: .center)
+					.padding()
+					.background(colorScheme == .dark ? (trueIfHeart ? Color.darkGray : Color.darkestGray) : (trueIfHeart ? Color.gray : Color.lightGray))
+					.cornerRadius(5)
+					.font(.title)
+				}.padding(.leading, 10)
+				Button (action: {
+					self.trueIfHeart = false
+					self.trueIfBat = true
+				}) {
+				(Text(Image(systemName: "battery.100"))
+					.foregroundColor(Color.green) +
+					Text(": " + String(format: "%.0f", bleManager.batteryLevel))
+					.foregroundColor(Color.white))
 					.frame(maxWidth: .infinity, alignment: .center)
 					.padding()
-					.background(Color.darkGray)
+					.background(colorScheme == .dark ? (trueIfBat ? Color.darkGray : Color.darkestGray) : (trueIfBat ? Color.gray : Color.lightGray))
 					.cornerRadius(5)
 					.font(.title)
-					.padding(.horizontal, 10)
-			} else {
-				HStack {
-					Button (action: {
-						self.trueIfHeart = true
-					}) {
-					(Text(Image(systemName: "heart"))
-						.foregroundColor(Color.pink) +
-					Text(": " + String(format: "%.0f", bleManager.heartBPM))
-						.foregroundColor(Color.white))
-						.frame(maxWidth:.infinity, alignment: .center)
-						.padding()
-						.background(trueIfHeart ? Color.darkGray : Color.darkestGray)
-						.cornerRadius(5)
-						.font(.title)
-					}.padding(.leading, 10)
-					Button (action: {
-						self.trueIfHeart = false
-					}) {
-					(Text(Image(systemName: "battery.100"))
-						.foregroundColor(Color.green) +
-						Text(": " + String(format: "%.0f", bleManager.batteryLevel))
-						.foregroundColor(Color.white))
-						.frame(maxWidth: .infinity, alignment: .center)
-						.padding()
-						.background(trueIfHeart ? Color.darkestGray : Color.darkGray)
-						.cornerRadius(5)
-						.font(.title)
-					}
-					.padding(.trailing, 10)
-				}
-				if trueIfHeart {
-					HeartChart()
-				} else {
-					BatteryChart()
 				}
+				.padding(.trailing, 10)
+			}
+			if trueIfHeart {
+				HeartChart()
+			} else {
+				BatteryChart()
 			}
 		}
 	}