Merge pull request #25 from engingulek/develop

Develop

Author: engingulek

.DS_Store

@@ -380,6 +380,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_DEFAULT_ACTOR_ISOLATION = nonisolated;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -440,6 +441,7 @@
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_DEFAULT_ACTOR_ISOLATION = nonisolated;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";

ICTMDBHomeModule.xcodeproj/project.pbxproj

@@ -8,75 +8,38 @@
 import Foundation
 import ICTMDBNetworkManagerKit
 
-import Foundation
 
-/// `HomeInteractor` handles the data-fetching logic for the Home module.
-final class HomeInteractor: @preconcurrency PresenterToInteractorHomeProtocol {
-    
+final class HomeInteractor: PresenterToInteractorHomeProtocol,@unchecked Sendable {
+  
     // MARK: - Properties
 
     /// Reference to the Presenter to send data or errors back.
-    var presenter: (any InteractorToPresenterHomeProtocol)?
+   weak var presenter: (any InteractorToPresenterHomeProtocol)?
 
     /// Network manager responsible for API requests.
     private let network: NetworkManagerProtocol
 
     /// Current device language code (e.g., tr, en).
     let deviceLanguageCode = Locale.current.language.languageCode ?? .english
 
- 
     init(network: NetworkManagerProtocol) {
         self.network = network
     }
 
-    // MARK: - Popular TV Shows
-    
-    /// Loads the list of popular TV shows from the API.
-    func loadPopularMovies() {
-        let request = PopularMoviesRequest(
-            language: deviceLanguageCode == .turkish ? .tr : .en,
-            page: 1
-        )
+    func loadData() async {
+        let popularMoviesRequest = PopularMoviesRequest(language: deviceLanguageCode == .turkish ? .tr : .en, page: 1)
+        let airingTodayRequest = AiringTodayRequest(language: deviceLanguageCode == .turkish ? .tr : .en, page: 1)
+        async let popularMovies = network.execute(popularMoviesRequest)
 
-        // Executes the network request asynchronously.
-        network.execute(request) { [weak self] result in
-            guard let self else { return }
-            
-            switch result {
-            case .success(let list):
-                // Sends the fetched popular shows to the Presenter.
-                presenter?.sendPopularTvShows(list.results)
-                
-            case .failure:
-                // Notifies Presenter of an error.
-                presenter?.sendError(.popular)
-            }
-        }
-    }
-    
-    // MARK: - Airing Today TV Shows
-    
-    /// Loads the list of TV shows airing today.
-    func loadAiringMovies() {
-        let request = AiringTodayRequest(
-            language: deviceLanguageCode == .turkish ? .tr : .en,
-            page: 1
-        )
-        
-        // Executes the network request asynchronously.
-        network.execute(request) { [weak self] result in
-            guard let self else { return }
+        async let airingMovies = network.execute(airingTodayRequest)
+
+        do {
+            let (popularResult, airingResult) = try await (popularMovies, airingMovies)
 
-            switch result {
-            case .success(let list):
-                // Sends the fetched airing shows to the Presenter.
-                presenter?.sendAiringTvShows(list.results)
-                
-            case .failure:
-                // Notifies Presenter of an error.
-                presenter?.sendError(.airingToday)
-            }
+            await presenter?.sendPopularTvShows(popularResult.results)
+            await presenter?.sendAiringTvShows(airingResult.results)
+        } catch {
+            await presenter?.sendError()
         }
     }
 }
-

ICTMDBHomeModule/HomeInteractor.swift

@@ -12,6 +12,7 @@ import UIKit
 
 // MARK: - HomePresenter
 /// Handles the presentation logic for the Home module.
+
 final class HomePresenter {
 
     // MARK: - Typealias
@@ -50,15 +51,28 @@ final class HomePresenter {
 
 // MARK: - ViewToPresenterHomeProtocol
 /// Handles actions triggered by the View layer.
+
 extension HomePresenter: ViewToPresenterHomeProtocol {
+  
 
+   
     func viewDidLoad() {
         view?.setBackColorAble(color: "backColor")
-        //TODO: move to Localizable
-        view?.setNavigationTitle(title: "Home Page")
-        interactor.loadPopularMovies()
-        interactor.loadAiringMovies()
+        view?.setNavigationTitle(title: LocalizableUI.homePageNavTitle.localized)
+        
+        Task {@MainActor in
+          await loadData()
+        }
     }
+    
+
+    @MainActor
+    func loadData() async {
+        view?.startLoading()
+        await interactor.loadData()
+        view?.finishLoading()
+    }
+
 }
 
 
@@ -116,33 +130,28 @@ extension HomePresenter {
         }
     }
 
-
-    func titleForSection(at section: Int) -> (
-        title: String,
-        sizeType: SectionSizeType,
-        buttonType: [TitleForSectionButtonType]?
-    ) {
+    func titleForSection(at section: Int) -> GenericCollectionViewKit.HeaderViewItem {
+        var headerViewItem:HeaderViewItem
         guard let sectionType = SectionType(rawValue: section) else {
-            return (title: "", sizeType: .small, buttonType: [])
+            headerViewItem = .init(title: "", sizeType: .empty)
+            return headerViewItem
         }
 
-        var item: (title: String, sizeType: SectionSizeType, buttonType: [TitleForSectionButtonType]?)
-        
         switch sectionType {
         case .popular:
-            item = (
+            headerViewItem = .init(
                 title: LocalizableUI.popular.localized,
+                icon: .init(image: .systemImage("flame.fill"), tintColor: .custom(hex: "#FF0000")),
                 sizeType: .large,
-                buttonType: [.allList]
-            )
+                buttonTypes: [.allList])
         case .airingToday:
-            item = (
+            headerViewItem = .init(
                 title: LocalizableUI.airingToday.localized,
-                sizeType: .small,
-                buttonType: [.allList]
-            )
+                icon: .init(image: .systemImage("circle.fill"), tintColor: .custom(hex: "#008000")),
+                sizeType: .large,
+                buttonTypes: [.allList])
         }
-        return item
+        return headerViewItem
     }
 
 
@@ -185,31 +194,31 @@ extension HomePresenter {
 // MARK: - InteractorToPresenterHomeProtocol
 /// Receives data from the Interactor and updates the view.
 extension HomePresenter: InteractorToPresenterHomeProtocol {
+    func sendError() {
+      
+        view?.sendError(errorState: (isHidden: true,
+                                     message: LocalizableUI.somethingWentWrong.localized))
+        view?.relaodCollectionView()
+      
+    }
+    
 
     func sendAiringTvShows(_ data: [AiringToday]) {
-        view?.startLoading()
+     
         airingTodayShows = data.map { AiringTodayPresentation(tvShow: $0) }
         view?.sendError(errorState: (isHidden: false, message: ""))
         view?.relaodCollectionView()
-        view?.finishLoading()
+      
     }
 
     func sendPopularTvShows(_ data: [PopularTvShows]) {
-        view?.startLoading()
+      
         popularTvShows = data
             .map { PopularTVShowPresentation(tvShow: $0) }
             .sorted { $0.rating > $1.rating }
         view?.sendError(errorState: (isHidden: false, message: ""))
         view?.relaodCollectionView()
-        view?.finishLoading()
-    }
-    
-    func sendError(_ type: HomePageErrorType) {
-        view?.startLoading()
-        view?.sendError(errorState: (isHidden: true,
-                                     message: LocalizableUI.somethingWentWrong.localized))
-        view?.relaodCollectionView()
-        view?.finishLoading()
+      
     }
 }
 

ICTMDBHomeModule/HomePresenter.swift

@@ -17,6 +17,7 @@ typealias Ables = UIViewAble & SegueAble & NavConUIAble
 
 // MARK: - View → Presenter
 /// Protocol for communication from View to Presenter.
+@MainActor
 protocol ViewToPresenterHomeProtocol: AnyObject,
     GenericCollectionDataSourceProtocol,
     GenericCollectionDelegateSourceProtocol,
@@ -27,6 +28,7 @@ protocol ViewToPresenterHomeProtocol: AnyObject,
 
     /// Called when the view is loaded
     func viewDidLoad()
+   
 }
 
 // MARK: - Presenter → View
@@ -48,21 +50,21 @@ protocol PresenterToViewHomeProtocol: AnyObject, Ables {
 
 // MARK: - Presenter → Interactor
 /// Protocol defining communication from Presenter to Interactor.
-protocol PresenterToInteractorHomeProtocol {
-    
+
+protocol PresenterToInteractorHomeProtocol:Sendable,AnyObject {
+
     /// Reference to the Presenter layer
     var presenter: InteractorToPresenterHomeProtocol? { get set }
-    
-    /// Requests popular TV shows data
-    func loadPopularMovies()
-    
-    /// Requests airing today TV shows data
-    func loadAiringMovies()
+
+   // Requests data
+    func loadData() async
 }
 
+
 // MARK: - Interactor → Presenter
 /// Protocol for sending data or errors from Interactor to Presenter.
-protocol InteractorToPresenterHomeProtocol {
+@MainActor
+protocol InteractorToPresenterHomeProtocol : AnyObject{
 
     /// Sends fetched popular TV shows
     func sendPopularTvShows(_ data: [PopularTvShows])
@@ -71,11 +73,13 @@ protocol InteractorToPresenterHomeProtocol {
     func sendAiringTvShows(_ data: [AiringToday])
 
     /// Sends an error state
-    func sendError(_ type: HomePageErrorType)
+    func sendError()
+    
 }
 
 // MARK: - Presenter → Router
 /// Protocol for navigation actions from Presenter to Router.
+
 protocol PresenterToRouterHomeProtocol {
 
     /// Navigates to All List page

ICTMDBHomeModule/HomeProtocols.swift

@@ -13,15 +13,15 @@ import ICTMDBViewKit
 import UIKit
 
 /// `HomeRouter` is responsible for navigation in the Home module.
-public class HomeRouter: @preconcurrency PresenterToRouterHomeProtocol {
+public class HomeRouter:  PresenterToRouterHomeProtocol {
 
     // MARK: - Navigation to All List Page
 
     /// Navigates to the All List screen based on the selected section type.
     /// - Parameters:
     ///   - view: The current view conforming to `PresenterToViewHomeProtocol`.
     ///   - type: The section type (e.g., popular or airingToday).
-    @MainActor
+  
     func toAllListPage(view: PresenterToViewHomeProtocol?, type: SectionType) {
         // Determine the list type based on section
         let listType: AllListType = type == .popular ? .popular : .airingToday
@@ -41,14 +41,11 @@ public class HomeRouter: @preconcurrency PresenterToRouterHomeProtocol {
     /// - Parameters:
     ///   - view: The current view conforming to `PresenterToViewHomeProtocol`.
     ///   - id: The TV show ID to display details for.
-    @MainActor
+
     func toDetailPage(view: (any PresenterToViewHomeProtocol)?, id: Int?) {
         // Resolve Detail module dependency from DependencyRegister
-        // Detail modülünü DependencyRegister üzerinden alır
         let detailModule = DependencyRegister.shared.resolve(TvShowDetailProtocol.self)
-        
         // Create the Detail view controller using module
-        // Modül üzerinden Detail view controller oluşturur
         let detailViewController = detailModule.createTvShowDetailModule(id: id)
 
         view?.pushViewControllerAble(detailViewController, animated: true)

ICTMDBHomeModule/HomeRouter.swift

@@ -48,6 +48,7 @@ final class HomeViewController: UIViewController {
         setupCollectionView()
         collectionPrepareView()
         setupUI()
+       
     }
 
 
@@ -135,5 +136,6 @@ extension HomeViewController: @MainActor PresenterToViewHomeProtocol {
 // MARK: - Preview
 #Preview {
     let module = ICTMDBHomeModule()
-    UINavigationController(rootViewController: module.createHomeModule())
+    
+    return UINavigationController(rootViewController: module.createHomeModule())
 }

ICTMDBHomeModule/HomeViewController.swift

@@ -12,7 +12,7 @@ import ICTMDBNetworkManagerKit
 
 // MARK: - ICTMDBHomeModule
 /// Responsible for creating the Home module and wiring VIPER components.
-public class ICTMDBHomeModule : @preconcurrency HomeModuleProtocol {
+public class ICTMDBHomeModule : @MainActor HomeModuleProtocol {
     public init() { }
     @MainActor public func createHomeModule() -> UIViewController {
 

ICTMDBHomeModule/ICTMDBHomeModule.swift

@@ -9,6 +9,7 @@ import ICTMDBNetworkManagerKit
 
 //MARK: AiringTodayRequest
 struct AiringTodayRequest :NetworkRequest {
+    
     typealias Response = DataResult<AiringToday>
     var language: RequestLanguage
     var page: Int