Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Add menu rows, property rows and sheet headers

Neeraj Gupta4ed4f8b84913
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/MenuRow.kt b/android/packages/components/src/main/kotlin/io/ente/components/MenuRow.kt
new file mode 100644
index 0000000000..b8aee1268d
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/MenuRow.kt
@@ -0,0 +1,126 @@
+package io.ente.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.selected
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun MenuRow(
+ title: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ subtitle: String? = null,
+ selected: Boolean? = null,
+ showsChevron: Boolean = false,
+ enabled: Boolean = true,
+ leading: @Composable (() -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ val interactionSource = remember { MutableInteractionSource() }
+ val pressed by interactionSource.collectIsPressedAsState()
+ val background by
+ animateColorAsState(
+ targetValue = if (pressed && enabled) palette.fillDarker else palette.surface,
+ animationSpec = tween(EnteMotion.quick),
+ label = "menuRowBackground",
+ )
+ val hasSubtitle = !subtitle.isNullOrEmpty()
+
+ Row(
+ modifier
+ .fillMaxWidth()
+ .heightIn(min = 58.dp)
+ .background(background)
+ .clickable(
+ enabled = enabled,
+ role = Role.Button,
+ interactionSource = interactionSource,
+ indication = null,
+ onClick = onClick,
+ )
+ .semantics { selected?.let { this.selected = it } }
+ .padding(
+ start = if (leading == null) EnteSpacing.lg else EnteSpacing.md,
+ end = EnteSpacing.md,
+ top = 9.dp,
+ bottom = 9.dp,
+ ),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(EnteSpacing.md),
+ ) {
+ leading?.let {
+ CompositionLocalProvider(LocalContentColor provides palette.mutedText) {
+ Box(Modifier.size(36.dp), contentAlignment = Alignment.Center) { it() }
+ }
+ }
+ Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(EnteSpacing.xs)) {
+ Text(
+ title,
+ maxLines = if (hasSubtitle) 1 else 2,
+ overflow = TextOverflow.Ellipsis,
+ style = EnteTypography.body,
+ color = if (enabled) palette.text else palette.disabledText,
+ )
+ if (!subtitle.isNullOrEmpty()) {
+ Text(
+ subtitle,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis,
+ style = EnteTypography.mini,
+ color = palette.mutedText,
+ )
+ }
+ }
+ if (selected == true || showsChevron) {
+ Row(
+ Modifier.defaultMinSize(minWidth = 36.dp, minHeight = 36.dp),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ if (selected == true) {
+ Icon(Icons.Default.Check, null, Modifier.size(24.dp), tint = palette.primary)
+ }
+ if (showsChevron) {
+ if (selected == true) Spacer(Modifier.width(EnteSpacing.xs))
+ Icon(
+ Icons.AutoMirrored.Filled.KeyboardArrowRight,
+ null,
+ Modifier.size(24.dp),
+ tint = palette.mutedText,
+ )
+ }
+ }
+ }
+ }
+}
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Rows.kt b/android/packages/components/src/main/kotlin/io/ente/components/Rows.kt
index 5ca70f3473..6b82867a62 100644
--- a/android/packages/components/src/main/kotlin/io/ente/components/Rows.kt
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Rows.kt
@@ -1,5 +1,6 @@
package io.ente.components
+import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -20,6 +21,7 @@ import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
@@ -78,6 +80,31 @@ public fun MenuGroup(modifier: Modifier = Modifier, content: @Composable () -> U
}
}
+@Composable
+public fun PropertyRow(label: String, value: String, modifier: Modifier = Modifier) {
+ val palette = LocalEntePalette.current
+ Row(
+ modifier.fillMaxWidth().heightIn(min = 48.dp).padding(EnteSpacing.md).semantics(
+ mergeDescendants = true
+ ) {},
+ horizontalArrangement = Arrangement.spacedBy(EnteSpacing.md),
+ ) {
+ Text(
+ label,
+ Modifier.weight(1f).alignByBaseline(),
+ style = EnteTypography.mini,
+ color = palette.mutedText,
+ )
+ Text(
+ value,
+ Modifier.weight(1f).alignByBaseline(),
+ textAlign = TextAlign.End,
+ style = EnteTypography.body,
+ color = palette.text,
+ )
+ }
+}
+
@Composable
public fun EnteDivider(modifier: Modifier = Modifier) {
HorizontalDivider(modifier, color = LocalEntePalette.current.faintBorder)
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/SheetHeader.kt b/android/packages/components/src/main/kotlin/io/ente/components/SheetHeader.kt
new file mode 100644
index 0000000000..ca54e7a92d
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/SheetHeader.kt
@@ -0,0 +1,44 @@
+package io.ente.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.sp
+
+@Composable
+public fun SheetHeader(
+ title: String,
+ modifier: Modifier = Modifier,
+ leading: @Composable (() -> Unit)? = null,
+ trailing: @Composable (() -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ CompositionLocalProvider(LocalContentColor provides palette.text) {
+ Row(
+ modifier.fillMaxWidth(),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(EnteSpacing.md),
+ ) {
+ leading?.invoke()
+ Text(
+ title,
+ Modifier.weight(1f).semantics { heading() },
+ maxLines = 1,
+ overflow = TextOverflow.Ellipsis,
+ style = sheetTitleStyle,
+ )
+ trailing?.invoke()
+ }
+ }
+}
+
+private val sheetTitleStyle = EnteTypography.bodyBold.copy(fontSize = 18.sp, lineHeight = 24.sp)
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Theme.kt b/android/packages/components/src/main/kotlin/io/ente/components/Theme.kt
index 8cb9f27a9e..ef72c83562 100644
--- a/android/packages/components/src/main/kotlin/io/ente/components/Theme.kt
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Theme.kt
@@ -48,6 +48,7 @@ public val LocalEntePalette: ProvidableCompositionLocal<Palette> = staticComposi
public object EnteSpacing {
public val xs: Dp = 4.dp
public val md: Dp = 12.dp
+ public val lg: Dp = 16.dp
public val xl: Dp = 20.dp
}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift b/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift
new file mode 100644
index 0000000000..3601b5dc88
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift
@@ -0,0 +1,89 @@
+import SwiftUI
+
+public struct MenuRow: View {
+ @Environment(\.entePalette) private var palette
+ private let title: String
+ private let subtitle: String?
+ private let image: Image?
+ private let selected: Bool?
+ private let showsChevron: Bool
+ private let action: () -> Void
+
+ public init(
+ _ title: String,
+ subtitle: String? = nil,
+ image: Image? = nil,
+ selected: Bool? = nil,
+ showsChevron: Bool = false,
+ action: @escaping () -> Void
+ ) {
+ self.title = title
+ self.subtitle = subtitle
+ self.image = image
+ self.selected = selected
+ self.showsChevron = showsChevron
+ self.action = action
+ }
+
+ public var body: some View {
+ Button(action: action) {
+ HStack(spacing: EnteSpacing.md) {
+ if let image {
+ image.resizable().scaledToFit()
+ .frame(width: 18, height: 18)
+ .frame(width: 36, height: 36)
+ .foregroundStyle(palette.mutedText)
+ .accessibilityHidden(true)
+ }
+ VStack(alignment: .leading, spacing: EnteSpacing.xs) {
+ Text(title)
+ .font(EnteTypography.body)
+ .lineLimit(subtitle?.isEmpty == false ? 1 : 2)
+ if let subtitle, !subtitle.isEmpty {
+ Text(subtitle)
+ .font(EnteTypography.mini)
+ .foregroundStyle(palette.mutedText)
+ .lineLimit(2)
+ }
+ }
+ Spacer(minLength: 0)
+ if selected == true || showsChevron {
+ HStack(spacing: EnteSpacing.xs) {
+ if selected == true {
+ Image(systemName: "checkmark")
+ .font(.system(size: 24))
+ .foregroundStyle(palette.primary)
+ }
+ if showsChevron {
+ Image(systemName: "chevron.forward")
+ .font(.system(size: 18))
+ .frame(width: 24, height: 24)
+ .foregroundStyle(palette.mutedText)
+ }
+ }
+ .frame(minWidth: 36, minHeight: 36)
+ .accessibilityHidden(true)
+ }
+ }
+ .padding(.leading, image == nil ? EnteSpacing.lg : EnteSpacing.md)
+ .padding(.trailing, EnteSpacing.md)
+ .padding(.vertical, 9)
+ .frame(minHeight: 58)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(MenuRowStyle())
+ .accessibilityAddTraits(selected == true ? .isSelected : [])
+ }
+}
+
+private struct MenuRowStyle: ButtonStyle {
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+
+ func makeBody(configuration: Configuration) -> some View {
+ configuration.label
+ .foregroundStyle(enabled ? palette.text : palette.disabledText)
+ .background(configuration.isPressed ? palette.fillDarker : palette.surface)
+ .animation(.easeOut(duration: EnteMotion.quick), value: configuration.isPressed)
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Rows.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Rows.swift
index 0c83335b61..3aab3c05ca 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/Rows.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Rows.swift
@@ -57,6 +57,34 @@ public struct MenuGroup<Content: View>: View {
}
}
+public struct PropertyRow: View {
+ @Environment(\.entePalette) private var palette
+ private let label: String
+ private let value: String
+
+ public init(_ label: String, value: String) {
+ self.label = label
+ self.value = value
+ }
+
+ public var body: some View {
+ HStack(alignment: .firstTextBaseline, spacing: EnteSpacing.md) {
+ Text(label)
+ .font(EnteTypography.mini)
+ .foregroundStyle(palette.mutedText)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ Text(value)
+ .font(EnteTypography.body)
+ .foregroundStyle(palette.text)
+ .multilineTextAlignment(.trailing)
+ .frame(maxWidth: .infinity, alignment: .trailing)
+ }
+ .padding(EnteSpacing.md)
+ .frame(minHeight: 48)
+ .accessibilityElement(children: .combine)
+ }
+}
+
public struct EnteDivider: View {
@Environment(\.entePalette) private var palette
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift b/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift
new file mode 100644
index 0000000000..0cfa375b72
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift
@@ -0,0 +1,32 @@
+import EnteFonts
+import SwiftUI
+
+public struct SheetHeader<Leading: View, Trailing: View>: View {
+ @Environment(\.entePalette) private var palette
+ private let title: String
+ private let leading: Leading
+ private let trailing: Trailing
+
+ public init(
+ _ title: String,
+ @ViewBuilder leading: () -> Leading = { EmptyView() },
+ @ViewBuilder trailing: () -> Trailing = { EmptyView() }
+ ) {
+ self.title = title
+ self.leading = leading()
+ self.trailing = trailing()
+ }
+
+ public var body: some View {
+ HStack(spacing: EnteSpacing.md) {
+ leading
+ Text(title)
+ .font(EnteFont.inter(size: 18, weight: .semibold, relativeTo: .title3))
+ .lineLimit(1)
+ .frame(maxWidth: .infinity, alignment: .leading)
+ .accessibilityAddTraits(.isHeader)
+ trailing
+ }
+ .foregroundStyle(palette.text)
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
index 29ee3730dc..d24b0e1ad5 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
@@ -61,6 +61,7 @@ public struct Palette: Sendable {
public enum EnteSpacing {
public static let xs: CGFloat = 4
public static let md: CGFloat = 12
+ public static let lg: CGFloat = 16
public static let xl: CGFloat = 20
}