Remove Image & Translation content view controllers

Features/QuranContentFeature/ContentViewController.swift

@@ -47,9 +47,14 @@ public final class ContentViewController: UIViewController, UIGestureRecognizerD
         true
     }
 
-    public func word(at point: CGPoint, in view: UIView) -> Word? {
-        convert(point, from: view)
-            .flatMap { $0.word(at: $1) }
+    public func word(at point: CGPoint) -> Word? {
+        let actions = viewModel.geometryActions
+        for action in actions {
+            if let word = action.word(point) {
+                return word
+            }
+        }
+        return nil
     }
 
     // MARK: Internal
@@ -65,40 +70,21 @@ public final class ContentViewController: UIViewController, UIGestureRecognizerD
 
     private let viewModel: ContentViewModel
 
-    private var pageViews: [PageView] {
-        findPageViews(in: self)
-    }
-
     private func setUpPagesView() {
+        let viewModel = viewModel
         let pagesView = PagesView(viewModel: viewModel)
         let pagingController = UIHostingController(rootView: pagesView)
         addFullScreenChild(pagingController)
     }
 
-    private func verse(at point: CGPoint, in view: UIView) -> AyahNumber? {
-        convert(point, from: view)
-            .flatMap { $0.verse(at: $1) }
-    }
-
-    private func convert(_ point: CGPoint, from view: UIView) -> (view: PageView, point: CGPoint)? {
-        let localPointsAndControllers = pageViews.map { (view: $0, point: $0.view.convert(point, from: view)) }
-        let convertedViewPoint = localPointsAndControllers.first { $0.view.view.point(inside: $0.point, with: nil) }
-        return convertedViewPoint
-    }
-
-    private func findPageViews(in viewController: UIViewController) -> [PageView] {
-        var result = [PageView]()
-
-        for child in viewController.children {
-            if let fooVC = child as? PageView {
-                result.append(fooVC)
+    private func verse(at point: CGPoint) -> AyahNumber? {
+        let actions = viewModel.geometryActions
+        for action in actions {
+            if let verse = action.verse(point) {
+                return verse
             }
-
-            // Recursively search in the child's children
-            result.append(contentsOf: findPageViews(in: child))
         }
-
-        return result
+        return nil
     }
 
     // MARK: - Gestures
@@ -120,14 +106,15 @@ public final class ContentViewController: UIViewController, UIGestureRecognizerD
         }
 
         let point = sender.location(in: targetView)
+        let globalPoint = sender.location(in: nil)
 
         switch sender.state {
         case .began:
-            if let verse = verse(at: point, in: targetView) {
+            if let verse = verse(at: globalPoint) {
                 viewModel.onViewLongPressStarted(at: point, sourceView: targetView, verse: verse)
             }
         case .changed:
-            if let verse = verse(at: point, in: targetView) {
+            if let verse = verse(at: globalPoint) {
                 viewModel.onViewLongPressChanged(to: point, verse: verse)
             }
         case .ended:
@@ -137,32 +124,3 @@ public final class ContentViewController: UIViewController, UIGestureRecognizerD
         }
     }
 }
-
-private struct PagesView: View {
-    @ObservedObject var viewModel: ContentViewModel
-
-    var body: some View {
-        GeometryReader { geometry in
-            QuranPaginationView(
-                pagingStrategy: pagingStrategy(with: geometry),
-                selection: $viewModel.visiblePages,
-                pages: viewModel.deps.quran.pages
-            ) { page in
-                StaticViewControllerRepresentable(viewController: viewModel.pageViewBuilder.build(at: page))
-            }
-            .id(viewModel.quranMode)
-        }
-    }
-
-    func pagingStrategy(with geometry: GeometryProxy) -> PagingStrategy {
-        if geometry.size.height > geometry.size.width {
-            return .singlePage
-        }
-
-        if !TwoPagesUtils.hasEnoughHorizontalSpace() {
-            return .singlePage
-        }
-
-        return viewModel.pagingStrategy
-    }
-}

Features/QuranContentFeature/ContentViewModel.swift

@@ -11,10 +11,12 @@ import AnnotationsService
 import Combine
 import Crashing
 import QuranAnnotations
+import QuranImageFeature
 import QuranKit
 import QuranPagesFeature
 import QuranText
 import QuranTextKit
+import QuranTranslationFeature
 import TranslationService
 import UIKit
 import VLogging
@@ -38,8 +40,8 @@ public final class ContentViewModel: ObservableObject {
 
         let highlightsService: QuranHighlightsService
 
-        let imageDataSourceBuilder: PageViewBuilder
-        let translationDataSourceBuilder: PageViewBuilder
+        let imageDataSourceBuilder: ContentImageBuilder
+        let translationDataSourceBuilder: ContentTranslationBuilder
     }
 
     private struct LongPressData {
@@ -108,6 +110,7 @@ public final class ContentViewModel: ObservableObject {
 
     @Published var quranMode: QuranMode
     @Published var twoPagesEnabled: Bool
+    @Published var geometryActions: [PageGeometryActions] = []
 
     @Published var highlights: QuranHighlights {
         didSet {
@@ -125,13 +128,6 @@ public final class ContentViewModel: ObservableObject {
         twoPagesEnabled ? .doublePage : .singlePage
     }
 
-    var pageViewBuilder: PageViewBuilder {
-        switch deps.quranContentStatePreferences.quranMode {
-        case .arabic: return deps.imageDataSourceBuilder
-        case .translation: return deps.translationDataSourceBuilder
-        }
-    }
-
     func onViewLongPressStarted(at point: CGPoint, sourceView: UIView, verse: AyahNumber) {
         longPressData = LongPressData(
             sourceView: sourceView,

Features/QuranContentFeature/PagesView.swift

@@ -0,0 +1,49 @@
+//
+//  PagesView.swift
+//
+//
+//  Created by Mohamed Afifi on 2024-10-06.
+//
+
+import QuranPagesFeature
+import QuranTextKit
+import SwiftUI
+import UIx
+
+struct PagesView: View {
+    @StateObject var viewModel: ContentViewModel
+
+    var body: some View {
+        GeometryReader { geometry in
+            QuranPaginationView(
+                pagingStrategy: pagingStrategy(with: geometry),
+                selection: $viewModel.visiblePages,
+                pages: viewModel.deps.quran.pages
+            ) { page in
+                Group {
+                    switch viewModel.quranMode {
+                    case .arabic:
+                        viewModel.deps.imageDataSourceBuilder.build(at: page)
+                    case .translation:
+                        viewModel.deps.translationDataSourceBuilder.build(at: page)
+                    }
+                }
+            }
+            .id(viewModel.quranMode)
+        }
+        .collectGeometryActions($viewModel.geometryActions)
+    }
+
+    private func pagingStrategy(with geometry: GeometryProxy) -> PagingStrategy {
+        // If portrait
+        if geometry.size.height > geometry.size.width {
+            return .singlePage
+        }
+
+        if !TwoPagesUtils.hasEnoughHorizontalSpace() {
+            return .singlePage
+        }
+
+        return viewModel.pagingStrategy
+    }
+}

Features/QuranImageFeature/ContentImageBuilder.swift

@@ -13,12 +13,13 @@ import ImageService
 import QuranKit
 import QuranPagesFeature
 import ReadingService
+import SwiftUI
 import UIKit
 import Utilities
 import VLogging
 
 @MainActor
-public struct ContentImageBuilder: PageViewBuilder {
+public struct ContentImageBuilder {
     // MARK: Lifecycle
 
     public init(container: AppDependencies, highlightsService: QuranHighlightsService) {
@@ -28,19 +29,17 @@ public struct ContentImageBuilder: PageViewBuilder {
 
     // MARK: Public
 
-    public func build(at page: Page) -> PageView {
+    public func build(at page: Page) -> some View {
         let reading = ReadingPreferences.shared.reading
         let imageService = Self.buildImageDataService(reading: reading, container: container)
 
-        return ContentImageViewController(
+        let viewModel = ContentImageViewModel(
+            reading: reading,
             page: page,
-            viewModel: ContentImageViewModel(
-                reading: reading,
-                page: page,
-                imageDataService: imageService,
-                highlightsService: highlightsService
-            )
+            imageDataService: imageService,
+            highlightsService: highlightsService
         )
+        return ContentImageView(viewModel: viewModel)
     }
 
     // MARK: Internal

Features/QuranImageFeature/ContentImageView.swift

@@ -8,10 +8,11 @@
 import NoorUI
 import QuranGeometry
 import QuranKit
+import QuranPagesFeature
 import SwiftUI
 
 struct ContentImageView: View {
-    @ObservedObject var viewModel: ContentImageViewModel
+    @StateObject var viewModel: ContentImageViewModel
 
     var body: some View {
         VStack {
@@ -27,6 +28,13 @@ struct ContentImageView: View {
                 onGlobalFrameChange: { viewModel.imageFrame = $0 }
             )
         }
+        .geometryActions(
+            PageGeometryActions(
+                id: ObjectIdentifier(viewModel),
+                word: { point in viewModel.wordAtGlobalPoint(point) },
+                verse: { point in viewModel.wordAtGlobalPoint(point)?.verse }
+            )
+        )
         .task {
             await viewModel.loadImagePage()
         }