APP-980-Chat config changes for admin + colors (#99)

bmalumphy · web-flow · commit 0f931272b88c · 2026-01-12T16:55:26.000-05:00
* APP-980-Change ChatConfig to allow for primary color override as well as admin access to edits/deletes

* iOS Chat send button color

* Room Edit fixes
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ColorUtils.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ColorUtils.kt
@@ -0,0 +1,6 @@
+import androidx.compose.ui.graphics.Color
+import androidx.core.graphics.toColorInt
+
+fun String.parseHexColor(): Color {
+    return Color(this.toColorInt())
+}
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/Configs.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/Configs.kt
@@ -5,7 +5,9 @@ data class ChatConfig(
     val retentionPolicy: ChatRetentionPolicy = ChatRetentionPolicy(days = 30),
     val usersCollection: String = "users",
     val userId: String? = "ditto-system-user-id",
-    val acceptLargeImages: Boolean = true
+    val acceptLargeImages: Boolean = true,
+    val primaryColor: String? = null,
+    val hasAdminPrivileges: Boolean = false
 )
 
 data class ChatRetentionPolicy(
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/DittoChat.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/DittoChat.kt
@@ -13,6 +13,7 @@ interface DittoChat {
     fun setCurrentUser(config: UserConfig)
 
     val publicRoomsFlow: kotlinx.coroutines.flow.Flow<List<Room>>
+    val dittoChatConfig: ChatConfig
 
     val localStore: LocalData
     val p2pStore: DittoData
@@ -24,6 +25,7 @@ interface DittoChat {
 }
 
 class DittoChatImpl(
+    override val dittoChatConfig: ChatConfig,
     override val localStore: LocalData,
     override val p2pStore: DittoData
 ) : DittoChat {
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatInputView.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatInputView.kt
@@ -20,7 +20,8 @@ fun ChatInputBar(
     text: String,
     onTextChange: (String) -> Unit,
     onSendClick: () -> Unit,
-    onCameraClick: () -> Unit
+    onCameraClick: () -> Unit,
+    primaryColor: Color
 ) {
     Surface(
         modifier = Modifier.fillMaxWidth(),
@@ -53,7 +54,7 @@ fun ChatInputBar(
                     .size(40.dp)
                     .padding(4.dp)
                     .clip(CircleShape)
-                    .background(MaterialTheme.colorScheme.primary)
+                    .background(primaryColor)
             ) {
                 Icon(
                     Icons.Default.Send,
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatScreen.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatScreen.kt
@@ -19,10 +19,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.core.graphics.toColorInt
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.ditto.dittochat.DittoChat
 import com.ditto.dittochat.DittoData
 import kotlinx.coroutines.launch
+import parseHexColor
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -84,7 +86,10 @@ fun ChatScreen(
                     text = inputText,
                     onTextChange = viewModel::updateInputText,
                     onSendClick = viewModel::sendMessage,
-                    onCameraClick = { imagePicker.launch("image/*") }
+                    onCameraClick = { imagePicker.launch("image/*") },
+                    primaryColor =
+                        viewModel.dittoChat.dittoChatConfig.primaryColor?.parseHexColor()
+                            ?: MaterialTheme.colorScheme.primary
                 )
             }
         }
@@ -105,7 +110,9 @@ fun ChatScreen(
                         currentUserId = currentUser?.id,
                         onEditClick = { viewModel.startEditMessage(it) },
                         onDeleteClick = { viewModel.deleteMessage(it) },
-                        onImageClick = { viewModel.showAttachment(it) }
+                        onImageClick = { viewModel.showAttachment(it) },
+                        hasAdminPrivileges = viewModel.dittoChat.dittoChatConfig.hasAdminPrivileges,
+                        primaryColor = viewModel.dittoChat.dittoChatConfig.primaryColor
                     )
                 }
             }
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatScreenViewModel.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatScreenViewModel.kt
@@ -18,7 +18,7 @@ import kotlinx.coroutines.withContext
 // ChatScreenViewModel.kt
 class ChatScreenViewModel(
     private val dittoData: DittoData,
-    private val dittoChat: DittoChat
+    internal val dittoChat: DittoChat
 ) {
 
     private val _room = MutableStateFlow<Room?>(null)
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/Dialogs.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/Dialogs.kt
@@ -12,7 +12,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 fun CreateRoomDialog(
     onDismiss: () -> Unit,
     onCreate: (String) -> Unit,
-    viewModel: RoomEditViewModel = hiltViewModel()
+    viewModel: RoomEditViewModel
 ) {
     val roomName by viewModel.roomName.collectAsState()
     val isCreating by viewModel.isCreating.collectAsState()
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatModule.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatModule.kt
@@ -41,18 +41,20 @@ object DittoChatModule {
 
     internal fun provideDittoChat(
         localStore: LocalData,
-        p2pStore: DittoData
+        p2pStore: DittoData,
+        dittoChatConfig: ChatConfig
     ): DittoChat {
-        return DittoChatImpl(localStore, p2pStore)
+        return DittoChatImpl(dittoChatConfig, localStore, p2pStore)
     }
 
-    fun provideDittoChatUI(ditto: Ditto, localData: LocalData): DittoChatUI {
+    fun provideDittoChatUI(ditto: Ditto, localData: LocalData, dittoChatConfig: ChatConfig): DittoChatUI {
         return DittoChatUI(provideDittoChat(
             localData,
             provideDittoDataInterface(
                 localData,
                 ditto
-            )
+            ),
+            dittoChatConfig
         ))
     }
 }
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatNavigation.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatNavigation.kt
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatUI.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/DittoChatUI.kt
@@ -1,14 +1,7 @@
 package com.ditto.dittochat.ui
 
-import android.content.Context
 import androidx.compose.runtime.Composable
-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.rememberNavController
-import com.ditto.dittochat.ChatConfig
 import com.ditto.dittochat.DittoChat
-import com.ditto.dittochat.DittoChatImpl
-import com.ditto.dittochat.DittoData
 import com.ditto.dittochat.UserConfig
 
 class DittoChatUI(
@@ -18,11 +11,13 @@ class DittoChatUI(
     @Composable
     fun RoomsListView(
         viewModel: RoomsListScreenViewModel,
+        editViewModel: RoomEditViewModel,
         navigateToChat: (String) -> Unit,
     ) {
         RoomsListScreen(
             onNavigateToChat = navigateToChat,
-            viewModel = viewModel
+            viewModel = viewModel,
+            roomEditViewModel = editViewModel,
         )
     }
 
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/MessageBubbleView.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/MessageBubbleView.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import com.ditto.dittochat.DateUtils
 import com.ditto.dittochat.Message
 import com.ditto.dittochat.MessageWithUser
+import parseHexColor
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -22,7 +23,9 @@ fun MessageBubble(
     currentUserId: String?,
     onEditClick: (Message) -> Unit,
     onDeleteClick: (Message) -> Unit,
-    onImageClick: (Message) -> Unit
+    onImageClick: (Message) -> Unit,
+    hasAdminPrivileges: Boolean = false,
+    primaryColor: String? = null
 ) {
     val message = messageWithUser.message
     val user = messageWithUser.user
@@ -50,7 +53,7 @@ fun MessageBubble(
             shape = MessageBubbleShape(isCurrentUser),
             colors = CardDefaults.cardColors(
                 containerColor = if (isCurrentUser)
-                    MaterialTheme.colorScheme.primary
+                    primaryColor?.parseHexColor() ?: MaterialTheme.colorScheme.primary
                 else
                     MaterialTheme.colorScheme.surfaceVariant
             )
@@ -92,7 +95,7 @@ fun MessageBubble(
                 )
             }
 
-            if (isCurrentUser && !message.isImageMessage) {
+            if (isCurrentUser && !message.isImageMessage && hasAdminPrivileges) {
                 DropdownMenuItem(
                     text = { Text("Edit") },
                     onClick = {
@@ -102,7 +105,7 @@ fun MessageBubble(
                 )
             }
 
-            if (isCurrentUser) {
+            if (isCurrentUser && hasAdminPrivileges) {
                 DropdownMenuItem(
                     text = { Text("Delete") },
                     onClick = {
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/RoomsListScreen.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/RoomsListScreen.kt
@@ -29,7 +29,8 @@ import kotlinx.coroutines.launch
 @Composable
 internal fun RoomsListScreen(
     onNavigateToChat: (String) -> Unit,
-    viewModel: RoomsListScreenViewModel
+    viewModel: RoomsListScreenViewModel,
+    roomEditViewModel: RoomEditViewModel
 ) {
     val publicRooms by viewModel.publicRooms.collectAsState()
     val defaultPublicRoom by viewModel.defaultPublicRoom.collectAsState()
@@ -111,7 +112,8 @@ internal fun RoomsListScreen(
             onDismiss = { viewModel.hideCreateRoomDialog() },
             onCreate = { name ->
                 viewModel.hideCreateRoomDialog()
-            }
+            },
+            roomEditViewModel
         )
     }
 }
diff --git a/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/RoomsListScreenViewModel.kt b/sdks/kotlin/src/main/java/com/ditto/dittochat/ui/RoomsListScreenViewModel.kt
@@ -5,13 +5,15 @@ import kotlinx.coroutines.launch
 import java.util.*
 import com.ditto.dittochat.ChatUser
 import com.ditto.dittochat.Constants
+import com.ditto.dittochat.DittoChat
 import com.ditto.dittochat.DittoData
 import com.ditto.dittochat.Room
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 
 class RoomsListScreenViewModel(
-    private val dittoData: DittoData
+    val dittoChat: DittoChat,
+    val dittoData: DittoData
 ) {
 
     private val _publicRooms = MutableStateFlow<List<Room>>(emptyList())
diff --git a/sdks/swift/Sources/DittoChatCore/DittoChat.swift b/sdks/swift/Sources/DittoChatCore/DittoChat.swift
@@ -64,16 +64,25 @@ public struct ChatConfig {
     public var usersCollection: String
     public var userId: String?
     public var acceptLargeImages: Bool
+    public var primaryColor: String?
+    public var hasAdminPrivileges: Bool
 
     public init(
-        ditto: Ditto, retentionPolicy: ChatRetentionPolicy = .init(days: 30), usersCollection: String = "users", 
-        userId: String? = nil, acceptLargeImages: Bool = true
+        ditto: Ditto,
+        retentionPolicy: ChatRetentionPolicy = .init(days: 30),
+        usersCollection: String = "users", 
+        userId: String? = nil,
+        acceptLargeImages: Bool = true,
+        primaryColor: String? = nil,
+        hasAdminPrivileges: Bool = false
     ) {
         self.ditto = ditto
         self.retentionPolicy = retentionPolicy
         self.usersCollection = usersCollection
         self.userId = userId
         self.acceptLargeImages = acceptLargeImages
+        self.primaryColor = primaryColor
+        self.hasAdminPrivileges = hasAdminPrivileges
     }
 }
 
@@ -90,13 +99,18 @@ public struct ChatRetentionPolicy {
 public class DittoChat: DittoSwiftChat, ObservableObject {
     @Published private(set) public var publicRoomsPublisher: AnyPublisher<[Room], Never>
     public var retentionPolicy: ChatRetentionPolicy = .init(days: 30)
-    public var acceptLargeImages: Bool = true
+    public var acceptLargeImages: Bool
+    public var primaryColor: String?
+    public var hasAdminPrivileges: Bool
 
     private var localStore: LocalDataInterface
     internal var p2pStore: DittoDataInterface
 
     public init(config: ChatConfig) {
         let localStore: LocalService = LocalService()
+        self.acceptLargeImages = config.acceptLargeImages
+        self.primaryColor = config.primaryColor
+        self.hasAdminPrivileges = config.hasAdminPrivileges
         self.localStore = localStore
         self.p2pStore = DittoService(privateStore: localStore, ditto: config.ditto, usersCollection: config.usersCollection, chatRetentionPolicy: config.retentionPolicy)
         self.publicRoomsPublisher = p2pStore.publicRoomsPublisher.eraseToAnyPublisher()
diff --git a/sdks/swift/Sources/DittoChatCore/Utilities/Utils.swift b/sdks/swift/Sources/DittoChatCore/Utilities/Utils.swift
@@ -9,6 +9,7 @@
 import Combine
 import CoreImage.CIFilterBuiltins
 import UIKit
+import SwiftUI
 
 extension DateFormatter {
     public static var shortTime: DateFormatter {
@@ -90,6 +91,46 @@ public enum KeyboardChangeEvent {
     case willShow, didShow, willHide, didHide, unchanged
 }
 
+extension Color {
+    public init?(hex: String) {
+        var hexString = hex.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+
+        if hexString.hasPrefix("#") {
+            hexString.removeFirst()
+        }
+
+        let scanner = Scanner(string: hexString)
+        var rgbValue: UInt64 = 0
+
+        guard scanner.scanHexInt64(&rgbValue) else {
+            return nil
+        }
+
+        var red, green, blue, alpha: UInt64
+        switch hexString.count {
+        case 6: // #RRGGBB
+            red = (rgbValue >> 16) & 0xFF
+            green = (rgbValue >> 8) & 0xFF
+            blue = rgbValue & 0xFF
+            alpha = 255
+        case 8: // #RRGGBBAA
+            red = (rgbValue >> 24) & 0xFF
+            green = (rgbValue >> 16) & 0xFF
+            blue = (rgbValue >> 8) & 0xFF
+            alpha = rgbValue & 0xFF
+        default:
+            return nil
+        }
+
+        self.init(
+            red: Double(red) / 255.0,
+            green: Double(green) / 255.0,
+            blue: Double(blue) / 255.0,
+            opacity: Double(alpha) / 255.0
+        )
+    }
+}
+
 #if !os(tvOS)
 // https://www.vadimbulavin.com/how-to-move-swiftui-view-when-keyboard-covers-text-field/
 extension Publishers {
diff --git a/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/ChatInputView.swift b/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/ChatInputView.swift
@@ -12,6 +12,7 @@ import DittoChatCore
 struct ChatInputView: View {
     @Binding var text: String
     var onSendButtonTappedCallback: (() -> Void)? = nil
+    var primaryColor: Color = .blue
 
     var body: some View {
         HStack(alignment: .bottom) {
diff --git a/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/ChatScreen.swift b/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/ChatScreen.swift
diff --git a/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/MessageBubbleView.swift b/sdks/swift/Sources/DittoChatUI/Screens/ChatScreen/MessageBubbleView.swift

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,12 @@ import androidx.compose.ui.draw.clip`
`19`	`19`	`import androidx.compose.ui.graphics.Color`
`20`	`20`	`import androidx.compose.ui.text.style.TextAlign`
`21`	`21`	`import androidx.compose.ui.unit.dp`
	`22`	`+import androidx.core.graphics.toColorInt`
`22`	`23`	`import androidx.hilt.navigation.compose.hiltViewModel`
`23`	`24`	`import com.ditto.dittochat.DittoChat`
`24`	`25`	`import com.ditto.dittochat.DittoData`
`25`	`26`	`import kotlinx.coroutines.launch`
	`27`	`+import parseHexColor`
`26`	`28`
`27`	`29`	`@OptIn(ExperimentalMaterial3Api::class)`
`28`	`30`	`@Composable`
`@@ -84,7 +86,10 @@ fun ChatScreen(`
`84`	`86`	`text = inputText,`
`85`	`87`	`onTextChange = viewModel::updateInputText,`
`86`	`88`	`onSendClick = viewModel::sendMessage,`
`87`		`- onCameraClick = { imagePicker.launch("image/*") }`
	`89`	`+ onCameraClick = { imagePicker.launch("image/*") },`
	`90`	`+ primaryColor =`
	`91`	`+ viewModel.dittoChat.dittoChatConfig.primaryColor?.parseHexColor()`
	`92`	`+ ?: MaterialTheme.colorScheme.primary`
`88`	`93`	`)`
`89`	`94`	`}`
`90`	`95`	`}`
`@@ -105,7 +110,9 @@ fun ChatScreen(`
`105`	`110`	`currentUserId = currentUser?.id,`
`106`	`111`	`onEditClick = { viewModel.startEditMessage(it) },`
`107`	`112`	`onDeleteClick = { viewModel.deleteMessage(it) },`
`108`		`- onImageClick = { viewModel.showAttachment(it) }`
	`113`	`+ onImageClick = { viewModel.showAttachment(it) },`
	`114`	`+ hasAdminPrivileges = viewModel.dittoChat.dittoChatConfig.hasAdminPrivileges,`
	`115`	`+ primaryColor = viewModel.dittoChat.dittoChatConfig.primaryColor`
`109`	`116`	`)`
`110`	`117`	`}`
`111`	`118`	`}`