a

FlipByBlink · Jan 19, 2024 · 970f87d · 970f87d
1 parent d0ba4c8
commit 970f87d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/SpatialClock/Supporting files/Localizable.xcstrings b/SpatialClock/Supporting files/Localizable.xcstrings
@@ -176,7 +176,7 @@
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "「アニメーションがオン」で「秒を表示」している場合、一定量のCPUリソースを消費することがあります。"
+            "value" : "「アニメーションがオン」かつ「秒を表示」している場合、一定量のCPUリソースを消費することがあります。"
           }
         }
       }

diff --git a/SpatialClock/💾Option/💾Key.swift b/SpatialClock/💾Option/💾Key.swift
@@ -1,8 +1,7 @@
 enum 💾Key {
-    static let presentSettingWindow: String = "presentSettingWindow"
+    static let hideDate: String = "hideDate"
     static let showYear: String = "showYear"
     static let hideWeekday: String = "hideWeekday"
-    static let hideDate: String = "hideDate"
     static let showSecond: String = "showSecond"
     static let fontSize: String = "fontSize"
     static let fontWeight: String = "fontWeight"

diff --git a/SpatialClock/💾Option/💾Option.swift b/SpatialClock/💾Option/💾Option.swift
@@ -56,25 +56,25 @@ enum 💾Option {
         var value: Date
         func body(content: Content) -> some View {
             switch self.model.animation {
+                case .disable:
+                    content
                 case .default:
                     content
                         .animation(.default, value: self.value)
                 case .cool:
                     content
                         .contentTransition(.numericText())
                         .animation(.default, value: self.value)
-                case .disable:
-                    content
             }
         }
         enum Case: String, CaseIterable, Identifiable {
-            case `default`, cool, disable
+            case disable, `default`, cool
             var id: Self { self }
             var label: LocalizedStringKey {
                 switch self {
+                    case .disable: "disable"
                     case .default: "default"
                     case .cool: "cool"
-                    case .disable: "disable"
                 }
             }
         }

diff --git a/SpatialClock/📱AppModel.swift b/SpatialClock/📱AppModel.swift
@@ -14,5 +14,5 @@ class 📱AppModel: ObservableObject {
     @AppStorage(💾Key.opacity) var opacity: Double = 1.0
     @AppStorage(💾Key.hideBackground) var hideBackground: Bool = false
     @AppStorage(💾Key.angle) var angle: Int = 0
-    @AppStorage(💾Key.animation) var animation: 💾Option.Animation.Case = .default
+    @AppStorage(💾Key.animation) var animation: 💾Option.Animation.Case = .disable
 }
diff --git a/SpatialClock/🕒ClockView.swift b/SpatialClock/🕒ClockView.swift
@@ -56,8 +56,8 @@ fileprivate extension 🕒ClockView {
         @EnvironmentObject var model: 📱AppModel
         func body(content: Content) -> some View {
             content
-                .animation(.default, value: self.model.showYear)
                 .animation(.default, value: self.model.hideDate)
+                .animation(.default, value: self.model.showYear)
                 .animation(.default, value: self.model.hideWeekday)
                 .animation(.default, value: self.model.showSecond)
                 .animation(.default, value: self.model.fontSize)

diff --git a/SpatialClock/🛠️Setting/🛠️SettingMenu.swift b/SpatialClock/🛠️Setting/🛠️SettingMenu.swift
@@ -10,7 +10,7 @@ struct 🛠️SettingMenu: View {
             🛠️VisualTab()
             🛠️InfoTab()
         }
-        .frame(maxWidth: 420, maxHeight: 600)
+        .frame(maxWidth: 420, maxHeight: 580)
         .onChange(of: self.scenePhase) { _, newValue in
             switch newValue {
                 case .background: self.dismissWindow()