Code Improvement

mehrankmlf · Apr 26, 2024 · e2ff80b · e2ff80b
1 parent dabb921
commit e2ff80b
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 18 deletions.
diff --git a/EasyCrypto/Base/BaseViewModel.swift b/EasyCrypto/Base/BaseViewModel.swift
@@ -29,19 +29,19 @@ protocol ViewModelService: AnyObject {
 typealias BaseViewModel = BaseViewModelEventSource & ViewModelService
 
 open class DefaultViewModel: BaseViewModel, ObservableObject {
-    
+
     var loadingState = CurrentValueSubject<ViewModelStatus, Never>(.dismissAlert)
     let subscriber = Cancelable()
-    
+
     func call<ReturnType>(callWithIndicator: Bool = true,
                           argument: AnyPublisher<ReturnType?,
                           APIError>,
                           callback: @escaping (_ data: ReturnType?) -> Void) {
-        
+
         if callWithIndicator {
             self.loadingState.send(.loadStart)
         }
-        
+
         let completionHandler: (Subscribers.Completion<APIError>) -> Void = { [weak self] completion in
             switch completion {
             case .failure(let error):
@@ -51,11 +51,11 @@ open class DefaultViewModel: BaseViewModel, ObservableObject {
                 self?.loadingState.send(.dismissAlert)
             }
         }
-        
+
         let resultValueHandler: (ReturnType?) -> Void = { data in
             callback(data)
         }
-        
+
         argument
             .subscribe(on: WorkScheduler.backgroundWorkScheduler)
             .receive(on: WorkScheduler.mainScheduler)

diff --git a/EasyCrypto/Presentation/CoinDetail/Coordinator/CoinDetailCoordinator.swift b/EasyCrypto/Presentation/CoinDetail/Coordinator/CoinDetailCoordinator.swift
@@ -11,8 +11,10 @@ import Combine
 struct CoinDetailCoordinator: CoordinatorProtocol {
 
     @ObservedObject var viewModel: CoinDetailViewModel
+
     @State var activeRoute: Destination? = Destination(route: .first(url: nil))
     @State var transition: Transition?
+
     let id: String
 
     let subscriber = Cancelable()

diff --git a/EasyCrypto/Presentation/CoinDetail/View/CoinDetailHeaderView.swift b/EasyCrypto/Presentation/CoinDetail/View/CoinDetailHeaderView.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct CoinDetailHeaderView: View {
 
     var item: CoinUnit
+
     var url: ((String?) -> Void)
 
     var body: some View {

diff --git a/EasyCrypto/Presentation/CoinDetail/View/CoinDetailView.swift b/EasyCrypto/Presentation/CoinDetail/View/CoinDetailView.swift
@@ -17,11 +17,13 @@ struct CoinDetailView: Coordinatable {
     }
 
     @ObservedObject private(set) var viewModel: CoinDetailViewModel
+
     @State private var isLoading: Bool = false
     @State private var presentAlert = false
     @State private var alertMessage: String = ""
 
     let subscriber = Cancelable()
+
     var id: String?
     var coinData: CoinUnit {
         return self.viewModel.coinData
@@ -33,6 +35,10 @@ struct CoinDetailView: Coordinatable {
     }
 
     var body: some View {
+        content
+    }
+
+    var content: some View {
         NavigationView {
             GeometryReader { geo in
                 let geoSize = geo.size

diff --git a/EasyCrypto/Presentation/Detail/View/PriceView.swift b/EasyCrypto/Presentation/Detail/View/PriceView.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct PriceView: View {
 
     let item: MarketsPrice
+
     var viewModel: DetailViewModel
 
     @State var isPersist: Bool = false
@@ -23,7 +24,7 @@ struct PriceView: View {
                     .font(FontManager.body)
                 Spacer()
                 Button {
-                    self.handleDataPersistance(item: item)
+                    self.handleDataPersistence(for: item)
                 } label: {
                     Image(isPersist ? Assets.save : Assets.unsave)
                         .resizable()
@@ -60,13 +61,14 @@ struct PriceView: View {
             self.isPersist = self.viewModel.checkIfItemExist(item)
         }
     }
-    func handleDataPersistance(item: MarketsPrice) {
+
+    private func handleDataPersistence(for item: MarketsPrice) {
+        isPersist.toggle()
+
         if isPersist {
-            self.isPersist = false
-            self.viewModel.deleteFromWishlist(item)
+            viewModel.addToWishlist(item)
         } else {
-            self.isPersist = true
-            self.viewModel.addToWishlist(item)
+            viewModel.deleteFromWishlist(item)
         }
     }
 }
diff --git a/EasyCrypto/Presentation/Detail/ViewModel/DetailViewModel.swift b/EasyCrypto/Presentation/Detail/ViewModel/DetailViewModel.swift
@@ -10,6 +10,7 @@ import Foundation
 final class DetailViewModel: ObservableObject {
 
     let title: String = Constants.Title.detailTitle
+
     @Published var marketPrice = MarketsPrice()
 
     private let repository: CacheRepositoryProtocol

diff --git a/EasyCrypto/Presentation/Main/Coordinator/MainCoordinator.swift b/EasyCrypto/Presentation/Main/Coordinator/MainCoordinator.swift
@@ -50,7 +50,7 @@ extension MainCoordinator {
                 CoinDetailCoordinator(viewModel: CoinDetailViewModel(), id: data)
             }
         }
-    
+
         var transition: Transition {
             switch route {
             case .first: return .push

diff --git a/EasyCrypto/Presentation/Main/View/MainView.swift b/EasyCrypto/Presentation/Main/View/MainView.swift
@@ -91,7 +91,7 @@ struct MainView: Coordinatable {
         }
     }
 
-    var coinsList: some View {
+   private var coinsList: some View {
         ScrollView {
             LazyVStack {
                 ForEach(viewModel.marketData, id: \.id) { item  in
@@ -120,7 +120,7 @@ struct MainView: Coordinatable {
         }
     }
 
-    var whishList: some View {
+   private var whishList: some View {
         ScrollView {
             VStack {
                 ForEach(viewModel.wishListData, id: \.symbol) { item  in

diff --git a/EasyCrypto/Presentation/Main/View/SearchBar.swift b/EasyCrypto/Presentation/Main/View/SearchBar.swift
@@ -14,6 +14,10 @@ struct SearchBar: View {
     @Binding var isEditing: Bool
 
     var body: some View {
+        content
+    }
+
+    var content: some View {
         ZStack(alignment: .leading) {
             HStack {
                 TextField("", text: $text)
@@ -49,7 +53,7 @@ struct SearchBar: View {
                     }
                 }
             }.padding(.horizontal)
-             .frame(height: 40.0)
+                .frame(height: 40.0)
         }
     }
 }

diff --git a/EasyCrypto/Presentation/Main/View/SortView.swift b/EasyCrypto/Presentation/Main/View/SortView.swift
@@ -10,6 +10,7 @@ import SwiftUI
 struct SortView: View {
 
     @ObservedObject var viewModel: MainViewModel
+
     @State var viewState: Bool = false
 
     var body: some View {

diff --git a/EasyCrypto/Support/ViewModifier/HandleViewModelStateModifier.swift b/EasyCrypto/Support/ViewModifier/HandleViewModelStateModifier.swift
@@ -8,12 +8,12 @@
 import SwiftUI
 
 struct HandleViewModelStateModifier: ViewModifier {
-    
+
     @ObservedObject var viewModel: DefaultViewModel
     @Binding var isLoading: Bool
     @Binding var alertMessage: String
     @Binding var presentAlert: Bool
-    
+
     func body(content: Content) -> some View {
         content
             .onReceive(viewModel.loadingState.receive(on: DispatchQueue.main)) { state in