update colors

simplex-chat · May 24, 2024 · bf76d9f · bf76d9f
1 parent a7dc23a
commit bf76d9f
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 75 deletions.
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Theme.kt
@@ -580,8 +580,8 @@ val DarkColorPaletteApp = AppColors(
   primaryVariant2 = Color(0xFF18262E),
   sentMessage = Color(0xFF18262E),
   sentQuote = Color(0xFF1D3847),
-  receivedMessage = Color(0x20B1B0B5),
-  receivedQuote = Color(0x20B1B0B5), //LALAL
+  receivedMessage = Color(0xff262627),
+  receivedQuote = Color(0xff373739),
 )
 
 val LightColorPalette = lightColors(
@@ -602,8 +602,8 @@ val LightColorPaletteApp = AppColors(
   primaryVariant2 = Color(0xFFE9F7FF),
   sentMessage = Color(0xFFE9F7FF),
   sentQuote = Color(0xFFD6F0FF),
-  receivedMessage = Color(0x20B1B0B5),
-  receivedQuote = Color(0x20B1B0B5),
+  receivedMessage = Color(0xfff5f5f6),
+  receivedQuote = Color(0xffececee),
 )
 
 val SimplexColorPalette = darkColors(
@@ -625,31 +625,31 @@ val SimplexColorPaletteApp = AppColors(
   primaryVariant2 = Color(0xFF172941),
   sentMessage = Color(0xFF172941),
   sentQuote = Color(0xFF1C3A57),
-  receivedMessage = Color(0x20B1B0B5),
-  receivedQuote = Color(0x20B1B0B5),
+  receivedMessage = Color(0xff25283a),
+  receivedQuote = Color(0xff36394a),
 )
 
 val BlackColorPalette = darkColors(
-  primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
-  primaryVariant = SimplexBlue,
+  primary = Color(0xff0077ff),  // If this value changes also need to update #0088ff in string resource files
+  primaryVariant = Color(0xff0077ff),
   secondary = HighOrLowlight,
   secondaryVariant = DarkGray,
   //  background = Color.Black,
-  surface = Color(0xFF222222),
+  surface = Color(0xff171716),
   //  background = Color(0xFF121212),
   //  surface = Color(0xFF121212),
   error = Color.Red,
-  onBackground = Color(0xFFFFFBFA),
-  onSurface = Color(0xFFFFFBFA),
+  onBackground = Color(0xff000000),
+  onSurface = Color(0xff000000),
   //  onError: Color = Color.Black,
 )
 val BlackColorPaletteApp = AppColors(
-  title = SimplexBlue,
-  primaryVariant2 = Color(0xFF18262E),
+  title = Color(0xff0077ff),
+  primaryVariant2 = Color(0xff243747),
   sentMessage = Color(0xFF18262E),
   sentQuote = Color(0xFF1D3847),
-  receivedMessage = Color(0x20B1B0B5),
-  receivedQuote = Color(0x20B1B0B5),
+  receivedMessage = Color(0xff161617),
+  receivedQuote = Color(0xff29292b),
 )
 
 var systemInDarkThemeCurrently: Boolean = isInNightMode()

diff --git a/...form/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatViewBackground.kt b/...form/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatViewBackground.kt
@@ -30,44 +30,45 @@ enum class PredefinedBackgroundImage(
   val colors: Map<DefaultTheme, ThemeColors>,
 ) {
   @SerialName("cats") CATS(MR.images.background_cats, "cats", MR.strings.background_cats, 0.63f,
-    mapOf(DefaultTheme.LIGHT to "#ffF8F6EA".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
-    mapOf(DefaultTheme.LIGHT to "#ffEFDCA6".colorFromReadableHex(), DefaultTheme.DARK to "#ff4B0E3A".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff4A104A".colorFromReadableHex(), DefaultTheme.BLACK to "#ff4B0E3A".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffF8F6EA".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
+//    mapOf(DefaultTheme.LIGHT to "#ffF8F6EA".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffefdca6".colorFromReadableHex(), DefaultTheme.DARK to "#ff4b3b0e".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff4b3b0e".colorFromReadableHex(), DefaultTheme.BLACK to "#ff4b3b0e".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffFFF9EA",
-        sentQuote = "#ffFAF0D6",
+        sentMessage = "#fffffaed",
+        sentQuote = "#fffaf0d6",
         receivedMessage = "#ffF8F7F4",
-        receivedQuote = "#ffEFEDE7",
+        receivedQuote = "#ffefede9",
       ),
       DefaultTheme.DARK to ThemeColors(
-        sentMessage = "#ff321027",
-        sentQuote = "#ff4D0E3C",
-        receivedMessage = "#ff2A2628",
-        receivedQuote = "#ff42393E",
+        sentMessage = "#ff2f2919",
+        sentQuote = "#ff473a1d",
+        receivedMessage = "#ff272624",
+        receivedQuote = "#ff373633",
       ),
       DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff4C1F4E",
-        sentQuote = "#ff782870",
-        receivedMessage = "#ff29283B",
-        receivedQuote = "#ff413B4E",
+        sentMessage = "#ff41371b",
+        sentQuote = "#ff654f1c",
+        receivedMessage = "#ff272624",
+        receivedQuote = "#ff373633",
       ),
       DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff4C1F4E",
-        sentQuote = "#ff782870",
-        receivedMessage = "#ff29283B",
-        receivedQuote = "#ff413B4E",
+        sentMessage = "#ff41371b",
+        sentQuote = "#ff654f1c",
+        receivedMessage = "#ff272624",
+        receivedQuote = "#ff373633",
       ),
     )
   ),
   @SerialName("flowers") FLOWERS(MR.images.background_flowers, "flowers", MR.strings.background_flowers, 0.53f,
-    mapOf(DefaultTheme.LIGHT to "#ffE2FFE4".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffE2FFE4".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
     mapOf(DefaultTheme.LIGHT to "#ff9CEA59".colorFromReadableHex(), DefaultTheme.DARK to "#ff31560D".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff31570D".colorFromReadableHex(), DefaultTheme.BLACK to "#ff31560D".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffEBFEDC",
-        sentQuote = "#ffD7F6BE",
+        sentMessage = "#fff1ffe5",
+        sentQuote = "#ffdcf9c4",
         receivedMessage = "#ffF4F8F2",
-        receivedQuote = "#ffE7EEE3",
+        receivedQuote = "#ffe7ece7",
       ),
       DefaultTheme.DARK to ThemeColors(
         sentMessage = "#ff163521",
@@ -78,26 +79,26 @@ enum class PredefinedBackgroundImage(
       DefaultTheme.SIMPLEX to ThemeColors(
         sentMessage = "#ff184739",
         sentQuote = "#ff1F6F4B",
-        receivedMessage = "#ff232736",
-        receivedQuote = "#ff343944",
+        receivedMessage = "#ff242523",
+        receivedQuote = "#ff353733",
       ),
       DefaultTheme.BLACK to ThemeColors(
         sentMessage = "#ff184739",
         sentQuote = "#ff1F6F4B",
-        receivedMessage = "#ff232736",
-        receivedQuote = "#ff343944",
+        receivedMessage = "#ff242523",
+        receivedQuote = "#ff353733",
       ),
     )
   ),
   @SerialName("hearts") HEARTS(MR.images.background_hearts, "hearts", MR.strings.background_hearts, 0.59f,
-    mapOf(DefaultTheme.LIGHT to "#ffFDECEC".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
-    mapOf(DefaultTheme.LIGHT to "#ffFCDADA".colorFromReadableHex(), DefaultTheme.DARK to "#ff3C0F0F".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff381221".colorFromReadableHex(), DefaultTheme.BLACK to "#ff3C0F0F".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffFDECEC".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#fffde0e0".colorFromReadableHex(), DefaultTheme.DARK to "#ff3C0F0F".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff381221".colorFromReadableHex(), DefaultTheme.BLACK to "#ff3C0F0F".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffFFF1F1",
-        sentQuote = "#ffFBE3E3",
-        receivedMessage = "#ffF8F5F5",
-        receivedQuote = "#ffEFE9E9",
+        sentMessage = "#fffff4f4",
+        sentQuote = "#ffffdfdf",
+        receivedMessage = "#fff8f6f6",
+        receivedQuote = "#ffefebeb",
       ),
       DefaultTheme.DARK to ThemeColors(
         sentMessage = "#ff301515",
@@ -108,56 +109,56 @@ enum class PredefinedBackgroundImage(
       DefaultTheme.SIMPLEX to ThemeColors(
         sentMessage = "#ff491A28",
         sentQuote = "#ff761F29",
-        receivedMessage = "#ff282839",
-        receivedQuote = "#ff3F3B4A",
+        receivedMessage = "#ff292626",
+        receivedQuote = "#ff403939",
       ),
       DefaultTheme.BLACK to ThemeColors(
         sentMessage = "#ff491A28",
         sentQuote = "#ff761F29",
-        receivedMessage = "#ff282839",
-        receivedQuote = "#ff3F3B4A",
+        receivedMessage = "#ff292626",
+        receivedQuote = "#ff403939",
       ),
     )
   ),
   @SerialName("kids") KIDS(MR.images.background_kids, "kids", MR.strings.background_kids, 0.53f,
-    mapOf(DefaultTheme.LIGHT to "#ffD1FDFC".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
-    mapOf(DefaultTheme.LIGHT to "#ff90E4F3".colorFromReadableHex(), DefaultTheme.DARK to "#ff16404B".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff143047".colorFromReadableHex(), DefaultTheme.BLACK to "#ff16404B".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffdbfdfb".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffadeffc".colorFromReadableHex(), DefaultTheme.DARK to "#ff16404B".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff143047".colorFromReadableHex(), DefaultTheme.BLACK to "#ff16404B".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffDCFEFF",
-        sentQuote = "#ffBEF6F8",
-        receivedMessage = "#ffF3FAFA",
-        receivedQuote = "#ffE7F2F2",
+        sentMessage = "#ffeafeff",
+        sentQuote = "#ffcbf4f7",
+        receivedMessage = "#fff3fafa",
+        receivedQuote = "#ffe4efef",
       ),
       DefaultTheme.DARK to ThemeColors(
         sentMessage = "#ff16302F",
-        sentQuote = "#ff1A4A49",
+        sentQuote = "#ff1a4a49",
         receivedMessage = "#ff252626",
         receivedQuote = "#ff373A39",
       ),
       DefaultTheme.SIMPLEX to ThemeColors(
-        sentMessage = "#ff174855",
-        sentQuote = "#ff1D707A",
-        receivedMessage = "#ff242839",
-        receivedQuote = "#ff363C4A",
+        sentMessage = "#ff1a4745",
+        sentQuote = "#ff1d6b69",
+        receivedMessage = "#ff252626",
+        receivedQuote = "#ff373a39",
       ),
       DefaultTheme.BLACK to ThemeColors(
-        sentMessage = "#ff174855",
-        sentQuote = "#ff1D707A",
-        receivedMessage = "#ff242839",
-        receivedQuote = "#ff363C4A",
+        sentMessage = "#ff1a4745",
+        sentQuote = "#ff1d6b69",
+        receivedMessage = "#ff252626",
+        receivedQuote = "#ff373A39",
       ),
     )
   ),
   @SerialName("school") SCHOOL(MR.images.background_school, "school",  MR.strings.background_school, 0.53f,
-  mapOf(DefaultTheme.LIGHT to "#ffE7F5FF".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
+  mapOf(DefaultTheme.LIGHT to "#ffE7F5FF".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
   mapOf(DefaultTheme.LIGHT to "#ffCEEBFF".colorFromReadableHex(), DefaultTheme.DARK to "#ff0F293B".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff0E2B4D".colorFromReadableHex(), DefaultTheme.BLACK to "#ff0F293B".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffEAF7FF",
+        sentMessage = "#ffeef9ff",
         sentQuote = "#ffD6EDFA",
         receivedMessage = "#ffF3F5F9",
-        receivedQuote = "#ffE6E9F0",
+        receivedQuote = "#ffe4e8ee",
       ),
       DefaultTheme.DARK to ThemeColors(
         sentMessage = "#ff172833",
@@ -167,27 +168,27 @@ enum class PredefinedBackgroundImage(
       ),
       DefaultTheme.SIMPLEX to ThemeColors(
         sentMessage = "#ff1A3C5D",
-        sentQuote = "#ff225E85",
+        sentQuote = "#ff235b80",
         receivedMessage = "#ff282D41",
         receivedQuote = "#ff3E455B",
       ),
       DefaultTheme.BLACK to ThemeColors(
         sentMessage = "#ff1A3C5D",
-        sentQuote = "#ff225E85",
+        sentQuote = "#ff235b80",
         receivedMessage = "#ff282D41",
         receivedQuote = "#ff3E455B",
       ),
     )
   ),
   @SerialName("travel") TRAVEL(MR.images.background_travel, "travel", MR.strings.background_travel, 0.68f,
-    mapOf(DefaultTheme.LIGHT to "#ffF7E9FF".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff121212".colorFromReadableHex()),
-    mapOf(DefaultTheme.LIGHT to "#ffEDD8FF".colorFromReadableHex(), DefaultTheme.DARK to "#ff311E48".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff34225E".colorFromReadableHex(), DefaultTheme.BLACK to "#ff311E48".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#fff9eeff".colorFromReadableHex(), DefaultTheme.DARK to "#ff121212".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff111528".colorFromReadableHex(), DefaultTheme.BLACK to "#ff000000".colorFromReadableHex()),
+    mapOf(DefaultTheme.LIGHT to "#ffeedbfe".colorFromReadableHex(), DefaultTheme.DARK to "#ff311E48".colorFromReadableHex(), DefaultTheme.SIMPLEX to "#ff34225E".colorFromReadableHex(), DefaultTheme.BLACK to "#ff311E48".colorFromReadableHex()),
     mapOf(
       DefaultTheme.LIGHT to ThemeColors(
-        sentMessage = "#ffF8ECFF",
-        sentQuote = "#ffEEDAFA",
+        sentMessage = "#fffcf6ff",
+        sentQuote = "#fff2e0fc",
         receivedMessage = "#ffF6F4F7",
-        receivedQuote = "#ffEBE7ED",
+        receivedQuote = "#ffede9ee",
       ),
       DefaultTheme.DARK to ThemeColors(
         sentMessage = "#ff33263B",