meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up weather view

Browse source
This commit is contained in:
Garth Vander Houwen 2024-07-12 17:52:21 -07:00
parent 8c60e23fb9
commit 2888eb341b
1 changed files with 47 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

102
Meshtastic/Views/Helpers/Weather/LocalWeatherConditions.swift
View file

@ -94,17 +94,15 @@ struct WeatherConditionsCompactWidget: View {
let symbolName: String
let description: String
var body: some View {
ViewThatFits {
VStack(alignment: .leading) {
Label { Text(description) } icon: { Image(systemName: symbolName).symbolRenderingMode(.multicolor) }
.font(.caption)
Text(temperature)
.font(temperature.length < 4 ? .system(size: 90) : .system(size: 60) )
}
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
VStack(alignment: .leading) {
Label { Text(description) } icon: { Image(systemName: symbolName).symbolRenderingMode(.multicolor) }
.font(.caption)
Text(temperature)
.font(temperature.length < 4 ? .system(size: 90) : .system(size: 60) )
}
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
}
}
@ -112,23 +110,21 @@ struct HumidityCompactWidget: View {
let humidity: Int
let dewPoint: String
var body: some View {
ViewThatFits {
VStack(alignment: .leading) {
Label { Text("HUMIDITY") } icon: { Image(systemName: "humidity").symbolRenderingMode(.multicolor) }
.font(.caption)
Text("\(humidity)%")
.font(.largeTitle)
.padding(.bottom)
Text("The dew point is \(dewPoint) right now.")
.lineLimit(3)
.fixedSize(horizontal: false, vertical: true)
.font(.caption)
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
VStack(alignment: .leading) {
Label { Text("HUMIDITY") } icon: { Image(systemName: "humidity").symbolRenderingMode(.multicolor) }
.font(.caption)
Text("\(humidity)%")
.font(.largeTitle)
.padding(.bottom)
Text("The dew point is \(dewPoint) right now.")
.lineLimit(3)
.fixedSize(horizontal: false, vertical: true)
.font(.caption)
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
}
}
@ -137,21 +133,19 @@ struct PressureCompactWidget: View {
let unit: String
let low: Bool
var body: some View {
ViewThatFits {
VStack(alignment: .leading) {
Label { Text("PRESSURE") } icon: { Image(systemName: "gauge").symbolRenderingMode(.multicolor) }
.font(.caption2)
Text(pressure)
.font(pressure.length < 7 ? .system(size: 35) : .system(size: 30) )
Text(low ? "LOW" : "HIGH")
.padding(.bottom)
Text(unit)
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
VStack(alignment: .leading) {
Label { Text("PRESSURE") } icon: { Image(systemName: "gauge").symbolRenderingMode(.multicolor) }
.font(.caption2)
Text(pressure)
.font(pressure.length < 7 ? .system(size: 35) : .system(size: 30) )
Text(low ? "LOW" : "HIGH")
.padding(.bottom)
Text(unit)
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
}
}
@ -160,22 +154,20 @@ struct WindCompactWidget: View {
let gust: String
let direction: String
var body: some View {
ViewThatFits {
VStack(alignment: .leading) {
Label { Text("WIND") } icon: { Image(systemName: "wind").foregroundColor(.accentColor) }
.font(.caption)
Text("\(direction)")
.font(.caption)
.padding(.bottom, 10)
Text(speed)
.font(.system(size: 35))
Text("Gusts \(gust)")
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
VStack(alignment: .leading) {
Label { Text("WIND") } icon: { Image(systemName: "wind").foregroundColor(.accentColor) }
.font(.caption)
Text("\(direction)")
.font(.caption)
.padding(.bottom, 10)
Text(speed)
.font(.system(size: 35))
Text("Gusts \(gust)")
}
.padding(.horizontal)
.frame(maxWidth: .infinity)
.frame(height: 175)
.background(.tertiary, in: RoundedRectangle(cornerRadius: 20, style: .continuous))
}
}