Merge pull request #9 from gokhanamal/fix/settingsview-navigation-and-review

Fix SettingsView navigation + Write a Review action

Author: gokhanamal

Sources/IndieBuilderKit/Services/RatingService.swift

@@ -5,31 +5,53 @@ import SwiftUI
 /// Service for handling app rating requests using StoreKit's native rating dialog
 public class RatingService {
     public static let shared = RatingService()
-    
+
+    // These are placeholders for future “smart prompting” rules.
+    // Kept for now to avoid a breaking change to any planned roadmap.
     private let minimumLaunchCountForRating = 3
     private let minimumDaysSinceInstall = 7
     private let minimumDaysBetweenRatingRequests = 30
-    
+
     private init() {}
-    
+
     /// Force request rating (useful for manual "Rate App" buttons)
     @MainActor
     public func requestRating() {
         guard let windowScene = UIApplication.shared.connectedScenes
             .first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene else {
             return
         }
-        
+
         SKStoreReviewController.requestReview(in: windowScene)
     }
-    
-    /// Open App Store review page directly
+
+    /// Open App Store review page directly.
+    ///
+    /// - Parameter appId: The numeric App Store ID (e.g. "123456789").
     public func openAppStoreReview(appId: String) {
-        let urlString = "https://apps.apple.com/app/id\(appId)?action=write-review"
-        guard let url = URL(string: urlString) else { return }
-        
-        if UIApplication.shared.canOpenURL(url) {
-            UIApplication.shared.open(url)
+        let trimmed = appId.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return }
+        guard let url = URL(string: "https://apps.apple.com/app/id\(trimmed)?action=write-review") else { return }
+
+        UIApplication.shared.open(url)
+    }
+
+    /// Open App Store review page using an App Store URL (extracts the app id from the URL).
+    ///
+    /// If parsing fails, falls back to opening the provided URL.
+    public func openAppStoreReview(appStoreURL: URL) {
+        let s = appStoreURL.absoluteString
+
+        // Typical formats include:
+        // - https://apps.apple.com/us/app/some-app/id123456789
+        // - https://apps.apple.com/app/id123456789
+        if let match = s.range(of: #"id(\d+)"#, options: .regularExpression) {
+            let idPart = String(s[match]) // e.g. "id123456789"
+            let appId = idPart.replacingOccurrences(of: "id", with: "")
+            openAppStoreReview(appId: appId)
+            return
         }
+
+        UIApplication.shared.open(appStoreURL)
     }
 }

Sources/IndieBuilderKit/UI/SettingsView.swift

@@ -57,20 +57,36 @@ public struct AppSettingsConfiguration {
 
 public struct SettingsView: View {
     private let configuration: AppSettingsConfiguration
+    private let embedInNavigation: Bool
+
     @Environment(\.dismiss) private var dismiss
     @State private var showingMailComposer = false
     @State private var showingShareSheet = false
     #if canImport(MessageUI)
     @State private var mailResult: Result<MFMailComposeResult, Error>? = nil
     #endif
-    
-    public init(configuration: AppSettingsConfiguration) {
+
+    /// - Parameter embedInNavigation: Set to `false` when presenting inside an existing `NavigationStack`
+    ///   to avoid a double navigation bar.
+    public init(configuration: AppSettingsConfiguration, embedInNavigation: Bool = true) {
         self.configuration = configuration
+        self.embedInNavigation = embedInNavigation
     }
-    
+
     public var body: some View {
-        NavigationView {
-            List {
+        Group {
+            if embedInNavigation {
+                NavigationStack {
+                    content
+                }
+            } else {
+                content
+            }
+        }
+    }
+
+    private var content: some View {
+        List {
                 // App Actions Section
                 Section {
                     SettingsRow(
@@ -265,7 +281,6 @@ public struct SettingsView: View {
                     ])
                 }
             }
-        }
     }
 
     private var hasSupportSection: Bool {
@@ -294,7 +309,7 @@ public struct SettingsView: View {
     }
 
     private func handleWriteReview(url: URL) {
-        RatingService.shared.openAppStoreReview(appId: "")
+        RatingService.shared.openAppStoreReview(appStoreURL: url)
     }
 
     private func handleContactUs() {