Merge pull request #189 from cocoatype/176-add-additional-contact-opt…

…ions

176 add additional contact options

App/Info.plist

@@ -55,6 +55,10 @@
 	<false/>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.photography</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>mailto</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>

App/Resources/Localizable.strings

@@ -115,21 +115,6 @@
 
 "RedactedWordObservationRotor.name" = "Redacted Words";
 
-"SettingsContentProvider.Item.about" = "About Black Highlighter";
-"SettingsContentProvider.Item.acknowledgements" = "Acknowledgements";
-"SettingsContentProvider.Item.autoRedactions" = "Auto-Hidden Words";
-"SettingsContentProvider.Item.contact" = "Contact the Developer";
-"SettingsContentProvider.Item.new" = "What’s New";
-"SettingsContentProvider.Item.privacy" = "Privacy Policy";
-
-"SettingsContentProvider.Section.purchasedFeatures.header" = "Ultra Highlighter Features";
-"SettingsContentProvider.Section.otherApps.header" = "Other Apps by Cocoatype";
-"SettingsContentProvider.Section.webURLs.header" = "Important Information";
-
-"SettingsContentGenerator.versionStringFormat" = "Version %@";
-
-"SettingsViewController.navigationTitle" = "Settings";
-
 "ShareItem.label" = "Share";
 
 "ToolPickerItem.itemLabel" = "Tools";

Highlighter.xctestplan

@@ -26,22 +26,22 @@
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "4CA37C6F81D42C86B5E1F67B",
-        "name" : "AppRatingsTests"
+        "identifier" : "983FCA5AE887D0F8F0871B52",
+        "name" : "AlbumsDataTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "D511BD3660BA1CD7A06AEBC1",
-        "name" : "AutoRedactionsUITests"
+        "identifier" : "FF81604FD0F405EF2D1CCC8B",
+        "name" : "ErrorHandlingTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "FFC529CC7C03FA34AB5A20B3",
-        "name" : "CoreTests"
+        "identifier" : "97F888315DF72D8A476D3EF9",
+        "name" : "LoggingTests"
       }
     },
     {
@@ -54,29 +54,43 @@
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "7C98246E8C096DC5B09B72A0",
-        "name" : "EditingTests"
+        "identifier" : "F94B4B52A4D8EB0AFAC24486",
+        "name" : "RenderingTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "FF81604FD0F405EF2D1CCC8B",
-        "name" : "ErrorHandlingTests"
+        "identifier" : "2B4661F6B9957A37CFC75AF1",
+        "name" : "ObservationsTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "97F888315DF72D8A476D3EF9",
-        "name" : "LoggingTests"
+        "identifier" : "4246008D146FDCE34C32DD40",
+        "name" : "ShortcutsTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "2B4661F6B9957A37CFC75AF1",
-        "name" : "ObservationsTests"
+        "identifier" : "AB94737BB65B38D6AD869B5F",
+        "name" : "ExportingTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Highlighter.xcodeproj",
+        "identifier" : "B6DC51055F4C558AC1C5C422",
+        "name" : "GeometryTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Highlighter.xcodeproj",
+        "identifier" : "D511BD3660BA1CD7A06AEBC1",
+        "name" : "AutoRedactionsUITests"
       }
     },
     {
@@ -93,6 +107,20 @@
         "name" : "PurchasingTests"
       }
     },
+    {
+      "target" : {
+        "containerPath" : "container:Highlighter.xcodeproj",
+        "identifier" : "FFC529CC7C03FA34AB5A20B3",
+        "name" : "CoreTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Highlighter.xcodeproj",
+        "identifier" : "55437D0117D8027C4D7EAECE",
+        "name" : "BrushesTests"
+      }
+    },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
@@ -103,36 +131,36 @@
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "77D525B0D7498E1676A96CC5",
-        "name" : "UnpurchasedTests"
+        "identifier" : "CDF6EE4AB5693C601A1982E2",
+        "name" : "AlbumsUITests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "55437D0117D8027C4D7EAECE",
-        "name" : "BrushesTests"
+        "identifier" : "DB97A2E09C66FD6696FBAF5A",
+        "name" : "SettingsUITests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "AB94737BB65B38D6AD869B5F",
-        "name" : "ExportingTests"
+        "identifier" : "4CA37C6F81D42C86B5E1F67B",
+        "name" : "AppRatingsTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "B6DC51055F4C558AC1C5C422",
-        "name" : "GeometryTests"
+        "identifier" : "7C98246E8C096DC5B09B72A0",
+        "name" : "EditingTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:Highlighter.xcodeproj",
-        "identifier" : "4246008D146FDCE34C32DD40",
-        "name" : "ShortcutsTests"
+        "identifier" : "77D525B0D7498E1676A96CC5",
+        "name" : "UnpurchasedTests"
       }
     }
   ],

Modules/Capabilities/AlbumsUI/Sources/AlbumsListBackgroundViewModifier.swift

@@ -2,6 +2,7 @@
 //  Copyright © 2022 Cocoatype, LLC. All rights reserved.
 
 import SwiftUI
+import SwiftUIIntrospect
 
 struct AlbumsListBackgroundViewModifier: ViewModifier {
     func body(content: Content) -> some View {
@@ -11,7 +12,9 @@ struct AlbumsListBackgroundViewModifier: ViewModifier {
                 .background(Color.appPrimary)
         } else {
             content
-                .introspectTableView { $0.backgroundColor = .primary }
+                .introspect(.list, on: .iOS(.v13, .v14, .v15)) {
+                    $0.backgroundColor = .primary
+                }
         }
     }
 }

