ALFMOB-162: Code review

Author: JoaoPinhoMinder

Alfie/Alfie/Navigation/Coordinator.swift

@@ -136,15 +136,15 @@ final class Coordinator: ObservableObject, CoordinatorProtocol {
     // MARK: - Product Details
 
     public func openDetails(for productId: String) {
-        navigationAdapter.push(.productDetails(.id(productId)))
+        navigationAdapter.push(.productDetails(configuration: .id(productId)))
     }
 
     public func openDetails(for product: Product) {
-        navigationAdapter.push(.productDetails(.product(product)))
+        navigationAdapter.push(.productDetails(configuration: .product(product)))
     }
 
     public func openDetails(for selectedProduct: SelectedProduct) {
-        navigationAdapter.push(.productDetails(.selectedProduct(selectedProduct)))
+        navigationAdapter.push(.productDetails(configuration: .selectedProduct(selectedProduct)))
     }
 
     // MARK: - Brands

Alfie/Alfie/Navigation/DeepLinking/DeepLinkHandler.swift

@@ -87,7 +87,7 @@ final class DeepLinkHandler: DeepLinkHandlerProtocol {
 
         case .productDetail(let productId, _, _, _):
             // TODO: currently the API does not support fetching a product by the StyleNumber (that is parsed from the URL), just by ProductID, so all requests will return "not found"
-            target = Screen.productDetails(.id(productId))
+            target = Screen.productDetails(configuration: .id(productId))
 
         case .webView(let url):
             target = Screen.webView(url: url, title: "")

Alfie/Alfie/Navigation/Screen.swift

@@ -13,7 +13,7 @@ enum Screen: ScreenProtocol {
     case recentSearches
     case forceAppUpdate
     case debugMenu
-    case productDetails(_ type: ThemedProductDetailsScreen)
+    case productDetails(configuration: ProductDetailsConfiguration)
     case productListing(configuration: ProductListingScreenConfiguration)
     case categoryList(_ categories: [NavigationItem], title: String)
 
@@ -35,18 +35,18 @@ enum TabScreen: ScreenProtocol {
     static let allCases: [TabScreen] = [.home(), .shop(), .wishlist, .bag]
 }
 
-enum HomeTabConfig: Equatable, Hashable {
+enum HomeTabConfig: Hashable {
     case loggedIn(username: String, memberSince: Int)
     case loggedOut
 }
 
-enum ThemedProductDetailsScreen: Equatable, Hashable {
+enum ProductDetailsConfiguration: Hashable {
     case id(_ id: String)
     case product(_ product: Product)
     case selectedProduct(_ selectedProduct: SelectedProduct)
 }
 
-struct ProductListingScreenConfiguration: Equatable, Hashable {
+struct ProductListingScreenConfiguration: Hashable {
     let category: String?
     let searchText: String?
     let urlQueryParameters: [String: String]?

Alfie/Alfie/Navigation/ViewFactory.swift

@@ -124,10 +124,10 @@ final class ViewFactory: ViewFactoryProtocol {
         case .wishlist:
             wishlistView
 
-        case .productDetails(let type):
+        case .productDetails(let configuration):
             ProductDetailsView(
                 viewModel: ProductDetailsViewModel(
-                    productKind: type,
+                    productDetailsConfiguration: configuration,
                     dependencies: ProductDetailsDependencyContainer(
                         productService: serviceProvider.productService,
                         webUrlProvider: serviceProvider.webUrlProvider,

Alfie/Alfie/Views/ProductDetails/ProductDetailsView.swift

@@ -73,7 +73,7 @@ struct ProductDetailsView<ViewModel: ProductDetailsViewModelProtocol>: View {
                     .writingSize(to: $viewSize)
             }
         }
-        .withToolbar(for: .productDetails(.id(viewModel.productId)))
+        .withToolbar(for: .productDetails(configuration: .id(viewModel.productId)))
         .toolbar {
             if !viewModel.state.didFail {
                 ToolbarItem(placement: .principal) {

Alfie/Alfie/Views/ProductDetails/ProductDetailsViewModel.swift

@@ -89,12 +89,12 @@ final class ProductDetailsViewModel: ProductDetailsViewModelProtocol {
     }
 
     init(
-        productKind: ThemedProductDetailsScreen,
+        productDetailsConfiguration: ProductDetailsConfiguration,
         dependencies: ProductDetailsDependencyContainer
     ) {
         self.dependencies = dependencies
 
-        switch productKind {
+        switch productDetailsConfiguration {
         case .id(let productId):
             self.productId = productId
             self.initialSelectedProduct = nil

Alfie/AlfieKit/Sources/Models/Models/Base/Brand.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Brand: Identifiable, Equatable {
+public struct Brand: Identifiable, Hashable {
     /// The ID for the brand
     public let id: String
     /// The display name of the brand

Alfie/AlfieKit/Sources/Models/Models/Base/Media.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public enum Media: Equatable, Hashable {
+public enum Media: Hashable {
     case image(MediaImage)
     case video(MediaVideo)
 

Alfie/AlfieKit/Sources/Models/Models/Base/MediaImage.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct MediaImage: Equatable, Hashable {
+public struct MediaImage: Hashable {
     /// A description of the contents of the image for accessibility purposes.
     public let alt: String?
     /// The media content type.
@@ -13,16 +13,4 @@ public struct MediaImage: Equatable, Hashable {
         self.mediaContentType = mediaContentType
         self.url = url
     }
-
-    public static func == (lhs: MediaImage, rhs: MediaImage) -> Bool {
-        lhs.alt == rhs.alt
-        && lhs.mediaContentType == rhs.mediaContentType
-        && lhs.url == rhs.url
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(alt)
-        hasher.combine(mediaContentType)
-        hasher.combine(url)
-    }
 }

Alfie/AlfieKit/Sources/Models/Models/Base/MediaVideo.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct MediaVideo: Equatable, Hashable {
+public struct MediaVideo: Hashable {
     /// A description of the contents of the video for accessibility purposes.
     public let alt: String?
     /// The media content type.
@@ -16,23 +16,9 @@ public struct MediaVideo: Equatable, Hashable {
         self.previewImage = previewImage
         self.sources = sources
     }
-
-    public static func == (lhs: MediaVideo, rhs: MediaVideo) -> Bool {
-        lhs.alt == rhs.alt
-        && lhs.mediaContentType == rhs.mediaContentType
-        && lhs.previewImage == rhs.previewImage
-        && lhs.sources == rhs.sources
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(alt)
-        hasher.combine(mediaContentType)
-        hasher.combine(previewImage)
-        hasher.combine(sources)
-    }
 }
 
-public struct VideoSource: Equatable, Hashable {
+public struct VideoSource: Hashable {
     public enum VideoFormat: String {
         case mp4 = "MP4"
         case webm = "WEBM"
@@ -51,16 +37,4 @@ public struct VideoSource: Equatable, Hashable {
         self.mimeType = mimeType
         self.url = url
     }
-
-    public static func == (lhs: VideoSource, rhs: VideoSource) -> Bool {
-        lhs.format == rhs.format
-        && lhs.mimeType == rhs.mimeType
-        && lhs.url == rhs.url
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(format)
-        hasher.combine(mimeType)
-        hasher.combine(url)
-    }
 }