fix: button on About cannot be clicked (#751)

* fix: button on about cannot be clicked * fix: remove Vortex
tisfeng · Dec 15, 2024 · 89b7ecc · 89b7ecc
1 parent 7866090
commit 89b7ecc
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 122 deletions.
diff --git a/Easydict.xcodeproj/project.pbxproj b/Easydict.xcodeproj/project.pbxproj
@@ -327,7 +327,6 @@
 		C490BF722BE910B70021E40A /* AdvancedTabItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C490BF712BE910B70021E40A /* AdvancedTabItemView.swift */; };
 		C4A512BE2C414A2400F00F33 /* AIToolService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A512BD2C414A2400F00F33 /* AIToolService.swift */; };
 		C4BE8E1C2C72E61B00F53204 /* LaunchAtLogin in Frameworks */ = {isa = PBXBuildFile; productRef = C4BE8E1B2C72E61B00F53204 /* LaunchAtLogin */; };
-		C4BFDD7A2BE61F550094026B /* Vortex in Frameworks */ = {isa = PBXBuildFile; productRef = C4BFDD792BE61F550094026B /* Vortex */; };
 		C4CCDAA32C407A0D00AC88BA /* SummaryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCDAA22C407A0D00AC88BA /* SummaryService.swift */; };
 		C4CCDAA52C407A4100AC88BA /* PolishingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4CCDAA42C407A4100AC88BA /* PolishingService.swift */; };
 		C4DD01E92B12B3C80025EE8E /* TencentService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4DD01E82B12B3C80025EE8E /* TencentService.swift */; };
@@ -904,7 +903,6 @@
 			files = (
 				0AC8A84F2B6DFDD4006DA5CC /* SettingsAccess in Frameworks */,
 				03022F192B3591AE00B63209 /* GoogleGenerativeAI in Frameworks */,
-				C4BFDD7A2BE61F550094026B /* Vortex in Frameworks */,
 				2721E4D02AFE920700A059AC /* Alamofire in Frameworks */,
 				038030952B4106800009230C /* CocoaLumberjack in Frameworks */,
 				03FD68BB2B1DC59600FD388E /* CryptoSwift in Frameworks */,
@@ -2701,7 +2699,6 @@
 				03022F182B3591AE00B63209 /* GoogleGenerativeAI */,
 				0AC8A84E2B6DFDD4006DA5CC /* SettingsAccess */,
 				03779F192BB25797008D3C42 /* OpenAI */,
-				C4BFDD792BE61F550094026B /* Vortex */,
 				0364EC892C208EB50036B61B /* KeySender */,
 				033E181E2C5A970A0099A7B0 /* Vapor */,
 				C4BE8E1B2C72E61B00F53204 /* LaunchAtLogin */,
@@ -2767,7 +2764,6 @@
 				03022F172B3591AE00B63209 /* XCRemoteSwiftPackageReference "generative-ai-swift" */,
 				0AC8A84D2B6DFDD4006DA5CC /* XCRemoteSwiftPackageReference "SettingsAccess" */,
 				03779F182BB25797008D3C42 /* XCRemoteSwiftPackageReference "OpenAI" */,
-				C4BFDD782BE61F550094026B /* XCRemoteSwiftPackageReference "Vortex" */,
 				0364EC882C208EB40036B61B /* XCRemoteSwiftPackageReference "KeySender" */,
 				033E181D2C5A970A0099A7B0 /* XCRemoteSwiftPackageReference "vapor" */,
 				C4BE8E1A2C72E5C500F53204 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */,
@@ -3791,14 +3787,6 @@
 				minimumVersion = 1.1.0;
 			};
 		};
-		C4BFDD782BE61F550094026B /* XCRemoteSwiftPackageReference "Vortex" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/twostraws/Vortex";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.1;
-			};
-		};
 		EA3B81FA2B52555C004C0E8B /* XCRemoteSwiftPackageReference "Defaults" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/sindresorhus/Defaults.git";
@@ -3920,11 +3908,6 @@
 			package = C4BE8E1A2C72E5C500F53204 /* XCRemoteSwiftPackageReference "LaunchAtLogin-Modern" */;
 			productName = LaunchAtLogin;
 		};
-		C4BFDD792BE61F550094026B /* Vortex */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = C4BFDD782BE61F550094026B /* XCRemoteSwiftPackageReference "Vortex" */;
-			productName = Vortex;
-		};
 		EA3B81FB2B52555C004C0E8B /* Defaults */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = EA3B81FA2B52555C004C0E8B /* XCRemoteSwiftPackageReference "Defaults" */;

diff --git a/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "6b2d9735092da5c9bc9b0a4954947f373d68f35b0939813ad8f54d785301c35e",
+  "originHash" : "8dd6aa510186229d6f2ea6220f7c231129077cb7b54cb2ca2c6d0c98c0660732",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -504,15 +504,6 @@
         "version" : "4.102.1"
       }
     },
