Fixes for Color Injection API (#101)

Author: bmalumphy

sdks/kotlin/src/main/java/com/ditto/dittochat/Configs.kt

@@ -1,12 +1,14 @@
 package com.ditto.dittochat
 
+import androidx.compose.ui.graphics.Color
+
 data class ChatConfig(
     val ditto: live.ditto.Ditto,
     val retentionPolicy: ChatRetentionPolicy = ChatRetentionPolicy(days = 30),
     val usersCollection: String = "users",
     val userId: String? = "ditto-system-user-id",
     val acceptLargeImages: Boolean = true,
-    val primaryColor: String? = null,
+    val primaryColor: Color? = null,
     val hasAdminPrivileges: Boolean = false
 )
 

sdks/kotlin/src/main/java/com/ditto/dittochat/ui/ChatScreen.kt

@@ -7,24 +7,15 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-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
@@ -79,7 +70,8 @@ fun ChatScreen(
                     text = inputText,
                     onTextChange = viewModel::updateInputText,
                     onSave = viewModel::saveEditedMessage,
-                    onCancel = viewModel::cancelEdit
+                    onCancel = viewModel::cancelEdit,
+                    primaryColor = viewModel.dittoChat.dittoChatConfig.primaryColor ?: Color.Cyan
                 )
             } else {
                 ChatInputBar(
@@ -88,8 +80,8 @@ fun ChatScreen(
                     onSendClick = viewModel::sendMessage,
                     onCameraClick = { imagePicker.launch("image/*") },
                     primaryColor =
-                        viewModel.dittoChat.dittoChatConfig.primaryColor?.parseHexColor()
-                            ?: MaterialTheme.colorScheme.primary
+                        viewModel.dittoChat.dittoChatConfig.primaryColor
+                            ?: Color.Cyan
                 )
             }
         }

sdks/kotlin/src/main/java/com/ditto/dittochat/ui/EditMessageView.kt

@@ -27,7 +27,8 @@ fun EditingBottomBar(
     text: String,
     onTextChange: (String) -> Unit,
     onSave: () -> Unit,
-    onCancel: () -> Unit
+    onCancel: () -> Unit,
+    primaryColor: Color
 ) {
     Surface(
         modifier = Modifier.fillMaxWidth(),
@@ -71,7 +72,7 @@ fun EditingBottomBar(
                     modifier = Modifier
                         .size(40.dp)
                         .clip(CircleShape)
-                        .background(MaterialTheme.colorScheme.primary)
+                        .background(primaryColor)
                 ) {
                     Icon(
                         Icons.Default.Send,

sdks/kotlin/src/main/java/com/ditto/dittochat/ui/MessageBubbleView.kt

@@ -14,7 +14,6 @@ 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
@@ -25,7 +24,7 @@ fun MessageBubble(
     onDeleteClick: (Message) -> Unit,
     onImageClick: (Message) -> Unit,
     hasAdminPrivileges: Boolean = false,
-    primaryColor: String? = null
+    primaryColor: Color? = null
 ) {
     val message = messageWithUser.message
     val user = messageWithUser.user
@@ -53,7 +52,7 @@ fun MessageBubble(
             shape = MessageBubbleShape(isCurrentUser),
             colors = CardDefaults.cardColors(
                 containerColor = if (isCurrentUser)
-                    primaryColor?.parseHexColor() ?: MaterialTheme.colorScheme.primary
+                    primaryColor ?: Color.Cyan
                 else
                     MaterialTheme.colorScheme.surfaceVariant
             )