tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue where theme would be changed to black and can't be switched back on iOS 18

Browse Source 
Removed line which forces preferred colour scheme to dark on iOS 18, and
made adjustments to the styling to maintain text legibility

Changelog-Fixed: Fixed issue where theme would be changed to black and can't be switched back on iOS 18
Closes: https://github.com/damus-io/damus/issues/2373
Co-authored-by: Daniel D’Aquino <daniel@daquino.me>
Signed-off-by: Daniel D’Aquino <daniel@daquino.me>
This commit is contained in:
cr0bar
2024-09-13 22:09:22 +01:00
committed by Daniel D’Aquino
parent 2278ab09a4
commit 6fa2e8b5c6
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
damus/Components/SupporterBadge.swift
View File

@@ -11,11 +11,13 @@ struct SupporterBadge: View {
let percent: Int? let percent: Int?
let purple_account: DamusPurple.Account? let purple_account: DamusPurple.Account?
let style: Style let style: Style
let text_color: Color
init(percent: Int?, purple_account: DamusPurple.Account? = nil, style: Style) { init(percent: Int?, purple_account: DamusPurple.Account? = nil, style: Style, text_color: Color = .secondary) {
self.percent = percent self.percent = percent
self.purple_account = purple_account self.purple_account = purple_account
self.style = style self.style = style
self.text_color = text_color
} }
let size: CGFloat = 17 let size: CGFloat = 17
@@ -31,7 +33,7 @@ struct SupporterBadge: View {
if self.style == .full { if self.style == .full {
let date = format_date(date: purple_account.created_at, time_style: .none) let date = format_date(date: purple_account.created_at, time_style: .none)
Text(date) Text(date)
.foregroundStyle(.secondary) .foregroundStyle(text_color)
.font(.caption) .font(.caption)
} }
} }

3
damus/Views/NoteContentView.swift
View File

@@ -120,8 +120,7 @@ struct NoteContentView: View {
EventView(damus: damus_state, event: self.event, options: .embedded_text_only) EventView(damus: damus_state, event: self.event, options: .embedded_text_only)
.padding(.top) .padding(.top)
} }
.background(.thinMaterial) .background(.thickMaterial)
.preferredColorScheme(.dark)
.onTapGesture(perform: { .onTapGesture(perform: {
damus_state.nav.push(route: Route.Thread(thread: .init(event: self.event, damus_state: damus_state))) damus_state.nav.push(route: Route.Thread(thread: .init(event: self.event, damus_state: damus_state)))
dismiss() dismiss()

4
damus/Views/Purple/DamusPurpleAccountView.swift
View File

@@ -64,7 +64,6 @@ struct DamusPurpleAccountView: View {
.padding(.bottom, 20) .padding(.bottom, 20)
} }
.foregroundColor(.white.opacity(0.8)) .foregroundColor(.white.opacity(0.8))
.preferredColorScheme(.dark)
.background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 12, style: .continuous)) .background(.ultraThinMaterial, in: RoundedRectangle(cornerRadius: 12, style: .continuous))
.padding() .padding()
} }
@@ -81,7 +80,8 @@ struct DamusPurpleAccountView: View {
SupporterBadge( SupporterBadge(
percent: nil, percent: nil,
purple_account: account, purple_account: account,
style: .full style: .full,
text_color: .white
) )
} }
} }