-    {
-      "identity" : "vortex",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/twostraws/Vortex",
-      "state" : {
-        "revision" : "bb48b128d3c13c68c68e83833c622eec9f6c701f",
-        "version" : "1.0.1"
-      }
-    },
     {
       "identity" : "websocket-kit",
       "kind" : "remoteSourceControl",

diff --git a/Easydict/App/EasydictApp.swift b/Easydict/App/EasydictApp.swift
@@ -94,7 +94,7 @@ struct EasydictApp: App {
 
         // About window
         Window("setting.about", id: .aboutWindowId) {
-            SettingsAboutTab()
+            AboutTab()
                 .frame(width: 500, height: 220)
                 .disableWindowMinimize()
         }

diff --git a/Easydict/Swift/View/SettingView/SettingView.swift b/Easydict/Swift/View/SettingView/SettingView.swift
@@ -50,7 +50,7 @@ struct SettingView: View {
                 .tabItem { Label("privacy", systemImage: "hand.raised.square") }
                 .tag(SettingTab.privacy)
 
-            SettingsAboutTab()
+            AboutTab()
                 .tabItem { Label("setting.about", systemImage: "info.bubble") }
                 .tag(SettingTab.about)
         }

diff --git a/Easydict/Swift/View/SettingView/Tabs/TabView/AboutTab.swift b/Easydict/Swift/View/SettingView/Tabs/TabView/AboutTab.swift
@@ -8,111 +8,71 @@
 
 import SFSafeSymbols
 import SwiftUI
-import Vortex
-
-// MARK: - SettingsAboutTab
-
-// Use ScrollView to enable resize animation for Settings
-struct SettingsAboutTab: View {
-    var body: some View {
-        ScrollView {
-            AboutTab()
-        }
-    }
-}
 
 // MARK: - AboutTab
 
 struct AboutTab: View {
     // MARK: Internal
 
     var body: some View {
-        VortexViewReader { proxy in
-            GeometryReader { geometry in
-                ZStack {
-                    VortexView(.confetti) {
-                        Rectangle()
-                            .fill(.white)
-                            .frame(width: 16, height: 16)
-                            .tag("square")
-
-                        Circle()
-                            .fill(.white)
-                            .frame(width: 16)
-                            .tag("circle")
+        HStack(alignment: .center, spacing: 30) {
+            Image(.logo)
+                .resizable()
+                .renderingMode(.original)
+                .frame(width: 100, height: 100)
+                .shadow(color: .gray, radius: 1, x: 0, y: 0.8)
+                .padding(.bottom, 2)
+                .padding(.leading, 16)
+                .padding(.trailing, 16)
+
+            VStack(alignment: .leading) {
+                VStack(alignment: .leading) {
+                    Text(appName)
+                        .font(.system(size: 35, weight: .medium))
+                        .padding(.bottom, 3)
+
+                    Text("current_version \(version)")
+                        .font(.system(size: 13))
+                        .foregroundColor(.gray)
+                        .padding(.bottom, 29)
+
+                    Text(copyrightInfo)
+                        .font(.system(size: 11))
+                        .foregroundColor(.gray)
+                        .padding(.bottom, 20)
+                }
+
+                HStack(spacing: 15) {
+                    Button {
+                        NSWorkspace.shared.open(
+                            URL(string: "https://github.com/tisfeng/Easydict")!
+                        )
+                    } label: {
+                        Label("setting.about.github_link", systemSymbol: .starFill)
                     }
-                    .frame(height: 220)
-
-                    HStack(alignment: .center, spacing: 30) {
-                        Image(.logo)
-                            .resizable()
-                            .renderingMode(.original)
-                            .frame(width: 100, height: 100)
-                            .shadow(color: .gray, radius: 1, x: 0, y: 0.8)
-                            .padding(.bottom, 2)
-                            .padding(.leading, 16)
-                            .padding(.trailing, 16)
-                            .onTapGesture { location in
-                                proxy.move(
-                                    to:
-                                    CGPoint(
-                                        x: location.x + ((geometry.size.width / 2) - 222),
-                                        y: location.y + 60
-                                    )
-                                )
-                                proxy.burst()
-                            }
-                        VStack(alignment: .leading) {
-                            VStack(alignment: .leading) {
-                                Text(appName)
-                                    .font(.system(size: 35, weight: .medium))
-                                    .padding(.bottom, 3)
-
-                                Text("current_version \(version)")
-                                    .font(.system(size: 13))
-                                    .foregroundColor(.gray)
-                                    .padding(.bottom, 29)
-
-                                Text(copyrightInfo)
-                                    .font(.system(size: 11))
-                                    .foregroundColor(.gray)
-                                    .padding(.bottom, 20)
-                            }
-
-                            HStack(spacing: 15) {
-                                Button {
-                                    NSWorkspace.shared.open(
-                                        URL(string: "https://github.com/tisfeng/Easydict")!
-                                    )
-                                } label: {
-                                    Label("setting.about.github_link", systemSymbol: .starFill)
-                                }
-
-                                Button {
-                                    NSWorkspace.shared
-                                        .open(
-                                            URL(
-                                                string:
-                                                "https://github.com/tisfeng/Easydict/graphs/contributors"
-                                            )!
-                                        )
-                                } label: {
-                                    Label("setting.about.contributor_link", systemSymbol: .person3Fill)
-                                }
-
-                                Button {
-                                    openWindow(id: .acknowledgementsWindowId)
-                                } label: {
-                                    Label("setting.about.acknowledgements", systemSymbol: .checkmarkSealFill)
-                                }
-                            }
-                            .padding(.bottom, 10)
-                        }
+
+                    Button {
+                        NSWorkspace.shared
+                            .open(
+                                URL(
+                                    string:
+                                    "https://github.com/tisfeng/Easydict/graphs/contributors"
+                                )!
+                            )
+                    } label: {
+                        Label("setting.about.contributor_link", systemSymbol: .person3Fill)
+                    }
+
+                    Button {
+                        openWindow(id: .acknowledgementsWindowId)
+                    } label: {
+                        Label("setting.about.acknowledgements", systemSymbol: .checkmarkSealFill)
                     }
-                    .frame(maxWidth: .infinity)
                 }
+                .padding(.bottom, 10)
             }
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
     }
 
     // MARK: Private