FM-1491: Fix view mode not being remembered

Author: tomekkuzma-mega

Modules/Presentation/Features/Search/Sources/Search/UI/SearchResultsView.swift

@@ -185,6 +185,7 @@ struct SearchResultsViewPreviews: PreviewProvider {
                 chipTapped: { _, _ in }
             ),
             config: .example,
+            layout: .list,
             keyboardVisibilityHandler: MockKeyboardVisibilityHandler()
 
         )

Modules/Presentation/Features/Search/Sources/Search/UI/SearchResultsViewModel.swift

@@ -12,7 +12,7 @@ public class SearchResultsViewModel: ObservableObject {
     // this will need to be to exposed outside when parent will need to know exactly what is selected
     @Published var selected: Set<ResultId> = []
 
-    @Published public var layout: PageLayout = .list
+    @Published public var layout: PageLayout
 
     @Published var chipsItems: [ChipViewModel] = []
     @Published var presentedChipsPickerViewModel: ChipViewModel?
@@ -72,6 +72,7 @@ public class SearchResultsViewModel: ObservableObject {
         resultsProvider: any SearchResultsProviding,
         bridge: SearchBridge,
         config: SearchConfig,
+        layout: PageLayout,
         showLoadingPlaceholderDelay: Double = 1,
         searchInputDebounceDelay: Double = 0.5,
         keyboardVisibilityHandler: any KeyboardVisibilityHandling
@@ -82,7 +83,7 @@ public class SearchResultsViewModel: ObservableObject {
         self.showLoadingPlaceholderDelay = showLoadingPlaceholderDelay
         self.searchInputDebounceDelay = searchInputDebounceDelay
         self.keyboardVisibilityHandler = keyboardVisibilityHandler
-
+        self.layout = layout
         self.bridge.queryChanged = { [weak self] query  in
             let _self = self
 

Modules/Presentation/Features/Search/Tests/SearchTests/SearchResultsViewModelTests.swift

@@ -55,6 +55,7 @@ final class SearchResultsViewModelTests: XCTestCase {
                 resultsProvider: resultsProvider,
                 bridge: bridge,
                 config: config,
+                layout: .list,
                 showLoadingPlaceholderDelay: 0.1,
                 keyboardVisibilityHandler: MockKeyboardVisibilityHandler()
             )

SearchDemo/SearchDemoApp.swift

@@ -41,6 +41,7 @@ struct ContentView: View {
                 }
             ),
             config: .testConfig,
+            layout: .list,  
             keyboardVisibilityHandler: KeyboardVisibilityHandler(notificationCenter: .default)
         )
         var body: some View {

iMEGA/Home/Scenes/HomeScreenFactory.swift

@@ -21,6 +21,15 @@ final class HomeScreenFactory: NSObject {
     private var megaStore: MEGAStore {
         MEGAStore.shareInstance()
     }
+    
+    private var newViewModeStore: some ViewModeStore {
+        ViewModeStore(
+            preferenceRepo: PreferenceRepository(userDefaults: .standard),
+            megaStore: megaStore,
+            sdk: sdk,
+            notificationCenter: notificationCenter
+        )
+    }
 
     func createHomeScreen(
         from tabBarController: MainTabBarController,
@@ -97,12 +106,8 @@ final class HomeScreenFactory: NSObject {
 
         navigationController.tabBarItem = UITabBarItem(title: nil, image: Asset.Images.TabBarIcons.home.image, selectedImage: nil)
 
-        homeViewController.viewModeStore = ViewModeStore(
-            preferenceRepo: PreferenceRepository(userDefaults: .standard),
-            megaStore: megaStore,
-            sdk: sdk,
-            notificationCenter: notificationCenter
-        )
+        let viewModeStore = newViewModeStore
+        homeViewController.viewModeStore = viewModeStore
 
         let bridge = SearchResultsBridge()
         homeViewController.searchResultsBridge = bridge
@@ -112,6 +117,7 @@ final class HomeScreenFactory: NSObject {
             bridge: bridge,
             newHomeSearchResultsEnabled: newHomeSearchResultsEnabled,
             tracker: tracker,
+            viewModeStore: viewModeStore,
             enableItemMultiSelection: enableItemMultiSelection
         )
 
@@ -151,6 +157,7 @@ final class HomeScreenFactory: NSObject {
         bridge: SearchResultsBridge,
         newHomeSearchResultsEnabled: Bool,
         tracker: some AnalyticsTracking,
+        viewModeStore: some ViewModeStoring,
         enableItemMultiSelection: Bool
     ) -> UIViewController {
 
@@ -159,6 +166,7 @@ final class HomeScreenFactory: NSObject {
                 with: navigationController,
                 bridge: bridge,
                 tracker: tracker,
+                viewModeStore: viewModeStore,
                 enableItemMultiSelection: enableItemMultiSelection
             )
         } else {
@@ -187,6 +195,7 @@ final class HomeScreenFactory: NSObject {
         with navigationController: UINavigationController,
         bridge: SearchResultsBridge,
         tracker: some AnalyticsTracking,
+        viewModeStore: some ViewModeStoring,
         enableItemMultiSelection: Bool
     ) -> UIViewController {
 
@@ -267,6 +276,7 @@ final class HomeScreenFactory: NSObject {
                 enableItemMultiSelection: enableItemMultiSelection
                 )
             ),
+            layout: viewModeStore.viewMode(for: .init(customLocation: CustomHomeSearch)).pageLayout ?? .list,
             keyboardVisibilityHandler: KeyboardVisibilityHandler(notificationCenter: notificationCenter)
 
         )

iMEGA/My Account/Login/MainTabBarController+Additions.swift

@@ -63,7 +63,8 @@ extension MainTabBarController {
         isNewHomeSearchEnabled: Bool
     ) async {
         guard let nav = defaultViewControllers[2] as? MEGANavigationController,
-              let homeVC = nav.viewControllers.first as? HomeViewController
+              let homeVC = nav.viewControllers.first as? HomeViewController,
+              let viewModeStore = homeVC.viewModeStore
         else {
             return
         }
@@ -73,6 +74,7 @@ extension MainTabBarController {
             bridge: homeVC.searchResultsBridge,
             newHomeSearchResultsEnabled: isNewHomeSearchEnabled,
             tracker: DIContainer.tracker,
+            viewModeStore: viewModeStore,
             enableItemMultiSelection: false // not enabled in the home search results
         )
         homeVC.searchResultViewController = searchResultVC

iMEGA/Utils/CoreData/ManagedObjects/Appearance/MEGAStore+OfflineAppearancePreference.swift

@@ -13,7 +13,7 @@ extension MEGAStore {
             offlineAppearancePreference.sortType = NSNumber(value: sortType)
         }
 
-        MEGAStore.shareInstance().save(context)
+        save(context)
     }
 
     @objc func insertOrUpdateOfflineViewMode(path: String, viewMode: Int) {
@@ -27,7 +27,7 @@ extension MEGAStore {
             offlineAppearancePreference.viewMode = NSNumber(value: viewMode)
         }
 
-        MEGAStore.shareInstance().save(context)
+        save(context)
     }
 
     @objc func fetchOfflineAppearancePreference(path: String) -> OfflineAppearancePreference? {
@@ -76,7 +76,7 @@ extension MEGAStore {
             MEGALogDebug("Deleted OfflineAppearancePreference \(offlineAppearancePreference)")
             context.delete(offlineAppearancePreference)
 
-            MEGAStore.shareInstance().save(context)
+            save(context)
         }
     }
 
@@ -88,5 +88,6 @@ extension MEGAStore {
             MEGALogDebug("Delete OfflineAppearancePreference \(offlineAppearancePreference)")
             context.delete(offlineAppearancePreference)
         }
+        save(context)
     }
 }