Skip to content

armgit / ente

Public Imported from GitHub
0

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

Expand shared UI components

Neeraj Gupta357bad86c2af
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Avatar.kt b/android/packages/components/src/main/kotlin/io/ente/components/Avatar.kt
new file mode 100644
index 0000000000..dcc1fafe4c
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Avatar.kt
@@ -0,0 +1,88 @@
+package io.ente.components
+
+import android.icu.text.BreakIterator
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import java.util.Locale
+
+@Composable
+public fun Avatar(
+ name: String,
+ modifier: Modifier = Modifier,
+ identity: String = name,
+ size: AvatarSize = AvatarSize.Regular,
+) {
+ val palette = LocalEntePalette.current
+ val colorIndex = remember(identity) { avatarIndex(identity) }
+ val initials = remember(name) { avatarInitials(name) }
+ val color = avatarColors(palette)[colorIndex]
+ Box(
+ modifier =
+ modifier
+ .size(size.dimension)
+ .clip(CircleShape)
+ .background(color)
+ .border(size.border, palette.background, CircleShape),
+ contentAlignment = Alignment.Center,
+ ) {
+ Text(initials, style = size.textStyle, color = Color.White)
+ }
+}
+
+public enum class AvatarSize(
+ internal val dimension: Dp,
+ internal val border: Dp,
+ internal val textStyle: TextStyle,
+) {
+ ExtraSmall(16.dp, 1.dp, EnteTypography.avatarExtraSmall),
+ Small(20.dp, 1.dp, EnteTypography.avatarSmall),
+ Regular(24.dp, 1.dp, EnteTypography.mini),
+ Medium(28.dp, 1.dp, EnteTypography.mini),
+ Large(32.dp, 2.dp, EnteTypography.mini),
+ Contact(56.dp, 2.dp, EnteTypography.heading2),
+}
+
+private fun avatarColors(palette: Palette) =
+ listOf(
+ palette.caution,
+ palette.primary,
+ Color(0xFFF24822),
+ Color(0xFFDF61BB),
+ Color(0xFF9610D6),
+ Color(0xFF1071FF),
+ Color(0xFF00B8D4),
+ )
+
+private fun avatarIndex(identity: String): Int {
+ var hash = 0x811c9dc5L
+ identity.trim().lowercase(Locale.ROOT).toByteArray(Charsets.UTF_8).forEach { byte ->
+ hash = (hash xor (byte.toLong() and 0xff)) * 0x01000193L and 0xffffffffL
+ }
+ return (hash % 7).toInt()
+}
+
+private val wordSeparator = Regex("\\s+")
+
+private fun avatarInitials(name: String): String {
+ val words = name.split(wordSeparator).filter(String::isNotEmpty)
+ if (words.isEmpty()) return "?"
+ val characters = BreakIterator.getCharacterInstance(Locale.ROOT)
+ fun initial(word: String): String {
+ characters.setText(word)
+ return word.substring(0, characters.next()).uppercase(Locale.ROOT)
+ }
+ return initial(words.first()) + if (words.size > 1) initial(words.last()) else ""
+}
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Banner.kt b/android/packages/components/src/main/kotlin/io/ente/components/Banner.kt
new file mode 100644
index 0000000000..0618b3cd6d
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Banner.kt
@@ -0,0 +1,97 @@
+package io.ente.components
+
+import androidx.compose.foundation.clickable
+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.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Surface
+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.Role
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun Banner(
+ title: String,
+ modifier: Modifier = Modifier,
+ onClick: (() -> Unit)? = null,
+ kind: BannerKind = BannerKind.Neutral,
+ subtitle: String? = null,
+ leading: @Composable (() -> Unit)? = null,
+ trailing: @Composable (() -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ val accent =
+ when (kind) {
+ BannerKind.Failure -> palette.danger
+ BannerKind.Information -> palette.information
+ BannerKind.Success,
+ BannerKind.Neutral -> palette.primaryDark
+ BannerKind.Warning -> palette.caution
+ }
+ val titleColor = if (kind == BannerKind.Neutral) palette.text else accent
+ val interaction =
+ if (onClick == null) Modifier else Modifier.clickable(role = Role.Button, onClick = onClick)
+
+ Surface(
+ color = palette.surface,
+ contentColor = palette.text,
+ shape = RoundedCornerShape(EnteRadius.button),
+ modifier = modifier.fillMaxWidth().defaultMinSize(minHeight = 66.dp).then(interaction),
+ ) {
+ Row(
+ modifier = Modifier.padding(horizontal = EnteSpacing.lg, vertical = EnteSpacing.md),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ leading?.let {
+ CompositionLocalProvider(LocalContentColor provides accent) {
+ Box(Modifier.size(24.dp), contentAlignment = Alignment.Center) { it() }
+ }
+ Spacer(Modifier.width(EnteSpacing.lg))
+ }
+ Column(Modifier.weight(1f)) {
+ Text(
+ title,
+ maxLines = if (subtitle == null) 2 else 1,
+ overflow = TextOverflow.Ellipsis,
+ style = EnteTypography.bodyBold,
+ color = titleColor,
+ )
+ subtitle?.let {
+ Spacer(Modifier.size(EnteSpacing.xs))
+ Text(
+ it,
+ maxLines = 2,
+ overflow = TextOverflow.Ellipsis,
+ style = EnteTypography.mini,
+ color = palette.mutedText,
+ )
+ }
+ }
+ trailing?.let {
+ Spacer(Modifier.width(EnteSpacing.md))
+ Box(Modifier.size(38.dp), contentAlignment = Alignment.Center) { it() }
+ }
+ }
+ }
+}
+
+public enum class BannerKind {
+ Failure,
+ Information,
+ Success,
+ Warning,
+ Neutral,
+}
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Chips.kt b/android/packages/components/src/main/kotlin/io/ente/components/Chips.kt
new file mode 100644
index 0000000000..a68fec3832
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Chips.kt
@@ -0,0 +1,154 @@
+package io.ente.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+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.foundation.selection.toggleable
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+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.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun FilterChip(
+ label: String,
+ selected: Boolean,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ leading: @Composable (() -> Unit)? = null,
+ trailing: @Composable (() -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ val background =
+ if (selected) {
+ if (palette.isDark) Color(0xFFF4F4F4) else Color(0xFF161616)
+ } else {
+ palette.surface
+ }
+ val foreground =
+ when {
+ selected -> palette.reverseText
+ enabled -> palette.mutedText
+ else -> palette.disabledText
+ }
+ val startPadding =
+ when {
+ leading != null && trailing == null -> EnteSpacing.md
+ trailing != null -> EnteSpacing.lg
+ else -> 18.dp
+ }
+ val endPadding =
+ when {
+ leading != null && trailing == null -> if (selected) EnteSpacing.md else EnteSpacing.lg
+ trailing != null || selected -> EnteSpacing.md
+ else -> 18.dp
+ }
+
+ Surface(
+ color = background,
+ contentColor = foreground,
+ shape = RoundedCornerShape(percent = 50),
+ modifier =
+ modifier.heightIn(min = 40.dp).toggleable(
+ value = selected,
+ enabled = enabled,
+ role = Role.Button,
+ ) {
+ onClick()
+ },
+ ) {
+ Row(
+ modifier =
+ Modifier.padding(
+ start = startPadding,
+ end = endPadding,
+ top = EnteSpacing.md,
+ bottom = EnteSpacing.md,
+ ),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ leading?.let {
+ Box(Modifier.size(16.dp), contentAlignment = Alignment.Center) { it() }
+ Spacer(Modifier.width(EnteSpacing.sm))
+ }
+ Text(label, maxLines = 1, overflow = TextOverflow.Ellipsis, style = EnteTypography.mini)
+ if (trailing != null || selected) {
+ Spacer(Modifier.width(EnteSpacing.sm))
+ if (trailing != null) {
+ Box(Modifier.size(16.dp), contentAlignment = Alignment.Center) { trailing() }
+ } else {
+ Icon(
+ painterResource(R.drawable.component_close),
+ null,
+ Modifier.size(14.dp),
+ tint = foreground,
+ )
+ }
+ }
+ }
+ }
+}
+
+@Composable
+public fun Tag(
+ label: String,
+ selected: Boolean,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+ leading: @Composable (() -> Unit)? = null,
+ trailing: @Composable (() -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ Surface(
+ color = if (selected) palette.primary else palette.surface,
+ contentColor =
+ if (selected) Color.White else if (enabled) palette.mutedText else palette.disabledText,
+ shape = RoundedCornerShape(EnteRadius.large),
+ modifier =
+ modifier.heightIn(min = 44.dp).toggleable(
+ value = selected,
+ enabled = enabled,
+ role = Role.Button,
+ ) {
+ onClick()
+ },
+ ) {
+ Row(
+ modifier =
+ Modifier.padding(
+ start = if (leading != null) EnteSpacing.md else EnteSpacing.xl,
+ end = if (trailing != null) EnteSpacing.md else EnteSpacing.xl,
+ top = EnteSpacing.md,
+ bottom = EnteSpacing.md,
+ ),
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ leading?.let {
+ Box(Modifier.size(20.dp), contentAlignment = Alignment.Center) { it() }
+ Spacer(Modifier.width(EnteSpacing.xs))
+ }
+ Text(label, maxLines = 1, overflow = TextOverflow.Ellipsis, style = EnteTypography.body)
+ trailing?.let {
+ Spacer(Modifier.width(EnteSpacing.xs))
+ Box(Modifier.size(20.dp), contentAlignment = Alignment.Center) { it() }
+ }
+ }
+ }
+}
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
index b8aee1268d..7ebdd747ca 100644
--- a/android/packages/components/src/main/kotlin/io/ente/components/MenuRow.kt
+++ b/android/packages/components/src/main/kotlin/io/ente/components/MenuRow.kt
@@ -17,9 +17,6 @@ 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
@@ -29,6 +26,7 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.selected
import androidx.compose.ui.semantics.semantics
@@ -109,12 +107,17 @@ public fun MenuRow(
verticalAlignment = Alignment.CenterVertically,
) {
if (selected == true) {
- Icon(Icons.Default.Check, null, Modifier.size(24.dp), tint = palette.primary)
+ Icon(
+ painterResource(R.drawable.component_check),
+ null,
+ Modifier.size(24.dp),
+ tint = palette.primary,
+ )
}
if (showsChevron) {
if (selected == true) Spacer(Modifier.width(EnteSpacing.xs))
Icon(
- Icons.AutoMirrored.Filled.KeyboardArrowRight,
+ painterResource(R.drawable.component_chevron),
null,
Modifier.size(24.dp),
tint = palette.mutedText,
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/PopupMenu.kt b/android/packages/components/src/main/kotlin/io/ente/components/PopupMenu.kt
new file mode 100644
index 0000000000..1b2f5c78d3
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/PopupMenu.kt
@@ -0,0 +1,81 @@
+package io.ente.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
+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.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+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.draw.clip
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.selected
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun PopupMenu(
+ modifier: Modifier = Modifier,
+ content: @Composable ColumnScope.() -> Unit,
+) {
+ val palette = LocalEntePalette.current
+ val shape = RoundedCornerShape(EnteRadius.button)
+ Column(
+ modifier
+ .width(196.dp)
+ .clip(shape)
+ .background(palette.surface)
+ .border(1.dp, palette.faintBorder, shape)
+ .verticalScroll(rememberScrollState()),
+ content = content,
+ )
+}
+
+@Composable
+public fun MenuItem(
+ title: String,
+ onClick: () -> Unit,
+ modifier: Modifier = Modifier,
+ selected: Boolean? = null,
+ enabled: Boolean = true,
+ leading: (@Composable () -> Unit)? = null,
+ trailing: (@Composable () -> Unit)? = null,
+) {
+ val palette = LocalEntePalette.current
+ Row(
+ modifier
+ .fillMaxWidth()
+ .clickable(enabled = enabled, role = Role.Button, onClick = onClick)
+ .semantics { selected?.let { this.selected = it } }
+ .heightIn(min = 52.dp)
+ .padding(horizontal = EnteSpacing.lg, vertical = 12.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(6.dp),
+ ) {
+ CompositionLocalProvider(LocalContentColor provides palette.mutedText) {
+ leading?.let { Box(Modifier.size(24.dp), contentAlignment = Alignment.Center) { it() } }
+ Text(
+ title,
+ Modifier.weight(1f),
+ style = EnteTypography.mini,
+ color = if (enabled) palette.text else palette.disabledText,
+ )
+ trailing?.invoke()
+ }
+ }
+}
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/SectionHeader.kt b/android/packages/components/src/main/kotlin/io/ente/components/SectionHeader.kt
index 146220c362..ebb4ba52ac 100644
--- a/android/packages/components/src/main/kotlin/io/ente/components/SectionHeader.kt
+++ b/android/packages/components/src/main/kotlin/io/ente/components/SectionHeader.kt
@@ -6,13 +6,12 @@ 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.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material3.Icon
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.semantics.Role
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
@@ -49,7 +48,7 @@ public fun SectionHeader(
)
if (onClick != null) {
Icon(
- Icons.AutoMirrored.Filled.KeyboardArrowRight,
+ painterResource(R.drawable.component_chevron),
null,
Modifier.size(38.dp).padding(7.dp),
tint = if (enabled) palette.mutedText else palette.disabledText,
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Selection.kt b/android/packages/components/src/main/kotlin/io/ente/components/Selection.kt
new file mode 100644
index 0000000000..cfae2cf727
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Selection.kt
@@ -0,0 +1,196 @@
+package io.ente.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+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.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.sizeIn
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.toggleable
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun Checkmark(
+ checked: Boolean,
+ onCheckedChange: ((Boolean) -> Unit)?,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+) {
+ val palette = LocalEntePalette.current
+ val fill by
+ animateColorAsState(
+ if (checked) if (enabled) palette.primary else palette.fillDarkest
+ else Color.Transparent,
+ tween(EnteMotion.quick),
+ label = "checkmarkFill",
+ )
+ val stroke = if (checked) fill else if (enabled) palette.mutedText else palette.faintBorder
+ Box(
+ modifier.then(
+ if (onCheckedChange == null) Modifier
+ else
+ Modifier.sizeIn(minWidth = 48.dp, minHeight = 48.dp)
+ .toggleable(checked, enabled, Role.Checkbox, onCheckedChange)
+ ),
+ contentAlignment = Alignment.Center,
+ ) {
+ Box(
+ Modifier.size(16.dp)
+ .clip(RoundedCornerShape(4.dp))
+ .background(fill)
+ .border(1.dp, stroke, RoundedCornerShape(4.dp)),
+ contentAlignment = Alignment.Center,
+ ) {
+ if (checked) {
+ Icon(
+ painterResource(R.drawable.component_check_rounded),
+ null,
+ Modifier.size(12.dp),
+ tint = Color.White,
+ )
+ }
+ }
+ }
+}
+
+@Composable
+public fun Radio(
+ selected: Boolean,
+ onClick: (() -> Unit)?,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+) {
+ val palette = LocalEntePalette.current
+ val active by
+ animateColorAsState(
+ if (enabled) palette.primary else palette.fillDarkest,
+ tween(EnteMotion.quick),
+ label = "radioFill",
+ )
+ Box(
+ modifier.then(
+ if (onClick == null) Modifier
+ else
+ Modifier.sizeIn(minWidth = 48.dp, minHeight = 48.dp)
+ .selectable(selected, enabled, Role.RadioButton, onClick)
+ ),
+ contentAlignment = Alignment.Center,
+ ) {
+ Box(
+ Modifier.size(16.dp)
+ .border(
+ if (selected) 2.dp else 1.dp,
+ if (selected) active else palette.border,
+ CircleShape,
+ )
+ .then(
+ if (selected)
+ Modifier.drawBehind {
+ drawCircle(active, radius = size.minDimension / 2 - 3.dp.toPx())
+ }
+ else Modifier
+ )
+ )
+ }
+}
+
+@Composable
+public fun Toggle(
+ checked: Boolean,
+ onCheckedChange: ((Boolean) -> Unit)?,
+ modifier: Modifier = Modifier,
+ enabled: Boolean = true,
+) {
+ val palette = LocalEntePalette.current
+ val shape = RoundedCornerShape(12.dp)
+ val track by
+ animateColorAsState(
+ if (checked) palette.primary else palette.fill,
+ tween(EnteMotion.quick),
+ label = "toggleTrack",
+ )
+ val thumb by
+ animateColorAsState(
+ if (checked) Color.White else palette.primary,
+ tween(EnteMotion.quick),
+ label = "toggleThumb",
+ )
+ val thumbOffset by
+ animateDpAsState(
+ if (checked) 19.dp else 3.dp,
+ tween(EnteMotion.quick),
+ label = "toggleOffset",
+ )
+ Box(
+ modifier.then(
+ if (onCheckedChange == null) Modifier
+ else
+ Modifier.sizeIn(minWidth = 48.dp, minHeight = 48.dp)
+ .toggleable(checked, enabled, Role.Switch, onCheckedChange)
+ ),
+ contentAlignment = Alignment.Center,
+ ) {
+ Box(
+ modifier =
+ Modifier.size(40.dp, 24.dp)
+ .clip(shape)
+ .background(track)
+ .border(1.dp, if (enabled) palette.primary else palette.faintBorder, shape)
+ ) {
+ Box(
+ Modifier.align(Alignment.CenterStart)
+ .padding(start = thumbOffset)
+ .size(18.dp)
+ .background(thumb, CircleShape)
+ )
+ }
+ }
+}
+
+@Composable
+public fun LabeledControl(
+ label: String,
+ modifier: Modifier = Modifier,
+ subtitle: String? = null,
+ enabled: Boolean = true,
+ control: @Composable () -> Unit,
+) {
+ val palette = LocalEntePalette.current
+ Row(
+ modifier = modifier.fillMaxWidth().sizeIn(minHeight = 48.dp),
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ control()
+ Spacer(Modifier.width(EnteSpacing.md))
+ Column(Modifier.weight(1f)) {
+ Text(
+ label,
+ style = EnteTypography.body,
+ color = if (enabled) palette.text else palette.disabledText,
+ )
+ subtitle?.let { Text(it, style = EnteTypography.mini, color = palette.mutedText) }
+ }
+ }
+}
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Sheet.kt b/android/packages/components/src/main/kotlin/io/ente/components/Sheet.kt
new file mode 100644
index 0000000000..86b44ed430
--- /dev/null
+++ b/android/packages/components/src/main/kotlin/io/ente/components/Sheet.kt
@@ -0,0 +1,63 @@
+package io.ente.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+
+@Composable
+public fun SheetContent(
+ title: String,
+ modifier: Modifier = Modifier,
+ message: String? = null,
+ back: (() -> Unit)? = null,
+ dismiss: (() -> Unit)? = null,
+ backLabel: String = "Back",
+ dismissLabel: String = "Close",
+ content: @Composable () -> Unit,
+) {
+ val palette = LocalEntePalette.current
+ Column(modifier.background(palette.background).padding(EnteSpacing.xl)) {
+ SheetHeader(
+ title,
+ leading =
+ back?.let { onBack ->
+ {
+ IconAction(onBack, kind = IconActionKind.Circular) {
+ Icon(
+ painterResource(R.drawable.component_back),
+ backLabel,
+ Modifier.size(24.dp),
+ )
+ }
+ }
+ },
+ trailing =
+ dismiss?.let { onDismiss ->
+ {
+ IconAction(onDismiss, kind = IconActionKind.Circular) {
+ Icon(
+ painterResource(R.drawable.component_close),
+ dismissLabel,
+ Modifier.size(18.dp),
+ )
+ }
+ }
+ },
+ )
+ Spacer(Modifier.height(EnteSpacing.lg))
+ if (message != null) {
+ Text(message, style = EnteTypography.body, color = palette.mutedText)
+ Spacer(Modifier.height(EnteSpacing.lg))
+ }
+ content()
+ }
+}
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 ff52f166a3..c6983c2390 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
@@ -26,19 +26,24 @@ public class Palette
internal constructor(
public val isDark: Boolean,
public val primary: Color,
+ public val primaryDark: Color,
public val primaryDarker: Color,
public val text: Color,
public val mutedText: Color,
public val hintText: Color,
public val disabledText: Color,
public val reverseText: Color,
+ public val background: Color,
public val surface: Color,
public val fill: Color,
public val fillDarker: Color,
public val fillDarkest: Color,
+ public val border: Color,
public val faintBorder: Color,
public val danger: Color,
public val dangerDarker: Color,
+ public val caution: Color,
+ public val information: Color,
)
public val LocalEntePalette: ProvidableCompositionLocal<Palette> = staticCompositionLocalOf {
@@ -47,6 +52,7 @@ public val LocalEntePalette: ProvidableCompositionLocal<Palette> = staticComposi
public object EnteSpacing {
public val xs: Dp = 4.dp
+ public val sm: Dp = 8.dp
public val md: Dp = 12.dp
public val lg: Dp = 16.dp
public val xl: Dp = 20.dp
@@ -54,6 +60,7 @@ public object EnteSpacing {
public object EnteRadius {
public val medium: Dp = 12.dp
+ public val large: Dp = 16.dp
public val button: Dp = 20.dp
}
@@ -79,6 +86,8 @@ public object EnteTypography {
public val bodyBold: TextStyle = body.copy(fontWeight = FontWeight.SemiBold)
public val heading2: TextStyle = bodyBold.copy(fontSize = 18.sp, lineHeight = 24.sp)
public val mini: TextStyle = body.copy(fontSize = 12.sp, lineHeight = 16.sp)
+ public val avatarExtraSmall: TextStyle = body.copy(fontSize = 8.sp, lineHeight = 15.sp)
+ public val avatarSmall: TextStyle = body.copy(fontSize = 10.sp, lineHeight = 15.sp)
}
@Composable
@@ -101,18 +110,28 @@ private fun palette(app: EnteApp, dark: Boolean): Palette {
return Palette(
isDark = dark,
primary = primary,
+ primaryDark =
+ when (app) {
+ EnteApp.Photos -> Color(0xFF069D1E)
+ EnteApp.Auth -> Color(0xFF7A0CAE)
+ EnteApp.Locker -> Color(0xFF0E5FD9)
+ },
primaryDarker = primaryDarker,
text = if (dark) Color.White else Color.Black,
mutedText = Color(if (dark) 0xFF999999 else 0xFF666666),
hintText = Color(0xFF969696),
disabledText = Color(if (dark) 0xFF414141 else 0xFFD6D6D6),
reverseText = if (dark) Color.Black else Color.White,
+ background = Color(if (dark) 0xFF161616 else 0xFFF4F4F4),
surface = Color(if (dark) 0xFF212121 else 0xFFFFFFFF),
fill = Color(if (dark) 0xFF0A0A0A else 0xFFEAEAEA),
fillDarker = Color(if (dark) 0xFF141414 else 0xFFDEDEDE),
fillDarkest = Color(if (dark) 0xFF292929 else 0xFFD2D2D2),
+ border = Color(if (dark) 0xFF3E3E3E else 0xFFE0E0E0),
faintBorder = Color(if (dark) 0xFF2A2A2A else 0xFFEBEBEB),
danger = Color(0xFFF63A3A),
dangerDarker = Color(0xFFC52E2E),
+ caution = Color(0xFFF08A1E),
+ information = Color(0xFF1071FF),
)
}
diff --git a/android/packages/components/src/main/res/drawable/component_back.xml b/android/packages/components/src/main/res/drawable/component_back.xml
new file mode 100644
index 0000000000..e1261a779b
--- /dev/null
+++ b/android/packages/components/src/main/res/drawable/component_back.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:autoMirrored="true">
+ <path android:pathData="M20.015625 11.015625L7.828125 11.015625L13.40625 5.390625L12 3.984375L3.984375 12L12 20.015625L13.40625 18.609375L7.828125 12.984375L20.015625 12.984375Z" android:fillColor="#FF000000"/>
+</vector>
diff --git a/android/packages/components/src/main/res/drawable/component_check.xml b/android/packages/components/src/main/res/drawable/component_check.xml
new file mode 100644
index 0000000000..73cc817f5b
--- /dev/null
+++ b/android/packages/components/src/main/res/drawable/component_check.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+ <path android:pathData="M9 16.171875L4.828125 12L3.421875 13.40625L9 18.984375L21 6.984375L19.59375 5.578125Z" android:fillColor="#FF000000"/>
+</vector>
diff --git a/android/packages/components/src/main/res/drawable/component_check_rounded.xml b/android/packages/components/src/main/res/drawable/component_check_rounded.xml
new file mode 100644
index 0000000000..a9dedb7ca2
--- /dev/null
+++ b/android/packages/components/src/main/res/drawable/component_check_rounded.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+ <path android:pathData="M9 16.171875L5.53125 12.703125C5.15625 12.328125 4.5 12.328125 4.125 12.703125C3.75 13.078125 3.75 13.734375 4.125 14.109375L8.296875 18.28125C8.671875 18.703125 9.328125 18.703125 9.703125 18.28125L20.296875 7.6875C20.671875 7.3125 20.671875 6.703125 20.296875 6.28125C19.921875 5.90625 19.265625 5.90625 18.890625 6.28125Z" android:fillColor="#FF000000"/>
+</vector>
diff --git a/android/packages/components/src/main/res/drawable/component_chevron.xml b/android/packages/components/src/main/res/drawable/component_chevron.xml
new file mode 100644
index 0000000000..ee940201b2
--- /dev/null
+++ b/android/packages/components/src/main/res/drawable/component_chevron.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" android:autoMirrored="true">
+ <path android:pathData="M9.984375 6L8.578125 7.40625L13.171875 12L8.578125 16.59375L9.984375 18L15.984375 12Z" android:fillColor="#FF000000"/>
+</vector>
diff --git a/android/packages/components/src/main/res/drawable/component_close.xml b/android/packages/components/src/main/res/drawable/component_close.xml
new file mode 100644
index 0000000000..859a2f88b3
--- /dev/null
+++ b/android/packages/components/src/main/res/drawable/component_close.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+ <path android:pathData="M18 6L6.00081 17.9992M17.9992 18L6 6.00085" android:fillColor="@android:color/transparent" android:strokeColor="#FF000000" android:strokeWidth="1.5" android:strokeLineCap="round" android:strokeLineJoin="round"/>
+</vector>
diff --git a/apple/packages/EnteComponents/Package.swift b/apple/packages/EnteComponents/Package.swift
index e1c0a649e5..63401bbc2c 100644
--- a/apple/packages/EnteComponents/Package.swift
+++ b/apple/packages/EnteComponents/Package.swift
@@ -4,10 +4,14 @@ import PackageDescription
let package = Package(
name: "EnteComponents",
- platforms: [.iOS("15.1"), .tvOS(.v16)],
+ platforms: [.iOS(.v16), .tvOS(.v16)],
products: [.library(name: "EnteComponents", targets: ["EnteComponents"])],
dependencies: [.package(path: "../EnteFonts")],
targets: [
- .target(name: "EnteComponents", dependencies: ["EnteFonts"])
+ .target(
+ name: "EnteComponents",
+ dependencies: ["EnteFonts"],
+ resources: [.process("Resources")]
+ )
]
)
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Avatar.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Avatar.swift
new file mode 100644
index 0000000000..aae882beba
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Avatar.swift
@@ -0,0 +1,88 @@
+import SwiftUI
+
+public struct Avatar: View {
+ @Environment(\.entePalette) private var palette
+ private let name: String
+ private let identity: String
+ private let size: AvatarSize
+
+ public init(_ name: String, identity: String? = nil, size: AvatarSize = .regular) {
+ self.name = name
+ self.identity = identity ?? name
+ self.size = size
+ }
+
+ public var body: some View {
+ Text(avatarInitials(name))
+ .font(size.font)
+ .foregroundStyle(Color.white)
+ .frame(width: size.dimension, height: size.dimension)
+ .background(colour)
+ .clipShape(Circle())
+ .overlay {
+ Circle().stroke(palette.background, lineWidth: size.border)
+ }
+ }
+
+ private var colour: Color {
+ [
+ palette.caution,
+ palette.primary,
+ Color(hex: 0xF24822),
+ Color(hex: 0xDF61BB),
+ Color(hex: 0x9610D6),
+ Color(hex: 0x1071FF),
+ Color(hex: 0x00B8D4),
+ ][identityHash % 7]
+ }
+
+ private var identityHash: Int {
+ Int(
+ identity.trimmingCharacters(in: .whitespacesAndNewlines).lowercased().utf8
+ .reduce(UInt32(0x811C_9DC5)) { ($0 ^ UInt32($1)) &* 0x0100_0193 })
+ }
+}
+
+private func avatarInitials(_ name: String) -> String {
+ let words = name.split(whereSeparator: { $0.isWhitespace })
+ guard let first = words.first?.first else { return "?" }
+ let initial = String(first).uppercased()
+ guard words.count > 1, let last = words.last?.first else { return initial }
+ return initial + String(last).uppercased()
+}
+
+public enum AvatarSize: Sendable {
+ case extraSmall
+ case small
+ case regular
+ case medium
+ case large
+ case contact
+
+ var dimension: CGFloat {
+ switch self {
+ case .extraSmall: 16
+ case .small: 20
+ case .regular: 24
+ case .medium: 28
+ case .large: 32
+ case .contact: 56
+ }
+ }
+
+ var font: Font {
+ switch self {
+ case .extraSmall: EnteTypography.avatarExtraSmall
+ case .small: EnteTypography.avatarSmall
+ case .regular, .medium, .large: EnteTypography.mini
+ case .contact: EnteTypography.heading2
+ }
+ }
+
+ var border: CGFloat {
+ switch self {
+ case .large, .contact: 2
+ default: 1
+ }
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Banner.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Banner.swift
new file mode 100644
index 0000000000..c2995e4a75
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Banner.swift
@@ -0,0 +1,82 @@
+import SwiftUI
+
+public enum BannerKind: Sendable {
+ case failure
+ case information
+ case success
+ case warning
+ case neutral
+}
+
+public struct Banner: View {
+ @Environment(\.entePalette) private var palette
+ private let title: String
+ private let subtitle: String?
+ private let kind: BannerKind
+ private let image: Image?
+ private let action: (() -> Void)?
+
+ public init(
+ _ title: String,
+ subtitle: String? = nil,
+ kind: BannerKind = .neutral,
+ image: Image? = nil,
+ action: (() -> Void)? = nil,
+ ) {
+ self.title = title
+ self.subtitle = subtitle
+ self.kind = kind
+ self.image = image
+ self.action = action
+ }
+
+ public var body: some View {
+ Group {
+ if let action {
+ Button(action: action) { content }
+ .buttonStyle(.plain)
+ } else {
+ content
+ }
+ }
+ .background(palette.surface)
+ .clipShape(RoundedRectangle(cornerRadius: EnteRadius.button, style: .continuous))
+ }
+
+ private var content: some View {
+ HStack(spacing: EnteSpacing.lg) {
+ if let image {
+ image.resizable().renderingMode(.template).scaledToFit()
+ .frame(width: 24, height: 24)
+ .foregroundStyle(accent)
+ .accessibilityHidden(true)
+ }
+ VStack(alignment: .leading, spacing: EnteSpacing.xs) {
+ Text(title)
+ .font(EnteTypography.bodyBold)
+ .foregroundStyle(kind == .neutral ? palette.text : accent)
+ .lineLimit(subtitle == nil ? 2 : 1)
+ if let subtitle {
+ Text(subtitle)
+ .font(EnteTypography.mini)
+ .foregroundStyle(palette.mutedText)
+ .lineLimit(2)
+ }
+ }
+ Spacer(minLength: 0)
+ }
+ .padding(.horizontal, EnteSpacing.lg)
+ .padding(.vertical, EnteSpacing.md)
+ .frame(maxWidth: .infinity, minHeight: 66, alignment: .leading)
+ .contentShape(Rectangle())
+ }
+
+ private var accent: Color {
+ switch kind {
+ case .failure: palette.danger
+ case .information: palette.information
+ case .success, .neutral: palette.primaryDark
+ case .warning: palette.caution
+ }
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Chips.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Chips.swift
new file mode 100644
index 0000000000..18a3628912
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Chips.swift
@@ -0,0 +1,96 @@
+import SwiftUI
+
+public struct FilterChip: View {
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+ private let label: String
+ private let image: Image?
+ private let selected: Bool
+ private let action: () -> Void
+
+ public init(
+ _ label: String,
+ image: Image? = nil,
+ selected: Bool,
+ action: @escaping () -> Void,
+ ) {
+ self.label = label
+ self.image = image
+ self.selected = selected
+ self.action = action
+ }
+
+ public var body: some View {
+ Button(action: action) {
+ HStack(spacing: EnteSpacing.sm) {
+ if let image {
+ image.resizable().renderingMode(.template).scaledToFit()
+ .frame(width: 16, height: 16)
+ .accessibilityHidden(true)
+ }
+ Text(label)
+ if selected {
+ Glyph.close.image.resizable().scaledToFit()
+ .frame(width: 14, height: 14)
+ .accessibilityHidden(true)
+ }
+ }
+ .font(EnteTypography.mini)
+ .lineLimit(1)
+ .padding(.leading, image == nil ? 18 : EnteSpacing.md)
+ .padding(
+ .trailing,
+ selected ? EnteSpacing.md : (image == nil ? 18 : EnteSpacing.lg),
+ )
+ .padding(.vertical, EnteSpacing.md)
+ .frame(minHeight: 40)
+ }
+ .buttonStyle(.plain)
+ .foregroundStyle(foreground)
+ .background(background)
+ .clipShape(Capsule())
+ .accessibilityAddTraits(selected ? .isSelected : [])
+ }
+
+ private var background: Color {
+ selected ? (palette.isDark ? Color(hex: 0xF4F4F4) : Color(hex: 0x161616)) : palette.surface
+ }
+
+ private var foreground: Color {
+ selected ? palette.reverseText : (enabled ? palette.mutedText : palette.disabledText)
+ }
+}
+
+public struct Tag: View {
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+ private let label: String
+ private let selected: Bool
+ private let action: () -> Void
+
+ public init(
+ _ label: String,
+ selected: Bool,
+ action: @escaping () -> Void,
+ ) {
+ self.label = label
+ self.selected = selected
+ self.action = action
+ }
+
+ public var body: some View {
+ Button(action: action) {
+ Text(label)
+ .font(EnteTypography.body)
+ .lineLimit(1)
+ .padding(.horizontal, EnteSpacing.xl)
+ .padding(.vertical, EnteSpacing.md)
+ .frame(minHeight: 44)
+ }
+ .buttonStyle(.plain)
+ .foregroundStyle(selected ? .white : (enabled ? palette.mutedText : palette.disabledText))
+ .background(selected ? palette.primary : palette.surface)
+ .clipShape(RoundedRectangle(cornerRadius: EnteRadius.large, style: .continuous))
+ .accessibilityAddTraits(selected ? .isSelected : [])
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Glyph.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Glyph.swift
new file mode 100644
index 0000000000..28f0d7e8ed
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Glyph.swift
@@ -0,0 +1,13 @@
+import SwiftUI
+
+enum Glyph: String {
+ case back
+ case chevron
+ case check
+ case checkRounded = "check-rounded"
+ case close
+
+ var image: Image {
+ Image("component-\(rawValue)", bundle: .module)
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift b/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift
index 3601b5dc88..d07ccd69b1 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/MenuRow.swift
@@ -5,7 +5,7 @@ public struct MenuRow: View {
private let title: String
private let subtitle: String?
private let image: Image?
- private let selected: Bool?
+ private let selected: Bool
private let showsChevron: Bool
private let action: () -> Void
@@ -13,7 +13,7 @@ public struct MenuRow: View {
_ title: String,
subtitle: String? = nil,
image: Image? = nil,
- selected: Bool? = nil,
+ selected: Bool = false,
showsChevron: Bool = false,
action: @escaping () -> Void
) {
@@ -47,17 +47,17 @@ public struct MenuRow: View {
}
}
Spacer(minLength: 0)
- if selected == true || showsChevron {
+ if selected || showsChevron {
HStack(spacing: EnteSpacing.xs) {
- if selected == true {
- Image(systemName: "checkmark")
- .font(.system(size: 24))
+ if selected {
+ Glyph.check.image.resizable().scaledToFit()
+ .frame(width: 24, height: 24)
.foregroundStyle(palette.primary)
}
if showsChevron {
- Image(systemName: "chevron.forward")
- .font(.system(size: 18))
+ Glyph.chevron.image.resizable().scaledToFit()
.frame(width: 24, height: 24)
+ .flipsForRightToLeftLayoutDirection(true)
.foregroundStyle(palette.mutedText)
}
}
@@ -72,7 +72,7 @@ public struct MenuRow: View {
.contentShape(Rectangle())
}
.buttonStyle(MenuRowStyle())
- .accessibilityAddTraits(selected == true ? .isSelected : [])
+ .accessibilityAddTraits(selected ? .isSelected : [])
}
}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/PopupMenu.swift b/apple/packages/EnteComponents/Sources/EnteComponents/PopupMenu.swift
new file mode 100644
index 0000000000..6f37b22c7f
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/PopupMenu.swift
@@ -0,0 +1,69 @@
+import SwiftUI
+
+public struct PopupMenu<Content: View>: View {
+ @Environment(\.entePalette) private var palette
+ private let content: Content
+
+ public init(@ViewBuilder content: () -> Content) {
+ self.content = content()
+ }
+
+ public var body: some View {
+ ViewThatFits(in: .vertical) {
+ VStack(spacing: 0) { content }.fixedSize(horizontal: false, vertical: true)
+ ScrollView { VStack(spacing: 0) { content } }
+ }
+ .frame(width: 196)
+ .background(palette.surface)
+ .clipShape(RoundedRectangle(cornerRadius: EnteRadius.button))
+ .overlay(RoundedRectangle(cornerRadius: EnteRadius.button).stroke(palette.faintBorder))
+ }
+}
+
+public struct MenuItem: View {
+ @Environment(\.entePalette) private var palette
+ private let title: String
+ private let image: Image?
+ private let trailing: String?
+ private let selected: Bool
+ private let action: () -> Void
+
+ public init(
+ _ title: String,
+ image: Image? = nil,
+ trailing: String? = nil,
+ selected: Bool = false,
+ action: @escaping () -> Void,
+ ) {
+ self.title = title
+ self.image = image
+ self.trailing = trailing
+ self.selected = selected
+ self.action = action
+ }
+
+ public var body: some View {
+ Button(action: action) {
+ HStack(spacing: 6) {
+ if let image {
+ image.resizable().renderingMode(.template).scaledToFit().frame(
+ width: 18,
+ height: 18,
+ )
+ .foregroundStyle(palette.mutedText).frame(width: 24, height: 24)
+ .accessibilityHidden(true)
+ }
+ Text(title).frame(maxWidth: .infinity, alignment: .leading)
+ if let trailing {
+ Text(trailing).foregroundStyle(palette.mutedText)
+ }
+ }
+ .font(EnteTypography.mini).foregroundStyle(palette.text)
+ .multilineTextAlignment(.leading)
+ .padding(.horizontal, EnteSpacing.lg).padding(.vertical, 12).frame(minHeight: 52)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityAddTraits(selected ? .isSelected : [])
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/Contents.json b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/Contents.json
new file mode 100644
index 0000000000..28b4318742
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images": [
+ {
+ "filename": "component-back.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "template"
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/component-back.svg b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/component-back.svg
new file mode 100644
index 0000000000..4b0d6aced7
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-back.imageset/component-back.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M20.015625 11.015625L7.828125 11.015625L13.40625 5.390625L12 3.984375L3.984375 12L12 20.015625L13.40625 18.609375L7.828125 12.984375L20.015625 12.984375Z" fill="#000000"/>
+</svg>
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/Contents.json b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/Contents.json
new file mode 100644
index 0000000000..a87da32426
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images": [
+ {
+ "filename": "component-check-rounded.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "template"
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/component-check-rounded.svg b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/component-check-rounded.svg
new file mode 100644
index 0000000000..65df88646e
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check-rounded.imageset/component-check-rounded.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M9 16.171875L5.53125 12.703125C5.15625 12.328125 4.5 12.328125 4.125 12.703125C3.75 13.078125 3.75 13.734375 4.125 14.109375L8.296875 18.28125C8.671875 18.703125 9.328125 18.703125 9.703125 18.28125L20.296875 7.6875C20.671875 7.3125 20.671875 6.703125 20.296875 6.28125C19.921875 5.90625 19.265625 5.90625 18.890625 6.28125Z" fill="#000000"/>
+</svg>
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/Contents.json b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/Contents.json
new file mode 100644
index 0000000000..fbab5c4baf
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images": [
+ {
+ "filename": "component-check.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "template"
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/component-check.svg b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/component-check.svg
new file mode 100644
index 0000000000..356b030895
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-check.imageset/component-check.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M9 16.171875L4.828125 12L3.421875 13.40625L9 18.984375L21 6.984375L19.59375 5.578125Z" fill="#000000"/>
+</svg>
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/Contents.json b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/Contents.json
new file mode 100644
index 0000000000..3310deeee6
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images": [
+ {
+ "filename": "component-chevron.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "template"
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/component-chevron.svg b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/component-chevron.svg
new file mode 100644
index 0000000000..642983bfa9
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-chevron.imageset/component-chevron.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M9.984375 6L8.578125 7.40625L13.171875 12L8.578125 16.59375L9.984375 18L15.984375 12Z" fill="#000000"/>
+</svg>
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/Contents.json b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/Contents.json
new file mode 100644
index 0000000000..accbd66b61
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/Contents.json
@@ -0,0 +1,16 @@
+{
+ "images": [
+ {
+ "filename": "component-close.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "template"
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/component-close.svg b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/component-close.svg
new file mode 100644
index 0000000000..6a07778099
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Resources/Controls.xcassets/component-close.imageset/component-close.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+ <path d="M18 6L6.00081 17.9992M17.9992 18L6 6.00085" fill="none" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/SectionHeader.swift b/apple/packages/EnteComponents/Sources/EnteComponents/SectionHeader.swift
index 81e807d468..97c7e754a4 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/SectionHeader.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/SectionHeader.swift
@@ -32,8 +32,9 @@ public struct SectionHeader: View {
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .leading)
if action != nil {
- Image(systemName: "chevron.forward")
- .font(.system(size: 18))
+ Glyph.chevron.image.resizable().scaledToFit()
+ .frame(width: 24, height: 24)
+ .flipsForRightToLeftLayoutDirection(true)
.frame(width: 38, height: 38)
.foregroundStyle(enabled ? palette.mutedText : palette.disabledText)
.accessibilityHidden(true)
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Selection.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Selection.swift
new file mode 100644
index 0000000000..f0c6c56f39
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Selection.swift
@@ -0,0 +1,160 @@
+import SwiftUI
+
+public struct Checkmark: View {
+ @Binding private var isOn: Bool
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+ private let label: String
+ private let subtitle: String?
+
+ public init(_ label: String, isOn: Binding<Bool>, subtitle: String? = nil) {
+ _isOn = isOn
+ self.label = label
+ self.subtitle = subtitle
+ }
+
+ public var body: some View {
+ let fill = isOn ? (enabled ? palette.primary : palette.fillDarkest) : .clear
+ Button {
+ isOn.toggle()
+ } label: {
+ LabeledControl(label, subtitle: subtitle) {
+ RoundedRectangle(cornerRadius: 4, style: .continuous)
+ .fill(fill)
+ .overlay {
+ RoundedRectangle(cornerRadius: 4, style: .continuous)
+ .stroke(
+ isOn ? fill : (enabled ? palette.mutedText : palette.faintBorder),
+ lineWidth: 1,
+ )
+ }
+ .overlay {
+ if isOn {
+ Glyph.checkRounded.image.resizable().scaledToFit()
+ .frame(width: 12, height: 12)
+ .foregroundStyle(.white)
+ }
+ }
+ .frame(width: 16, height: 16)
+ }
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityRepresentation {
+ Toggle(label, isOn: $isOn).toggleStyle(.automatic)
+ }
+ .accessibilityHint(subtitle ?? "")
+ }
+}
+
+public struct Radio: View {
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+ private let selected: Bool
+ private let label: String
+ private let subtitle: String?
+ private let action: () -> Void
+
+ public init(
+ _ label: String,
+ selected: Bool,
+ subtitle: String? = nil,
+ action: @escaping () -> Void,
+ ) {
+ self.selected = selected
+ self.label = label
+ self.subtitle = subtitle
+ self.action = action
+ }
+
+ public var body: some View {
+ let active = enabled ? palette.primary : palette.fillDarkest
+ Button(action: action) {
+ LabeledControl(label, subtitle: subtitle) {
+ Circle()
+ .stroke(selected ? active : palette.border, lineWidth: selected ? 2 : 1)
+ .overlay {
+ if selected {
+ Circle().fill(active).padding(3)
+ }
+ }
+ .frame(width: 16, height: 16)
+ }
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityLabel(label)
+ .accessibilityHint(subtitle ?? "")
+ .accessibilityAddTraits(selected ? .isSelected : [])
+ }
+}
+
+public struct EnteToggleStyle: ToggleStyle {
+ @Environment(\.entePalette) private var palette
+
+ public init() {}
+
+ public func makeBody(configuration: Configuration) -> some View {
+ Button {
+ configuration.isOn.toggle()
+ } label: {
+ HStack {
+ configuration.label
+ Spacer(minLength: EnteSpacing.md)
+ RoundedRectangle(cornerRadius: 16, style: .continuous)
+ .fill(configuration.isOn ? palette.primary : palette.fill)
+ .overlay {
+ Circle()
+ .fill(configuration.isOn ? palette.reverseText : palette.primary)
+ .padding(3)
+ .frame(
+ maxWidth: .infinity,
+ alignment: configuration.isOn ? .trailing : .leading,
+ )
+ }
+ .frame(width: 51, height: 31)
+ .animation(.easeInOut(duration: EnteMotion.quick), value: configuration.isOn)
+ }
+ .frame(minHeight: 44)
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityRepresentation {
+ Toggle(isOn: configuration.$isOn) { configuration.label }.toggleStyle(.automatic)
+ }
+ }
+}
+
+private struct LabeledControl<Control: View>: View {
+ @Environment(\.entePalette) private var palette
+ @Environment(\.isEnabled) private var enabled
+ private let label: String
+ private let subtitle: String?
+ private let control: Control
+
+ init(
+ _ label: String,
+ subtitle: String? = nil,
+ @ViewBuilder control: () -> Control,
+ ) {
+ self.label = label
+ self.subtitle = subtitle
+ self.control = control()
+ }
+
+ var body: some View {
+ HStack(spacing: EnteSpacing.md) {
+ control
+ VStack(alignment: .leading, spacing: 0) {
+ Text(label)
+ .font(EnteTypography.body)
+ .foregroundStyle(enabled ? palette.text : palette.disabledText)
+ if let subtitle {
+ Text(subtitle)
+ .font(EnteTypography.mini)
+ .foregroundStyle(palette.mutedText)
+ }
+ }
+ }.frame(maxWidth: .infinity, minHeight: 44, alignment: .leading)
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Sheet.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Sheet.swift
new file mode 100644
index 0000000000..8ca23cac09
--- /dev/null
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Sheet.swift
@@ -0,0 +1,61 @@
+import SwiftUI
+
+public struct SheetContent<Content: View>: View {
+ @Environment(\.entePalette) private var palette
+ private let title: String
+ private let message: String?
+ private let back: (() -> Void)?
+ private let dismiss: (() -> Void)?
+ private let backLabel: String
+ private let dismissLabel: String
+ private let content: Content
+
+ public init(
+ title: String,
+ message: String? = nil,
+ back: (() -> Void)? = nil,
+ dismiss: (() -> Void)? = nil,
+ backLabel: String = "Back",
+ dismissLabel: String = "Close",
+ @ViewBuilder content: () -> Content,
+ ) {
+ self.title = title
+ self.message = message
+ self.back = back
+ self.dismiss = dismiss
+ self.backLabel = backLabel
+ self.dismissLabel = dismissLabel
+ self.content = content()
+ }
+
+ public var body: some View {
+ VStack(alignment: .leading, spacing: EnteSpacing.lg) {
+ SheetHeader(title) {
+ if let back {
+ IconAction(kind: .circular, size: 40, action: back) {
+ Glyph.back.image.resizable().scaledToFit()
+ .frame(width: 24, height: 24)
+ .flipsForRightToLeftLayoutDirection(true)
+ }
+ .accessibilityLabel(backLabel)
+ }
+ } trailing: {
+ if let dismiss {
+ IconAction(kind: .circular, size: 40, action: dismiss) {
+ Glyph.close.image.resizable().scaledToFit()
+ .frame(width: 18, height: 18)
+ }
+ .accessibilityLabel(dismissLabel)
+ }
+ }
+ if let message {
+ Text(message)
+ .font(EnteTypography.body)
+ .foregroundStyle(palette.mutedText)
+ }
+ content
+ }
+ .padding(EnteSpacing.xl)
+ .background(palette.background)
+ }
+}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
index c9e87832f2..8ef120f5be 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
@@ -10,56 +10,71 @@ public enum EnteApp: Sendable {
public struct Palette: Sendable {
public let isDark: Bool
public let primary: Color
+ public let primaryDark: Color
public let primaryDarker: Color
public let text: Color
public let mutedText: Color
public let hintText: Color
public let disabledText: Color
public let reverseText: Color
+ public let background: Color
public let surface: Color
public let fill: Color
public let fillDarker: Color
public let fillDarkest: Color
+ public let border: Color
public let faintBorder: Color
public let danger: Color
public let dangerDarker: Color
+ public let caution: Color
+ public let information: Color
fileprivate static func make(app: EnteApp, dark: Bool) -> Palette {
let primary: Color
+ let primaryDark: Color
let primaryDarker: Color
switch app {
case .photos:
primary = Color(hex: 0x08C225)
+ primaryDark = Color(hex: 0x069D1E)
primaryDarker = Color(hex: 0x057C18)
case .auth:
primary = Color(hex: 0x9610D6)
+ primaryDark = Color(hex: 0x7A0CAE)
primaryDarker = Color(hex: 0x5D0884)
case .locker:
primary = Color(hex: 0x1071FF)
+ primaryDark = Color(hex: 0x0E5FD9)
primaryDarker = Color(hex: 0x0B4CAD)
}
return Palette(
isDark: dark,
primary: primary,
+ primaryDark: primaryDark,
primaryDarker: primaryDarker,
text: dark ? .white : .black,
mutedText: Color(hex: dark ? 0x999999 : 0x666666),
hintText: Color(hex: 0x969696),
disabledText: Color(hex: dark ? 0x414141 : 0xD6D6D6),
reverseText: dark ? .black : .white,
+ background: Color(hex: dark ? 0x161616 : 0xF4F4F4),
surface: Color(hex: dark ? 0x212121 : 0xFFFFFF),
fill: Color(hex: dark ? 0x0A0A0A : 0xEAEAEA),
fillDarker: Color(hex: dark ? 0x141414 : 0xDEDEDE),
fillDarkest: Color(hex: dark ? 0x292929 : 0xD2D2D2),
+ border: Color(hex: dark ? 0x3E3E3E : 0xE0E0E0),
faintBorder: Color(hex: dark ? 0x2A2A2A : 0xEBEBEB),
danger: Color(hex: 0xF63A3A),
- dangerDarker: Color(hex: 0xC52E2E)
+ dangerDarker: Color(hex: 0xC52E2E),
+ caution: Color(hex: 0xF08A1E),
+ information: Color(hex: 0x1071FF)
)
}
}
public enum EnteSpacing {
public static let xs: CGFloat = 4
+ public static let sm: CGFloat = 8
public static let md: CGFloat = 12
public static let lg: CGFloat = 16
public static let xl: CGFloat = 20
@@ -67,6 +82,7 @@ public enum EnteSpacing {
public enum EnteRadius {
public static let medium: CGFloat = 12
+ public static let large: CGFloat = 16
public static let button: CGFloat = 20
}
@@ -80,6 +96,9 @@ public enum EnteTypography {
public static let body = EnteFont.inter(size: 14, weight: .medium, relativeTo: .body)
public static let bodyBold = EnteFont.inter(size: 14, weight: .semibold, relativeTo: .body)
public static let mini = EnteFont.inter(size: 12, weight: .medium, relativeTo: .caption)
+ public static let avatarExtraSmall = EnteFont.inter(
+ size: 8, weight: .medium, relativeTo: .caption2)
+ public static let avatarSmall = EnteFont.inter(size: 10, weight: .medium, relativeTo: .caption2)
}
public struct EnteTheme<Content: View>: View {
@@ -109,7 +128,7 @@ public extension EnvironmentValues {
}
}
-private extension Color {
+extension Color {
init(hex: UInt) {
self.init(
red: Double((hex >> 16) & 0xFF) / 255,