TestApp: Update OutlineTableViewController to use SwiftUI (#42)

Author: gatamar

TestApp/Sources/Data/Bookmark.swift

@@ -64,3 +64,6 @@ final class BookmarkRepository {
         db.write { db in try Bookmark.deleteOne(db, key: id) }
     }
 }
+
+// for the default SwiftUI support
+extension Bookmark: Hashable {}

TestApp/Sources/Data/Highlight.swift

@@ -110,3 +110,6 @@ final class HighlightRepository {
         db.write { db in try Highlight.deleteOne(db, key: id) }
     }
 }
+
+// for the default SwiftUI support
+extension Highlight: Hashable {}

TestApp/Sources/Reader/Common/Bookmark/BookmarkCell.swift

@@ -0,0 +1,47 @@
+//
+//  Copyright 2022 Readium Foundation. All rights reserved.
+//  Use of this source code is governed by the BSD-style license
+//  available in the top-level LICENSE file of the project.
+//
+
+import SwiftUI
+
+struct BookmarkCellView: View {
+    static var dateFormatter: DateFormatter {
+        let formatter = DateFormatter()
+        formatter.dateStyle = .medium
+        return formatter
+    }
+    
+    let bookmark: Bookmark
+    var body: some View {
+        HStack {
+            VStack {
+                Text(bookmark.locator.title ?? "")
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    .font(.headline)
+                Text(bookmark.positionText ?? "")
+                    .font(.footnote)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+            }
+                .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .leading)
+            
+            Text(BookmarkCellView.dateFormatter.string(from: bookmark.created))
+                .font(.footnote)
+                .frame(maxHeight: .infinity, alignment: .bottomTrailing)
+        }
+        .padding()
+    }
+}
+
+extension Bookmark {
+    var positionText: String? {
+        if let position = locator.locations.position {
+            return String(format: NSLocalizedString("reader_outline_position_label", comment: "Outline bookmark label when the position is available"), position)
+        } else if let progression = locator.locations.progression {
+            return String(format: NSLocalizedString("reader_outline_progression_label", comment: "Outline bookmark label when the progression is available"), progression * 100)
+        } else {
+            return nil
+        }
+    }
+}

TestApp/Sources/Reader/Common/Bookmark/BookmarkCellView.swift

@@ -0,0 +1,36 @@
+//
+//  Copyright 2022 Readium Foundation. All rights reserved.
+//  Use of this source code is governed by the BSD-style license
+//  available in the top-level LICENSE file of the project.
+//
+
+import SwiftUI
+import Combine
+import UIKit
+import R2Shared // for UserProperty
+
+// This color scheme is passed to SwiftUI. In the (SwiftUI) future, EnvironmentObject can be injected and updated from UserDefaults in some reactive way.
+class ColorScheme {
+    private(set) var mainColor: Color = Color.white
+    private(set) var textColor: Color = Color.black
+    
+    func update(with appearance: UserProperty) {
+        mainColor = Color(AssociatedColors.getColors(for: appearance).mainColor)
+        textColor = Color(AssociatedColors.getColors(for: appearance).textColor)
+    }
+}
+
+struct ColorModifier: ViewModifier {
+    let colorScheme: ColorScheme
+    func body(content: Content) -> some View {
+        content
+            .foregroundColor(colorScheme.textColor)
+            .background(colorScheme.mainColor)
+    }
+}
+
+extension View {
+    func colorStyle(_ colorScheme: ColorScheme) -> some View {
+        modifier(ColorModifier(colorScheme: colorScheme))
+    }
+}

TestApp/Sources/Reader/Common/ColorScheme.swift

@@ -21,41 +21,11 @@ struct HighlightCellView: View {
                 .fill(Color(highlight.color.uiColor))
                 .frame(maxWidth: 20, maxHeight: .infinity)
 
-            Spacer()
-            
             Text(highlight.locator.text.sanitized().highlight ?? "")
-                .frame(maxWidth: .infinity)
+                .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding()
-        }
-    }
-}
-
-// This UITableView-SwiftUI wrapper is from here: https://stackoverflow.com/a/59474133
-class HostingTableViewCell<Content: View>: UITableViewCell {
-
-    private weak var controller: UIHostingController<Content>?
-
-    func host(_ view: Content, parent: UIViewController) {
-        if let controller = controller {
-            controller.rootView = view
-            controller.view.layoutIfNeeded()
-        } else {
-            let swiftUICellViewController = UIHostingController(rootView: view)
-            controller = swiftUICellViewController
-            swiftUICellViewController.view.backgroundColor = .clear
 
-            layoutIfNeeded()
-            
-            parent.addChild(swiftUICellViewController)
-            contentView.addSubview(swiftUICellViewController.view)
-            swiftUICellViewController.view.translatesAutoresizingMaskIntoConstraints = false
-            contentView.addConstraint(NSLayoutConstraint(item: swiftUICellViewController.view!, attribute: NSLayoutConstraint.Attribute.leading, relatedBy: NSLayoutConstraint.Relation.equal, toItem: contentView, attribute: NSLayoutConstraint.Attribute.leading, multiplier: 1.0, constant: 0.0))
-            contentView.addConstraint(NSLayoutConstraint(item: swiftUICellViewController.view!, attribute: NSLayoutConstraint.Attribute.trailing, relatedBy: NSLayoutConstraint.Relation.equal, toItem: contentView, attribute: NSLayoutConstraint.Attribute.trailing, multiplier: 1.0, constant: 0.0))
-            contentView.addConstraint(NSLayoutConstraint(item: swiftUICellViewController.view!, attribute: NSLayoutConstraint.Attribute.top, relatedBy: NSLayoutConstraint.Relation.equal, toItem: contentView, attribute: NSLayoutConstraint.Attribute.top, multiplier: 1.0, constant: 0.0))
-            contentView.addConstraint(NSLayoutConstraint(item: swiftUICellViewController.view!, attribute: NSLayoutConstraint.Attribute.bottom, relatedBy: NSLayoutConstraint.Relation.equal, toItem: contentView, attribute: NSLayoutConstraint.Attribute.bottom, multiplier: 1.0, constant: 0.0))
-        
-            swiftUICellViewController.didMove(toParent: parent)
-            swiftUICellViewController.view.layoutIfNeeded()
+            Spacer()
         }
     }
 }

TestApp/Sources/Reader/Common/Highlight/HighlightCellView.swift

@@ -10,6 +10,7 @@ import Combine
 struct HighlightContextMenu: View {
     let colors: [HighlightColor]
     let systemFontSize: CGFloat
+    let colorScheme: ColorScheme
 
     private let colorSubject = PassthroughSubject<HighlightColor, Never>()
     var selectedColorPublisher: AnyPublisher<HighlightColor, Never> {
@@ -40,6 +41,7 @@ struct HighlightContextMenu: View {
                     .font(.system(size: systemFontSize))
             }
         }
+        .colorStyle(colorScheme)
     }
 
     var preferredSize: CGSize {