Improve UI for notification permission screen in onboarding (#2660)

* Improve UI for notification permission screen in onboarding

* Update screenshots

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
Jorge Martin Espinosa 2024-04-08 10:58:37 +02:00 committed by GitHub
parent 8e2f7a35cb
commit b6ceb8c697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 129 additions and 28 deletions

View file

@ -34,6 +34,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
/**
* @param modifier Classical modifier.
* @param background optional background component.
* @param topBar optional topBar.
* @param header optional header.
* @param footer optional footer.
@ -42,6 +43,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
@Composable
fun HeaderFooterPage(
modifier: Modifier = Modifier,
background: @Composable () -> Unit = {},
topBar: @Composable () -> Unit = {},
header: @Composable () -> Unit = {},
footer: @Composable () -> Unit = {},
@ -51,25 +53,28 @@ fun HeaderFooterPage(
modifier = modifier,
topBar = topBar,
) { padding ->
Column(
modifier = Modifier
.padding(padding)
.consumeWindowInsets(padding)
.padding(all = 20.dp),
) {
// Header
header()
// Content
Box {
background()
Column(
modifier = Modifier
.weight(1f)
.fillMaxWidth(),
.padding(all = 20.dp)
.padding(padding)
.consumeWindowInsets(padding)
) {
content()
}
// Footer
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
footer()
// Header
header()
// Content
Column(
modifier = Modifier
.weight(1f)
.fillMaxWidth(),
) {
content()
}
// Footer
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
footer()
}
}
}
}

View file

@ -0,0 +1,86 @@
/*
* Copyright (c) 2024 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.element.android.libraries.designsystem.components
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.BlendMode
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.LinearGradientShader
import androidx.compose.ui.graphics.ShaderBrush
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight
/**
* Gradient background for FTUE (onboarding) screens.
*/
@Suppress("ModifierMissing")
@Composable
fun OnboardingBackground() {
Box(modifier = Modifier.fillMaxSize()) {
val isLightTheme = ElementTheme.isLightTheme
Canvas(
modifier = Modifier
.fillMaxWidth()
.height(220.dp)
.align(Alignment.BottomCenter)
) {
val gradientBrush = ShaderBrush(
LinearGradientShader(
from = Offset(0f, size.height / 2f),
to = Offset(size.width, size.height / 2f),
colors = listOf(
Color(0xFF0DBDA8),
if (isLightTheme) Color(0xC90D5CBD) else Color(0xFF0D5CBD),
)
)
)
val eraseBrush = ShaderBrush(
LinearGradientShader(
from = Offset(size.width / 2f, 0f),
to = Offset(size.width / 2f, size.height * 2f),
colors = listOf(
Color(0xFF000000),
Color(0x00000000),
)
)
)
drawWithLayer {
drawRect(brush = gradientBrush, size = size)
drawRect(brush = gradientBrush, size = size, blendMode = BlendMode.Overlay)
drawRect(brush = eraseBrush, size = size, blendMode = BlendMode.DstOut)
}
}
}
}
@PreviewsDayNight
@Composable
internal fun OnboardingBackgroundPreview() {
ElementPreview {
OnboardingBackground()
}
}