Fix layout of solstice and equinox sheet

daneden · Sep 13, 2024 · 36d01bb · 36d01bb
1 parent e3efbb3
commit 36d01bb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 36 deletions.
diff --git 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
@@ -18,36 +18,6 @@
             endingLineNumber = "58"
             landmarkName = "body(content:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "D80AA32B-93C1-4B79-8BCD-7882590E25ED - 5cb83d7ca7d4d185"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Foundation.URL) -&gt; () in Solstice_watchOS_Watch_App.DeepLinkResolver.body(content: SwiftUI._ViewModifier_Content&lt;Solstice_watchOS_Watch_App.DeepLinkResolver&gt;) -&gt; some"
-                  moduleName = "Solstice watchOS Watch App"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/dte/Developer/Solstice/Solstice/Helpers/DeepLinkResolver.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "58"
-                  endingLineNumber = "58">
-               </Location>
-               <Location
-                  uuid = "D80AA32B-93C1-4B79-8BCD-7882590E25ED - 5ad97386725c4c56"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (Foundation.URL) -&gt; () in Solstice.DeepLinkResolver.body(content: SwiftUI._ViewModifier_Content&lt;Solstice.DeepLinkResolver&gt;) -&gt; some"
-                  moduleName = "Solstice"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/dte/Developer/Solstice/Solstice/Helpers/DeepLinkResolver.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "58"
-                  endingLineNumber = "58">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>

diff --git 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
@@ -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
@@ -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()