Fix merge conflict

aheze · Sep 11, 2022 · 7eb29e0 · 7eb29e0
2 parents 4f862de + 1991e19
commit 7eb29e0
Show file tree

Hide file tree

Showing 30 changed files with 905 additions and 64 deletions.
diff --git a/Assets/ExampleProjectHome.png b/Assets/ExampleProjectHome.png
diff --git a/Assets/ExampleProjectLibrary.png b/Assets/ExampleProjectLibrary.png
diff --git a/Assets/ExampleProjectOptions.png b/Assets/ExampleProjectOptions.png
diff --git a/Assets/OptionsPreview/SearchBarPreview.png b/Assets/OptionsPreview/SearchBarPreview.png
diff --git a/Assets/SearchBar/always.gif b/Assets/SearchBar/always.gif
diff --git a/Assets/SearchBar/backgroundColor.jpeg b/Assets/SearchBar/backgroundColor.jpeg
diff --git a/Assets/SearchBar/never.gif b/Assets/SearchBar/never.gif
diff --git a/Assets/SearchBar/placeholder.jpeg b/Assets/SearchBar/placeholder.jpeg
diff --git a/Assets/SearchBar/placeholderColor.jpeg b/Assets/SearchBar/placeholderColor.jpeg
diff --git a/Assets/SearchBar/textColor.jpeg b/Assets/SearchBar/textColor.jpeg
diff --git a/Assets/SearchBar/tintColor.jpeg b/Assets/SearchBar/tintColor.jpeg
diff --git a/Assets/SearchBar/unlessEditing.gif b/Assets/SearchBar/unlessEditing.gif
diff --git a/Assets/SearchBar/whileEditing.gif b/Assets/SearchBar/whileEditing.gif
diff --git a/Assets/TitleImage.png b/Assets/TitleImage.png
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team on [Discord](https://discord.gg/7G8WZTVXv8). All
+reported by contacting the project team [here](https://www.getfind.app/contact/). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

diff --git a/Documentation/Examples/SwiftUI/SupportOptions.swift b/Documentation/Examples/SwiftUI/SupportOptions.swift
@@ -17,19 +17,28 @@ struct SupportOptionsExample: View {
         navigationBar: .init(
             title: "Support",
             titleColor: UIColor.white,
-            dismissButtonView: AnyView(Text("Done")),
+            dismissButtonTitle: "Done",
             buttonTintColor: UIColor.white,
             backgroundColor: UIColor(red: 6 / 255, green: 151 / 255, blue: 0 / 255, alpha: 1)
         ),
+        searchBar: .init(
+            placeholder: "Type here to search",
+            placeholderColor: UIColor.white.withAlphaComponent(0.75),
+            textColor: UIColor.white,
+            tintColor: UIColor.green,
+            backgroundColor: UIColor.white.withAlphaComponent(0.3),
+            clearButtonMode: .whileEditing
+        ),
         progressBar: .init(
             foregroundColor: UIColor.green,
             backgroundColor: UIColor.systemBackground
         ),
         listStyle: .insetGroupedListStyle,
+        navigationViewStyle: .defaultNavigationViewStyle,
         other: .init(
             activityIndicatorStyle: UIActivityIndicatorView.Style.large,
-            welcomeView: AnyView(WelcomeView()),
-            footer: AnyView(Footer()),
+            welcomeView: AnyView(WelcomeView()), /// find this inside https://github.com/aheze/SupportDocs/blob/main/Example/Example/WelcomeView.swift
+            footer: AnyView(Footer()), /// find this inside https://github.com/aheze/SupportDocs/blob/main/Example/Example/Footer.swift
             error404: URL(string: "https://aheze.github.io/SupportDocs/404")!
         )
     )

diff --git a/Documentation/Examples/UIKit/SupportOptions.swift b/Documentation/Examples/UIKit/SupportOptions.swift
@@ -11,24 +11,33 @@ import UIKit
 
 class SupportOptionsExample: UIViewController {
     @IBOutlet var presentButton: UIButton!
-    @IBAction func presentButtonPressed(_: Any) {
+
+    /// Connect this inside the storyboard
+    @IBAction func presentButtonPressed(_ sender: Any) {
         let dataSource = URL(string: "https://raw.githubusercontent.com/aheze/SupportDocs/DataSource/_data/supportdocs_datasource.json")!
 
         // MARK: - UIKit way to make `SupportOptions`
 
         var options = SupportOptions()
-        options.categories = [SupportOptions.Category(tags: ["boba"], displayName: "Boba is awesome!")]
+        options.categories = [SupportOptions.Category(tag: "boba", displayName: "Boba is awesome!")]
         options.navigationBar.title = "Support"
         options.navigationBar.titleColor = UIColor.white
         options.navigationBar.dismissButtonView = AnyView(Text("Done"))
         options.navigationBar.buttonTintColor = UIColor.white
         options.navigationBar.backgroundColor = UIColor(red: 6 / 255, green: 151 / 255, blue: 0 / 255, alpha: 1)
+        options.searchBar?.placeholder = "Type here to search"
+        options.searchBar?.placeholderColor = UIColor.white.withAlphaComponent(0.75)
+        options.searchBar?.textColor = UIColor.white
+        options.searchBar?.tintColor = UIColor.green
+        options.searchBar?.backgroundColor = UIColor.white.withAlphaComponent(0.3)
+        options.searchBar?.clearButtonMode = .whileEditing
         options.progressBar.foregroundColor = UIColor.green
         options.progressBar.backgroundColor = UIColor.systemBackground
         options.listStyle = .insetGroupedListStyle
+        options.navigationViewStyle = .defaultNavigationViewStyle
         options.other.activityIndicatorStyle = .large
-        options.other.welcomeView = AnyView(WelcomeView())
-        options.other.footer = AnyView(Footer())
+        options.other.welcomeView = AnyView(WelcomeView()) /// find this inside https://github.com/aheze/SupportDocs/blob/main/Example/Example/WelcomeView.swift
+        options.other.footer = AnyView(Footer()) /// find this inside https://github.com/aheze/SupportDocs/blob/main/Example/Example/Footer.swift
         options.other.error404 = URL(string: "https://aheze.github.io/SupportDocs/404")!
 
         let supportDocsViewController = SupportDocsViewController(dataSource: dataSource, options: options)