This repository has been archived by the owner on Feb 20, 2023. It is now read-only.
Closes #26750: add Wallpapers Onboarding dialog #26758
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -199,28 +199,43 @@ class SessionControlView( | |
|
|
||
| val view: RecyclerView = containerView as RecyclerView | ||
|
|
||
| // We want to limit feature recommendations to one per HomePage visit. | ||
| var featureRecommended = false | ||
|
|
||
| private val sessionControlAdapter = SessionControlAdapter( | ||
| interactor, | ||
| viewLifecycleOwner, | ||
| containerView.context.components, | ||
| ) | ||
|
|
||
| init { | ||
| @Suppress("NestedBlockDepth") | ||
| view.apply { | ||
| adapter = sessionControlAdapter | ||
| layoutManager = object : LinearLayoutManager(containerView.context) { | ||
| override fun onLayoutCompleted(state: RecyclerView.State?) { | ||
| super.onLayoutCompleted(state) | ||
|
|
||
| if (!featureRecommended && !context.settings().showHomeOnboardingDialog) { | ||
|
There was a problem hiding this comment. Wouldn't There was a problem hiding this comment. yes, it will be. but There was a problem hiding this comment. I think in general there is a future opportunity to solidify our work around when different onboarding items are shown. That said, I think this solution would work for now given the details @mavduevskiy has listed and our time constraints. |
||
| if (!context.settings().showHomeOnboardingDialog && ( | ||
| context.settings().showSyncCFR || | ||
| context.settings().shouldShowJumpBackInCFR | ||
| ) | ||
| ) { | ||
| featureRecommended = HomeCFRPresenter( | ||
| context = context, | ||
| recyclerView = view, | ||
| ).show() | ||
| } | ||
|
|
||
| if (!context.settings().shouldShowJumpBackInCFR && | ||
| context.settings().showWallpaperOnboarding && | ||
| !featureRecommended | ||
| ) { | ||
| featureRecommended = interactor.showWallpapersOnboardingDialog( | ||
| context.components.appStore.state.wallpaperState, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // We want some parts of the home screen UI to be rendered first if they are | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * 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.onboarding | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.content.pm.ActivityInfo | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.compose.material.ExperimentalMaterialApi | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.ui.platform.ComposeView | ||
| import androidx.compose.ui.platform.ViewCompositionStrategy | ||
| import androidx.navigation.fragment.findNavController | ||
| import com.google.android.material.bottomsheet.BottomSheetDialogFragment | ||
| import kotlinx.coroutines.launch | ||
| import mozilla.components.lib.state.ext.observeAsComposableState | ||
| import org.mozilla.fenix.NavGraphDirections | ||
| 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. | ||
| */ | ||
| @OptIn(ExperimentalMaterialApi::class) | ||
| class WallpaperOnboardingDialogFragment : BottomSheetDialogFragment() { | ||
| private val appStore by lazy { | ||
| requireComponents.appStore | ||
| } | ||
|
|
||
| private val wallpaperUseCases by lazy { | ||
| requireComponents.useCases.wallpaperUseCases | ||
| } | ||
|
|
||
| @SuppressLint("SourceLockedOrientationActivity") | ||
MatthewTighe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setStyle(STYLE_NO_TITLE, R.style.WallpaperOnboardingDialogStyle) | ||
| activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT | ||
| } | ||
|
|
||
| override fun onDestroy() { | ||
| super.onDestroy() | ||
| activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED | ||
MatthewTighe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
| requireContext().settings().showWallpaperOnboarding = false | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle?, | ||
| ): View = ComposeView(requireContext()).apply { | ||
| setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) | ||
|
|
||
| setContent { | ||
| FirefoxTheme { | ||
| val wallpapers = appStore.observeAsComposableState { state -> | ||
| state.wallpaperState.availableWallpapers.subList(0, THUMBNAILS_COUNT) | ||
|
There was a problem hiding this comment. nit: |
||
| }.value ?: listOf() | ||
| val currentWallpaper = appStore.observeAsComposableState { state -> | ||
| state.wallpaperState.currentWallpaper | ||
| }.value ?: Wallpaper.Default | ||
|
|
||
| val coroutineScope = rememberCoroutineScope() | ||
|
|
||
| WallpaperOnboarding( | ||
| wallpapers = wallpapers, | ||
| currentWallpaper = currentWallpaper, | ||
| onCloseClicked = { dismiss() }, | ||
| onBottomButtonClicked = { | ||
| val directions = NavGraphDirections.actionGlobalWallpaperSettingsFragment() | ||
| findNavController().navigate(directions) | ||
| }, | ||
| loadWallpaperResource = { wallpaperUseCases.loadThumbnail(it) }, | ||
| onSelectWallpaper = { | ||
| coroutineScope.launch { wallpaperUseCases.selectWallpaper(it) } | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val THUMBNAILS_COUNT = 6 | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Add a new line above to separate the description and @param