RomanPodymov · RomanPodymov · Apr 25, 2025 · Apr 24, 2025 · Apr 24, 2025 · Apr 24, 2025
diff --git a/Bookie/UI/Extensions.swift → Bookie/Extensions.swift b/Bookie/UI/Extensions.swift → Bookie/Extensions.swift
@@ -9,7 +9,9 @@
 import UIKit
 
 extension Optional {
-    func mapAsync<E, U>(_ transform: @Sendable (Wrapped) async throws (E) -> U) async throws (E) -> U? where E: Error, U: ~Copyable {
+    func mapAsync<E, U>(
+        _ transform: @Sendable (Wrapped) async throws (E) -> U
+    ) async throws (E) -> U? where E: Error, U: ~Copyable {
         if let self {
             return try await transform(self)
         } else {

diff --git a/Bookie/UI/Models.swift → Bookie/Models/Models.swift b/Bookie/UI/Models.swift → Bookie/Models/Models.swift
diff --git a/Bookie/UI/AppDelegate.swift b/Bookie/UI/AppDelegate.swift
@@ -11,16 +11,10 @@ import Fashion
 import Then
 import UIKit
 
-protocol AnyCoordinator {
-    func set(window: UIWindow)
-    func openHomeScreen(previousBook: Book?) async
-    func openDetailScreen(_ data: Book, searchText: String) async
-}
-
 let dependenciesContainer = {
     let result = Container()
     result.register(AnyCoordinator.self) { _ in
-        Coordinator()
+        CoordinatorSwiftUI()
     }.inObjectScope(.container)
     result.register(Stylesheet.self) { _ in
         MainStylesheet()

diff --git a/Bookie/UI/BookScreenSwiftUI.swift b/Bookie/UI/BookScreenSwiftUI.swift
@@ -0,0 +1,89 @@
+//
+//  BookScreenSwiftUI.swift
+//  Bookie
+//
+//  Created by Roman Podymov on 25/04/2025.
+//  Copyright © 2025 Bookie. All rights reserved.
+//
+
+import Kingfisher
+import SwiftUI
+
+struct BookScreenRootView: View {
+    @Binding var backPressed: Bool
+    @State var data: Book?
+
+    var body: some View {
+        ZStack {
+            if let detailScreenImage = data?.volumeInfo.imageLinks?.detailScreenImage {
+                KFImage(URL(
+                    unsafeString: detailScreenImage
+                ))
+                .resizable()
+                .aspectRatio(contentMode: .fill)
+            }
+            VStack {
+                HStack {
+                    Button {
+                        backPressed = true
+                    } label: {
+                        Image(systemName: "arrowshape.backward.fill")
+                    }
+                    Spacer()
+                }
+                .padding(.leading, LayoutParams.BooksScren.defaultInset)
+                .padding(.top, LayoutParams.BooksScren.defaultInset)
+                Spacer()
+                HStack {
+                    VStack(alignment: .leading) {
+                        Text(data?.volumeInfo.title ?? "")
+                            .foregroundStyle(Color(AppColors.textColor))
+                        Text(data?.volumeInfo.authors?.joined(separator: ", ") ?? "")
+                            .foregroundStyle(Color(AppColors.textColor))
+                        Text(data?.volumeInfo.publishedDate ?? "")
+                            .foregroundStyle(Color(AppColors.textColor))
+                        Text(data?.volumeInfo.description ?? "")
+                            .foregroundStyle(Color(AppColors.textColor))
+                    }
+                    .background(Color(AppColors.metadataBackgroundColor))
+                    Spacer()
+                }
+                .padding(.leading, LayoutParams.BooksScren.defaultInset)
+                .padding(.bottom, LayoutParams.BooksScren.defaultInset)
+            }
+        }
+    }
+}
+
+final class BookScreenSwiftUI: UIHostingController<BookScreenRootView>, AnyBookScreen {
+    private var viewModel: BookViewModel!
+
+    init(_ data: Book?) {
+        viewModel = BookViewModel(screen: nil, data: data)
+        super.init(
+            rootView: BookScreenRootView(
+                backPressed: Self.backPressedBinding(viewModel: viewModel),
+                data: data
+            )
+        )
+        viewModel.screen = self
+    }
+
+    private static func backPressedBinding(viewModel: BookViewModel) -> Binding<Bool> {
+        .init(get: {
+            false
+        }, set: { _ in
+            Task { [weak viewModel] in
+                await dependenciesContainer.resolve(
+                    AnyCoordinator.self
+                )?.openHomeScreen(
+                    previousBook: viewModel?.data
+                )
+            }
+        })
+    }
+
+    @MainActor @preconcurrency dynamic required init?(coder _: NSCoder) {
+        nil
+    }
+}
diff --git a/Bookie/UI/BooksScreen.swift b/Bookie/UI/BooksScreen.swift
@@ -52,10 +52,11 @@ final class BooksScreen: UIViewController {
             $0.apply(styles: Style.booksScreenRootView)
             $0.dataSource = self
             $0.delegate = self
-            ($0.collectionViewLayout as? UICollectionViewFlowLayout)?.minimumLineSpacing = LayoutParams.BooksScren.smallerInset
-            ($0.collectionViewLayout as? UICollectionViewFlowLayout)?.minimumInteritemSpacing = LayoutParams.BooksScren.smallerInset
-            ($0.collectionViewLayout as? UICollectionViewFlowLayout)?.itemSize = LayoutParams.BooksScren.itemSize
-            ($0.collectionViewLayout as? UICollectionViewFlowLayout)?.headerReferenceSize = LayoutParams.BooksScren.sectionHeaderSize
+            let collectionViewLayout = $0.collectionViewLayout as? UICollectionViewFlowLayout
+            collectionViewLayout?.minimumLineSpacing = LayoutParams.BooksScren.smallerInset
+            collectionViewLayout?.minimumInteritemSpacing = LayoutParams.BooksScren.smallerInset
+            collectionViewLayout?.itemSize = LayoutParams.BooksScren.itemSize
+            collectionViewLayout?.headerReferenceSize = LayoutParams.BooksScren.sectionHeaderSize
             $0.register(
                 supplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
                 withClass: BookSectionHeader.self

diff --git a/Bookie/UI/BooksScreenSwiftUI.swift b/Bookie/UI/BooksScreenSwiftUI.swift
@@ -6,29 +6,126 @@
 //  Copyright © 2025 Bookie. All rights reserved.
 //
 
+import OrderedCollections
 import SwiftUI
 
-// TODO: SwiftUI version
+extension Book: Identifiable {}
+
+final class BooksScreenRootViewState: ObservableObject {
+    @Published var data: DataSetType = .init()
+}
+
+extension DataSetItemType: @retroactive Identifiable {
+    public var id: DataSetKeyType {
+        differenceIdentifier
+    }
+}
+
 struct BooksScreenRootView: View {
+    @ObservedObject var state: BooksScreenRootViewState
+    @Binding private var selectedBook: Book?
+    @Binding private var searchText: String
+    @State private var showCancelButton = false
+
+    init(
+        state: BooksScreenRootViewState = BooksScreenRootViewState(),
+        selectedBook: Binding<Book?>,
+        searchText: Binding<String>
+    ) {
+        self.state = state
+        _selectedBook = selectedBook
+        _searchText = searchText
+    }
+
     var body: some View {
-        Text("Hello")
+        VStack {
+            HStack {
+                TextField("", text: $searchText, onEditingChanged: { _ in
+                    self.showCancelButton = true
+                }, onCommit: {})
+                    .padding(.leading, LayoutParams.BooksScren.defaultInset)
+                    .foregroundStyle(Color(AppColors.textColor))
+                if showCancelButton {
+                    Button(L10n.BooksScreen.Button.cancel) {
+                        self.searchText = ""
+                        self.showCancelButton = false
+                    }
+                    .foregroundStyle(Color(AppColors.textColor))
+                    .padding(.trailing, LayoutParams.BooksScren.defaultInset)
+                }
+            }
+            List {
+                ForEach(state.data) { section in
+                    Section(header: Text(section.model.joined(separator: ", "))) {
+                        ForEach(section.elements) { book in
+                            Button(action: {
+                                selectedBook = book
+                            }, label: {
+                                Text(book.volumeInfo.title)
+                                    .foregroundStyle(Color(AppColors.textColor))
+                            })
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
 final class BooksScreenSwiftUI: UIHostingController<BooksScreenRootView>, AnyBooksScreen {
-    func onNewDataReceived(oldSet _: DataSetType, newSet _: DataSetType) async {}
+    private var viewModel: BooksViewModel!
 
-    func onNewDataError(_: BooksViewModelError) async {}
+    init(searchText: String, previousBook: Book?) {
+        viewModel = .init(screen: nil, searchText: searchText, previousBook: previousBook)
+        super.init(
+            rootView: BooksScreenRootView(
+                selectedBook: Self.selectedBook(searchText: searchText, previousBook: previousBook),
+                searchText: Self.searchTextBinding(viewModel: viewModel)
+            )
+        )
+        viewModel.screen = self
 
-    func onSearchTextChanged(_: String) async {}
+        Task { [weak viewModel] in
+            await viewModel?.reloadData()
+        }
+    }
+
+    private static func selectedBook(searchText: String, previousBook: Book?) -> Binding<Book?> {
+        .init(get: {
+            previousBook
+        }, set: { book in
+            guard let book else {
+                return
+            }
+            Task {
+                await dependenciesContainer.resolve(
+                    AnyCoordinator.self
+                )?.openDetailScreen(book, searchText: searchText)
+            }
+        })
+    }
+
+    private static func searchTextBinding(viewModel: BooksViewModel) -> Binding<String> {
+        .init(get: { [weak viewModel] in
+            viewModel?.searchText.value ?? ""
+        }, set: { [weak viewModel] in
+            viewModel?.searchText.send($0)
+        })
+    }
 
-    init() {
-        super.init(rootView: BooksScreenRootView())
+    func onNewDataReceived(oldSet _: DataSetType, newSet: DataSetType) async {
+        rootView.state.data = newSet
+    }
+
+    func onNewDataError(_: BooksViewModelError) async {}
+
+    func onSearchTextChanged(_: String) async {
+        await Task { [weak viewModel] in
+            await viewModel?.reloadData()
+        }.value
     }
 
     @MainActor @preconcurrency dynamic required init?(coder _: NSCoder) {
         nil
     }
-
-    func onNewDataReceived() async {}
 }
diff --git a/Bookie/UI/Coordinator.swift b/Bookie/UI/Coordinator.swift
@@ -8,6 +8,12 @@
 
 import UIKit
 
+protocol AnyCoordinator {
+    func set(window: UIWindow)
+    func openHomeScreen(previousBook: Book?) async
+    func openDetailScreen(_ data: Book, searchText: String) async
+}
+
 class Coordinator: AnyCoordinator {
     private weak var window: UIWindow?
     private var searchText = "Karel"
@@ -18,20 +24,35 @@ class Coordinator: AnyCoordinator {
 
     func openHomeScreen(previousBook: Book?) async {
         await MainActor.run { [weak window, searchText] in
-            window?.rootViewController = BooksScreen(searchText: searchText, previousBook: previousBook)
+            window?.rootViewController = Self.createRootScreen(searchText: searchText, previousBook: previousBook)
         }
-        await animateScrenChange()
+        await animateScreenChange()
     }
 
     func openDetailScreen(_ data: Book, searchText: String) async {
         self.searchText = searchText
         await MainActor.run { [weak window] in
-            window?.rootViewController = BookScreen(data)
+            window?.rootViewController = Self.createDetailScreen(data)
         }
-        await animateScrenChange()
+        await animateScreenChange()
+    }
+
+    @MainActor
+    fileprivate class func createRootScreen(
+        searchText: String,
+        previousBook: Book?
+    ) -> (AnyBooksScreen & UIViewController) {
+        BooksScreen(searchText: searchText, previousBook: previousBook)
+    }
+
+    @MainActor
+    fileprivate class func createDetailScreen(
+        _ data: Book
+    ) -> (AnyBookScreen & UIViewController) {
+        BookScreen(data)
     }
 
-    private func animateScrenChange() async {
+    fileprivate func animateScreenChange() async {
         guard let window else {
             return
         }
@@ -40,3 +61,20 @@ class Coordinator: AnyCoordinator {
         await UIView.transition(with: window, duration: duration, options: options, animations: {})
     }
 }
+
+class CoordinatorSwiftUI: Coordinator {
+    @MainActor
+    override fileprivate class func createRootScreen(
+        searchText: String,
+        previousBook: Book?
+    ) -> (AnyBooksScreen & UIViewController) {
+        BooksScreenSwiftUI(searchText: searchText, previousBook: previousBook)
+    }
+
+    @MainActor
+    override fileprivate class func createDetailScreen(
+        _ data: Book
+    ) -> (AnyBookScreen & UIViewController) {
+        BookScreenSwiftUI(data)
+    }
+}