Skip to content

armgit / ente

Public Imported from GitHub
0

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

Simplify native button styling and preserve content height

Neeraj Guptafa4573f144fa
diff --git a/android/packages/components/src/main/kotlin/io/ente/components/Actions.kt b/android/packages/components/src/main/kotlin/io/ente/components/ActionButton.kt
similarity index 97%
rename from android/packages/components/src/main/kotlin/io/ente/components/Actions.kt
rename to android/packages/components/src/main/kotlin/io/ente/components/ActionButton.kt
index 29044a5a79..dffda77ce8 100644
--- a/android/packages/components/src/main/kotlin/io/ente/components/Actions.kt
+++ b/android/packages/components/src/main/kotlin/io/ente/components/ActionButton.kt
@@ -87,8 +87,7 @@ public fun ActionButton(
) {
Row(
modifier =
- Modifier.heightIn(min = if (inlineLink) 0.dp else 24.dp)
- .padding(
+ Modifier.padding(
horizontal = if (inlineLink) 0.dp else EnteSpacing.xl,
vertical =
if (inlineLink) {
@@ -98,7 +97,8 @@ public fun ActionButton(
} else {
12.dp
},
- ),
+ )
+ .heightIn(min = if (inlineLink) 0.dp else 24.dp),
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically,
) {
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 dba50012da..b797c89576 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
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.remember
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
@@ -51,7 +52,7 @@ public object EnteMotion {
}
public object EnteTypography {
- public val display: TextStyle =
+ public val display2: TextStyle =
TextStyle(
fontFamily = EnteFontFamily.outfit,
fontSize = 24.sp,
@@ -74,7 +75,8 @@ public fun EnteTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit,
) {
- CompositionLocalProvider(LocalEntePalette provides palette(app, darkTheme), content = content)
+ val palette = remember(app, darkTheme) { palette(app, darkTheme) }
+ CompositionLocalProvider(LocalEntePalette provides palette, content = content)
}
private fun palette(app: EnteApp, dark: Boolean): Palette {
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Actions.swift b/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift
similarity index 70%
rename from apple/packages/EnteComponents/Sources/EnteComponents/Actions.swift
rename to apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift
index 9a8013fef7..ff68beac23 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/Actions.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift
@@ -73,35 +73,29 @@ private struct ActionStyle: ButtonStyle {
let cornerRadius: CGFloat
func makeBody(configuration: Configuration) -> some View {
- configuration.label
- .foregroundStyle(foreground(pressed: configuration.isPressed))
- .background(background(pressed: configuration.isPressed))
+ let colors = colors(pressed: configuration.isPressed)
+ return configuration.label
+ .foregroundStyle(colors.foreground)
+ .background(colors.background)
.clipShape(RoundedRectangle(cornerRadius: cornerRadius, style: .continuous))
.scaleEffect(configuration.isPressed ? 0.98 : 1)
.animation(.easeOut(duration: EnteMotion.quick), value: configuration.isPressed)
}
- private func background(pressed: Bool) -> Color {
+ private func colors(pressed: Bool) -> (background: Color, foreground: Color) {
guard enabled else {
- return variant == .criticalText || variant == .link ? .clear : palette.fill
- }
- return switch variant {
- case .primary: pressed ? palette.primaryDarker : palette.primary
- case .secondary: pressed ? palette.fillDarkest : palette.fill
- case .neutral: palette.text
- case .critical: pressed ? palette.dangerDarker : palette.danger
- case .criticalText, .link: .clear
+ return (
+ variant == .criticalText || variant == .link ? .clear : palette.fill,
+ palette.disabledText
+ )
}
- }
-
- private func foreground(pressed: Bool) -> Color {
- guard enabled else { return palette.disabledText }
return switch variant {
- case .primary, .critical: .white
- case .secondary: palette.text
- case .neutral: palette.reverseText
- case .criticalText: pressed ? palette.dangerDarker : palette.danger
- case .link: pressed ? palette.primaryDarker : palette.primary
+ case .primary: (pressed ? palette.primaryDarker : palette.primary, .white)
+ case .secondary: (pressed ? palette.fillDarkest : palette.fill, palette.text)
+ case .neutral: (palette.text, palette.reverseText)
+ case .critical: (pressed ? palette.dangerDarker : palette.danger, .white)
+ case .criticalText: (.clear, pressed ? palette.dangerDarker : palette.danger)
+ case .link: (.clear, pressed ? palette.primaryDarker : palette.primary)
}
}
}
diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
index df40ea56b7..1ff3ebf77a 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift
@@ -59,7 +59,7 @@ public enum EnteMotion {
}
public enum EnteTypography {
- public static let display = EnteFont.outfit(size: 24, relativeTo: .title)
+ public static let display2 = EnteFont.outfit(size: 24, relativeTo: .title)
public static let body = EnteFont.inter(size: 14, weight: .medium, relativeTo: .body)
public static let bodyBold = EnteFont.inter(size: 14, weight: .semibold, relativeTo: .body)
}