From 7204aa5081cf28abe385ac2048af830a89c53612 Mon Sep 17 00:00:00 2001 From: mike a Date: Fri, 9 Sep 2022 12:16:59 -0700 Subject: [PATCH] [fenix] Closes https://github.com/mozilla-mobile/fenix/issues/26750: add ktlintFormat changes --- .../home/sessioncontrol/SessionControlController.kt | 2 +- .../fenix/home/sessioncontrol/SessionControlView.kt | 8 ++++---- .../onboarding/WallpaperOnboardingDialogFragment.kt | 4 ++-- .../fenix/settings/wallpaper/WallpaperSettings.kt | 1 - .../mozilla/fenix/wallpapers/WallpaperOnboarding.kt | 12 ++++++------ 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt index 5d6db7a160..fbbebe4b95 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt @@ -515,7 +515,7 @@ class DefaultSessionControlController( ) { navController.nav( R.id.homeFragment, - HomeFragmentDirections.actionGlobalWallpaperOnboardingDialog() + HomeFragmentDirections.actionGlobalWallpaperOnboardingDialog(), ) return true } 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 index 0c5ebe4830..d1c40b8adf 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt @@ -218,9 +218,9 @@ class SessionControlView( if (!featureRecommended && !context.settings().showHomeOnboardingDialog) { if (!context.settings().showHomeOnboardingDialog && ( - context.settings().showSyncCFR || - context.settings().shouldShowJumpBackInCFR - ) + context.settings().showSyncCFR || + context.settings().shouldShowJumpBackInCFR + ) ) { featureRecommended = HomeCFRPresenter( context = context, @@ -233,7 +233,7 @@ class SessionControlView( !featureRecommended ) { featureRecommended = interactor.showWallpapersOnboardingDialog( - context.components.appStore.state.wallpaperState + context.components.appStore.state.wallpaperState, ) } } 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 8070ce4c78..1986500fe6 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt @@ -59,7 +59,7 @@ class WallpaperOnboardingDialogFragment : BottomSheetDialogFragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View = ComposeView(requireContext()).apply { setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) @@ -85,7 +85,7 @@ class WallpaperOnboardingDialogFragment : BottomSheetDialogFragment() { loadWallpaperResource = { wallpaperUseCases.loadThumbnail(it) }, onSelectWallpaper = { coroutineScope.launch { wallpaperUseCases.selectWallpaper(it) } - } + }, ) } } 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 2ce976b4ae..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 @@ -7,7 +7,6 @@ package org.mozilla.fenix.settings.wallpaper import android.annotation.SuppressLint import android.graphics.Bitmap import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image import androidx.compose.foundation.border import androidx.compose.foundation.clickable 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 d0bd723b9b..6a2dc9afad 100644 --- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt +++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt @@ -57,11 +57,11 @@ fun WallpaperOnboarding( ) { Surface( color = FirefoxTheme.colors.layer2, - shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp) + shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp), ) { Column( modifier = Modifier.padding(16.dp), - horizontalAlignment = Alignment.CenterHorizontally + horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( painter = painterResource(id = R.drawable.mozac_ic_close), @@ -70,7 +70,7 @@ fun WallpaperOnboarding( modifier = Modifier .clickable { onCloseClicked() } .size(24.dp) - .align(Alignment.End) + .align(Alignment.End), ) Spacer(modifier = Modifier.height(8.dp)) @@ -100,14 +100,14 @@ fun WallpaperOnboarding( selectedWallpaper = currentWallpaper, onSelectWallpaper = { onSelectWallpaper(it) }, verticalPadding = 16, - horizontalPadding = 0 + horizontalPadding = 0, ) TextButton( modifier = Modifier .align(Alignment.CenterHorizontally) .fillMaxWidth(), - onClick = { onBottomButtonClicked() } + onClick = { onBottomButtonClicked() }, ) { Text( text = stringResource(R.string.wallpapers_onboarding_dialog_explore_more_button_text), @@ -135,7 +135,7 @@ private fun WallpaperSnackbarPreview() { onCloseClicked = {}, onBottomButtonClicked = {}, loadWallpaperResource = { null }, - onSelectWallpaper = {} + onSelectWallpaper = {}, ) } }