π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Keep collapsing header actions full size
Neeraj Gupta0cd1575e3350
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/CollapsingPage.kt b/android/packages/components/src/main/kotlin/io/ente/components/CollapsingPage.ktindex 379d7af125..844cc6e5cd 100644--- a/android/packages/components/src/main/kotlin/io/ente/components/CollapsingPage.kt+++ b/android/packages/components/src/main/kotlin/io/ente/components/CollapsingPage.kt@@ -119,6 +119,8 @@ public fun CollapsingPage(val progress = (offset / extent).coerceIn(0f, 1f)val eased = HeaderEaseInOut.transform(progress)val titleTop = contentTop + ((toolbarHeight - collapsedTitleHeight) / 2 - contentTop) * eased+ val currentTitleHeight = titleHeight + (collapsedTitleHeight - titleHeight) * eased+ val rowHeight = maxOf(toolbarHeight, currentTitleHeight)Column(modifier.fillMaxSize().background(palette.background).nestedScroll(scroll)) {Box(Modifier.fillMaxWidth().height(expandedHeight - expansion * progress).clipToBounds()) {IconAction(@@ -135,10 +137,10 @@ public fun CollapsingPage(}Row(Modifier.fillMaxWidth()- .offset(y = titleTop)- .height(titleHeight + (collapsedTitleHeight - titleHeight) * eased)+ .offset(y = titleTop - (rowHeight - currentTitleHeight) / 2)+ .height(rowHeight).padding(start = EnteSpacing.lg + 36.dp * eased, end = EnteSpacing.lg),- verticalAlignment = Alignment.Top,+ verticalAlignment = Alignment.CenterVertically,horizontalArrangement = Arrangement.spacedBy(EnteSpacing.sm),) {HeaderTitle(@@ -146,6 +148,7 @@ public fun CollapsingPage(eyebrow,eased,Modifier.weight(1f)+ .height(currentTitleHeight).semantics(mergeDescendants = true) { heading() }.then(identifier?.let { Modifier.testTag("$it.title") } ?: Modifier),)diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/CollapsingPage.swift b/apple/packages/EnteComponents/Sources/EnteComponents/CollapsingPage.swiftindex 0e567f25c9..42b42d08fd 100644--- a/apple/packages/EnteComponents/Sources/EnteComponents/CollapsingPage.swift+++ b/apple/packages/EnteComponents/Sources/EnteComponents/CollapsingPage.swift@@ -92,6 +92,10 @@ private struct CollapsingHeader<Actions: View>: View {metrics.contentTop+ ((metrics.toolbarHeight - metrics.collapsedTitleHeight) / 2 - metrics.contentTop)* eased+ let titleHeight =+ metrics.expandedTitleHeight+ + (metrics.collapsedTitleHeight - metrics.expandedTitleHeight) * eased+ let rowHeight = max(metrics.toolbarHeight, titleHeight)ZStack(alignment: .topLeading) {IconAction(kind: .unfilled, size: 48, action: back) {Glyph.back.image.resizable().scaledToFit()@@ -102,22 +106,19 @@ private struct CollapsingHeader<Actions: View>: View {.padding(.leading, 4).accessibilityLabel(backLabel).accessibilityIdentifier(identifier.map { "\($0).back" } ?? "")- HStack(alignment: .top, spacing: EnteSpacing.sm) {+ HStack(spacing: EnteSpacing.sm) {titleView(progress: eased).frame(maxWidth: .infinity, alignment: .leading)- .frame(- height: metrics.expandedTitleHeight- + (metrics.collapsedTitleHeight - metrics.expandedTitleHeight) * eased,- alignment: .top- )+ .frame(height: titleHeight, alignment: .top).accessibilityElement(children: .combine).accessibilityAddTraits(.isHeader).accessibilityIdentifier(identifier.map { "\($0).title" } ?? "")actions}+ .frame(height: rowHeight).padding(.leading, EnteSpacing.lg + 36 * eased).padding(.trailing, EnteSpacing.lg)- .offset(y: titleTop)+ .offset(y: titleTop - (rowHeight - titleHeight) / 2)if let subtitle {Text(subtitle).font(EnteTypography.mini)