Merge pull request #53 from crane-hiromu/feature/license

ライセンス画面の追加

.gitignore

@@ -38,6 +38,7 @@ playground.xcworkspace
 #
 # Swift Playground 4.1 でアプリをクローンした際に、クラッシュするため、一旦リポジトリにも含めておく
 # Package.resolved
+CachedManifest.plist
 
 #
 # Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata

App/Helpers/Router.swift

@@ -12,6 +12,7 @@ protocol RouterProtocol {
  static func routeToSessionDetail(with model: SessionModel) -> SessionDetailView
  static func routeToUserList(with models: [User]) -> UserListView
  static func routeToLicense() -> LicenseView
+ static func routeToLicenseDetail(with model: LicenseModel) -> LicenseDetailView
  // Web
  static func routeToWeb(with url: URL)
 }
@@ -78,7 +79,15 @@ enum Router: RouterProtocol {
  }
 
  static func routeToLicense() -> LicenseView {
- .init()
+ .init(viewModel: .init(), environment: .init())
+ }
+
+ static func routeToLicenseDetail(with model: LicenseModel) -> LicenseDetailView {
+ .init(
+ viewModel: .init(
+ output: .init(model: model)
+ )
+ )
  }
 
  // MARK: Web

App/Resources/SwiftGen/Stencil/plist-runtime-swift5-revision.stencil

@@ -17,6 +17,7 @@ import Foundation
  {% if document.metadata.type == "Array" %}
  {{accessModifier}} static let items: {{rootType}} = arrayFromPlist(at: "{% call transformPath file.path %}")
  {% elif document.metadata.type == "Dictionary" %}
+ static let name = "{% call transformPath file.path %}"
  private static let _document = PlistDocument(path: "{% call transformPath file.path %}")
  {% for key,value in document.metadata.properties %}
  {{accessModifier}} {%+ call propertyBlock key value %}

App/Screens/Info/InfoView.swift

@@ -83,10 +83,10 @@ private extension InfoView {
  type: .privacyPolicy,
  action: { viewModel.input.didTapButton.send(.privacyPolicy) }
  )
-// InfoNavigationRow(
-// type: .license,
-// destination: licenseView
-// )
+ InfoNavigationRow(
+ type: .license,
+ destination: licenseView
+ )
  }
  }
 

App/Screens/License/LicenseEnvironment.swift

@@ -0,0 +1,6 @@
+import SwiftUI
+
+// MARK: - Environment
+struct LicenseEnvironment: DynamicProperty {
+ @Environment(\.router) var router
+}

App/Screens/License/LicenseView.swift

@@ -2,9 +2,16 @@ import SwiftUI
 
 // MARK: - View
 struct LicenseView: View {
+ @ObservedObject var viewModel: LicenseViewModel
+ let environment: LicenseEnvironment
 
  var body: some View {
- Text("LicenseView")
+ List(viewModel.output.models, id: \.id) {
+ LicenseRow(
+ name: $0.name,
+ destination: environment.router.routeToLicenseDetail(with: $0)
+ )
+ }
+ .navigationBarTitle(L10n.infoTypeLicense, displayMode: .inline)
  }
 }
-

App/Screens/License/LicenseViewModel.swift

@@ -0,0 +1,59 @@
+import SwiftUI
+import Foundation
+import Combine
+import CombineStorable
+
+// MARK: - ViewModel
+final class LicenseViewModel: NSObject, ObservableObject, Storable {
+ let input: Input
+ let output: Output
+ @ObservedObject var binding: Binding
+
+ init(
+ input: Input = .init(),
+ output: Output = .init(),
+ binding: Binding = .init()
+ ) {
+ self.input = input
+ self.output = output
+ self.binding = binding
+ super.init()
+ bind(input: input, output: output, binding: binding)
+ }
+}
+
+// MARK: - Property
+extension LicenseViewModel {
+
+ final class Input {
+ // NOP
+ }
+
+ final class Output: ObservableObject {
+ // fixme: update stencil
+ let models: [LicenseModel] = [
+ LicenseModel(name: PlistFiles.CombineStorable.name, plist: PlistFiles.CombineStorable.preferenceSpecifiers),
+ LicenseModel(name: PlistFiles.PlaygroundTester.name, plist: PlistFiles.PlaygroundTester.preferenceSpecifiers),
+ LicenseModel(name: PlistFiles.SwiftUIWorkaround.name, plist: PlistFiles.SwiftUIWorkaround.preferenceSpecifiers)
+ ] 
+ }
+
+ final class Binding: ObservableObject {
+ // NOP
+ }
+}
+
+
+// MARK: - Private
+private extension LicenseViewModel {
+
+ func bind(input: Input, output: Output, binding: Binding) {
+ // 親孫でのbindを可能にする
+ binding.objectWillChange
+ .sink { [weak self] _ in
+ self?.objectWillChange.send()
+ }
+ .store(in: &cancellables)
+ }
+}
+

