chore: updated styles for lists
b4d1d490
3 file(s) · +17 −14
| 10 | 10 | let onSelect: (Bookmark) -> Void |
|
| 11 | 11 | ||
| 12 | 12 | @Environment(\.dismiss) private var dismiss |
|
| 13 | + | @Environment(\.themeSettings) private var themeSettings |
|
| 13 | 14 | ||
| 14 | 15 | var body: some View { |
|
| 15 | 16 | NavigationStack { |
|
| 28 | 29 | } label: { |
|
| 29 | 30 | VStack(alignment: .leading, spacing: 4) { |
|
| 30 | 31 | Text(bookmark.title) |
|
| 31 | - | .font(.system(.body, design: .monospaced)) |
|
| 32 | - | .foregroundStyle(.primary) |
|
| 32 | + | .font(.system(.body, design: themeSettings.fontDesign.fontDesign)) |
|
| 33 | + | .foregroundStyle(themeSettings.textColor) |
|
| 33 | 34 | .lineLimit(2) |
|
| 34 | 35 | ||
| 35 | 36 | Text(bookmark.url) |
|
| 36 | - | .font(.system(.caption, design: .monospaced)) |
|
| 37 | - | .foregroundStyle(.secondary) |
|
| 37 | + | .font(.system(.caption, design: themeSettings.fontDesign.fontDesign)) |
|
| 38 | + | .foregroundStyle(themeSettings.textColor.opacity(0.7)) |
|
| 38 | 39 | .lineLimit(1) |
|
| 39 | 40 | } |
|
| 40 | 41 | .padding(.vertical, 4) |
|
| 10 | 10 | let onSelect: (HistoryItem) -> Void |
|
| 11 | 11 | ||
| 12 | 12 | @Environment(\.dismiss) private var dismiss |
|
| 13 | + | @Environment(\.themeSettings) private var themeSettings |
|
| 13 | 14 | @State private var showClearConfirmation = false |
|
| 14 | 15 | ||
| 15 | 16 | private var groupedHistory: [(String, [HistoryItem])] { |
|
| 60 | 61 | } label: { |
|
| 61 | 62 | VStack(alignment: .leading, spacing: 4) { |
|
| 62 | 63 | Text(item.title) |
|
| 63 | - | .font(.system(.body, design: .monospaced)) |
|
| 64 | - | .foregroundStyle(.primary) |
|
| 64 | + | .font(.system(.body, design: themeSettings.fontDesign.fontDesign)) |
|
| 65 | + | .foregroundStyle(themeSettings.textColor) |
|
| 65 | 66 | .lineLimit(2) |
|
| 66 | 67 | ||
| 67 | 68 | HStack { |
|
| 68 | 69 | Text(item.url) |
|
| 69 | - | .font(.system(.caption, design: .monospaced)) |
|
| 70 | - | .foregroundStyle(.secondary) |
|
| 70 | + | .font(.system(.caption, design: themeSettings.fontDesign.fontDesign)) |
|
| 71 | + | .foregroundStyle(themeSettings.textColor.opacity(0.7)) |
|
| 71 | 72 | .lineLimit(1) |
|
| 72 | 73 | ||
| 73 | 74 | Spacer() |
|
| 74 | 75 | ||
| 75 | 76 | Text(item.visitedAt, style: .time) |
|
| 76 | - | .font(.system(.caption2, design: .monospaced)) |
|
| 77 | - | .foregroundStyle(.tertiary) |
|
| 77 | + | .font(.system(.caption2, design: themeSettings.fontDesign.fontDesign)) |
|
| 78 | + | .foregroundStyle(themeSettings.textColor.opacity(0.5)) |
|
| 78 | 79 | } |
|
| 79 | 80 | } |
|
| 80 | 81 | .padding(.vertical, 4) |
|
| 10 | 10 | let onSelect: (Tab) -> Void |
|
| 11 | 11 | ||
| 12 | 12 | @Environment(\.dismiss) private var dismiss |
|
| 13 | + | @Environment(\.themeSettings) private var themeSettings |
|
| 13 | 14 | ||
| 14 | 15 | var body: some View { |
|
| 15 | 16 | NavigationStack { |
|
| 21 | 22 | HStack { |
|
| 22 | 23 | VStack(alignment: .leading, spacing: 4) { |
|
| 23 | 24 | Text(tab.title.isEmpty ? (tab.url.isEmpty ? "New Tab" : tab.url) : tab.title) |
|
| 24 | - | .font(.system(.body, design: .monospaced)) |
|
| 25 | - | .foregroundStyle(.primary) |
|
| 25 | + | .font(.system(.body, design: themeSettings.fontDesign.fontDesign)) |
|
| 26 | + | .foregroundStyle(themeSettings.textColor) |
|
| 26 | 27 | .lineLimit(2) |
|
| 27 | 28 | ||
| 28 | 29 | if !tab.url.isEmpty && !tab.title.isEmpty { |
|
| 29 | 30 | Text(tab.url) |
|
| 30 | - | .font(.system(.caption, design: .monospaced)) |
|
| 31 | - | .foregroundStyle(.secondary) |
|
| 31 | + | .font(.system(.caption, design: themeSettings.fontDesign.fontDesign)) |
|
| 32 | + | .foregroundStyle(themeSettings.textColor.opacity(0.7)) |
|
| 32 | 33 | .lineLimit(1) |
|
| 33 | 34 | } |
|
| 34 | 35 | } |
|