Add option to always show images (never blur)
Changelog-Added: Add option to always show images (never blur)
This commit is contained in:
@@ -100,6 +100,12 @@ class UserSettingsStore: ObservableObject {
|
|||||||
UserDefaults.standard.set(left_handed, forKey: "left_handed")
|
UserDefaults.standard.set(left_handed, forKey: "left_handed")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Published var always_show_images: Bool {
|
||||||
|
didSet {
|
||||||
|
UserDefaults.standard.set(always_show_images, forKey: "always_show_images")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Published var zap_vibration: Bool {
|
@Published var zap_vibration: Bool {
|
||||||
didSet {
|
didSet {
|
||||||
@@ -182,6 +188,7 @@ class UserSettingsStore: ObservableObject {
|
|||||||
let pubkey = ""
|
let pubkey = ""
|
||||||
self.default_wallet = get_default_wallet(pubkey)
|
self.default_wallet = get_default_wallet(pubkey)
|
||||||
show_wallet_selector = should_show_wallet_selector(pubkey)
|
show_wallet_selector = should_show_wallet_selector(pubkey)
|
||||||
|
always_show_images = UserDefaults.standard.object(forKey: "always_show_images") as? Bool ?? false
|
||||||
|
|
||||||
left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
|
left_handed = UserDefaults.standard.object(forKey: "left_handed") as? Bool ?? false
|
||||||
zap_vibration = UserDefaults.standard.object(forKey: "zap_vibration") as? Bool ?? false
|
zap_vibration = UserDefaults.standard.object(forKey: "zap_vibration") as? Bool ?? false
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ struct ChatView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let show_images = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
let show_images = should_show_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
||||||
NoteContentView(damus_state: damus_state,
|
NoteContentView(damus_state: damus_state,
|
||||||
event: event,
|
event: event,
|
||||||
show_images: show_images,
|
show_images: show_images,
|
||||||
|
|||||||
@@ -207,6 +207,8 @@ struct ConfigView: View {
|
|||||||
.onChange(of: settings.disable_animation) { _ in
|
.onChange(of: settings.disable_animation) { _ in
|
||||||
clear_kingfisher_cache()
|
clear_kingfisher_cache()
|
||||||
}
|
}
|
||||||
|
Toggle(NSLocalizedString("Always show images", comment: "Setting to always show and never blur images"), isOn: $settings.always_show_images)
|
||||||
|
.toggleStyle(.switch)
|
||||||
|
|
||||||
Button(NSLocalizedString("Clear Cache", comment: "Button to clear image cache.")) {
|
Button(NSLocalizedString("Clear Cache", comment: "Button to clear image cache.")) {
|
||||||
clear_kingfisher_cache()
|
clear_kingfisher_cache()
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ struct DMView: View {
|
|||||||
Spacer(minLength: UIScreen.main.bounds.width * 0.2)
|
Spacer(minLength: UIScreen.main.bounds.width * 0.2)
|
||||||
}
|
}
|
||||||
|
|
||||||
let should_show_img = should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
let should_show_img = should_show_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
||||||
|
|
||||||
NoteContentView(damus_state: damus_state, event: event, show_images: should_show_img, size: .normal, artifacts: .just_content(event.get_content(damus_state.keypair.privkey)), truncate: false)
|
NoteContentView(damus_state: damus_state, event: event, show_images: should_show_img, size: .normal, artifacts: .just_content(event.get_content(damus_state.keypair.privkey)), truncate: false)
|
||||||
.padding(10)
|
.padding(10)
|
||||||
|
|||||||
@@ -89,7 +89,11 @@ struct EventView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// blame the porn bots for this code
|
// blame the porn bots for this code
|
||||||
func should_show_images(contacts: Contacts, ev: NostrEvent, our_pubkey: String, booster_pubkey: String? = nil) -> Bool {
|
func should_show_images(settings: UserSettingsStore, contacts: Contacts, ev: NostrEvent, our_pubkey: String, booster_pubkey: String? = nil) -> Bool {
|
||||||
|
if settings.always_show_images {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
if ev.pubkey == our_pubkey {
|
if ev.pubkey == our_pubkey {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ struct EventBody: View {
|
|||||||
self.damus_state = damus_state
|
self.damus_state = damus_state
|
||||||
self.event = event
|
self.event = event
|
||||||
self.size = size
|
self.size = size
|
||||||
self.should_show_img = should_show_img ?? should_show_images(contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
self.should_show_img = should_show_img ?? should_show_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
|
||||||
}
|
}
|
||||||
|
|
||||||
var content: String {
|
var content: String {
|
||||||
|
|||||||
Reference in New Issue
Block a user