diff --git a/jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt b/jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt index 763fc0705fd35d15bf747ec9d6e693ffacdd7e6d..82d5e40a01df73c531273a5fa7440e97f747b6de 100644 --- a/jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt +++ b/jami-android/app/src/main/java/cx/ring/client/ColorChooserBottomSheet.kt @@ -64,14 +64,14 @@ class ColorChooserBottomSheet(val onColorSelected: ((Int) -> Unit)? = null) : Bo companion object { private val colors = intArrayOf( - R.color.pink_500, - R.color.purple_500, R.color.deep_purple_500, - R.color.indigo_500, R.color.blue_500, - R.color.cyan_500, R.color.teal_500, - R.color.green_500, R.color.light_green_500, - R.color.grey_500, R.color.lime_500, - R.color.amber_500, R.color.deep_orange_500, - R.color.brown_500, R.color.blue_grey_500 + R.color.conversation_palette_pink, + R.color.conversation_palette_purple, R.color.conversation_palette_indigo, + R.color.conversation_palette_dark_blue, R.color.conversation_palette_blue, + R.color.conversation_palette_blue_jean, R.color.conversation_palette_cyan, + R.color.conversation_palette_teal, R.color.conversation_palette_green, + R.color.conversation_palette_lime, R.color.conversation_palette_yellow, + R.color.conversation_palette_orange, R.color.conversation_palette_red, + R.color.conversation_palette_brown, R.color.conversation_palette_grey ) } } \ No newline at end of file diff --git a/jami-android/app/src/main/res/values/colors.xml b/jami-android/app/src/main/res/values/colors.xml index 6cd0bf72c95357d3f6bd6893655b79b563181371..8f601069d2836f7872b76341ee18c050db47039e 100644 --- a/jami-android/app/src/main/res/values/colors.xml +++ b/jami-android/app/src/main/res/values/colors.xml @@ -95,4 +95,21 @@ <color name="border_color">#E5E5E5</color> <color name="link_peer_color">#005699</color> + <!-- Chooser conversation color --> + <color name="conversation_palette_pink">@color/pink_700</color> + <color name="conversation_palette_purple">#5934AE</color> + <color name="conversation_palette_indigo">@color/indigo_700</color> + <color name="conversation_palette_dark_blue">#005699</color> + <color name="conversation_palette_blue">@color/light_blue_700</color> + <color name="conversation_palette_blue_jean">#417FC2</color> + <color name="conversation_palette_cyan">@color/cyan_700</color> + <color name="conversation_palette_teal">@color/teal_700</color> + <color name="conversation_palette_green">@color/light_green_700</color> + <color name="conversation_palette_lime">@color/lime_800</color> + <color name="conversation_palette_yellow">@color/yellow_600</color> + <color name="conversation_palette_orange">#E59028</color> + <color name="conversation_palette_red">#CC0022</color> + <color name="conversation_palette_brown">#A6948B</color> + <color name="conversation_palette_grey">#6C6C6C</color> + </resources>