Hide time if font size is zero

pqrs-org · Jan 29, 2025 · 971f221 · 971f221
1 parent e416fdc
commit 971f221
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/src/TrueWidget/swift/Views/Main/CompactTimeView.swift b/src/TrueWidget/swift/Views/Main/CompactTimeView.swift
@@ -11,16 +11,18 @@ struct CompactTimeView: View {
 
   var body: some View {
     HStack(alignment: .firstTextBaseline, spacing: 0) {
-      Text(
-        time.localTime == nil
-          ? "---"
-          : String(
-            format: " %02d:%02d",
-            time.localTime?.hour ?? 0,
-            time.localTime?.minute ?? 0
-          )
-      )
-      .font(.custom("Menlo", size: userSettings.compactLocalTimeFontSize))
+      if userSettings.compactLocalTimeFontSize > 0 {
+        Text(
+          time.localTime == nil
+            ? "---"
+            : String(
+              format: " %02d:%02d",
+              time.localTime?.hour ?? 0,
+              time.localTime?.minute ?? 0
+            )
+        )
+        .font(.custom("Menlo", size: userSettings.compactLocalTimeFontSize))
+      }
 
       if userSettings.compactLocalTimeSecondsFontSize > 0 {
         Text(

diff --git a/src/TrueWidget/swift/Views/Main/MainTimeView.swift b/src/TrueWidget/swift/Views/Main/MainTimeView.swift
@@ -19,16 +19,18 @@ struct MainTimeView: View {
 
       if userSettings.showLocalTime {
         HStack(alignment: .firstTextBaseline, spacing: 0) {
-          Text(
-            time.localTime == nil
-              ? "---"
-              : String(
-                format: " %02d:%02d",
-                time.localTime?.hour ?? 0,
-                time.localTime?.minute ?? 0
-              )
-          )
-          .font(.custom("Menlo", size: userSettings.localTimeFontSize))
+          if userSettings.localTimeFontSize > 0 {
+            Text(
+              time.localTime == nil
+                ? "---"
+                : String(
+                  format: " %02d:%02d",
+                  time.localTime?.hour ?? 0,
+                  time.localTime?.minute ?? 0
+                )
+            )
+            .font(.custom("Menlo", size: userSettings.localTimeFontSize))
+          }
 
           if userSettings.localTimeSecondsFontSize > 0 {
             Text(
@@ -57,16 +59,18 @@ struct MainTimeView: View {
                 .font(.custom("Menlo", size: userSettings.timeZoneDateFontSize))
             }
 
-            Text(
-              dateTime == nil
-                ? "---"
-                : String(
-                  format: "%02d:%02d:%02d",
-                  dateTime?.hour ?? 0,
-                  dateTime?.minute ?? 0,
-                  dateTime?.second ?? 0)
-            )
-            .font(.custom("Menlo", size: userSettings.timeZoneTimeFontSize))
+            if userSettings.timeZoneTimeFontSize > 0 {
+              Text(
+                dateTime == nil
+                  ? "---"
+                  : String(
+                    format: "%02d:%02d:%02d",
+                    dateTime?.hour ?? 0,
+                    dateTime?.minute ?? 0,
+                    dateTime?.second ?? 0)
+              )
+              .font(.custom("Menlo", size: userSettings.timeZoneTimeFontSize))
+            }
           }
         }
       }