feat: add source code viewing feature and update version to 1.2.7

- Introduced a new button in ContentView to view the source code on GitHub. - Added SafariWebView component to handle the display of the web content. - Updated the app version from 1.2.6 to 1.2.7. - Minor text correction in ProxyView for clarity.
bin64 · Dec 30, 2024 · a56c750 · a56c750
1 parent 6b9d01a
commit a56c750
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 6 deletions.
diff --git a/Clash Dash.xcodeproj/project.pbxproj b/Clash Dash.xcodeproj/project.pbxproj
@@ -539,7 +539,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = ym.si.clashdash;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -574,7 +574,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = ym.si.clashdash;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -676,7 +676,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = ym.si.clashdash.WidgetExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -706,7 +706,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.6;
+				MARKETING_VERSION = 1.2.7;
 				PRODUCT_BUNDLE_IDENTIFIER = ym.si.clashdash.WidgetExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/Clash Dash/Views/Components/SafariWebView.swift b/Clash Dash/Views/Components/SafariWebView.swift
@@ -0,0 +1,20 @@
+import SwiftUI
+import SafariServices
+
+struct SafariWebView: UIViewControllerRepresentable {
+    let url: URL
+
+    func makeUIViewController(context: Context) -> SFSafariViewController {
+        let config = SFSafariViewController.Configuration()
+        config.entersReaderIfAvailable = false
+        config.barCollapsingEnabled = true
+
+        let safariViewController = SFSafariViewController(url: url, configuration: config)
+        safariViewController.preferredControlTintColor = .systemBlue
+        safariViewController.dismissButtonStyle = .close
+
+        return safariViewController
+    }
+
+    func updateUIViewController(_ uiViewController: SFSafariViewController, context: Context) {}
+}
diff --git a/Clash Dash/Views/ContentView.swift b/Clash Dash/Views/ContentView.swift
@@ -1,5 +1,6 @@
 import SwiftUI
 import UIKit
+import SafariServices
 
 struct ContentView: View {
     @StateObject private var viewModel = ServerViewModel()
@@ -11,6 +12,7 @@ struct ContentView: View {
     @StateObject private var settingsViewModel = SettingsViewModel()
     @State private var showingModeChangeSuccess = false
     @State private var lastChangedMode = ""
+    @State private var showingSourceCode = false
 
     // 添加触觉反馈生成器
     private let impactFeedback = UIImpactFeedbackGenerator(style: .medium)
@@ -210,6 +212,27 @@ struct ContentView: View {
                                 destination: HelpView()
                             )
 
+                            Button {
+                                impactFeedback.impactOccurred()
+                                showingSourceCode = true
+                            } label: {
+                                HStack {
+                                    Image(systemName: "chevron.left.forwardslash.chevron.right")
+                                        .font(.body)
+                                        .foregroundColor(.purple)
+                                        .frame(width: 32)
+
+                                    Text("源码查看")
+                                        .font(.body)
+
+                                    Spacer()
+
+                                    Image(systemName: "chevron.right")
+                                        .font(.caption)
+                                        .foregroundColor(.secondary)
+                                }
+                            }
+
                             // SettingsLinkRow(
                             //     title: "给APP评分",
                             //     icon: "star.fill",
@@ -222,7 +245,7 @@ struct ContentView: View {
                         .cornerRadius(16)
 
                         // 版本信息
-                        Text("Ver: 1.2.6")
+                        Text("Ver: 1.2.7")
                             .foregroundColor(.secondary)
                             .font(.footnote)
                             .padding(.top, 8)
@@ -276,6 +299,12 @@ struct ContentView: View {
             .sheet(isPresented: $showingAddOpenWRTSheet) {
                 OpenWRTServerView(viewModel: viewModel)
             }
+            .sheet(isPresented: $showingSourceCode) {
+                if let url = URL(string: "https://github.com/bin64/Clash-Dash") {
+                    SafariWebView(url: url)
+                        .ignoresSafeArea()
+                }
+            }
             .refreshable {
                 await viewModel.checkAllServersStatus()
             }

diff --git a/Clash Dash/Views/Proxies/ProxyView.swift b/Clash Dash/Views/Proxies/ProxyView.swift
@@ -384,7 +384,7 @@ struct ProxyGroupsOverview: View {
     }
 }
 
-// 单��代理组卡片
+// 单个代理组卡片
 struct GroupCard: View {
     let group: ProxyGroup
     @ObservedObject var viewModel: ProxyViewModel