Improve UI

2024-02-08 10:37:37 +08:00
parent 70d43abd52
commit 1f6e99f576
32 changed files with 1201 additions and 646 deletions
@@ -0,0 +1,85 @@
+import Foundation
+import SwiftUI
+
+public func FormView(@ViewBuilder content: () -> some View) -> some View {
+    Form {
+        content()
+    }
+    #if os(macOS)
+    .formStyle(.grouped)
+    #endif
+}
+
+public func FormTextItem(_ name: LocalizedStringKey, _ value: String) -> some View {
+    HStack {
+        Text(name)
+        Spacer()
+        Text(value)
+            .multilineTextAlignment(.trailing)
+            .font(Font.system(.caption, design: .monospaced))
+        #if os(iOS) || os(macOS)
+            .textSelection(.enabled)
+        #endif
+    }
+}
+
+public func FormTextItem(_ name: LocalizedStringKey, _ systemImage: String, @ViewBuilder _ value: () -> some View) -> some View {
+    HStack {
+        Label(name, systemImage: systemImage)
+        Spacer()
+        value()
+            .multilineTextAlignment(.trailing)
+            .font(Font.system(.caption, design: .monospaced))
+        #if os(iOS) || os(macOS)
+            .textSelection(.enabled)
+        #endif
+    }
+}
+
+public func FormItem(_ title: String, @ViewBuilder content: () -> some View) -> some View {
+    #if os(iOS) || os(tvOS)
+        HStack {
+            Text(title)
+                .lineLimit(1)
+                .layoutPriority(1)
+            Spacer()
+            Spacer()
+            content()
+        }
+    #elseif os(macOS)
+        content()
+    #endif
+}
+
+public func FormSection(@ViewBuilder content: () -> some View, @ViewBuilder footer: () -> some View) -> some View {
+    Section {
+        content()
+    } footer: {
+        footer()
+            .frame(maxWidth: .infinity, alignment: .leading)
+    }
+}
+
+public func FormButton(action: @escaping () -> Void, @ViewBuilder label: () -> some View) -> some View {
+    Button(action: action, label: label)
+    #if os(macOS)
+        .buttonStyle(.plain)
+        .foregroundColor(.accentColor)
+    #endif
+}
+
+public func FormButton(_ titleKey: some StringProtocol, action: @escaping () -> Void) -> some View {
+    Button(titleKey, action: action)
+    #if os(macOS)
+        .buttonStyle(.plain)
+        .foregroundColor(.accentColor)
+    #endif
+}
+
+public func FormButton(role: ButtonRole?, action: @escaping () -> Void, @ViewBuilder label: () -> some View) -> some View {
+    Button(role: role, action: action, label: label)
+    #if os(macOS)
+        .buttonStyle(.plain)
+        .foregroundColor(.accentColor)
+    #endif
+}
@@ -1,39 +0,0 @@
-import Foundation
-import SwiftUI
-
-public func FormView(@ViewBuilder content: () -> some View) -> some View {
-    Form {
-        content()
-    }
-    #if os(macOS)
-    .formStyle(.grouped)
-    #endif
-}
-
-public func FormTextItem(_ name: String, _ value: String) -> some View {
-    HStack {
-        Text(name)
-        Spacer()
-        Text(value)
-            .multilineTextAlignment(.trailing)
-            .font(Font.system(.caption, design: .monospaced))
-        #if os(iOS) || os(macOS)
-            .textSelection(.enabled)
-        #endif
-    }
-}
-
-public func FormItem(_ title: String, @ViewBuilder content: () -> some View) -> some View {
-    #if os(iOS) || os(tvOS)
-        HStack {
-            Text(title)
-                .lineLimit(1)
-                .layoutPriority(1)
-            Spacer()
-            Spacer()
-            content()
-        }
-    #elseif os(macOS)
-        content()
-    #endif
-}
@@ -0,0 +1,49 @@
+#if !os(tvOS)
+
+    import StoreKit
+    import SwiftUI
+
+    public func RequestReviewButton(label: @escaping () -> some View) -> some View {
+        viewBuilder {
+            if #available(iOS 16.0, macOS 13.0, visionOS 1.0, *) {
+                RequestReviewButton0(label: label)
+            } else {
+                #if os(iOS)
+                    RequestReviewButton1(label: label)
+                #else
+                    EmptyView()
+                #endif
+            }
+        }
+    }
+
+    @available(iOS 16.0, macOS 13.0, visionOS 1.0, *)
+    struct RequestReviewButton0<Label: View>: View {
+        @Environment(\.requestReview) private var requestReview
+
+        private let label: () -> Label
+        init(label: @escaping () -> Label) {
+            self.label = label
+        }
+
+        var body: some View {
+            FormButton(action: {
+                requestReview()
+            }, label: label)
+        }
+    }
+
+    struct RequestReviewButton1<Label: View>: View {
+        private let label: () -> Label
+        init(label: @escaping () -> Label) {
+            self.label = label
+        }
+
+        var body: some View {
+            Button(action: {
+                SKStoreReviewController.requestReview()
+            }, label: label)
+        }
+    }
+
+#endif
@@ -1,9 +1,9 @@
 import Foundation
 import Library
 import SwiftUI
-#if os(iOS)
+#if canImport(UIKit)
    import UIKit
-#elseif os(macOS)
+#elseif canImport(AppKit)
    import AppKit
 #endif