feat: add a back button when selected service is not nil

tisfeng · Oct 27, 2024 · 27c8663 · 27c8663
1 parent 413ea6b
commit 27c8663
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 9 deletions.
diff --git a/Easydict/App/Localizable.xcstrings b/Easydict/App/Localizable.xcstrings
@@ -799,6 +799,40 @@
         }
       }
     },
+    "setting.service.back" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Back"
+          }
+        },
+        "en-CA" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Back"
+          }
+        },
+        "sk" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Späť"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "返回"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "返回"
+          }
+        }
+      }
+    },
     "Baidu" : {
       "extractionState" : "manual",
       "localizations" : {

diff --git a/Easydict/Swift/View/SettingView/Tabs/TabView/ServiceTab.swift b/Easydict/Swift/View/SettingView/Tabs/TabView/ServiceTab.swift
@@ -15,7 +15,7 @@ struct ServiceTab: View {
     // MARK: Internal
 
     var body: some View {
-        HStack {
+        HStack(alignment: .top, spacing: 0) {
             VStack {
                 WindowTypePicker(windowType: $viewModel.windowType)
                     .padding()
@@ -35,16 +35,24 @@ struct ServiceTab: View {
 
             Group {
                 if let service = viewModel.selectedService {
-                    if let view = service.configurationListItems() as? (any View) {
-                        Form {
-                            AnyView(view)
+                    VStack(alignment: .leading) {
+                        Button("setting.service.back") {
+                            viewModel.selectedService = nil
                         }
-                        .formStyle(.grouped)
-
-                    } else {
-                        HStack {
+                        .padding()
+
+                        if let view = service.configurationListItems() as? (any View) {
+                            Form {
+                                AnyView(view)
+                            }
+                            .formStyle(.grouped)
+                        } else {
                             Spacer()
-                            Text("setting.service.detail.no_configuration \(service.name())")
+                            HStack {
+                                Spacer()
+                                Text("setting.service.detail.no_configuration \(service.name())")
+                                Spacer()
+                            }
                             Spacer()
                         }
                     }