Merge pull request #64 from DroidKaigi/MrSmart00/feature/safari

Add SafariView and connect with url links
DroidKaigi · Jun 23, 2024 · e797c0b · e797c0b
2 parents 0fece23 + 0f77b44
commit e797c0b
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 14 deletions.
diff --git a/app-ios/Sources/AboutFeature/AboutView.swift b/app-ios/Sources/AboutFeature/AboutView.swift
@@ -29,19 +29,24 @@ public struct AboutView: View {
             }
         }
         .sheet(item: $store.scope(state: \.destination?.codeOfConduct, action: \.presentation.codeOfConduct), content: { _ in
-            Text("CodeOfConduct")
+            SafariView(url: .codeOfConduct)
+                .ignoresSafeArea()
         })
         .sheet(item: $store.scope(state: \.destination?.privacyPolicy, action: \.presentation.privacyPolicy), content: { _ in
-            Text("PrivacyPolicy")
+            SafariView(url: .privacyPolicy)
+                .ignoresSafeArea()
         })
         .sheet(item: $store.scope(state: \.destination?.youtube, action: \.presentation.youtube), content: { _ in
-            Text("Youtube")
+            SafariView(url: .youtube)
+                .ignoresSafeArea()
         })
         .sheet(item: $store.scope(state: \.destination?.xcom, action: \.presentation.xcom), content: { _ in
-            Text("X.com")
+            SafariView(url: .xcom)
+                .ignoresSafeArea()
         })
         .sheet(item: $store.scope(state: \.destination?.medium, action: \.presentation.medium), content: { _ in
-            Text("Medium")
+            SafariView(url: .medium)
+                .ignoresSafeArea()
         })
     }
 

diff --git a/app-ios/Sources/AboutFeature/Localizable.xcstrings b/app-ios/Sources/AboutFeature/Localizable.xcstrings
@@ -31,6 +31,23 @@
         }
       }
     },
+    "CodeOfConductURL" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "https://portal.droidkaigi.jp/en/about/code-of-conduct"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "https://portal.droidkaigi.jp/about/code-of-conduct"
+          }
+        }
+      }
+    },
     "Contributers" : {
       "localizations" : {
         "ja" : {
@@ -110,9 +127,6 @@
           }
         }
       }
-    },
-    "Medium" : {
-
     },
     "Others" : {
       "localizations" : {
@@ -134,6 +148,23 @@
         }
       }
     },
+    "PrivacyPolicyURL" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "https://portal.droidkaigi.jp/en/about/code-of-conduct"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "https://portal.droidkaigi.jp/about/privacy"
+          }
+        }
+      }
+    },
     "Sponsors" : {
       "localizations" : {
         "ja" : {
@@ -153,12 +184,6 @@
           }
         }
       }
-    },
-    "X.com" : {
-
-    },
-    "Youtube" : {
-
     }
   },
   "version" : "1.0"

diff --git a/app-ios/Sources/AboutFeature/SafariView.swift b/app-ios/Sources/AboutFeature/SafariView.swift
@@ -0,0 +1,24 @@
+import SafariServices
+import SwiftUI
+
+struct SafariView: UIViewControllerRepresentable {
+    let url: URL
+
+    func makeUIViewController(context: Context) -> some UIViewController {
+        let configuration = SFSafariViewController.Configuration()
+        configuration.barCollapsingEnabled = false
+        return SFSafariViewController(
+            url: url,
+            configuration: configuration
+        )
+    }
+
+    func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) { }
+}
+
+#Preview {
+    SafariView(
+        url: URL(string: "https://2023.droidkaigi.jp/")!
+    )
+}
+
diff --git a/app-ios/Sources/AboutFeature/URL+Constants.swift b/app-ios/Sources/AboutFeature/URL+Constants.swift
@@ -0,0 +1,9 @@
+import Foundation
+
+extension URL {
+    static let youtube = URL(string: "https://www.youtube.com/c/DroidKaigi")!
+    static let xcom = URL(string: "https://x.com/DroidKaigi")!
+    static let medium = URL(string: "https://medium.com/droidkaigi")!
+    static let privacyPolicy = URL(string: String(localized: "PrivacyPolicyURL", bundle: .module))!
+    static let codeOfConduct = URL(string: String(localized: "CodeOfConductURL", bundle: .module))!
+}