add wishlist add private policy link in about page

Author: 110

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -24,6 +24,7 @@
 		642DED2D2DBF6965006B944C /* FontAwesomeSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = 642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */; };
 		644C84F82D535D0B00E92D0D /* JXPagingView in Frameworks */ = {isa = PBXBuildFile; productRef = 644C84F72D535D0B00E92D0D /* JXPagingView */; };
 		64541A902DA3CE5A001208C7 /* Tiercel in Frameworks */ = {isa = PBXBuildFile; productRef = 64541A8F2DA3CE5A001208C7 /* Tiercel */; };
+		645CC8672DC9FEF600B8CBF6 /* WishKit in Frameworks */ = {isa = PBXBuildFile; productRef = 645CC8662DC9FEF600B8CBF6 /* WishKit */; };
 		64655C2D2CFD6CA000255488 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 64655C2C2CFD6CA000255488 /* Debug.xcconfig */; };
 		6467B2AE2DB109500045DA9A /* SFSymbolKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6467B2AD2DB109500045DA9A /* SFSymbolKit */; };
 		646CABC52DAE876C00B9EA6F /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 646CABC42DAE876C00B9EA6F /* ExyteChat */; };
@@ -89,6 +90,7 @@
 				0690507B2CAE634C007FC957 /* Awesome in Frameworks */,
 				066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */,
 				067D89772AD25C1700F8F932 /* MarkdownUI in Frameworks */,
+				645CC8672DC9FEF600B8CBF6 /* WishKit in Frameworks */,
 				64E208742CF845C2001C64EF /* Kingfisher in Frameworks */,
 				64FF2E132D2BC4E80046A32B /* Generated in Frameworks */,
 				066AD0492B3ACDC1006F28F4 /* OrderedCollections in Frameworks */,
@@ -268,6 +270,7 @@
 				646CABC42DAE876C00B9EA6F /* ExyteChat */,
 				6467B2AD2DB109500045DA9A /* SFSymbolKit */,
 				642DED2C2DBF6965006B944C /* FontAwesomeSwiftUI */,
+				645CC8662DC9FEF600B8CBF6 /* WishKit */,
 			);
 			productName = iosApp;
 			productReference = 7555FF7B242A565900829871 /* Flare.app */;
@@ -326,6 +329,7 @@
 				646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */,
 				6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */,
 				642DED2B2DBF6965006B944C /* XCRemoteSwiftPackageReference "FontAwesomeSwiftUI" */,
+				645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */,
 			);
 			productRefGroup = 7555FF7C242A565900829871 /* Products */;
 			projectDirPath = "";
@@ -747,6 +751,14 @@
 				minimumVersion = 3.2.6;
 			};
 		};
+		645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/wishkit/wishkit-ios.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 4.7.0;
+			};
+		};
 		6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/Sedlacek-Solutions/SFSymbolKit.git";
@@ -936,6 +948,11 @@
 			package = 64541A8E2DA3CE5A001208C7 /* XCRemoteSwiftPackageReference "Tiercel" */;
 			productName = Tiercel;
 		};
+		645CC8662DC9FEF600B8CBF6 /* WishKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 645CC8652DC9FEF600B8CBF6 /* XCRemoteSwiftPackageReference "wishkit-ios" */;
+			productName = WishKit;
+		};
 		6467B2AD2DB109500045DA9A /* SFSymbolKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 6467B2AC2DB109500045DA9A /* XCRemoteSwiftPackageReference "SFSymbolKit" */;

iosApp/iosApp/AppDelegate.swift

@@ -1,6 +1,7 @@
 import FirebaseCore
 import SwiftUI
 import Tiercel
+import WishKit
 
 #if os(iOS)
     typealias ApplicationDelegate = UIApplicationDelegate
@@ -20,6 +21,7 @@ class AppDelegate: NSObject, ApplicationDelegate {
 //      FirebaseApp.configure()
             // DownloadManager初始化
             _ = DownloadManager.shared
+            WishKit.configure(with: "8B16D016-FC6D-4DEB-8FC5-91E6A7C46A5C")
             return true
         }
 

iosApp/iosApp/FlareApp.swift

