Skip to content

Bug 2021398 - Refined s2s gradient #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fmasalha wants to merge 1 commit into from
Closed

Bug 2021398 - Refined s2s gradient #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ...ature/summarize/src/main/java/mozilla/components/feature/summarize/SummarizationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
import mozilla.components.compose.base.modifier.thenConditional
import mozilla.components.compose.base.theme.AcornTheme
import mozilla.components.feature.summarize.ui.DownloadError
Expand Down Expand Up @@ -111,7 +111,9 @@ private fun SummarizationScreen(
},
)
}
is SummarizationState.Summarizing -> SummarizingContent()
is SummarizationState.Summarizing -> SummarizingContent(
modifier = Modifier.height(252.dp),
)
is SummarizationState.Summarized -> SummarizedContent(
text = state.text,
modifier = Modifier.verticalScroll(rememberScrollState())
Expand Down Expand Up @@ -194,16 +196,18 @@ private class SummarizationStatePreviewProvider : PreviewParameterProvider<Summa
)
}

@Preview
@FlexibleWindowLightDarkPreview
@Composable
private fun SummarizationScreenPreview(
@PreviewParameter(SummarizationStatePreviewProvider::class) state: SummarizationState,
) {
SummarizationScreen(
store = SummarizationStore(
initialState = state,
reducer = ::summarizationReducer,
middleware = listOf(),
),
)
AcornTheme {
SummarizationScreen(
store = SummarizationStore(
initialState = state,
reducer = ::summarizationReducer,
middleware = listOf(),
),
)
}
}
95 changes: 71 additions & 24 deletions ...ure/summarize/src/main/java/mozilla/components/feature/summarize/ui/SummarizingContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,115 @@
package mozilla.components.feature.summarize.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredHeight
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import mozilla.components.compose.base.annotation.FlexibleWindowLightDarkPreview
import mozilla.components.compose.base.theme.AcornTheme
import mozilla.components.feature.summarize.R
import mozilla.components.feature.summarize.ui.gradient.summaryLoadingGradient
import mozilla.components.ui.icons.R as iconsR

private const val DRAG_HANDLE_CORNER_RATIO = 50

/**
* Content shown while a page summary is being generated.
* Displays the animated gradient background with centered loading text.
* Displays a Firefox logo icon and loading text over the animated gradient background.
*/
@Composable
internal fun SummarizingContent(
modifier: Modifier = Modifier,
title: String = stringResource(R.string.mozac_feature_summarize_loading_title),
) {
Box(
contentAlignment = Alignment.Center,
Column(
modifier = modifier
.fillMaxWidth()
.padding(top = 80.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(10.dp),
) {
val contentColor = if (isSystemInDarkTheme()) {
MaterialTheme.colorScheme.onSurface
} else {
MaterialTheme.colorScheme.onPrimary
}

Icon(
painter = painterResource(id = iconsR.drawable.mozac_ic_logo_firefox_24),
contentDescription = null,
modifier = Modifier.size(48.dp),
tint = contentColor,
)

Text(
text = title,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.onSurface,
fontSize = 20.sp,
fontWeight = FontWeight.Medium,
lineHeight = 24.sp,
letterSpacing = 0.15.sp,
color = contentColor.copy(alpha = 0.5f),
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold,
lineHeight = 21.sp,
letterSpacing = (-0.31).sp,
)
}
}

@Preview(showBackground = true, heightDp = 800)
@FlexibleWindowLightDarkPreview
@Composable
private fun SummarizingContentPreview() {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.surfaceVariant),
contentAlignment = Alignment.BottomCenter,
) {
Surface(
AcornTheme {
Box(
modifier = Modifier
.fillMaxWidth()
.height(400.dp),
shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
.fillMaxSize()
.background(MaterialTheme.colorScheme.surfaceVariant),
contentAlignment = Alignment.BottomCenter,
) {
SummarizingContent()
Surface(
modifier = Modifier
.fillMaxWidth()
.height(336.dp),
shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
) {
Box(modifier = Modifier.fillMaxSize().summaryLoadingGradient()) {
Column(modifier = Modifier.fillMaxWidth()) {
Box(
modifier = Modifier.fillMaxWidth().requiredHeight(36.dp),
contentAlignment = Alignment.Center,
) {
Box(
modifier = Modifier
.requiredSize(width = 32.dp, height = 4.dp)
.background(
color = MaterialTheme.colorScheme.outline,
shape = RoundedCornerShape(DRAG_HANDLE_CORNER_RATIO),
),
)
}
SummarizingContent()
}
}
}
}
}
}
Loading