Cleanup list views

hk14004 · Mar 29, 2023 · b44e879 · b44e879
1 parent 7510ca1
commit b44e879
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 28 deletions.
diff --git a/CatalogViewer.xcodeproj/project.pbxproj b/CatalogViewer.xcodeproj/project.pbxproj
@@ -185,8 +185,8 @@
 		D40BC2F829CE286000B4A1E2 /* Navigation */ = {
 			isa = PBXGroup;
 			children = (
-				D40BC2FB29CE299E00B4A1E2 /* Categories */,
 				D40BC2F929CE288300B4A1E2 /* AppCoordinator.swift */,
+				D40BC2FB29CE299E00B4A1E2 /* Categories */,
 			);
 			path = Navigation;
 			sourceTree = "<group>";
@@ -219,8 +219,8 @@
 		D40BC30029CE2C8B00B4A1E2 /* Screens */ = {
 			isa = PBXGroup;
 			children = (
-				D40BC30629CE3C6D00B4A1E2 /* CategoryProductsScreen */,
 				D40BC30529CE3C0700B4A1E2 /* CategoriesScreen */,
+				D40BC30629CE3C6D00B4A1E2 /* CategoryProductsScreen */,
 			);
 			path = Screens;
 			sourceTree = "<group>";

diff --git a/CatalogViewer/AppDelegate.swift b/CatalogViewer/AppDelegate.swift
@@ -10,8 +10,6 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -31,6 +29,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
     }
 
-
 }
-
diff --git a/CatalogViewer/UI/Screens/CategoriesScreen/CategoriesScreenVM.swift b/CatalogViewer/UI/Screens/CategoriesScreen/CategoriesScreenVM.swift
@@ -88,7 +88,7 @@ extension CategoriesScreenVM {
             // Load DB cache and display again, this time we know if there is no data
             await updateCategoriesSection()
             // Observe and react to DB changes
-            observeLocalData()
+            observeCachedData()
         }
     }
 
@@ -97,29 +97,25 @@ extension CategoriesScreenVM {
         if !categoriesRefreshed, loaded.isEmpty {
             return
         }
-
         loadedCategories = loaded
-        onLocalCategoriesUpdated(list: loaded)
+        onRenderCategories(list: loaded)
     }
 
     private func refreshCategories() async {
         await categoryRepository.refreshCategories()
         categoriesRefreshed = true
     }
 
-    private func observeLocalData() {
+    private func observeCachedData() {
         bag.categoriesHandle = categoryRepository.observeCategories()
             .dropFirst()
-            .removeDuplicates().sink { [weak self] _categories in
-                self?.onLocalCategoriesUpdated(list: _categories)
+            .removeDuplicates().sink { [unowned self] _categories in
+                loadedCategories = _categories
+                onRenderCategories(list: _categories)
             }
     }
 
-    private func onLocalCategoriesUpdated(list: [Category]) {
-        loadedCategories = list
-
-        // Update UI
-
+    private func onRenderCategories(list: [Category]) {
         func onUpdateUI() {
             let updatedSection = makeCategoriesListSection(items: loadedCategories)
             sections.update(section: updatedSection)

diff --git a/CatalogViewer/UI/Screens/CategoryProductsScreen/CategoryProductsScreenVM.swift b/CatalogViewer/UI/Screens/CategoryProductsScreen/CategoryProductsScreenVM.swift
@@ -53,7 +53,7 @@ class CategoryProductsScreenVM: ObservableObject {
     private let productsRepository: ProductRepositoryProtocol
     private var productsRefreshed: Bool = false
     private lazy var redactedProducts: [Cell] = makeRedactedCells(count: 12)
-        
+
     init(category: Category, productsRepository: ProductRepositoryProtocol) {
         self.category = category
         self.productsRepository = productsRepository
@@ -73,7 +73,7 @@ extension CategoryProductsScreenVM {
             // Load DB cache and display again, this time we know if there is no data
             await updateProductsSection()
             // Observe and react to DB changes
-            observeLocalData()
+            observeCachedData()
         }
     }
 
@@ -84,7 +84,7 @@ extension CategoryProductsScreenVM {
         }
 
         loadedProducts = loaded
-        onLocalProductsUpdated(list: loaded)
+        onRenderProducts(list: loaded)
 
     }
 
@@ -93,20 +93,17 @@ extension CategoryProductsScreenVM {
         productsRefreshed = true
     }
 
-    private func observeLocalData()  {
+    private func observeCachedData()  {
         bag.productsHandle = productsRepository.observeProducts(categoryIds: [category.id])
             .dropFirst()
             .removeDuplicates()
-            .sink { [weak self] _products in
-                self?.onLocalProductsUpdated(list: _products)
+            .sink { [unowned self] _products in
+                loadedProducts = _products
+                onRenderProducts(list: _products)
             }
     }
 
-    private func onLocalProductsUpdated(list: [Product]) {
-        loadedProducts = list
-
-        // Update UI
-
+    private func onRenderProducts(list: [Product]) {
         func onUpdateUI() {
             let updatedSection = makeProductListSection(items: loadedProducts)
             sections.update(section: updatedSection)