ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Closes #26750: add ktlintFormat changes" 

This reverts commit 0ff140193b.
This commit is contained in:
Christian Sadilek 2022-09-11 09:57:53 -04:00 committed by Ryan VanderMeulen
parent 29a36d5e9a
commit 8dd326f9f2
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
View File

@ -515,7 +515,7 @@ class DefaultSessionControlController(
) {
navController.nav(
R.id.homeFragment,
HomeFragmentDirections.actionGlobalWallpaperOnboardingDialog(),
HomeFragmentDirections.actionGlobalWallpaperOnboardingDialog()
)
return true
}

8
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt
View File

@ -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
)
}
}

4
app/src/main/java/org/mozilla/fenix/onboarding/WallpaperOnboardingDialogFragment.kt
View File

@ -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) }
},
}
)
}
}

1
app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettings.kt
View File

@ -7,6 +7,7 @@ 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

12
app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt
View File

@ -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 = {}
)
}
}