types and api

2026-05-25 20:44:38 +00:00 · 2024-06-14 03:30:48 +07:00
parent b8bf5871fb
commit 2023464a13
11 changed files with 125 additions and 41 deletions
@@ -244,7 +244,7 @@ struct ContentView: View {
        .background(
            Rectangle()
                .fill(theme.colors.background)
-        ) 
+        )
    }

    private func mainView() -> some View {
@@ -422,6 +422,16 @@ final class ChatModel: ObservableObject {
        }
    }

+    func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
+        guard var current = currentUser else { return }
+        current.uiThemes = uiThemes
+        let i = users.index(where: { $0.user.userId == current.userId })
+        if let i {
+            users[i].user = current
+        }
+        currentUser = current
+    }
+
    func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
        let cItem = ChatItem.liveDummy(chatInfo.chatType)
        withAnimation {
@@ -205,6 +205,43 @@ func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
    }
 }

+func saveWallpaperFile(url: URL) -> String? {
+    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", "jpg", fullPath: true))
+    do {
+        try FileManager.default.copyItem(atPath: url.path, toPath: destFile.path)
+        return destFile.lastPathComponent
+    } catch {
+        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
+        return nil
+    }
+}
+
+func saveWallpaperFile(image: UIImage) -> String? {
+    let hasAlpha = imageHasAlpha(image)
+    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", hasAlpha ? "png" : "jpg", fullPath: true))
+    let dataResized = resizeImageToDataSize(image, maxDataSize: 5_000_000, hasAlpha: hasAlpha)
+    do {
+        try dataResized!.write(to: destFile)
+        return destFile.lastPathComponent
+    } catch {
+        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
+        return nil
+    }
+}
+
+func removeWallpaperFile(fileName: String? = nil) {
+    do {
+        try FileManager.default.contentsOfDirectory(atPath: getWallpaperDirectory().path).forEach {
+            if URL(fileURLWithPath: $0).lastPathComponent == fileName { try FileManager.default.removeItem(atPath: $0) }
+        }
+    } catch {
+        logger.error("FileUtils.removeWallpaperFile error: \(error.localizedDescription)")
+    }
+    if let fileName {
+        WallpaperType.cachedImages.removeValue(forKey: fileName)
+    }
+}
+
 func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
    uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }
@@ -242,14 +242,8 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
    logger.error("apiSuspendChat error: \(String(describing: r))")
 }

-func apiSetTempFolder(tempFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder), ctrl)
-    if case .cmdOk = r { return }
-    throw r
-}
-
-func apiSetFilesFolder(filesFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder), ctrl)
+func apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String, ctrl: chat_ctrl? = nil) throws {
+    let r = chatSendCmdSync(.apiSetAppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder), ctrl)
    if case .cmdOk = r { return }
    throw r
 }
@@ -831,6 +825,21 @@ func apiSetConnectionAlias(connId: Int64, localAlias: String) async throws -> Pe
    throw r
 }