App/Screens/License/Models/LicenseModel.swift

@@ -0,0 +1,30 @@
+import SwiftUI
+
+// MARK: - Model
+final class LicenseModel {
+ let name: String
+ let description: String
+
+ init(
+ name: String,
+ plist: [[String: Any]]
+ ) {
+ self.name = name.replaceExtension
+ self.description = plist.compactMap { 
+ $0["FooterText"] as? String 
+ }.first ?? ""
+ }
+}
+
+// MARK: - Identifiable
+extension LicenseModel: Identifiable {
+ var id: UUID { UUID() }
+}
+
+/* fixme: いずれ stenceil ファイル側で制御する */
+private extension String {
+
+ var replaceExtension: String {
+ replacingOccurrences(of: ".plist", with: "")
+ }
+}

App/Screens/License/Views/LicenseRow.swift

@@ -0,0 +1,23 @@
+import SwiftUI
+
+// MARK: - Row
+struct LicenseRow<Destination: View>: View {
+ let name: String
+ let destination: Destination
+
+ var body: some View {
+ NavigationLink(
+ destination: destination,
+ label: { label }
+ )
+ }
+}
+
+// MARK: - Private 
+private extension LicenseRow {
+
+ var label: some View {
+ Text(name)
+ .foregroundColor(.primary)
+ }
+} 

App/Screens/LicenseDetail/LicenseDetailView.swift

@@ -0,0 +1,14 @@
+import SwiftUI
+
+// MARK: - View
+struct LicenseDetailView: View {
+ @ObservedObject var viewModel: LicenseDetailViewModel
+
+ var body: some View {
+ ScrollView {
+ Text(viewModel.output.model.description)
+ .padding()
+ }
+ .navigationBarTitle(viewModel.output.model.name, displayMode: .inline)
+ }
+}

App/Screens/LicenseDetail/LicenseDetailViewModel.swift

@@ -0,0 +1,43 @@
+import SwiftUI
+import Foundation
+import Combine
+import CombineStorable
+
+
+// MARK: - ViewModel
+final class LicenseDetailViewModel: NSObject, ObservableObject, Storable {
+ let input: Input
+ let output: Output
+ @ObservedObject var binding: Binding
+
+ init(
+ input: Input = .init(),
+ output: Output = .init(),
+ binding: Binding = .init()
+ ) {
+ self.input = input
+ self.output = output
+ self.binding = binding
+ super.init()
+ }
+}
+
+// MARK: - Property
+extension LicenseDetailViewModel {
+
+ final class Input {
+ // NOP
+ }
+
+ final class Output: ObservableObject {
+ let model: LicenseModel
+
+ init(model: LicenseModel = .init(name: "", plist: [])) {
+ self.model = model
+ }
+ }
+
+ final class Binding: ObservableObject {
+ // NOP
+ }
+}

Package.swift

@@ -51,13 +51,15 @@ let package = Package(
  .product(name: "PlaygroundTester", package: "playgroundtester")
  ],
  path: ".",
+ exclude: [
+ "swiftgen.yml",
+ "README.md",
+ "Makefile",
+ "App/Resources/SwiftGen/Stencil"
+ ],
  resources: [
- .copy("swiftgen.yml"),
- .copy("README.md"),
- .copy("Makefile"),
- .copy("App.plist"),
- .copy("App/Resources/License"),
- .copy("App/Resources/SwiftGen/Stencil")
+ .process("App/Resources/License"),
+ .copy("App.plist")
  ],
  swiftSettings: [
  .unsafeFlags(["-Xfrontend", "-warn-long-function-bodies=100"], .when(configuration: .debug)),