From 3e06f5b0caec4bc5cdabddb79e01858599f441c3 Mon Sep 17 00:00:00 2001 From: Christian Sadilek Date: Sun, 11 Sep 2022 09:57:53 -0400 Subject: [PATCH] [fenix] Revert "Closes https://github.com/mozilla-mobile/fenix/issues/26750: pr review changes" This reverts commit 013c9beaa36741d005b363cfedc7f2412906449e. --- .../home/sessioncontrol/SessionControlInteractor.kt | 2 +- .../onboarding/WallpaperOnboardingDialogFragment.kt | 4 ++-- .../fenix/settings/wallpaper/WallpaperSettings.kt | 6 +++--- .../mozilla/fenix/wallpapers/WallpaperOnboarding.kt | 10 +++++----- 4 files changed, 11 insertions(+), 11 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 index 82a84e74ee..793bbe1cbf 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt @@ -169,7 +169,7 @@ interface OnboardingInteractor { * Returns true if the call has been passed down to the controller. * * @param state The wallpaper state. - * @return Whether the onboarding dialog is currently shown. + * @return Whether the onboarding dialog is currently shown */ fun showWallpapersOnboardingDialog(state: WallpaperState): Boolean } diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt index 0108e8f215..1986500fe6 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt @@ -66,7 +66,7 @@ class WallpaperOnboardingDialogFragment : BottomSheetDialogFragment() { setContent { FirefoxTheme { val wallpapers = appStore.observeAsComposableState { state -> - state.wallpaperState.availableWallpapers.take(THUMBNAILS_COUNT) + state.wallpaperState.availableWallpapers.subList(0, THUMBNAILS_COUNT) }.value ?: listOf() val currentWallpaper = appStore.observeAsComposableState { state -> state.wallpaperState.currentWallpaper @@ -78,7 +78,7 @@ class WallpaperOnboardingDialogFragment : BottomSheetDialogFragment() { wallpapers = wallpapers, currentWallpaper = currentWallpaper, onCloseClicked = { dismiss() }, - onExploreMoreButtonClicked = { + onBottomButtonClicked = { val directions = NavGraphDirections.actionGlobalWallpaperSettingsFragment() findNavController().navigate(directions) }, diff --git a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt index b74cf59e29..3a21086a15 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt @@ -90,8 +90,8 @@ fun WallpaperSettings( WallpaperThumbnails( wallpapers = wallpapers, defaultWallpaper = defaultWallpaper, - selectedWallpaper = selectedWallpaper, loadWallpaperResource = loadWallpaperResource, + selectedWallpaper = selectedWallpaper, onSelectWallpaper = { updatedWallpaper -> coroutineScope.launch { scaffoldState.snackbarHostState.showSnackbar( @@ -154,10 +154,10 @@ private fun WallpaperSnackbar( fun WallpaperThumbnails( wallpapers: List, defaultWallpaper: Wallpaper, - selectedWallpaper: Wallpaper, loadWallpaperResource: suspend (Wallpaper) -> Bitmap?, - onSelectWallpaper: (Wallpaper) -> Unit, + selectedWallpaper: Wallpaper, numColumns: Int = 3, + onSelectWallpaper: (Wallpaper) -> Unit, verticalPadding: Int = 30, horizontalPadding: Int = 20, ) { diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt index 05003c6404..6a2dc9afad 100644 --- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt +++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt @@ -40,7 +40,7 @@ import org.mozilla.fenix.theme.Theme * @param currentWallpaper The currently selected wallpaper. * @param loadWallpaperResource Callback to handle loading a wallpaper bitmap. Only optional in the default case. * @param onCloseClicked Callback for when the close button is clicked. - * @param onExploreMoreButtonClicked Callback for when the bottom text button is clicked. + * @param onBottomButtonClicked Callback for when the bottom text button is clicked. * @param onSelectWallpaper Callback for when a new wallpaper is selected. */ @@ -52,7 +52,7 @@ fun WallpaperOnboarding( currentWallpaper: Wallpaper, loadWallpaperResource: suspend (Wallpaper) -> Bitmap?, onCloseClicked: () -> Unit, - onExploreMoreButtonClicked: () -> Unit, + onBottomButtonClicked: () -> Unit, onSelectWallpaper: (Wallpaper) -> Unit, ) { Surface( @@ -96,8 +96,8 @@ fun WallpaperOnboarding( WallpaperThumbnails( wallpapers = wallpapers, defaultWallpaper = Wallpaper.Default, - selectedWallpaper = currentWallpaper, loadWallpaperResource = { loadWallpaperResource(it) }, + selectedWallpaper = currentWallpaper, onSelectWallpaper = { onSelectWallpaper(it) }, verticalPadding = 16, horizontalPadding = 0, @@ -107,7 +107,7 @@ fun WallpaperOnboarding( modifier = Modifier .align(Alignment.CenterHorizontally) .fillMaxWidth(), - onClick = { onExploreMoreButtonClicked() }, + onClick = { onBottomButtonClicked() }, ) { Text( text = stringResource(R.string.wallpapers_onboarding_dialog_explore_more_button_text), @@ -133,7 +133,7 @@ private fun WallpaperSnackbarPreview() { wallpapers = listOf(Wallpaper.Default), currentWallpaper = Wallpaper.Default, onCloseClicked = {}, - onExploreMoreButtonClicked = {}, + onBottomButtonClicked = {}, loadWallpaperResource = { null }, onSelectWallpaper = {}, )