Merge pull request #20 from engingulek/develop

Develop

Author: engingulek

.DS_Store

@@ -7,9 +7,9 @@
 import Foundation
 import ICTMDBNetworkManagerKit
 
-final class TvShowDetailInteractor : @preconcurrency PresenterToInteractorTvShowDetailProtocol {
-    
-    
+final class TvShowDetailInteractor : PresenterToInteractorTvShowDetailProtocol,@unchecked Sendable {
+  
+   
    weak var presenter: (any InteractorToPresenterTvShowDetailProtocol)?
 
     private let network : NetworkManagerProtocol
@@ -19,37 +19,27 @@ final class TvShowDetailInteractor : @preconcurrency PresenterToInteractorTvShow
         self.network = network
     }
     let deviceLanguageCode = Locale.current.language.languageCode ?? .english
-    @MainActor func loadTvShowDetail(id: Int?) {
-        guard let id = id else {return}
-        let request = TvShowDetailRequest(
+    
+    
+    func loadData(id: Int?) async {
+        guard let id else {return}
+        let detailRequest = TvShowDetailRequest(
             language: deviceLanguageCode == .turkish ? .tr : .en,
             id: id)
+        let castRequest = CastRequest(id: id)
 
-        network.execute(request) {[weak self] result in
-            guard let self else {return}
-            switch result {
-            case .success(let data):
-                presenter?.onHandle(handle: .sendData(data))
-                
-            case .failure:
-                presenter?.onHandle(handle: .sendError(.detailError))
-                
-            }
+        async let detail = network.execute(detailRequest)
+        async let cast = network.execute(castRequest)
+        
+        do{
+            let (detailResult,castResult) = try await (detail,cast)
+           await presenter?.onHandle(handle: .sendData(detailResult))
+           await presenter?.onHandle(handle: .sendCast(castResult.cast))
+        }catch{
+           await presenter?.onHandle(handle: .sendError)
         }
+        
     }
 
-    @MainActor func loadTvShowCasts(id: Int?) {
-        guard let id = id else {return}
-        let request = CastRequest(id: id)
-        network.execute(request) { [weak self] result in
-            guard let self else {return}
-            switch result {
-            case .success(let casts):
-                presenter?.onHandle(handle: .sendCast(casts.cast))
-            case .failure:
-                presenter?.onHandle(handle: .sendError(.castError))
-            }
-        }
-    }
 }
 

ICTMDBDetailModule/.DS_Store

@@ -24,12 +24,13 @@ final class TvShowDetailPresenter {
 
     func viewDidLoad() {
         view?.setBackColorAble(color: "backColor")
-        view?.setNavigationTitle(title: "Detail")
-       // view?.prepareCollectionView()
+        view?.setNavigationTitle(title: LocalizableUI.detailNavTitle.localized)
     }
 }
 
 extension TvShowDetailPresenter: ViewToPresenterTvShowDetailProtocol {
+   
+    
     func layout(for sectionIndex: Int) -> LayoutSource {
         guard let sectionType = SectionType(rawValue: sectionIndex) else {
             return LayoutSourceTeamplate.none.template
@@ -57,8 +58,9 @@ extension TvShowDetailPresenter: ViewToPresenterTvShowDetailProtocol {
 
     func getID(id: Int?) {
         guard let id = id  else {return}
-        interactor.loadTvShowDetail(id: id)
-        interactor.loadTvShowCasts(id: id)
+        Task{@MainActor in 
+            await interactor.loadData(id: id)
+        }
 
     }
 
@@ -88,21 +90,31 @@ extension TvShowDetailPresenter: ViewToPresenterTvShowDetailProtocol {
         }
     }
 
-   
-    
-    func titleForSection(at section: Int) -> (
-        title: String, sizeType:SectionSizeType,
-        buttonType: [TitleForSectionButtonType]?) {
-            guard let sectionType = SectionType(rawValue: section) else { return  (title:"",sizeType:.small,buttonType:[]) }
-            var item : (title: String, sizeType: SectionSizeType,buttonType: [TitleForSectionButtonType]?)
-            switch sectionType {
-            case .cast:
-                item = (title:LocalizableUI.cast.localized,sizeType:.large,buttonType:[])
-            case .season:
-                item = (title:LocalizableUI.season.localized,sizeType:.large,buttonType:[])
-            }
-            return item
+    func titleForSection(at section: Int) -> GenericCollectionViewKit.HeaderViewItem {
+        let headerViewItem : HeaderViewItem
+        guard let sectionType = SectionType(rawValue: section)
+        else {
+            return .init(title: "", sizeType: .empty)
         }
+        switch sectionType {
+        case .cast:
+            headerViewItem = .init(
+                title: LocalizableUI.cast.localized,
+                icon: .init(
+                image: .systemImage("person.3"),
+                tintColor: .secondary),
+                sizeType: .large)
+        case .season:
+            headerViewItem = .init(
+                title: LocalizableUI.season.localized,
+                icon: .init(
+                image: .systemImage("film.stack"),
+                tintColor: .custom(hex:"#FFA500")),
+                sizeType: .large)
+        }
+        return headerViewItem
+    
+    }
 
     func sectionType(at section: Int) -> SectionType {
         return SectionType(rawValue: section) ?? .cast
@@ -128,13 +140,9 @@ extension TvShowDetailPresenter: InteractorToPresenterTvShowDetailProtocol {
             guard let seasons = seasons else {return}
             seasonList =  seasons.map { SeasonPresentation(season: $0) }
 
-        case .sendError(let error):
-            switch error {
-            case .detailError:
-                break
-            case .castError:
-                castList = []
-            }
+        case .sendError:
+           castList = []
+            break
         case .sendCast(let casts):
             castList = casts.map{CastPresentation(cast: $0) }
 

ICTMDBDetailModule/DetailInteractor.swift

@@ -10,7 +10,7 @@ typealias Ables = UIViewAble & NavConUIAble
  import GenericCollectionViewKit
 
 
-
+@MainActor
 protocol ViewToPresenterTvShowDetailProtocol:
     AnyObject, GenericCollectionDataSourceProtocol,
     GenericCollectionDelegateSourceProtocol,
@@ -29,26 +29,22 @@ protocol PresenterToViewTvShowDetailProtocol : AnyObject,Ables{
 }
 
 
-protocol PresenterToInteractorTvShowDetailProtocol {
+protocol PresenterToInteractorTvShowDetailProtocol:Sendable,AnyObject  {
     var presenter: InteractorToPresenterTvShowDetailProtocol? {get set}
-    func loadTvShowDetail(id:Int?)
-    func loadTvShowCasts(id:Int?)
+    func loadData(id:Int?) async
 }
 
 
-enum TvShowErrorType : Error{
-    case detailError
-    case castError
-}
+
 enum TvShowInteractorResult {
     case sendData(_ data: TvShowDetail,)
     case sendCast(_ data:[Cast])
-    case sendError(_ error:TvShowErrorType)
+    case sendError
 }
 
+@MainActor
 protocol InteractorToPresenterTvShowDetailProtocol : AnyObject {
     func onHandle(handle:TvShowInteractorResult)
-   
 }
 
 

ICTMDBDetailModule/DetailPresenter.swift

@@ -10,7 +10,7 @@ import UIKit
 import ICTMDBModularProtocols
 import ICTMDBNetworkManagerKit
 
-public class ICTMDBDetailModule : @preconcurrency TvShowDetailProtocol {
+public class ICTMDBDetailModule : @MainActor TvShowDetailProtocol {
 
 
     public init() { }

ICTMDBDetailModule/DetailProtocols.swift

@@ -14,5 +14,5 @@ struct CastRequest : NetworkRequest {
     var path: NetworkPath {.casts(id)}
     var method: AlamofireMethod  { .GET}
     var headers: [String : String]?
-    var parameters: [String : Any]?
+    var parameters: [String : Any]? { [:]}
 }

ICTMDBDetailModule/ICTMDBDetailModule.swift

@@ -5,11 +5,9 @@
 //  Created by Engin Gülek on 12.11.2025.
 //
 
- import UIKit
+import UIKit
 import SnapKit
 
-
-
 extension DetailViewController {
 
    func setupCollectionView() {

ICTMDBDetailModule/cells/.DS_Store

@@ -100,7 +100,7 @@ final class DetailViewController: UIViewController {
     }
 }
 
-extension DetailViewController: @preconcurrency PresenterToViewTvShowDetailProtocol {
+extension DetailViewController:  @MainActor PresenterToViewTvShowDetailProtocol {
     func sendData(detail: TvShowDetailPresentation, title: TvShowDetailTitlePresentation) {
         configureExampleData(detail, title)
     }