diff --git a/Localizable.xcstrings b/Localizable.xcstrings index cfeddd8a..9ea62360 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -59,7 +59,7 @@ } }, "%@ %@" : { - "comment" : "Widget heading for real location", + "comment" : "Widget heading for custom location\nWidget heading for real location", "localizations" : { "en" : { "stringUnit" : { @@ -535,6 +535,7 @@ } }, "Content #1" : { + "extractionState" : "stale", "localizations" : { "it" : { "stringUnit" : { @@ -545,6 +546,7 @@ } }, "Content #2" : { + "extractionState" : "stale", "localizations" : { "it" : { "stringUnit" : { @@ -877,6 +879,18 @@ } } } + }, + "Get the daylight duration on ${date} in ${location}" : { + + }, + "Get the sunrise time on ${date} in ${location}" : { + + }, + "Get the sunset time on ${date} in ${location}" : { + + }, + "Get today's remaining daylight in ${location}" : { + }, "Good Afternoon" : { "comment" : "Notification title for afternoon notification", @@ -1333,6 +1347,7 @@ }, "on (baseDateString)" : { "comment" : "Sentence fragment for nominal date", + "extractionState" : "stale", "localizations" : { "it" : { "stringUnit" : { @@ -1791,6 +1806,7 @@ } }, "Test Label" : { + "extractionState" : "stale", "localizations" : { "it" : { "stringUnit" : { diff --git a/Solstice.xcodeproj/xcuserdata/dte.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Solstice.xcodeproj/xcuserdata/dte.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 2c9edfe8..38fdd3a0 100644 --- a/Solstice.xcodeproj/xcuserdata/dte.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Solstice.xcodeproj/xcuserdata/dte.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -18,36 +18,6 @@ endingLineNumber = "58" landmarkName = "body(content:)" landmarkType = "7"> - - - - - - diff --git a/Solstice/Equinox and Solstice Info View/EarthSceneKitView.swift b/Solstice/Equinox and Solstice Info View/EarthSceneKitView.swift index 2401485d..48199a55 100644 --- a/Solstice/Equinox and Solstice Info View/EarthSceneKitView.swift +++ b/Solstice/Equinox and Solstice Info View/EarthSceneKitView.swift @@ -19,6 +19,7 @@ extension NSBundleResourceRequest: @unchecked Sendable {} #endif struct EarthSceneKitView: View { + var height: Double = 400 @State private var selection: AnnualSolarEvent = .juneSolstice var rotationAmount: Double { @@ -38,7 +39,7 @@ struct EarthSceneKitView: View { VStack { if scene != nil { CustomSceneView(scene: $scene) - .frame(maxHeight: .infinity) + .frame(idealHeight: height, maxHeight: .infinity) } else { #if os(iOS) HStack { diff --git a/Solstice/Equinox and Solstice Info View/EquinoxAndSolsticeInfoSheet.swift b/Solstice/Equinox and Solstice Info View/EquinoxAndSolsticeInfoSheet.swift index bec1cd82..ed6eb678 100644 --- a/Solstice/Equinox and Solstice Info View/EquinoxAndSolsticeInfoSheet.swift +++ b/Solstice/Equinox and Solstice Info View/EquinoxAndSolsticeInfoSheet.swift @@ -12,8 +12,7 @@ struct EquinoxAndSolsticeInfoSheet: View { GeometryReader { geometry in Form { Section { - EarthSceneKitView() - .frame(height: min(geometry.size.width, 400)) + EarthSceneKitView(height: min(geometry.size.width, 400)) EquinoxAndSolsticeDescriptions() } footer: { diff --git a/Solstice/Equinox and Solstice Info View/SolarSystemMiniMap.swift b/Solstice/Equinox and Solstice Info View/SolarSystemMiniMap.swift index 35048456..d2bf075f 100644 --- a/Solstice/Equinox and Solstice Info View/SolarSystemMiniMap.swift +++ b/Solstice/Equinox and Solstice Info View/SolarSystemMiniMap.swift @@ -14,7 +14,7 @@ struct SolarSystemMiniMap: View { event.sunAngle } - var size: Double = 60 + var size: Double = 44 var body: some View { HStack { @@ -23,7 +23,7 @@ struct SolarSystemMiniMap: View { .fontWeight(.semibold) Text(event.shortEventDescription) } - .font(.subheadline) + .font(.caption) ZStack { Circle()