π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Simplify shared component styling
Neeraj Gupta46a2dfced6ec
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.ktindex ca54e7a92d..c5a4e875d5 100644--- a/android/packages/components/src/main/kotlin/io/ente/components/SheetHeader.kt+++ b/android/packages/components/src/main/kotlin/io/ente/components/SheetHeader.kt@@ -12,7 +12,6 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.semantics.headingimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.text.style.TextOverflow-import androidx.compose.ui.unit.sp@Composablepublic fun SheetHeader(@@ -34,11 +33,9 @@ public fun SheetHeader(Modifier.weight(1f).semantics { heading() },maxLines = 1,overflow = TextOverflow.Ellipsis,- style = sheetTitleStyle,+ style = EnteTypography.heading2,)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.ktindex ef72c83562..ff52f166a3 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@@ -77,6 +77,7 @@ public object EnteTypography {lineHeight = 20.sp,)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)}diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift b/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swiftindex 8e953b9064..eb3cbadc36 100644--- a/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift+++ b/apple/packages/EnteComponents/Sources/EnteComponents/ActionButton.swift@@ -24,7 +24,6 @@ public struct ActionButton: View {private let variant: ActionVariantprivate let size: ActionSizeprivate let density: ActionDensity- private let enabled: Boolprivate let action: () -> Voidpublic init(@@ -32,14 +31,12 @@ public struct ActionButton: View {variant: ActionVariant = .primary,size: ActionSize = .large,density: ActionDensity = .regular,- enabled: Bool = true,action: @escaping () -> Void) {self.title = titleself.variant = variantself.size = sizeself.density = density- self.enabled = enabledself.action = action}@@ -60,7 +57,6 @@ public struct ActionButton: View {cornerRadius: inlineLink ? 0 : EnteRadius.button))- .disabled(!enabled)}}diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swift b/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swiftindex f43b7ff357..9d64e81e0a 100644--- a/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swift+++ b/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swift@@ -2,20 +2,17 @@ import SwiftUIpublic struct IconAction<Content: View>: View {private let kind: IconActionKind- private let enabled: Boolprivate let size: CGFloatprivate let action: () -> Voidprivate let content: Contentpublic init(kind: IconActionKind = .unfilled,- enabled: Bool = true,size: CGFloat = 40,action: @escaping () -> Void,@ViewBuilder content: () -> Content) {self.kind = kind- self.enabled = enabledself.size = sizeself.action = actionself.content = content()@@ -33,7 +30,6 @@ public struct IconAction<Content: View>: View {cornerRadius: kind == .circular ? size / 2 : EnteRadius.medium))- .disabled(!enabled)}}diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift b/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swiftindex 0cfa375b72..20da7cdfa1 100644--- a/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift+++ b/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift@@ -1,4 +1,3 @@-import EnteFontsimport SwiftUIpublic struct SheetHeader<Leading: View, Trailing: View>: View {@@ -21,7 +20,7 @@ public struct SheetHeader<Leading: View, Trailing: View>: View {HStack(spacing: EnteSpacing.md) {leadingText(title)- .font(EnteFont.inter(size: 18, weight: .semibold, relativeTo: .title3))+ .font(EnteTypography.heading2).lineLimit(1).frame(maxWidth: .infinity, alignment: .leading).accessibilityAddTraits(.isHeader)diff --git a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swiftindex d24b0e1ad5..c9e87832f2 100644--- a/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift+++ b/apple/packages/EnteComponents/Sources/EnteComponents/Theme.swift@@ -76,6 +76,7 @@ public enum EnteMotion {public enum EnteTypography {public static let display2 = EnteFont.outfit(size: 24, relativeTo: .title)+ public static let heading2 = EnteFont.inter(size: 18, weight: .semibold, relativeTo: .title3)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)