Closes mozilla-mobile#26750: refactoring

mavduevskiy · Sep 5, 2022 · b737bdf · b737bdf
1 parent 54ad6c6
commit b737bdf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt
@@ -27,6 +27,8 @@ import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryGrou
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryHighlight
 import org.mozilla.fenix.home.recentvisits.controller.RecentVisitsController
 import org.mozilla.fenix.home.recentvisits.interactor.RecentVisitsInteractor
+import org.mozilla.fenix.onboarding.WallpaperOnboardingDialogFragment
+import org.mozilla.fenix.wallpapers.Wallpaper
 
 /**
  * Interface for tab related actions in the [SessionControlInteractor].
@@ -164,9 +166,10 @@ interface OnboardingInteractor {
     fun onReadPrivacyNoticeClicked()
 
     /**
-     * Show the Wallpapers onboarding dialog to onboard users about the feature.
+     * Show Wallpapers onboarding dialog to onboard users about the feature if conditions are met.
+     * Returns true if the call has been passed down to the controller.
      */
-    fun showWallpapersOnboardingDialog()
+    fun showWallpapersOnboardingDialog(state: AppState?): Boolean
 }
 
 interface CustomizeHomeIteractor {
@@ -327,8 +330,19 @@ class SessionControlInteractor(
         controller.handleReadPrivacyNoticeClicked()
     }
 
-    override fun showWallpapersOnboardingDialog() {
-        controller.handleShowWallpapersOnboardingDialog()
+    override fun showWallpapersOnboardingDialog(state: AppState?): Boolean {
+        return state?.wallpaperState?.availableWallpapers?.let { wallpapers ->
+            wallpapers.filter { wallpaper ->
+                wallpaper.thumbnailFileState == Wallpaper.ImageFileState.Downloaded
+            }.size.let { downloadedCount ->
+                downloadedCount >= WallpaperOnboardingDialogFragment.THUMBNAILS_COUNT &&
+                    downloadedCount == wallpapers.size
+            }.also { isThumbnailsDownloaded ->
+                if (isThumbnailsDownloaded) {
+                    controller.handleShowWallpapersOnboardingDialog()
+                }
+            }
+        } ?: false
     }
 
     override fun onToggleCollectionExpanded(collection: TabCollection, expand: Boolean) {

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
@@ -26,8 +26,6 @@ import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem
 import org.mozilla.fenix.onboarding.JumpBackInCFRDialog
 import org.mozilla.fenix.onboarding.SyncCFRPresenter
 import org.mozilla.fenix.utils.Settings
-import org.mozilla.fenix.wallpapers.Wallpaper
-import org.mozilla.fenix.wallpapers.WallpaperOnboardingDialogFragment
 
 // This method got a little complex with the addition of the tab tray feature flag
 // When we remove the tabs from the home screen this will get much simpler again.
@@ -234,19 +232,8 @@ class SessionControlView(
                             context.settings().showWallpaperOnboarding &&
                             !isCFRDisplayed
                         ) {
-                            val isThumbnailsDownloaded =
-                                this@SessionControlView.state?.wallpaperState?.availableWallpapers?.let {
-                                    it.filter { wallpaper ->
-                                        wallpaper.thumbnailFileState == Wallpaper.ImageFileState.Downloaded
-                                    }.size.run {
-                                        this >= WallpaperOnboardingDialogFragment.THUMBNAILS_COUNT &&
-                                            this == it.size
-                                    }
-                                } ?: false
-                            if (isThumbnailsDownloaded) {
-                                interactor.showWallpapersOnboardingDialog()
-                                isCFRDisplayed = true
-                            }
+                            isCFRDisplayed =
+                                interactor.showWallpapersOnboardingDialog(this@SessionControlView.state)
                         }
                     }
 

diff --git a/...pers/WallpaperOnboardingDialogFragment.kt → ...ding/WallpaperOnboardingDialogFragment.kt b/...pers/WallpaperOnboardingDialogFragment.kt → ...ding/WallpaperOnboardingDialogFragment.kt
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.fenix.wallpapers
+package org.mozilla.fenix.onboarding
 
 import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo
@@ -23,6 +23,8 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.theme.FirefoxTheme
+import org.mozilla.fenix.wallpapers.Wallpaper
+import org.mozilla.fenix.wallpapers.WallpaperOnboarding
 
 /**
  * Dialog displaying the wallpapers onboarding.

diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
@@ -196,7 +196,7 @@
 
     <dialog
         android:id="@+id/wallpaperOnboardingDialogFragment"
-        android:name="org.mozilla.fenix.wallpapers.WallpaperOnboardingDialogFragment" />
+        android:name="org.mozilla.fenix.onboarding.WallpaperOnboardingDialogFragment" />
 
     <dialog
         android:id="@+id/searchDialogFragment"