RomanPodymov · RomanPodymov · Jun 3, 2025 · Jun 1, 2025 · Jun 1, 2025 · Jun 1, 2025
diff --git a/Bookie/DI/DI.swift b/Bookie/DI/DI.swift
@@ -19,11 +19,11 @@ protocol AnyCoordinator {
 }
 
 protocol RemoteDataSource {
-    func search(text: String) async throws (BooksViewModelError) -> BookResponse
+    func search(text: String) async throws(BooksViewModelError) -> BookResponse
 }
 
 protocol LocalDataSource: RemoteDataSource {
-    func save(books: [Book]) async throws (BooksViewModelError)
+    func save(books: [Book]) async throws(BooksViewModelError)
 }
 
 extension Container: @retroactive Then {}

diff --git a/Bookie/DI/GoogleRemoteDataSource.swift b/Bookie/DI/GoogleRemoteDataSource.swift
@@ -10,7 +10,7 @@ import Foundation
 import Moya
 
 struct GoogleRemoteDataSource: RemoteDataSource {
-    func search(text: String) async throws (BooksViewModelError) -> BookResponse {
+    func search(text: String) async throws(BooksViewModelError) -> BookResponse {
         let provider = MoyaProvider<BooksService>(plugins: [
             NetworkLoggerPlugin(configuration: .init(
                 logOptions: [.requestBody, .successResponseBody, .errorResponseBody]

diff --git a/Bookie/DI/RealmDataSource.swift b/Bookie/DI/RealmDataSource.swift
@@ -29,7 +29,7 @@ struct RealmDataSource: LocalDataSource {
         Realm.Configuration.defaultConfiguration.deleteRealmIfMigrationNeeded = true
     }
 
-    func search(text: String) async throws (BooksViewModelError) -> BookResponse {
+    func search(text: String) async throws(BooksViewModelError) -> BookResponse {
         do {
             return try await Task { @MainActor in
                 let realm = try await Realm()
@@ -75,7 +75,7 @@ struct RealmDataSource: LocalDataSource {
         }
     }
 
-    func save(books: [Book]) async throws (BooksViewModelError) {
+    func save(books: [Book]) async throws(BooksViewModelError) {
         do {
             try await Task { @MainActor in
                 let realm = try await Realm()

diff --git a/Bookie/DI/SwiftDataSource.swift b/Bookie/DI/SwiftDataSource.swift
@@ -25,7 +25,7 @@ final class BookSwiftData: Identifiable {
 actor SwiftDataSource: LocalDataSource {
     private var context: ModelContext { modelExecutor.modelContext }
 
-    func search(text: String) async throws (BooksViewModelError) -> BookResponse {
+    func search(text: String) async throws(BooksViewModelError) -> BookResponse {
         do {
             let books = try context.fetch(FetchDescriptor<BookSwiftData>()).map {
                 Book(
@@ -61,10 +61,10 @@ actor SwiftDataSource: LocalDataSource {
         }
     }
 
-    func save(books: [Book]) async throws (BooksViewModelError) {
+    func save(books: [Book]) async throws(BooksViewModelError) {
         do {
-            books.forEach {
-                context.insert(BookSwiftData(id: $0.id, title: $0.volumeInfo.title))
+            for book in books {
+                context.insert(BookSwiftData(id: book.id, title: book.volumeInfo.title))
             }
             try context.save()
         } catch {

diff --git a/Bookie/Extensions.swift b/Bookie/Extensions.swift
@@ -10,8 +10,8 @@ import UIKit
 
 extension Optional {
     func mapAsync<E, U>(
-        _ transform: @Sendable (Wrapped) async throws (E) -> U
-    ) async throws (E) -> U? where E: Error, U: ~Copyable {
+        _ 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/BooksScreenSwiftUI.swift b/Bookie/UI/BooksScreenSwiftUI.swift
@@ -41,14 +41,14 @@ struct BooksScreenRootView: View {
         VStack {
             HStack {
                 TextField("", text: $searchText, onEditingChanged: { _ in
-                    self.showCancelButton = true
+                    showCancelButton = true
                 }, onCommit: {})
                     .padding(.leading, LayoutParams.BooksScren.defaultInset)
                     .foregroundStyle(Color(AppColors.textColor))
                 if showCancelButton {
                     Button(L10n.BooksScreen.Button.cancel) {
-                        self.searchText = ""
-                        self.showCancelButton = false
+                        searchText = ""
+                        showCancelButton = false
                     }
                     .foregroundStyle(Color(AppColors.textColor))
                     .padding(.trailing, LayoutParams.BooksScren.defaultInset)

diff --git a/Bookie/UI/MainStylesheet.swift b/Bookie/UI/MainStylesheet.swift
@@ -9,7 +9,7 @@
 import Fashion
 import UIKit
 
-struct LayoutParams {
+enum LayoutParams {
     enum BooksScren {
         static let defaultInset = CGFloat(20)
         static let smallerInset = CGFloat(10)

diff --git a/Bookie/ViewModel/BooksViewModel.swift b/Bookie/ViewModel/BooksViewModel.swift
@@ -59,7 +59,8 @@ final class BooksViewModel<BooksScreenType: AnyObject & AnyBooksScreen>: BasicVi
         self.screen = screen
     }
 
-    func reloadData() async {
+    override func reloadData() async {
+        await super.reloadData()
         guard let source = dependenciesContainer.resolve(RemoteDataSource.self),
               let localSource = dependenciesContainer.resolve(LocalDataSource.self)
         else {
@@ -83,7 +84,8 @@ final class BooksViewModel<BooksScreenType: AnyObject & AnyBooksScreen>: BasicVi
         }
     }
 
-    func ready() {
+    override func ready() {
+        super.ready()
         searchText.removeDuplicates().sink { [weak screen = self.screen] text in
             _Concurrency.Task { [weak screen] in
                 await screen?.onSearchTextChanged(text)

diff --git a/BookieTests/BookieTests.swift b/BookieTests/BookieTests.swift
@@ -102,7 +102,7 @@ class BookieTests: XCTestCase {
 private struct TestRemoteDataSource: RemoteDataSource {
     let expected: [Book]
 
-    func search(text _: String) async throws (BooksViewModelError) -> BookResponse {
+    func search(text _: String) async throws(BooksViewModelError) -> BookResponse {
         .init(
             kind: "",
             totalItems: expected.count,

diff --git a/Mintfile b/Mintfile
@@ -1,4 +1,4 @@
 yonaskolb/[email protected]
-realm/swiftlint@0.58.2
-nicklockwood/swiftformat@0.49.1
+realm/swiftlint@0.59.1
+nicklockwood/swiftformat@0.56.2
 swiftgen/[email protected]
diff --git a/Screenshot/detail_uikit.png b/Screenshot/detail_uikit.png
diff --git a/Screenshot/main_uikit.png b/Screenshot/main_uikit.png
diff --git a/project.yml b/project.yml
@@ -43,10 +43,10 @@ packages:
     version: 2.2.1
   OrderedCollections:
     url: https://github.com/apple/swift-collections
-    version: 1.1.4
+    version: 1.2.0
   JobInterviewAssignmentKit:
     url: https://github.com/RomanPodymov/JobInterviewAssignmentKit
-    version: 0.0.1
+    version: 0.0.2
   RealmSwift:
     url: https://github.com/realm/realm-swift.git
     version: 20.0.2