Skip to content

armgit / ente

Public Imported from GitHub
0

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

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.kt
index 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.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(
@@ -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.kt
index 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.swift
index 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: ActionVariant
private let size: ActionSize
private let density: ActionDensity
- private let enabled: Bool
private let action: () -> Void
public 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 = title
self.variant = variant
self.size = size
self.density = density
- self.enabled = enabled
self.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.swift
index f43b7ff357..9d64e81e0a 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/IconAction.swift
@@ -2,20 +2,17 @@ import SwiftUI
public struct IconAction<Content: View>: View {
private let kind: IconActionKind
- private let enabled: Bool
private let size: CGFloat
private let action: () -> Void
private let content: Content
public init(
kind: IconActionKind = .unfilled,
- enabled: Bool = true,
size: CGFloat = 40,
action: @escaping () -> Void,
@ViewBuilder content: () -> Content
) {
self.kind = kind
- self.enabled = enabled
self.size = size
self.action = action
self.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.swift
index 0cfa375b72..20da7cdfa1 100644
--- a/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift
+++ b/apple/packages/EnteComponents/Sources/EnteComponents/SheetHeader.swift
@@ -1,4 +1,3 @@
-import EnteFonts
import SwiftUI
public struct SheetHeader<Leading: View, Trailing: View>: View {
@@ -21,7 +20,7 @@ public struct SheetHeader<Leading: View, Trailing: View>: View {
HStack(spacing: EnteSpacing.md) {
leading
Text(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.swift
index 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)