mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-11-12 11:38:01 +00:00
* plan: UI improvements to improve LLM usage via SimpleX * core, ui: types for chat layout * core, ui: settings for alternative terminal-like chat layout for managing LLMs or other service bots * plan: message priority * fixes * query plan * update plans * remove silent messages plan * rename migrations * implement layout * amend * fix * fix * fix * improve * time on the right, sender name in blue * no avatar in direct chats * better previews * update, fixes * update * time gap * changes * ui: terminal layout line heights, gaps and time placement * ui: simplify terminal meta layout, correct its docs and tests * ui: right-to-left emoji edge in terminal rows, time placement tests * android, desktop: raise Kotlin compiler memory to 4 GB * ui: terminal captions as follow-up text, classic event separators * ui: terminal media edge and overlay time, plan decisions * ui: simplify terminal row separation, correct doc line references * ui: keep the media time inside terminal rows, restore caption conditions * ui: terminal heading capitals at large font scales, idle live message time * ui: rename the classic voice-with-text flag, correct the meta copy docs * ui: smaller terminal layout diff, sender gap and meta names * ui: terminal row as tall as the media time * docs: remove the chat layout section from the bots readme * docs: shorten the terminal layout section of the chat view * core: address settings API as on master, /auto_accept reads the stored layout * ui: smaller terminal headings * ui: classic sender rows and avatar rule as on master * ui: classic reply quote text colour as on master * ios: keep the chat layout setting with other UI settings * ui: go-to button at the end of terminal rows, no gutter in direct chats * ui: forwarded arrow on the header line of terminal rows, above the time * ui: forwarded arrow centred above the time line of terminal rows * ios: terminal chat layout, chosen per app, profile and chat * ios: event time reserve of three spaces, app layout picker as Kotlin * ios: spec and plan of the terminal chat layout * ios: classic message text at 87% in dark themes, as terminal rows * ios: terminal gaps scaled by the body size, 17/16 of Kotlin values * ios: terminal quote sender at 13.5pt, thumbnail at the item end * ios: product docs of the terminal layout, plans updated for iOS * ios: chat scenes rendered to PNG by a unit test in the simulator CI * ios: snapshots rendered by the smoke test script, workflow unchanged * ios: terminal names at 13.5 x 17/16 pt, as the gaps * ios: Markdown views at the 87% message colour in dark themes * ios: terminal quote thumbnail 12pt after the quote text or the bar * ios: terminal rule-only message widened by a wider quote or header * ios: member avatars scaled with the text size, as in the chat list * ios: snapshot rows at their own height, as list cells, so text wraps * ios: member avatars back at 34pt, for the snapshot before scaling * ios: member avatars scaled with the text size, as in the chat list * ui: terminal quote thumbnail 12dp after the quote text or the bar * ios: classic group bubble width follows the scaled member avatar * ci: ios-sim README describes the snapshots rendered after the smoke test * ios: scratch, padding variants for the I7 and I8 renders, to revert * ios: revert the scratch padding variants after their renders * ui: contrast of the voice message button in terminal rows * ios: scratch, spacing variants and list margins to render, to revert * ios: revert the scratch spacing variants after their renders * ios: snapshots at a fixed date, in UTC and the en_US locale * ios: snapshots drawn as 8-bit sRGB without alpha * ci: compare iOS snapshots with the references in the repository * ci: record and check iOS snapshot references on GitHub's runner * ios: scratch, list margins on the remaining screens, to revert * ios: revert the scratch list margins after their measurement * ci: snapshot scripts executable, as the other CI scripts * ios: scratch, voice circle variants in light themes, to revert * ios: revert the scratch voice circle variants * ios: one 12pt padding at the edges and after avatars in terminal rows * ios: classic group sender name on the bubble edge * ui: one 12dp padding at the edges and after avatars in terminal rows * ios: one heading scale in both chat layouts * ios: snapshot references of the chat scenes * docs: leave the headings and classic lines of the plan to ep/classic-bubbles * ios: declare terminal layout functions inside types * ios: keep layout constants at file scope * ios: keep file-scope functions, move only extension members into types * ios: snapshot tests record row heights at first layout and the appearance layout switch * ios: appearance preview follows the chat layout setting at once * ios: snapshot test measures first-layout rows by SwiftUI and by cells * ios: chat rows measured at the chat width when they first appear * ios: snapshot test checks that chat rows keep their first height after a reload * ios, ci: references of terminal and classic chat scenes, dark message text * ios: message text at 95% in dark themes * ios, ci: references with message text at 95% in dark themes * ios: media in terminal rows end at the time's right inset * ios, ci: references with terminal media at the time's right inset --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
483 lines
23 KiB
Swift
483 lines
23 KiB
Swift
//
|
|
// ThemeModeEditor.swift
|
|
// SimpleX (iOS)
|
|
//
|
|
// Created by Avently on 20.06.2024.
|
|
// Copyright © 2024 SimpleX Chat. All rights reserved.
|
|
//
|
|
|
|
import Foundation
|
|
import SwiftUI
|
|
import SimpleXChat
|
|
|
|
struct UserWallpaperEditor: View {
|
|
@EnvironmentObject var theme: AppTheme
|
|
var initialTheme: ThemeModeOverride
|
|
@State var themeModeOverride: ThemeModeOverride
|
|
@State var applyToMode: DefaultThemeMode?
|
|
@State var showMore: Bool = false
|
|
@State var showFileImporter: Bool = false
|
|
@Binding var globalThemeUsed: Bool
|
|
var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
|
|
|
|
@State private var showImageImporter: Bool = false
|
|
|
|
var body: some View {
|
|
List {
|
|
let wallpaperType = theme.wallpaper.type
|
|
|
|
WallpaperPresetSelector(
|
|
selectedWallpaper: wallpaperType,
|
|
currentColors: { type in
|
|
// If applying for :
|
|
// - all themes: no overrides needed
|
|
// - specific user: only user overrides for currently selected theme are needed, because they will NOT be copied when other wallpaper is selected
|
|
let perUserOverride: ThemeModeOverrides? = wallpaperType.sameType(type) ? ChatModel.shared.currentUser?.uiThemes : nil
|
|
return ThemeManager.currentColors(type, nil, perUserOverride, themeOverridesDefault.get())
|
|
},
|
|
onChooseType: onChooseType
|
|
)
|
|
.padding(.bottom, 10)
|
|
.listRowInsets(.init())
|
|
.listRowBackground(Color.clear)
|
|
.modifier(WallpaperImporter(showImageImporter: $showImageImporter, onChooseImage: { image in
|
|
if let filename = saveWallpaperFile(image: image) {
|
|
_ = onTypeCopyFromSameTheme(WallpaperType.image(filename, 1, WallpaperScaleType.fill))
|
|
}
|
|
}))
|
|
|
|
WallpaperSetupView(
|
|
wallpaperType: themeModeOverride.type,
|
|
base: theme.base,
|
|
initialWallpaper: theme.wallpaper,
|
|
editColor: { name in editColor(name, theme) },
|
|
onTypeChange: onTypeChange
|
|
)
|
|
|
|
Section {
|
|
if !globalThemeUsed {
|
|
ResetToGlobalThemeButton(true, theme.colors.primary) {
|
|
themeModeOverride = ThemeManager.defaultActiveTheme(ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
globalThemeUsed = true
|
|
Task {
|
|
await save(applyToMode, nil)
|
|
await MainActor.run {
|
|
// Change accent color globally
|
|
ThemeManager.applyTheme(currentThemeDefault.get())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
SetDefaultThemeButton(theme.colors.primary) {
|
|
globalThemeUsed = false
|
|
let lightBase = DefaultTheme.LIGHT
|
|
let darkBase = if theme.base != DefaultTheme.LIGHT { theme.base } else if systemDarkThemeDefault.get() == DefaultTheme.DARK.themeName { DefaultTheme.DARK } else if systemDarkThemeDefault.get() == DefaultTheme.BLACK.themeName { DefaultTheme.BLACK } else { DefaultTheme.SIMPLEX }
|
|
let mode = themeModeOverride.mode
|
|
Task {
|
|
// Saving for both modes in one place by changing mode once per save
|
|
if applyToMode == nil {
|
|
let oppositeMode = mode == DefaultThemeMode.light ? DefaultThemeMode.dark : DefaultThemeMode.light
|
|
await save(oppositeMode, ThemeModeOverride.withFilledAppDefaults(oppositeMode, oppositeMode == DefaultThemeMode.light ? lightBase : darkBase))
|
|
}
|
|
await MainActor.run {
|
|
themeModeOverride = ThemeModeOverride.withFilledAppDefaults(mode, mode == DefaultThemeMode.light ? lightBase : darkBase)
|
|
}
|
|
await save(themeModeOverride.mode, themeModeOverride)
|
|
await MainActor.run {
|
|
// Change accent color globally
|
|
ThemeManager.applyTheme(currentThemeDefault.get())
|
|
}
|
|
}
|
|
}.onChange(of: initialTheme.mode) { mode in
|
|
themeModeOverride = initialTheme
|
|
if applyToMode != nil {
|
|
applyToMode = mode
|
|
}
|
|
}
|
|
.onChange(of: theme) { _ in
|
|
// Applies updated global theme if current one tracks global theme
|
|
if globalThemeUsed {
|
|
themeModeOverride = ThemeManager.defaultActiveTheme(ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
globalThemeUsed = true
|
|
}
|
|
}
|
|
}
|
|
|
|
if showMore {
|
|
let values = [
|
|
(nil, "All modes"),
|
|
(DefaultThemeMode.light, "Light mode"),
|
|
(DefaultThemeMode.dark, "Dark mode")
|
|
]
|
|
Picker("Apply to", selection: $applyToMode) {
|
|
ForEach(values, id: \.0) { (_, text) in
|
|
Text(text)
|
|
}
|
|
}
|
|
.frame(height: 36)
|
|
.onChange(of: applyToMode) { mode in
|
|
if let mode, mode != theme.base.mode {
|
|
let lightBase = DefaultTheme.LIGHT
|
|
let darkBase = if theme.base != DefaultTheme.LIGHT { theme.base } else if systemDarkThemeDefault.get() == DefaultTheme.DARK.themeName { DefaultTheme.DARK } else if systemDarkThemeDefault.get() == DefaultTheme.BLACK.themeName { DefaultTheme.BLACK } else { DefaultTheme.SIMPLEX }
|
|
ThemeManager.applyTheme(mode == DefaultThemeMode.light ? lightBase.themeName : darkBase.themeName)
|
|
}
|
|
}
|
|
|
|
CustomizeThemeColorsSection(editColor: { name in editColor(name, theme) })
|
|
|
|
ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes)
|
|
} else {
|
|
AdvancedSettingsButton(theme.colors.primary) { showMore = true }
|
|
}
|
|
}
|
|
.modifier(
|
|
ThemeImporter(isPresented: $showFileImporter) { imported in
|
|
let importedFromString = imported.wallpaper?.importFromString()
|
|
let importedType = importedFromString?.toAppWallpaper().type
|
|
let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
|
|
let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
|
|
let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
|
|
let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
|
|
Task {
|
|
await MainActor.run {
|
|
themeModeOverride = res
|
|
}
|
|
await save(applyToMode, res)
|
|
}
|
|
}
|
|
)
|
|
}
|
|
|
|
private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
|
|
_ = ThemeManager.copyFromSameThemeOverrides(type, nil, $themeModeOverride)
|
|
Task {
|
|
await save(applyToMode, themeModeOverride)
|
|
}
|
|
globalThemeUsed = false
|
|
return true
|
|
}
|
|
|
|
private func preApplyGlobalIfNeeded(_ type: WallpaperType?) {
|
|
if globalThemeUsed {
|
|
_ = onTypeCopyFromSameTheme(type)
|
|
}
|
|
}
|
|
|
|
private func onTypeChange(_ type: WallpaperType?) {
|
|
if globalThemeUsed {
|
|
preApplyGlobalIfNeeded(type)
|
|
// Saves copied static image instead of original from global theme
|
|
ThemeManager.applyWallpaper(themeModeOverride.type, $themeModeOverride)
|
|
} else {
|
|
ThemeManager.applyWallpaper(type, $themeModeOverride)
|
|
}
|
|
Task {
|
|
await save(applyToMode, themeModeOverride)
|
|
}
|
|
}
|
|
|
|
private func currentColors(_ type: WallpaperType?) -> ThemeManager.ActiveTheme {
|
|
// If applying for :
|
|
// - all themes: no overrides needed
|
|
// - specific user: only user overrides for currently selected theme are needed, because they will NOT be copied when other wallpaper is selected
|
|
let perUserOverride: ThemeModeOverrides? = theme.wallpaper.type.sameType(type) ? ChatModel.shared.currentUser?.uiThemes : nil
|
|
return ThemeManager.currentColors(type, nil, perUserOverride, themeOverridesDefault.get())
|
|
}
|
|
|
|
private func onChooseType(_ type: WallpaperType?) {
|
|
if let type, case WallpaperType.image = type {
|
|
if theme.wallpaper.type.isImage || currentColors(type).wallpaper.type.image == nil {
|
|
showImageImporter = true
|
|
} else {
|
|
_ = onTypeCopyFromSameTheme(currentColors(type).wallpaper.type)
|
|
}
|
|
} else if themeModeOverride.type != type || theme.wallpaper.type != type {
|
|
_ = onTypeCopyFromSameTheme(type)
|
|
} else {
|
|
onTypeChange(type)
|
|
}
|
|
}
|
|
|
|
private func editColor(_ name: ThemeColor, _ currentTheme: AppTheme) -> Binding<Color> {
|
|
editColorBinding(
|
|
name: name,
|
|
wallpaperType: theme.wallpaper.type,
|
|
wallpaperImage: theme.wallpaper.type.image,
|
|
theme: currentTheme,
|
|
onColorChange: { color in
|
|
preApplyGlobalIfNeeded(themeModeOverride.type)
|
|
ThemeManager.applyThemeColor(name: name, color: color, pref: $themeModeOverride)
|
|
Task { await save(applyToMode, themeModeOverride) }
|
|
})
|
|
}
|
|
}
|
|
|
|
struct ChatWallpaperEditor: View {
|
|
@EnvironmentObject var theme: AppTheme
|
|
@State private var currentTheme: ThemeManager.ActiveTheme
|
|
var initialTheme: ThemeModeOverride
|
|
@State var themeModeOverride: ThemeModeOverride
|
|
@State var applyToMode: DefaultThemeMode?
|
|
@State var showMore: Bool = false
|
|
@State var showFileImporter: Bool = false
|
|
@Binding var globalThemeUsed: Bool
|
|
var layoutSection: AnyView
|
|
var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
|
|
|
|
@State private var showImageImporter: Bool = false
|
|
|
|
init(initialTheme: ThemeModeOverride, themeModeOverride: ThemeModeOverride, applyToMode: DefaultThemeMode? = nil, globalThemeUsed: Binding<Bool>, layoutSection: AnyView, save: @escaping (DefaultThemeMode?, ThemeModeOverride?) async -> Void) {
|
|
let cur = ThemeManager.currentColors(nil, globalThemeUsed.wrappedValue ? nil : themeModeOverride, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
self.currentTheme = cur
|
|
self.initialTheme = initialTheme
|
|
self.themeModeOverride = themeModeOverride
|
|
self.applyToMode = applyToMode
|
|
self._globalThemeUsed = globalThemeUsed
|
|
self.layoutSection = layoutSection
|
|
self.save = save
|
|
}
|
|
|
|
var body: some View {
|
|
List {
|
|
layoutSection
|
|
|
|
WallpaperPresetSelector(
|
|
selectedWallpaper: currentTheme.wallpaper.type,
|
|
activeBackgroundColor: currentTheme.wallpaper.background,
|
|
activeTintColor: currentTheme.wallpaper.tint,
|
|
currentColors: currentColors,
|
|
onChooseType: onChooseType
|
|
)
|
|
.padding(.bottom, 10)
|
|
.listRowInsets(.init())
|
|
.listRowBackground(Color.clear)
|
|
.modifier(WallpaperImporter(showImageImporter: $showImageImporter, onChooseImage: { image in
|
|
if let filename = saveWallpaperFile(image: image) {
|
|
_ = onTypeCopyFromSameTheme(WallpaperType.image(filename, 1, WallpaperScaleType.fill))
|
|
}
|
|
}))
|
|
|
|
WallpaperSetupView(
|
|
wallpaperType: themeModeOverride.type,
|
|
base: currentTheme.base,
|
|
initialWallpaper: currentTheme.wallpaper,
|
|
editColor: editColor,
|
|
onTypeChange: onTypeChange
|
|
)
|
|
|
|
Section {
|
|
if !globalThemeUsed {
|
|
ResetToGlobalThemeButton(ChatModel.shared.currentUser?.uiThemes?.preferredMode(isInDarkTheme()) == nil, theme.colors.primary) {
|
|
themeModeOverride = ThemeManager.defaultActiveTheme(ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
globalThemeUsed = true
|
|
Task {
|
|
await save(applyToMode, nil)
|
|
}
|
|
}
|
|
}
|
|
|
|
SetDefaultThemeButton(theme.colors.primary) {
|
|
globalThemeUsed = false
|
|
let lightBase = DefaultTheme.LIGHT
|
|
let darkBase = if currentTheme.base != DefaultTheme.LIGHT { currentTheme.base } else if systemDarkThemeDefault.get() == DefaultTheme.DARK.themeName { DefaultTheme.DARK } else if systemDarkThemeDefault.get() == DefaultTheme.BLACK.themeName { DefaultTheme.BLACK } else { DefaultTheme.SIMPLEX }
|
|
let mode = themeModeOverride.mode
|
|
Task {
|
|
// Saving for both modes in one place by changing mode once per save
|
|
if applyToMode == nil {
|
|
let oppositeMode = mode == DefaultThemeMode.light ? DefaultThemeMode.dark : DefaultThemeMode.light
|
|
await save(oppositeMode, ThemeModeOverride.withFilledAppDefaults(oppositeMode, oppositeMode == DefaultThemeMode.light ? lightBase : darkBase))
|
|
}
|
|
await MainActor.run {
|
|
themeModeOverride = ThemeModeOverride.withFilledAppDefaults(mode, mode == DefaultThemeMode.light ? lightBase : darkBase)
|
|
}
|
|
await save(themeModeOverride.mode, themeModeOverride)
|
|
}
|
|
}
|
|
.onChange(of: initialTheme) { initial in
|
|
if initial.mode != themeModeOverride.mode {
|
|
themeModeOverride = initial
|
|
currentTheme = ThemeManager.currentColors(nil, globalThemeUsed ? nil : themeModeOverride, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
if applyToMode != nil {
|
|
applyToMode = initial.mode
|
|
}
|
|
}
|
|
}
|
|
.onChange(of: currentTheme) { _ in
|
|
// Applies updated global theme if current one tracks global theme
|
|
if globalThemeUsed {
|
|
themeModeOverride = ThemeManager.defaultActiveTheme(ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
globalThemeUsed = true
|
|
}
|
|
}
|
|
.onChange(of: themeModeOverride) { override in
|
|
currentTheme = ThemeManager.currentColors(nil, globalThemeUsed ? nil : override, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
}
|
|
}
|
|
|
|
if showMore {
|
|
let values = [
|
|
(nil, "All modes"),
|
|
(DefaultThemeMode.light, "Light mode"),
|
|
(DefaultThemeMode.dark, "Dark mode")
|
|
]
|
|
Picker("Apply to", selection: $applyToMode) {
|
|
ForEach(values, id: \.0) { (_, text) in
|
|
Text(text)
|
|
}
|
|
}
|
|
.frame(height: 36)
|
|
.onChange(of: applyToMode) { mode in
|
|
if let mode, mode != currentTheme.base.mode {
|
|
let lightBase = DefaultTheme.LIGHT
|
|
let darkBase = if currentTheme.base != DefaultTheme.LIGHT { currentTheme.base } else if systemDarkThemeDefault.get() == DefaultTheme.DARK.themeName { DefaultTheme.DARK } else if systemDarkThemeDefault.get() == DefaultTheme.BLACK.themeName { DefaultTheme.BLACK } else { DefaultTheme.SIMPLEX }
|
|
ThemeManager.applyTheme(mode == DefaultThemeMode.light ? lightBase.themeName : darkBase.themeName)
|
|
}
|
|
}
|
|
|
|
CustomizeThemeColorsSection(editColor: editColor)
|
|
|
|
ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes)
|
|
} else {
|
|
AdvancedSettingsButton(theme.colors.primary) { showMore = true }
|
|
}
|
|
}
|
|
.modifier(
|
|
ThemeImporter(isPresented: $showFileImporter) { imported in
|
|
let importedFromString = imported.wallpaper?.importFromString()
|
|
let importedType = importedFromString?.toAppWallpaper().type
|
|
let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
|
|
let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
|
|
let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
|
|
Task {
|
|
await MainActor.run {
|
|
themeModeOverride = res
|
|
}
|
|
await save(applyToMode, res)
|
|
}
|
|
}
|
|
)
|
|
}
|
|
|
|
private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
|
|
let success = ThemeManager.copyFromSameThemeOverrides(type, ChatModel.shared.currentUser?.uiThemes?.preferredMode(!currentTheme.colors.isLight), $themeModeOverride)
|
|
if success {
|
|
Task {
|
|
await save(applyToMode, themeModeOverride)
|
|
}
|
|
globalThemeUsed = false
|
|
}
|
|
return success
|
|
}
|
|
|
|
private func preApplyGlobalIfNeeded(_ type: WallpaperType?) {
|
|
if globalThemeUsed {
|
|
_ = onTypeCopyFromSameTheme(type)
|
|
}
|
|
}
|
|
|
|
private func onTypeChange(_ type: WallpaperType?) {
|
|
if globalThemeUsed {
|
|
preApplyGlobalIfNeeded(type)
|
|
// Saves copied static image instead of original from global theme
|
|
ThemeManager.applyWallpaper(themeModeOverride.type, $themeModeOverride)
|
|
} else {
|
|
ThemeManager.applyWallpaper(type, $themeModeOverride)
|
|
}
|
|
Task {
|
|
await save(applyToMode, themeModeOverride)
|
|
}
|
|
}
|
|
|
|
private func currentColors(_ type: WallpaperType?) -> ThemeManager.ActiveTheme {
|
|
// If applying for :
|
|
// - all themes: no overrides needed
|
|
// - specific user: only user overrides for currently selected theme are needed, because they will NOT be copied when other wallpaper is selected
|
|
let perChatOverride: ThemeModeOverride? = type?.sameType(themeModeOverride.type) == true ? themeModeOverride : nil
|
|
return ThemeManager.currentColors(type, perChatOverride, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
}
|
|
|
|
private func onChooseType(_ type: WallpaperType?) {
|
|
if let type, case WallpaperType.image = type {
|
|
if (themeModeOverride.type?.isImage == true && !globalThemeUsed) || currentColors(type).wallpaper.type.image == nil {
|
|
showImageImporter = true
|
|
} else if !onTypeCopyFromSameTheme(currentColors(type).wallpaper.type) {
|
|
showImageImporter = true
|
|
}
|
|
} else if globalThemeUsed || themeModeOverride.type != type || themeModeOverride.type != type {
|
|
_ = onTypeCopyFromSameTheme(type)
|
|
} else {
|
|
onTypeChange(type)
|
|
}
|
|
}
|
|
|
|
private func editColor(_ name: ThemeColor) -> Binding<Color> {
|
|
editColorBinding(
|
|
name: name,
|
|
wallpaperType: themeModeOverride.type,
|
|
wallpaperImage: themeModeOverride.type?.image,
|
|
theme: currentTheme.toAppTheme(),
|
|
onColorChange: { color in
|
|
preApplyGlobalIfNeeded(themeModeOverride.type)
|
|
ThemeManager.applyThemeColor(name: name, color: color, pref: $themeModeOverride)
|
|
currentTheme = ThemeManager.currentColors(nil, globalThemeUsed ? nil : themeModeOverride, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
|
|
Task { await save(applyToMode, themeModeOverride) }
|
|
})
|
|
}
|
|
}
|
|
|
|
private func ResetToGlobalThemeButton(_ app: Bool, _ primaryColor: Color, _ onClick: @escaping () -> Void) -> some View {
|
|
Button {
|
|
onClick()
|
|
} label: {
|
|
Text(app ? "Reset to app theme" : "Reset to user theme")
|
|
.foregroundColor(primaryColor)
|
|
}
|
|
}
|
|
|
|
private func SetDefaultThemeButton(_ primaryColor: Color, _ onClick: @escaping () -> Void) -> some View {
|
|
Button {
|
|
onClick()
|
|
} label: {
|
|
Text("Set default theme")
|
|
.foregroundColor(primaryColor)
|
|
}
|
|
}
|
|
|
|
private func AdvancedSettingsButton(_ primaryColor: Color, _ onClick: @escaping () -> Void) -> some View {
|
|
Button {
|
|
onClick()
|
|
} label: {
|
|
HStack {
|
|
Image(systemName: "chevron.down")
|
|
Text("Advanced settings")
|
|
}.foregroundColor(primaryColor)
|
|
}
|
|
}
|
|
|
|
struct ChatLayoutSection: View {
|
|
var chatInfo: ChatInfo
|
|
var setChatLayout: (ChatLayout?) -> Void
|
|
|
|
var body: some View {
|
|
let defaultChatLayout = chatInfo.defaultChatLayout(profileChatLayout(ChatModel.shared.currentUser))
|
|
let otherLayout = otherChatLayout(defaultChatLayout)
|
|
let suffix = chatInfo.chatLayout == defaultChatLayout ? NSLocalizedString("(chat)", comment: "chat layout") : NSLocalizedString("(default)", comment: "chat layout")
|
|
Section {
|
|
Picker("Chat layout", selection: Binding(
|
|
get: { chatInfo.uiThemes?.chatLayout == otherLayout ? otherLayout : nil },
|
|
set: setChatLayout
|
|
)) {
|
|
Text(defaultChatLayout.displayName + " " + suffix).tag(nil as ChatLayout?)
|
|
Text(otherLayout.displayName).tag(otherLayout as ChatLayout?)
|
|
}
|
|
.frame(height: 36)
|
|
}
|
|
}
|
|
}
|
|
|
|
func otherChatLayout(_ layout: ChatLayout) -> ChatLayout {
|
|
layout == .terminal ? .classic : .terminal
|
|
}
|