update based on feedback

mozilla-mobile · Jan 22, 2025 · 7fbf234 · 7fbf234
1 parent 74e5a71
commit 7fbf234
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageDiffableDataSource.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageDiffableDataSource.swift
@@ -49,8 +49,8 @@ final class HomepageDiffableDataSource:
         snapshot.appendItems([.header(state.headerState)], toSection: .header)
 
         if let topSites = getTopSites(with: state.topSitesState, and: textColor, numberOfCellsPerRow: numberOfCellsPerRow) {
-            snapshot.appendSections([.topSites(state.topSitesState.numberOfRows)])
-            snapshot.appendItems(topSites, toSection: .topSites(state.topSitesState.numberOfRows))
+            snapshot.appendSections([.topSites(numberOfCellsPerRow)])
+            snapshot.appendItems(topSites, toSection: .topSites(numberOfCellsPerRow))
         }
 
         if let stories = getPocketStories(with: state.pocketState) {

diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageSectionLayoutProvider.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageSectionLayoutProvider.swift
@@ -67,17 +67,15 @@ final class HomepageSectionLayoutProvider {
 
     func createLayoutSection(
         for section: HomepageSection,
-        with traitCollection: UITraitCollection,
-        size: CGSize
+        with traitCollection: UITraitCollection
     ) -> NSCollectionLayoutSection {
         switch section {
         case .header:
             return createHeaderSectionLayout(for: traitCollection)
-        case .topSites(let numberOfRows):
+        case .topSites(let numberOfTilesPerRow):
             return createTopSitesSectionLayout(
                 for: traitCollection,
-                size: size,
-                numberOfRows: numberOfRows
+                numberOfTilesPerRow: numberOfTilesPerRow
             )
         case .pocket:
             return createPocketSectionLayout(for: traitCollection)
@@ -153,16 +151,8 @@ final class HomepageSectionLayoutProvider {
 
     private func createTopSitesSectionLayout(
         for traitCollection: UITraitCollection,
-        size: CGSize,
-        numberOfRows: Int
+        numberOfTilesPerRow: Int
     ) -> NSCollectionLayoutSection {
-        let numberOfTilesPerRow = TopSitesDimensionCalculator.numberOfTilesPerRow(
-            availableWidth: size.width,
-            leadingInset: HomepageSectionLayoutProvider.UX.leadingInset(
-                traitCollection: traitCollection
-            )
-        )
-
         let itemSize = NSCollectionLayoutSize(
             widthDimension: .fractionalWidth(1.0 / CGFloat(numberOfTilesPerRow)),
             heightDimension: .estimated(UX.TopSitesConstants.cellEstimatedSize.height)

diff --git a/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageViewController.swift b/firefox-ios/Client/Frontend/Home/Homepage Rebuild/HomepageViewController.swift
@@ -207,7 +207,7 @@ final class HomepageViewController: UIViewController,
     }
 
     func newState(state: HomepageState) {
-        guard self.homepageState != state else { return }
+        self.homepageState = state
         wallpaperView.wallpaperState = state.wallpaperState
         dataSource?.updateSnapshot(state: state, numberOfCellsPerRow: numberOfTilesPerRow(for: availableWidth))
     }
@@ -308,8 +308,7 @@ final class HomepageViewController: UIViewController,
 
             return sectionProvider.createLayoutSection(
                 for: section,
-                with: environment.traitCollection,
-                size: environment.container.contentSize
+                with: environment.traitCollection
             )
         }
         return layout