Modules/Capabilities/AlbumsUI/Sources/AlbumsRow.swift

@@ -4,6 +4,7 @@
 import AlbumsData
 import AppNavigation
 import SwiftUI
+import SwiftUIIntrospect
 
 struct AlbumsRow: View {
     @Binding var selection: String?
@@ -30,7 +31,9 @@ struct AlbumsRow: View {
             .tag(collection.identifier)
         }
         .selected(selection == collection.identifier)
-        .introspectTableViewCell { $0.selectionStyle = .none }
+        .introspect(.listCell, on: .iOS(.v13, .v14, .v15)) {
+            $0.selectionStyle = .none
+        }
     }
 
     @EnvironmentObject private var navigationWrapper: NavigationWrapper

Modules/Capabilities/DesignSystem/Sources/View Modifiers/NavigationBarAppearanceViewModifier.swift

@@ -1,18 +1,19 @@
 //  Created by Geoff Pado on 5/11/24.
 //  Copyright © 2024 Cocoatype, LLC. All rights reserved.
 
-import Introspect
 import SwiftUI
+import SwiftUIIntrospect
 
 struct NavigationBarAppearanceViewModifier: ViewModifier {
     func body(content: Content) -> some View {
-        AnyView(content).introspectNavigationController { navigationController in
-            navigationController.navigationBar.standardAppearance = NavigationBarAppearance()
-            navigationController.navigationBar.scrollEdgeAppearance = NavigationBarAppearance()
+        AnyView(content)
+            .introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { navigationController in
+                navigationController.navigationBar.standardAppearance = NavigationBarAppearance()
+                navigationController.navigationBar.scrollEdgeAppearance = NavigationBarAppearance()
 
-            navigationController.navigationBar.tintColor = .white
-            navigationController.navigationBar.prefersLargeTitles = false
-        }
+                navigationController.navigationBar.tintColor = .white
+                navigationController.navigationBar.prefersLargeTitles = false
+            }
     }
 }
 

Modules/Capabilities/SettingsUI/Resources/Media.xcassets/App Store.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "App Store.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Modules/Capabilities/SettingsUI/Resources/Media.xcassets/Mail.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Mail.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Modules/Capabilities/SettingsUI/Resources/Media.xcassets/Threads.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "Threads.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Modules/Capabilities/SettingsUI/Resources/Media.xcassets/X.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "X.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true
+  }
+}

Modules/Capabilities/SettingsUI/Resources/en.lproj/Localizable.strings

@@ -0,0 +1,31 @@
+/* 
+  Localizable.strings
+  Highlighter
+
+  Created by Geoff Pado on 6/29/24.
+  Copyright © 2024 Cocoatype, LLC. All rights reserved.
+*/
+
+"SettingsContentContactSection.appStoreTitle" = "App Store";
+"SettingsContentContactSection.appStoreSubtitle" = "Write a Review";
+"SettingsContentContactSection.emailTitle" = "E-mail";
+"SettingsContentContactSection.emailSubtitle" = "[email protected]";
+"SettingsContentContactSection.header" = "Contact the Developer";
+"SettingsContentContactSection.threadsTitle" = "Threads";
+"SettingsContentContactSection.threadsSubtitle" = "@blackhighlighterapp";
+"SettingsContentContactSection.twitterTitle" = "X";
+"SettingsContentContactSection.twitterSubtitle" = "@BlkHighlighter";
+
+"SettingsContentInformationSection.aboutTitle" = "About Black Highlighter";
+"SettingsContentInformationSection.acknowledgementsTitle" = "Acknowledgements";
+"SettingsContentInformationSection.header" = "Important Information";
+"SettingsContentInformationSection.privacyTitle" = "Privacy Policy";
+"SettingsContentInformationSection.releaseNotesTitle" = "What’s New";
+"SettingsContentInformationSection.versionStringFormat" = "Version %@";
+
+"SettingsContentOtherAppsSection.header" = "Other Apps by Cocoatype";
+
+"SettingsContentPurchasedFeaturesSection.header" = "Ultra Highlighter Features";
+"SettingsContentPurchasedFeaturesSection.autoRedactionsTitle" = "Auto-Hidden Words";
+
+"SettingsViewController.navigationTitle" = "Settings";

Modules/Capabilities/SettingsUI/Sources/List/App Reviews/ReviewButton.swift

@@ -0,0 +1,20 @@
+//  Created by Geoff Pado on 7/5/24.
+//  Copyright © 2024 Cocoatype, LLC. All rights reserved.
+
+import StoreKit
+import SwiftUI
+
+struct ReviewButton: View {
+    @State private var windowScene: UIWindowScene?
+
+    var body: some View {
+        Button {
+            UIApplication.shared.open(URL(staticString: "https://itunes.apple.com/us/app/appName/id1215283742?mt=8&action=write-review"))
+        } label: {
+            ButtonLabel(title: Strings.appStoreTitle, subtitle: Strings.appStoreSubtitle, imageName: "App Store")
+        }
+        .settingsCell()
+    }
+
+    private typealias Strings = SettingsUIStrings.SettingsContentContactSection
+}