+func apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?) -> Bool {
+    let r = await chatSendCmd(.apiSetUserUIThemes(userId: userId, themes: themes))
+    if case .cmdOk = r { return true }
+    logger.error("apiSetUserUIThemes bad response: \(String(describing: r))")
+    return false
+}
+
+func apiSetChatUIThemes(chatId: ChatId, themes: ThemeModeOverrides?) -> Bool {
+    let r = chatSendCmd(.apiSetChatUIThemes(chatId: chatId, themes: themes))
+    if case .cmdOk = r { return true }
+    logger.error("apiSetChatUIThemes bad response: \(String(describing: r))")
+    return false
+}
+
+
 func apiCreateUserAddress() async throws -> String {
    let userId = try currentUserId("apiCreateUserAddress")
    let r = await chatSendCmd(.apiCreateMyAddress(userId: userId))
@@ -1353,8 +1362,7 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
    if encryptionStartedDefault.get() {
        encryptionStartedDefault.set(false)
    }
-    try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
-    try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try apiSetAppFilePaths(filesFolder: getAppFilesDirectory().path, tempFolder: getTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path)
    try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
    m.chatInitialized = true
    m.currentUser = try apiGetActiveUser()
@@ -1439,8 +1447,7 @@ func startChatWithTemporaryDatabase(ctrl: chat_ctrl) throws -> User? {
    logger.debug("startChatWithTemporaryDatabase")
    let migrationActiveUser = try? apiGetActiveUser(ctrl: ctrl) ?? apiCreateActiveUser(Profile(displayName: "Temp", fullName: ""), ctrl: ctrl)
    try setNetworkConfig(getNetCfg(), ctrl: ctrl)
-    try apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
+    try apiSetAppFilePaths(filesFolder: getMigrationTempFilesDirectory().path, tempFolder: getMigrationTempFilesDirectory().path, assetsFolder: getWallpaperDirectory().deletingLastPathComponent().path, ctrl: ctrl)
    _ = try apiStartChat(ctrl: ctrl)
    return migrationActiveUser
 }
@@ -684,25 +684,6 @@ let BlackColorPaletteApp = AppColors(

 var systemInDarkThemeCurrently: Bool = false

-extension User {
-    var uiThemes: ThemeModeOverrides? {
-        ThemeModeOverrides() // LALAL remove it
-    }
-}
-
-extension Contact {
-    var uiThemes: ThemeModeOverrides? {
-        nil
-        //ThemeModeOverrides(dark: ThemeModeOverride(mode: DefaultThemeMode.dark, colors: ThemeColors(primary: Color.green.toReadableHex(), secondary: Color.red.toReadableHex(), background: Color.white.toReadableHex(), sentMessage: Color.yellow.toReadableHex()))) // LALAL remove it
-    }
-}
-
-extension GroupInfo {
-    var uiThemes: ThemeModeOverrides? {
-        ThemeModeOverrides() // LALAL remove it
-    }
-}
-
 var CurrentColors: ThemeManager.ActiveTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get()) {
    didSet {
        AppTheme.shared.name = CurrentColors.name
@@ -610,7 +610,7 @@ struct ChatView: View {
                                .padding(.top, 7)
                        }
                        HStack(alignment: .top, spacing: 8) {
-                            ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize)
+                            ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize, backgroundColor: theme.colors.background)
                                .onTapGesture {
                                    if chatView.membersLoaded {
                                        selectedMember = m.getGroupMember(member.groupMemberId)
@@ -16,6 +16,7 @@ struct ProfileImage: View {
    var iconName: String = "person.crop.circle.fill"
    var size: CGFloat
    var color = Color(uiColor: .tertiarySystemGroupedBackground)
+    var backgroundColor: Color? = nil
    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner

    var body: some View {
@@ -28,6 +29,7 @@ struct ProfileImage: View {
                .resizable()
                .foregroundColor(color)
                .frame(width: size, height: size)
+                .background(backgroundColor != nil ? backgroundColor! : .clear)
        }
    }
 }
@@ -44,6 +44,11 @@ extension AppSettings {
        if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
        if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
        if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
+        if let val = uiProfileImageCornerRadius { def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) }
+        if let val = uiColorScheme { def.setValue(val, forKey: DEFAULT_CURRENT_THEME) }
+        if let val = uiDarkColorScheme { def.setValue(val, forKey: DEFAULT_SYSTEM_DARK_THEME) }
+        if let val = uiCurrentThemeIds { def.setValue(val, forKey: DEFAULT_CURRENT_THEME_IDS) }
+        if let val = uiThemes { def.setValue(val, forKey: DEFAULT_THEME_OVERRIDES) }
    }

    public static var current: AppSettings {
@@ -69,6 +74,11 @@ extension AppSettings {
        c.androidCallOnLockScreen = AppSettingsLockScreenCalls(rawValue: def.string(forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN)!)
        c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
        c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
+        c.uiProfileImageCornerRadius = def.float(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
+        c.uiColorScheme = currentThemeDefault.get()
+        c.uiDarkColorScheme = systemDarkThemeDefault.get()
+        c.uiCurrentThemeIds = currentThemeIdsDefault.get()
+        c.uiThemes = themeOverridesDefault.get()
        return c
    }
 }
@@ -29,8 +29,7 @@ public enum ChatCommand {
    case apiStopChat
    case apiActivateChat(restoreChat: Bool)
    case apiSuspendChat(timeoutMicroseconds: Int)
-    case setTempFolder(tempFolder: String)
-    case setFilesFolder(filesFolder: String)
+    case apiSetAppFilePaths(filesFolder: String, tempFolder: String, assetsFolder: String)
    case apiSetEncryptLocalFiles(enable: Bool)
    case apiExportArchive(config: ArchiveConfig)
    case apiImportArchive(config: ArchiveConfig)
@@ -106,6 +105,8 @@ public enum ChatCommand {
    case apiSetContactPrefs(contactId: Int64, preferences: Preferences)
    case apiSetContactAlias(contactId: Int64, localAlias: String)
    case apiSetConnectionAlias(connId: Int64, localAlias: String)
+    case apiSetUserUIThemes(userId: Int64, themes: ThemeModeOverrides?)
+    case apiSetChatUIThemes(chatId: String, themes: ThemeModeOverrides?)
    case apiCreateMyAddress(userId: Int64)
    case apiDeleteMyAddress(userId: Int64)
    case apiShowMyAddress(userId: Int64)
@@ -169,8 +170,7 @@ public enum ChatCommand {
            case .apiStopChat: return "/_stop"
            case let .apiActivateChat(restore): return "/_app activate restore=\(onOff(restore))"
            case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
-            case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
-            case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
+            case let .apiSetAppFilePaths(filesFolder, tempFolder, assetsFolder): return "/set file paths \(encodeJSON(AppFilePaths(filesFolder: filesFolder, tempFolder: tempFolder, assetsFolder: assetsFolder)))"
            case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
            case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
            case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
@@ -268,6 +268,8 @@ public enum ChatCommand {
            case let .apiSetContactPrefs(contactId, preferences): return "/_set prefs @\(contactId) \(encodeJSON(preferences))"
            case let .apiSetContactAlias(contactId, localAlias): return "/_set alias @\(contactId) \(localAlias.trimmingCharacters(in: .whitespaces))"
            case let .apiSetConnectionAlias(connId, localAlias): return "/_set alias :\(connId) \(localAlias.trimmingCharacters(in: .whitespaces))"
+            case let .apiSetUserUIThemes(userId, themes): return "/_set theme user \(userId) \(themes != nil ? encodeJSON(themes) : "")"
+            case let .apiSetChatUIThemes(chatId, themes): return "/_set theme \(chatId) \(themes != nil ? encodeJSON(themes) : "")"
            case let .apiCreateMyAddress(userId): return "/_address \(userId)"
            case let .apiDeleteMyAddress(userId): return "/_delete_address \(userId)"
            case let .apiShowMyAddress(userId): return "/_show_address \(userId)"
@@ -325,8 +327,7 @@ public enum ChatCommand {
            case .apiStopChat: return "apiStopChat"
            case .apiActivateChat: return "apiActivateChat"
            case .apiSuspendChat: return "apiSuspendChat"
-            case .setTempFolder: return "setTempFolder"
-            case .setFilesFolder: return "setFilesFolder"
+            case .apiSetAppFilePaths: return "apiSetAppFilePaths"
            case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
            case .apiExportArchive: return "apiExportArchive"
            case .apiImportArchive: return "apiImportArchive"
@@ -402,6 +403,8 @@ public enum ChatCommand {
            case .apiSetContactPrefs: return "apiSetContactPrefs"
            case .apiSetContactAlias: return "apiSetContactAlias"
            case .apiSetConnectionAlias: return "apiSetConnectionAlias"
+            case .apiSetUserUIThemes: return "apiSetUserUIThemes"
+            case .apiSetChatUIThemes: return "apiSetChatUIThemes"
            case .apiCreateMyAddress: return "apiCreateMyAddress"
            case .apiDeleteMyAddress: return "apiDeleteMyAddress"
            case .apiShowMyAddress: return "apiShowMyAddress"
@@ -2071,6 +2074,11 @@ public struct AppSettings: Codable, Equatable {
    public var androidCallOnLockScreen: AppSettingsLockScreenCalls? = nil
    public var iosCallKitEnabled: Bool? = nil
    public var iosCallKitCallsInRecents: Bool? = nil
+    public var uiProfileImageCornerRadius: Float? = nil
+    public var uiColorScheme: String? = nil
+    public var uiDarkColorScheme: String? = nil
+    public var uiCurrentThemeIds: [String: String]? = nil
+    public var uiThemes: [ThemeOverrides]? = nil

    public func prepareForExport() -> AppSettings {
        var empty = AppSettings()
@@ -2095,6 +2103,11 @@ public struct AppSettings: Codable, Equatable {
        if androidCallOnLockScreen != def.androidCallOnLockScreen { empty.androidCallOnLockScreen = androidCallOnLockScreen }
        if iosCallKitEnabled != def.iosCallKitEnabled { empty.iosCallKitEnabled = iosCallKitEnabled }
        if iosCallKitCallsInRecents != def.iosCallKitCallsInRecents { empty.iosCallKitCallsInRecents = iosCallKitCallsInRecents }
+        if uiProfileImageCornerRadius != def.uiProfileImageCornerRadius { empty.uiProfileImageCornerRadius = uiProfileImageCornerRadius }
+        if uiColorScheme != def.uiColorScheme { empty.uiColorScheme = uiColorScheme }
+        if uiDarkColorScheme != def.uiDarkColorScheme { empty.uiDarkColorScheme = uiDarkColorScheme }
+        if uiCurrentThemeIds != def.uiCurrentThemeIds { empty.uiCurrentThemeIds = uiCurrentThemeIds }
+        if uiThemes != def.uiThemes { empty.uiThemes = uiThemes }
        return empty
    }

@@ -2119,7 +2132,12 @@ public struct AppSettings: Codable, Equatable {
            confirmDBUpgrades: false,
            androidCallOnLockScreen: AppSettingsLockScreenCalls.show,
            iosCallKitEnabled: true,
-            iosCallKitCallsInRecents: false
+            iosCallKitCallsInRecents: false,
+            uiProfileImageCornerRadius: 22.5,
+            uiColorScheme: DefaultTheme.SYSTEM_THEME_NAME,
+            uiDarkColorScheme: DefaultTheme.SIMPLEX.themeName,
+            uiCurrentThemeIds: nil as [String: String]?,
+            uiThemes: nil as [ThemeOverrides]?
        )
    }
 }
@@ -2224,3 +2242,9 @@ public enum MsgType: String, Codable {
    case message
    case quota
 }
+
+public struct AppFilePaths: Encodable {
+    public let filesFolder: String
+    public let tempFolder: String
+    public let assetsFolder: String
+}
@@ -26,7 +26,7 @@ public struct User: Identifiable, Decodable, UserLike, NamedChat {
    public var sendRcptsContacts: Bool
    public var sendRcptsSmallGroups: Bool
    public var viewPwdHash: UserPwdHash?
-    //public var uiThemes: ThemeModeOverrides
+    public var uiThemes: ThemeModeOverrides?

    public var id: Int64 { userId }

@@ -1505,6 +1505,7 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    var chatTs: Date?
    var contactGroupMemberId: Int64?
    var contactGrpInvSent: Bool
+    public var uiThemes: ThemeModeOverrides?

    public var id: ChatId { get { "@\(contactId)" } }
    public var apiId: Int64 { get { contactId } }
@@ -1844,6 +1845,7 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat {
    var createdAt: Date
    var updatedAt: Date
    var chatTs: Date?
+    public var uiThemes: ThemeModeOverrides?

    public var id: ChatId { get { "#\(groupId)" } }
    public var apiId: Int64 { get { groupId } }
@@ -8,6 +8,7 @@

 import Foundation
 import OSLog
+import UIKit

 let logger = Logger()

@@ -85,6 +86,8 @@ public func deleteAppDatabaseAndFiles() {
    try? fm.removeItem(at: getTempFilesDirectory())
    try? fm.removeItem(at: getMigrationTempFilesDirectory())
    try? fm.createDirectory(at: getTempFilesDirectory(), withIntermediateDirectories: true)
+    try? fm.removeItem(at: getWallpaperDirectory())
+    try? fm.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
    deleteAppFiles()
    _ = kcDatabasePassword.remove()
    storeDBPassphraseGroupDefault.set(true)
@@ -196,6 +199,14 @@ public func getAppFilePath(_ fileName: String) -> URL {
    getAppFilesDirectory().appendingPathComponent(fileName)
 }

+public func getWallpaperDirectory() -> URL {
+    getAppDirectory().appendingPathComponent("assets", isDirectory: true).appendingPathComponent("wallpapers", isDirectory: true)
+}
+
+public func getWallpaperFilePath(_ filename: String) -> URL {
+    getWallpaperDirectory().appendingPathComponent(filename)
+}
+
 public func saveFile(_ data: Data, _ fileName: String, encrypted: Bool) -> CryptoFile? {
    let filePath = getAppFilePath(fileName)
    do {