GeneralSettingsViewのレイアウト修正

Kyome22 · Nov 7, 2024 · e5a1416 · e5a1416
1 parent 9b0182d
commit e5a1416
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 25 deletions.
diff --git a/ShiftWindowPackages/Sources/Domain/ViewModel/MenuViewModel.swift b/ShiftWindowPackages/Sources/Domain/ViewModel/MenuViewModel.swift
@@ -54,9 +54,9 @@ import Observation
         task = Task {
             await withTaskGroup(of: Void.self) { group in
                 group.addTask {
-                    for await patterns in await shortcutService.patternsStream() {
+                    for await value in await shortcutService.patternsStream() {
                         await MainActor.run {
-                            self.patterns = patterns
+                            self.patterns = value
                         }
                     }
                 }

diff --git a/ShiftWindowPackages/Sources/Presentation/Resources/Localizable.xcstrings b/ShiftWindowPackages/Sources/Presentation/Resources/Localizable.xcstrings
@@ -33,6 +33,22 @@
         }
       }
     },
+    "AutomaticallyLaunchAtLogin" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatically launch at login"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "ログイン時に自動的に起動"
+          }
+        }
+      }
+    },
     "checkForUpdates" : {
       "localizations" : {
         "en" : {
@@ -97,18 +113,18 @@
         }
       }
     },
-    "launchAtLogin" : {
+    "launch" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Launch at Login:"
+            "value" : "Launch:"
           }
         },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ログイン時に起動:"
+            "value" : "起動:"
           }
         }
       }
@@ -369,34 +385,34 @@
         }
       }
     },
-    "softwareUpdate" : {
+    "terminateApp" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Software Update:"
+            "value" : "Quit ShiftWindow"
           }
         },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ソフトウェアアップデート:"
+            "value" : "ShiftWindowを終了"
           }
         }
       }
     },
-    "terminateApp" : {
+    "update" : {
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Quit ShiftWindow"
+            "value" : "Update:"
           }
         },
         "ja" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "ShiftWindowを終了"
+            "value" : "アップデート:"
           }
         }
       }

diff --git a/ShiftWindowPackages/Sources/Presentation/View/GeneralSettingsView.swift b/ShiftWindowPackages/Sources/Presentation/View/GeneralSettingsView.swift
@@ -36,22 +36,22 @@ struct GeneralSettingsView: View {
 
     var body: some View {
         VStack(alignment: .leading) {
-            LabeledContent {
-                Toggle(isOn: $viewModel.launchAtLoginIsEnabled) {
-                    Text("enable", bundle: .module)
+            Form {
+                LabeledContent {
+                    Toggle(isOn: $viewModel.launchAtLoginIsEnabled) {
+                        Text("AutomaticallyLaunchAtLogin", bundle: .module)
+                    }
+                } label: {
+                    Text("launch", bundle: .module)
                 }
-            } label: {
-                Text("launchAtLogin", bundle: .module)
-            }
-            LabeledContent {
-                Toggle(isOn: $viewModel.checkForUpdatesIsEnabled) {
-                    Text("AutomaticallyCheckForUpdates", bundle: .module)
+                LabeledContent {
+                    Toggle(isOn: $viewModel.checkForUpdatesIsEnabled) {
+                        Text("AutomaticallyCheckForUpdates", bundle: .module)
+                    }
+                } label: {
+                    Text("update", bundle: .module)
                 }
-            } label: {
-                Text("softwareUpdate", bundle: .module)
-            }
-            Divider()
-            Form {
+                Divider()
                 LabeledContent {
                     Text("permissionExplain", bundle: .module)
                         .frame(width: 300, alignment: .leading)