@@ -2,6 +2,7 @@ import FontAwesomeSwiftUI
 import shared
 import SwiftUI
 
+
 @main
 struct FlareApp: SwiftUI.App {
     #if os(macOS)

iosApp/iosApp/Localizable.xcstrings

@@ -24725,6 +24725,9 @@
           }
         }
       }
+    },
+    "Feature Requests" : {
+
     },
     "Feed Info" : {
       "localizations" : {
@@ -94260,6 +94263,9 @@
           }
         }
       }
+    },
+    "settings_wishlist_title" : {
+
     },
     "Share" : {
       "localizations" : {
@@ -95139,6 +95145,7 @@
       }
     },
     "Spaces list comming soon" : {
+      "extractionState" : "stale",
       "localizations" : {
         "ar" : {
           "stringUnit" : {
@@ -106443,6 +106450,9 @@
           }
         }
       }
+    },
+    "XSpaces list comming soon" : {
+
     },
     "Your account doesn't have any feeds" : {
       "localizations" : {

iosApp/iosApp/UI/Page/Settings/View/SettingsUIScreen.swift

@@ -34,13 +34,18 @@ struct SettingsUIScreen: View {
 
                             Label("settings_storage_title", systemImage: "externaldrive")
                                 .tag(SettingsDestination.storage)
-
+                            
+                            Label("Feature Requests", systemImage: "list.bullet.rectangle.portrait")
+                                .tag(SettingsDestination.wishlist)
+                            
                             Label("settings_about_subtitle", systemImage: "exclamationmark.circle")
                                 .tag(SettingsDestination.about)
+
+                            
                         }
                     }
                     .navigationTitle("settings_title")
-                    .environment(\.defaultMinListRowHeight, 50)
+                    .environment(\.defaultMinListRowHeight, 60)
                 } detail: {
                     if let detail = selectedDetail {
                         switch detail {
@@ -54,6 +59,8 @@ struct SettingsUIScreen: View {
                             StorageScreen()
                         case .about:
                             AboutScreen()
+                        case .wishlist:
+                            WishlistView()
                         }
                     } else {
                         Text("settings_welcome")
@@ -85,6 +92,7 @@ public enum SettingsDestination: String, CaseIterable, Identifiable {
     case other
     case storage
     case about
+    case wishlist
     public var id: String {
         rawValue
     }

iosApp/iosApp/UI/Page/Settings/View/WishlistView.swift

@@ -0,0 +1,8 @@
+import SwiftUI
+import WishKit
+
+struct WishlistView: View {
+  var body: some View {
+    WishKit.FeedbackListView().navigationTitle("wishlist")
+  }
+} 

shared/ui/src/commonMain/composeResources/values/strings.xml

@@ -9,4 +9,5 @@
     <string name="settings_about_line_description">Join our Line group</string>
     <string name="settings_about_localization">Crowdin</string>
     <string name="settings_about_localization_description">Help us translate Flare</string>
+    <string name="settings_privacy_policy">Privacy Policy</string>
 </resources>

shared/ui/src/commonMain/kotlin/dev/dimension/flare/ui/screen/settings/AboutScreenContent.kt

@@ -7,6 +7,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Lock
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
@@ -35,6 +37,7 @@ import dev.dimension.flare.settings_about_localization_description
 import dev.dimension.flare.settings_about_source_code
 import dev.dimension.flare.settings_about_telegram
 import dev.dimension.flare.settings_about_telegram_description
+import dev.dimension.flare.settings_privacy_policy
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 
@@ -156,5 +159,26 @@ public fun AboutScreenContent(
                 )
             },
         )
+        ListItem(
+            headlineContent = {
+                Text(text = stringResource(resource = Res.string.settings_privacy_policy))
+            },
+            supportingContent = {
+                Text(
+                    text = "https://legal.mask.io/maskbook",
+                )
+            },
+            modifier =
+                Modifier.clickable {
+                    uriHandler.openUri("https://legal.mask.io/maskbook/")
+                },
+            leadingContent = {
+                Icon(
+                    imageVector = Icons.Filled.Lock,
+                    contentDescription = stringResource(resource = Res.string.settings_privacy_policy),
+                    modifier = Modifier.size(24.dp),
+                )
+            },
+        )
     }
 }