From a8435aecdc7c9da576ad98470f125b5a5da69b1b Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Tue, 21 Apr 2026 13:02:01 +0000 Subject: [PATCH] hex colors in comments --- .../Theme/ChatWallpaperTypes.swift | 242 ++++++++-------- apps/ios/SimpleXChat/Theme/ThemeTypes.swift | 62 ++--- .../chat/simplex/common/ui/theme/Color.kt | 10 +- .../chat/simplex/common/ui/theme/Theme.kt | 68 ++--- .../common/views/helpers/ChatWallpaper.kt | 258 +++++++++--------- 5 files changed, 320 insertions(+), 320 deletions(-) diff --git a/apps/ios/SimpleXChat/Theme/ChatWallpaperTypes.swift b/apps/ios/SimpleXChat/Theme/ChatWallpaperTypes.swift index 36263fba74..3b45b1a3f9 100644 --- a/apps/ios/SimpleXChat/Theme/ChatWallpaperTypes.swift +++ b/apps/ios/SimpleXChat/Theme/ChatWallpaperTypes.swift @@ -58,40 +58,40 @@ public enum PresetWallpaper: CaseIterable { public var tint: [DefaultTheme: Color] { switch self { case .cats: [ - DefaultTheme.LIGHT: oklch(0.897064, 0.07281305, 90.95935), - DefaultTheme.DARK: oklch(0.3603656, 0.0643012, 88.54155), - DefaultTheme.SIMPLEX: oklch(0.3797781, 0.06842897, 88.88896), - DefaultTheme.BLACK: oklch(0.3603656, 0.0643012, 88.54155) + DefaultTheme.LIGHT: oklch(0.897064, 0.07281305, 90.95935), // #ffefdca6 + DefaultTheme.DARK: oklch(0.3603656, 0.0643012, 88.54155), // #ff4b3b0e + DefaultTheme.SIMPLEX: oklch(0.3797781, 0.06842897, 88.88896), // #ff51400f + DefaultTheme.BLACK: oklch(0.3603656, 0.0643012, 88.54155) // #ff4b3b0e ] case .flowers: [ - DefaultTheme.LIGHT: oklch(0.8574244, 0.1932141, 133.0531), - DefaultTheme.DARK: oklch(0.409874, 0.1074549, 133.4271), - DefaultTheme.SIMPLEX: oklch(0.4415422, 0.1170956, 133.8571), - DefaultTheme.BLACK: oklch(0.409874, 0.1074549, 133.4271) + DefaultTheme.LIGHT: oklch(0.8574244, 0.1932141, 133.0531), // #ff9CEA59 + DefaultTheme.DARK: oklch(0.409874, 0.1074549, 133.4271), // #ff31560D + DefaultTheme.SIMPLEX: oklch(0.4415422, 0.1170956, 133.8571), // #ff36600f + DefaultTheme.BLACK: oklch(0.409874, 0.1074549, 133.4271) // #ff31560D ] case .hearts: [ - DefaultTheme.LIGHT: oklch(0.9304586, 0.03207239, 17.7425), - DefaultTheme.DARK: oklch(0.2458526, 0.07098409, 23.94782), - DefaultTheme.SIMPLEX: oklch(0.2574974, 0.07614605, 24.19117), - DefaultTheme.BLACK: oklch(0.2458526, 0.07098409, 23.94782) + DefaultTheme.LIGHT: oklch(0.9304586, 0.03207239, 17.7425), // #fffde0e0 + DefaultTheme.DARK: oklch(0.2458526, 0.07098409, 23.94782), // #ff3C0F0F + DefaultTheme.SIMPLEX: oklch(0.2574974, 0.07614605, 24.19117), // #ff411010 + DefaultTheme.BLACK: oklch(0.2458526, 0.07098409, 23.94782) // #ff3C0F0F ] case .kids: [ - DefaultTheme.LIGHT: oklch(0.9123625, 0.06815507, 211.1344), - DefaultTheme.DARK: oklch(0.3473769, 0.04958945, 218.0525), - DefaultTheme.SIMPLEX: oklch(0.3716418, 0.05389406, 217.7104), - DefaultTheme.BLACK: oklch(0.3473769, 0.04958945, 218.0525) + DefaultTheme.LIGHT: oklch(0.9123625, 0.06815507, 211.1344), // #ffadeffc + DefaultTheme.DARK: oklch(0.3473769, 0.04958945, 218.0525), // #ff16404B + DefaultTheme.SIMPLEX: oklch(0.3716418, 0.05389406, 217.7104), // #ff184753 + DefaultTheme.BLACK: oklch(0.3473769, 0.04958945, 218.0525) // #ff16404B ] case .school: [ - DefaultTheme.LIGHT: oklch(0.9252349, 0.04096641, 238.0518), - DefaultTheme.DARK: oklch(0.2700986, 0.04630937, 241.5568), - DefaultTheme.SIMPLEX: oklch(0.2929108, 0.05102392, 240.8139), - DefaultTheme.BLACK: oklch(0.2700986, 0.04630937, 241.5568) + DefaultTheme.LIGHT: oklch(0.9252349, 0.04096641, 238.0518), // #ffCEEBFF + DefaultTheme.DARK: oklch(0.2700986, 0.04630937, 241.5568), // #ff0F293B + DefaultTheme.SIMPLEX: oklch(0.2929108, 0.05102392, 240.8139), // #ff112f43 + DefaultTheme.BLACK: oklch(0.2700986, 0.04630937, 241.5568) // #ff0F293B ] case .travel: [ - DefaultTheme.LIGHT: oklch(0.9174161, 0.05105522, 309.6281), - DefaultTheme.DARK: oklch(0.2817417, 0.07665313, 302.6645), - DefaultTheme.SIMPLEX: oklch(0.2948376, 0.08277514, 302.7197), - DefaultTheme.BLACK: oklch(0.2817417, 0.07665313, 302.6645) + DefaultTheme.LIGHT: oklch(0.9174161, 0.05105522, 309.6281), // #ffeedbfe + DefaultTheme.DARK: oklch(0.2817417, 0.07665313, 302.6645), // #ff311E48 + DefaultTheme.SIMPLEX: oklch(0.2948376, 0.08277514, 302.7197), // #ff35204e + DefaultTheme.BLACK: oklch(0.2817417, 0.07665313, 302.6645) // #ff311E48 ] } } @@ -100,158 +100,158 @@ public enum PresetWallpaper: CaseIterable { switch self { case .cats: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9854474, 0.01790464, 89.3544), - sentQuote: oklch(0.9562038, 0.0357691, 89.44265), - receivedMessage: oklch(0.9760699, 0.004115805, 91.44609), - receivedQuote: oklch(0.9465333, 0.005762915, 84.56661) + sentMessage: oklch(0.9854474, 0.01790464, 89.3544), // #fffffaed + sentQuote: oklch(0.9562038, 0.0357691, 89.44265), // #fffaf0d6 + receivedMessage: oklch(0.9760699, 0.004115805, 91.44609), // #ffF8F7F4 + receivedQuote: oklch(0.9465333, 0.005762915, 84.56661) // #ffefede9 ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.2827141, 0.02844628, 89.80136), - sentQuote: oklch(0.3550253, 0.04770112, 85.80835), - receivedMessage: oklch(0.2689313, 0.003935312, 84.58291), - receivedQuote: oklch(0.332832, 0.005361989, 91.54412) + sentMessage: oklch(0.2827141, 0.02844628, 89.80136), // #ff2f2919 + sentQuote: oklch(0.3550253, 0.04770112, 85.80835), // #ff473a1d + receivedMessage: oklch(0.2689313, 0.003935312, 84.58291), // #ff272624 + receivedQuote: oklch(0.332832, 0.005361989, 91.54412) // #ff373633 ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.3402031, 0.04537511, 90.2498), - sentQuote: oklch(0.4398707, 0.0737883, 85.23908), - receivedMessage: oklch(0.2689313, 0.003935312, 84.58291), - receivedQuote: oklch(0.332832, 0.005361989, 91.54412) + sentMessage: oklch(0.3402031, 0.04537511, 90.2498), // #ff41371b + sentQuote: oklch(0.4398707, 0.0737883, 85.23908), // #ff654f1c + receivedMessage: oklch(0.2689313, 0.003935312, 84.58291), // #ff272624 + receivedQuote: oklch(0.332832, 0.005361989, 91.54412) // #ff373633 ), DefaultTheme.BLACK: ResolvedColors( - sentMessage: oklch(0.3402031, 0.04537511, 90.2498), - sentQuote: oklch(0.4398707, 0.0737883, 85.23908), - receivedMessage: oklch(0.2349937, 0.005828091, 91.60813), - receivedQuote: oklch(0.2971596, 0.01092985, 91.6846) + sentMessage: oklch(0.3402031, 0.04537511, 90.2498), // #ff41371b + sentQuote: oklch(0.4398707, 0.0737883, 85.23908), // #ff654f1c + receivedMessage: oklch(0.2349937, 0.005828091, 91.60813), // #ff1f1e1b + receivedQuote: oklch(0.2971596, 0.01092985, 91.6846) // #ff2f2d27 ) ] case .flowers: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9827452, 0.03710413, 130.3627), - sentQuote: oklch(0.9477894, 0.07588911, 131.1257), - receivedMessage: oklch(0.9744452, 0.008958742, 134.8726), - receivedQuote: oklch(0.9378814, 0.008518542, 145.5074) + sentMessage: oklch(0.9827452, 0.03710413, 130.3627), // #fff1ffe5 + sentQuote: oklch(0.9477894, 0.07588911, 131.1257), // #ffdcf9c4 + receivedMessage: oklch(0.9744452, 0.008958742, 134.8726), // #ffF4F8F2 + receivedQuote: oklch(0.9378814, 0.008518542, 145.5074) // #ffe7ece7 ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.2986395, 0.05211595, 153.5889), - sentQuote: oklch(0.3954021, 0.08319059, 152.8037), - receivedMessage: oklch(0.2626721, 0.003936427, 128.6285), - receivedQuote: oklch(0.3334174, 0.007411477, 128.7105) + sentMessage: oklch(0.2986395, 0.05211595, 153.5889), // #ff163521 + sentQuote: oklch(0.3954021, 0.08319059, 152.8037), // #ff1B5330 + receivedMessage: oklch(0.2626721, 0.003936427, 128.6285), // #ff242523 + receivedQuote: oklch(0.3334174, 0.007411477, 128.7105) // #ff353733 ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.3611755, 0.05678164, 170.3752), - sentQuote: oklch(0.484029, 0.09629127, 159.5568), - receivedMessage: oklch(0.2626721, 0.003936427, 128.6285), - receivedQuote: oklch(0.3334174, 0.007411477, 128.7105) + sentMessage: oklch(0.3611755, 0.05678164, 170.3752), // #ff184739 + sentQuote: oklch(0.484029, 0.09629127, 159.5568), // #ff1F6F4B + receivedMessage: oklch(0.2626721, 0.003936427, 128.6285), // #ff242523 + receivedQuote: oklch(0.3334174, 0.007411477, 128.7105) // #ff353733 ), DefaultTheme.BLACK: ResolvedColors( sentMessage: oklch(0.3611755, 0.05678164, 170.3752), - sentQuote: oklch(0.484029, 0.09629127, 159.5568), - receivedMessage: oklch(0.2342548, 0.01039849, 132.6996), - receivedQuote: oklch(0.2838948, 0.01154375, 128.9221) + sentQuote: oklch(0.484029, 0.09629127, 159.5568), // #ff1F6F4B + receivedMessage: oklch(0.2342548, 0.01039849, 132.6996), // #ff1c1f1a + receivedQuote: oklch(0.2838948, 0.01154375, 128.9221) // #ff282b25 ) ] case .hearts: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9757184, 0.01184164, 17.35934), - sentQuote: oklch(0.9300344, 0.0354728, 17.80723), - receivedMessage: oklch(0.9746758, 0.002137086, 17.19433), - receivedQuote: oklch(0.9431687, 0.004317648, 17.23361) + sentMessage: oklch(0.9757184, 0.01184164, 17.35934), // #fffff4f4 + sentQuote: oklch(0.9300344, 0.0354728, 17.80723), // #ffffdfdf + receivedMessage: oklch(0.9746758, 0.002137086, 17.19433), // #fff8f6f6 + receivedQuote: oklch(0.9431687, 0.004317648, 17.23361) // #ffefebeb ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.2353791, 0.04398437, 20.94719), - sentQuote: oklch(0.2920391, 0.07914221, 23.35544), - receivedMessage: oklch(0.2510736, 0.004554155, 17.46058), - receivedQuote: oklch(0.3352158, 0.008515606, 17.58481) + sentMessage: oklch(0.2353791, 0.04398437, 20.94719), // #ff301515 + sentQuote: oklch(0.2920391, 0.07914221, 23.35544), // #ff4C1818 + receivedMessage: oklch(0.2510736, 0.004554155, 17.46058), // #ff242121 + receivedQuote: oklch(0.3352158, 0.008515606, 17.58481) // #ff3b3535 ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.2941874, 0.07322977, 4.102547), - sentQuote: oklch(0.3831088, 0.1201278, 18.61089), - receivedMessage: oklch(0.2510736, 0.004554155, 17.46058), - receivedQuote: oklch(0.3352158, 0.008515606, 17.58481) + sentMessage: oklch(0.2941874, 0.07322977, 4.102547), // #ff491A28 + sentQuote: oklch(0.3831088, 0.1201278, 18.61089), // #ff761F29 + receivedMessage: oklch(0.2510736, 0.004554155, 17.46058), // #ff242121 + receivedQuote: oklch(0.3352158, 0.008515606, 17.58481) // #ff3b3535 ), DefaultTheme.BLACK: ResolvedColors( - sentMessage: oklch(0.2941874, 0.07322977, 4.102547), - sentQuote: oklch(0.3831088, 0.1201278, 18.61089), - receivedMessage: oklch(0.2267386, 0.00626924, 17.6236), - receivedQuote: oklch(0.2776199, 0.012034, 17.89987) + sentMessage: oklch(0.2941874, 0.07322977, 4.102547), // #ff491A28 + sentQuote: oklch(0.3831088, 0.1201278, 18.61089), // #ff761F29 + receivedMessage: oklch(0.2267386, 0.00626924, 17.6236), // #ff1f1b1b + receivedQuote: oklch(0.2776199, 0.012034, 17.89987) // #ff2e2626 ) ] case .kids: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9827091, 0.02093746, 200.4479), - sentQuote: oklch(0.9392156, 0.04239295, 201.9221), - receivedMessage: oklch(0.9798523, 0.007408877, 197.0357), + sentMessage: oklch(0.9827091, 0.02093746, 200.4479), // #ffeafeff + sentQuote: oklch(0.9392156, 0.04239295, 201.9221), // #ffcbf4f7 + receivedMessage: oklch(0.9798523, 0.007408877, 197.0357), // #fff3fafa receivedQuote: oklch(0.9438775, 0.0117012, 196.9581) ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.2881511, 0.03214503, 192.2759), - sentQuote: oklch(0.3764664, 0.05129536, 193.292), - receivedMessage: oklch(0.2675764, 0.001466786, 197.0692), - receivedQuote: oklch(0.3451987, 0.004436687, 174.2088) + sentMessage: oklch(0.2881511, 0.03214503, 192.2759), // #ff16302F + sentQuote: oklch(0.3764664, 0.05129536, 193.292), // #ff1a4a49 + receivedMessage: oklch(0.2675764, 0.001466786, 197.0692), // #ff252626 + receivedQuote: oklch(0.3451987, 0.004436687, 174.2088) // #ff373a39 ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.3662882, 0.04909204, 191.2229), - sentQuote: oklch(0.4817563, 0.07299667, 192.4874), - receivedMessage: oklch(0.2675764, 0.001466786, 197.0692), - receivedQuote: oklch(0.3451987, 0.004436687, 174.2088) + sentMessage: oklch(0.3662882, 0.04909204, 191.2229), // #ff1a4745 + sentQuote: oklch(0.4817563, 0.07299667, 192.4874), // #ff1d6b69 + receivedMessage: oklch(0.2675764, 0.001466786, 197.0692), // #ff252626 + receivedQuote: oklch(0.3451987, 0.004436687, 174.2088) // #ff373a39 ), DefaultTheme.BLACK: ResolvedColors( - sentMessage: oklch(0.3662882, 0.04909204, 191.2229), - sentQuote: oklch(0.4817563, 0.07299667, 192.4874), - receivedMessage: oklch(0.2382215, 0.001508911, 197.0555), - receivedQuote: oklch(0.2833724, 0.007955636, 169.798) + sentMessage: oklch(0.3662882, 0.04909204, 191.2229), // #ff1a4745 + sentQuote: oklch(0.4817563, 0.07299667, 192.4874), // #ff1d6b69 + receivedMessage: oklch(0.2382215, 0.001508911, 197.0555), // #ff1e1f1f + receivedQuote: oklch(0.2833724, 0.007955636, 169.798) // #ff262b29 ) ] case .school: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9756479, 0.01416295, 231.2013), - sentQuote: oklch(0.9331527, 0.03006113, 232.4212), - receivedMessage: oklch(0.9697657, 0.005748723, 264.5325), - receivedQuote: oklch(0.9296755, 0.00918803, 258.3366) + sentMessage: oklch(0.9756479, 0.01416295, 231.2013), // #ffeef9ff + sentQuote: oklch(0.9331527, 0.03006113, 232.4212), // #ffD6EDFA + receivedMessage: oklch(0.9697657, 0.005748723, 264.5325), // #ffF3F5F9 + receivedQuote: oklch(0.9296755, 0.00918803, 258.3366) // #ffe4e8ee ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.267226, 0.03061943, 237.8609), - sentQuote: oklch(0.3464064, 0.04943852, 232.4005), - receivedMessage: oklch(0.2764251, 0.007910622, 264.4375), - receivedQuote: oklch(0.3548081, 0.008034593, 255.5451) + sentMessage: oklch(0.267226, 0.03061943, 237.8609), // #ff172833 + sentQuote: oklch(0.3464064, 0.04943852, 232.4005), // #ff1C3E4F + receivedMessage: oklch(0.2764251, 0.007910622, 264.4375), // #ff26282c + receivedQuote: oklch(0.3548081, 0.008034593, 255.5451) // #ff393c40 ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.3481476, 0.07023845, 249.9259), - sentQuote: oklch(0.4520089, 0.08394516, 241.1934), - receivedMessage: oklch(0.2764251, 0.007910622, 264.4375), - receivedQuote: oklch(0.3548081, 0.008034593, 255.5451) + sentMessage: oklch(0.3481476, 0.07023845, 249.9259), // #ff1A3C5D + sentQuote: oklch(0.4520089, 0.08394516, 241.1934), // #ff235b80 + receivedMessage: oklch(0.2764251, 0.007910622, 264.4375), // #ff26282c + receivedQuote: oklch(0.3548081, 0.008034593, 255.5451) // #ff393c40 ), DefaultTheme.BLACK: ResolvedColors( - sentMessage: oklch(0.3481476, 0.07023845, 249.9259), - sentQuote: oklch(0.4520089, 0.08394516, 241.1934), - receivedMessage: oklch(0.2356588, 0.007789041, 274.6063), - receivedQuote: oklch(0.2886546, 0.007823012, 264.445) + sentMessage: oklch(0.3481476, 0.07023845, 249.9259), // #ff1A3C5D + sentQuote: oklch(0.4520089, 0.08394516, 241.1934), // #ff235b80 + receivedMessage: oklch(0.2356588, 0.007789041, 274.6063), // #ff1d1e22 + receivedQuote: oklch(0.2886546, 0.007823012, 264.445) // #ff292b2f ) ] case .travel: [ DefaultTheme.LIGHT: ResolvedColors( - sentMessage: oklch(0.9803204, 0.01342671, 314.7601), - sentQuote: oklch(0.9294779, 0.04197705, 313.6968), - receivedMessage: oklch(0.9695303, 0.004487354, 314.8044), - receivedQuote: oklch(0.9385522, 0.007899312, 319.4466) + sentMessage: oklch(0.9803204, 0.01342671, 314.7601), // #fffcf6ff + sentQuote: oklch(0.9294779, 0.04197705, 313.6968), // #fff2e0fc + receivedMessage: oklch(0.9695303, 0.004487354, 314.8044), // #ffF6F4F7 + receivedQuote: oklch(0.9385522, 0.007899312, 319.4466) // #ffede9ee ), DefaultTheme.DARK: ResolvedColors( - sentMessage: oklch(0.2929984, 0.04120036, 312.1162), - sentQuote: oklch(0.3876602, 0.07087001, 315.7654), - receivedMessage: oklch(0.2678179, 0.006190444, 314.7144), - receivedQuote: oklch(0.3435397, 0.01317027, 310.9424) + sentMessage: oklch(0.2929984, 0.04120036, 312.1162), // #ff33263B + sentQuote: oklch(0.3876602, 0.07087001, 315.7654), // #ff53385E + receivedMessage: oklch(0.2678179, 0.006190444, 314.7144), // #ff272528 + receivedQuote: oklch(0.3435397, 0.01317027, 310.9424) // #ff3B373E ), DefaultTheme.SIMPLEX: ResolvedColors( - sentMessage: oklch(0.3234681, 0.09690244, 299.9634), - sentQuote: oklch(0.4226042, 0.1341495, 307.8573), - receivedMessage: oklch(0.2812692, 0.03669397, 281.5485), - receivedQuote: oklch(0.355058, 0.03791292, 286.3773) + sentMessage: oklch(0.3234681, 0.09690244, 299.9634), // #ff3C255D + sentQuote: oklch(0.4226042, 0.1341495, 307.8573), // #ff623485 + receivedMessage: oklch(0.2812692, 0.03669397, 281.5485), // #ff26273B + receivedQuote: oklch(0.355058, 0.03791292, 286.3773) // #ff3A394F ), DefaultTheme.BLACK: ResolvedColors( - sentMessage: oklch(0.3234681, 0.09690244, 299.9634), - sentQuote: oklch(0.4226042, 0.1341495, 307.8573), - receivedMessage: oklch(0.2454222, 0.009540156, 325.8636), - receivedQuote: oklch(0.2874049, 0.0149843, 302.5009) + sentMessage: oklch(0.3234681, 0.09690244, 299.9634), // #ff3C255D + sentQuote: oklch(0.4226042, 0.1341495, 307.8573), // #ff623485 + receivedMessage: oklch(0.2454222, 0.009540156, 325.8636), // #ff231f23 + receivedQuote: oklch(0.2874049, 0.0149843, 302.5009) // #ff2c2931 ) ] } @@ -273,9 +273,9 @@ public enum PresetWallpaper: CaseIterable { func wallpaperBackgrounds(light: Color) -> [DefaultTheme : Color] { [ DefaultTheme.LIGHT: light, - DefaultTheme.DARK: oklch(0.1822037, 0, 0), - DefaultTheme.SIMPLEX: oklch(0.2024453, 0.03849037, 273.4875), - DefaultTheme.BLACK: oklch(0.1285578, 0, 0) + DefaultTheme.DARK: oklch(0.1822037, 0, 0), // #ff121212 + DefaultTheme.SIMPLEX: oklch(0.2024453, 0.03849037, 273.4875), // #ff111528 + DefaultTheme.BLACK: oklch(0.1285578, 0, 0) // #ff070707 ] } diff --git a/apps/ios/SimpleXChat/Theme/ThemeTypes.swift b/apps/ios/SimpleXChat/Theme/ThemeTypes.swift index f02430954b..0ce0b9ece8 100644 --- a/apps/ios/SimpleXChat/Theme/ThemeTypes.swift +++ b/apps/ios/SimpleXChat/Theme/ThemeTypes.swift @@ -670,19 +670,19 @@ public let DarkColorPalette = Colors( secondary: HighOrLowlight, secondaryVariant: DarkGray, background: Color.black, - surface: oklch(0.2519647, 0, 0), + surface: oklch(0.2519647, 0, 0), // #ff222222 error: Color.red, - onBackground: oklch(0.9908696, 0.00447983, 34.30938), - onSurface: oklch(0.9908696, 0.00447983, 34.30938), + onBackground: oklch(0.9908696, 0.00447983, 34.30938), // #fffffbfa + onSurface: oklch(0.9908696, 0.00447983, 34.30938), // #fffffbfa isLight: false ) public let DarkColorPaletteApp = AppColors( title: .white, - primaryVariant2: oklch(0.2596116, 0.02435695, 234.0127), - sentMessage: oklch(0.2596116, 0.02435695, 234.0127), - sentQuote: oklch(0.3262685, 0.04242656, 234.4608), - receivedMessage: oklch(0.2690091, 0.001828474, 286.2761), - receivedQuote: oklch(0.3375424, 0.003458181, 286.2129) + primaryVariant2: oklch(0.2596116, 0.02435695, 234.0127), // #ff18262e + sentMessage: oklch(0.2596116, 0.02435695, 234.0127), // #ff18262e + sentQuote: oklch(0.3262685, 0.04242656, 234.4608), // #ff1d3847 + receivedMessage: oklch(0.2690091, 0.001828474, 286.2761), // #ff262627 + receivedQuote: oklch(0.3375424, 0.003458181, 286.2129) // #ff373739 ) public let LightColorPalette = Colors ( @@ -699,20 +699,20 @@ public let LightColorPalette = Colors ( ) public let LightColorPaletteApp = AppColors( title: .black, - primaryVariant2: oklch(0.9680794, 0.0183117, 232.503), - sentMessage: oklch(0.9680794, 0.0183117, 232.503), - sentQuote: oklch(0.9407676, 0.03409827, 233.0377), - receivedMessage: oklch(0.9704316, 0.001324867, 286.3749), - receivedQuote: oklch(0.943656, 0.002669381, 286.3484) + primaryVariant2: oklch(0.9680794, 0.0183117, 232.503), // #ffe9f7ff + sentMessage: oklch(0.9680794, 0.0183117, 232.503), // #ffe9f7ff + sentQuote: oklch(0.9407676, 0.03409827, 233.0377), // #ffd6f0ff + receivedMessage: oklch(0.9704316, 0.001324867, 286.3749), // #fff5f5f6 + receivedQuote: oklch(0.943656, 0.002669381, 286.3484) // #ffececee ) public let SimplexColorPalette = Colors( - primary: oklch(0.8862563, 0.113699, 201.5703), - primaryVariant: oklch(0.6217762, 0.1034518, 205.799), + primary: oklch(0.8862563, 0.113699, 201.5703), // #ff70f0f9 + primaryVariant: oklch(0.6217762, 0.1034518, 205.799), // #ff1298a5 secondary: HighOrLowlight, - secondaryVariant: oklch(0.3761328, 0.03384425, 216.5493), - background: oklch(0.2024453, 0.03849037, 273.4875), - surface: oklch(0.2331016, 0.05415408, 266.8904), + secondaryVariant: oklch(0.3761328, 0.03384425, 216.5493), // #ff2c464d + background: oklch(0.2024453, 0.03849037, 273.4875), // #ff111528 + surface: oklch(0.2331016, 0.05415408, 266.8904), // #ff121c37 error: Color.red, onBackground: Color.white, onSurface: Color.white, @@ -720,20 +720,20 @@ public let SimplexColorPalette = Colors( ) public let SimplexColorPaletteApp = AppColors( title: .white, - primaryVariant2: oklch(0.2782386, 0.05068946, 256.0234), - sentMessage: oklch(0.2782386, 0.05068946, 256.0234), - sentQuote: oklch(0.3401385, 0.06268949, 249.4274), - receivedMessage: oklch(0.2823021, 0.03341238, 276.7299), - receivedQuote: oklch(0.3488846, 0.02991734, 276.9226) + primaryVariant2: oklch(0.2782386, 0.05068946, 256.0234), // #ff172941 + sentMessage: oklch(0.2782386, 0.05068946, 256.0234), // #ff172941 + sentQuote: oklch(0.3401385, 0.06268949, 249.4274), // #ff1C3A57 + receivedMessage: oklch(0.2823021, 0.03341238, 276.7299), // #ff25283a + receivedQuote: oklch(0.3488846, 0.02991734, 276.9226) // #ff36394a ) public let BlackColorPalette = Colors( - primary: oklch(0.5737125, 0.1826329, 254.0001), - primaryVariant: oklch(0.5737125, 0.1826329, 254.0001), + primary: oklch(0.5737125, 0.1826329, 254.0001), // #ff0077e0 + primaryVariant: oklch(0.5737125, 0.1826329, 254.0001), // #ff0077e0 secondary: HighOrLowlight, secondaryVariant: DarkGray, - background: oklch(0.1285578, 0, 0), - surface: oklch(0.200616, 0.001969079, 286.2208), + background: oklch(0.1285578, 0, 0), // #ff070707 + surface: oklch(0.200616, 0.001969079, 286.2208), // #ff161617 error: Color.red, onBackground: oklch(0.9908696, 0.00447983, 34.30938), onSurface: oklch(0.9908696, 0.00447983, 34.30938), @@ -741,10 +741,10 @@ public let BlackColorPalette = Colors( ) public let BlackColorPaletteApp = AppColors( title: .white, - primaryVariant2: oklch(0.327876, 0.03765742, 244.7111), - sentMessage: oklch(0.2596116, 0.02435695, 234.0127), - sentQuote: oklch(0.3262685, 0.04242656, 234.4608), - receivedMessage: oklch(0.2221287, 0, 0), + primaryVariant2: oklch(0.327876, 0.03765742, 244.7111), // #ff243747 + sentMessage: oklch(0.2596116, 0.02435695, 234.0127), // #ff18262e + sentQuote: oklch(0.3262685, 0.04242656, 234.4608), // #ff1d3847 + receivedMessage: oklch(0.2221287, 0, 0), // #ff1b1b1b receivedQuote: oklch(0.2817215, 0.003620283, 286.165) ) diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Color.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Color.kt index 9c20b764e4..7decadb1b3 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Color.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/ui/theme/Color.kt @@ -46,11 +46,11 @@ val Teal200 = Color(0xFF03DAC5) val Gray = Color(0x22222222) val Indigo = Color(0xFF9966FF) val SimplexBlue = oklch(0.6320536f, 0.2017874f, 254.0879f) // If this value changes also need to update #0088ff in string resource files -val SimplexGreen = oklch(0.7871495f, 0.1979258f, 146.6814f) -val SecretColor = oklch(0.5998708f, 0f, 0f, 0.2509804f) -val LightGray = oklch(0.9615242f, 0.005440391f, 274.9652f) -val DarkGray = oklch(0.2928853f, 0.003884885f, 264.5058f) -val HighOrLowlight = oklch(0.6265517f, 0.005036114f, 34.30441f) +val SimplexGreen = oklch(0.7871495f, 0.1979258f, 146.6814f) // #ff4dda67 +val SecretColor = oklch(0.5998708f, 0f, 0f, 0.2509804f) // #40808080 +val LightGray = oklch(0.9615242f, 0.005440391f, 274.9652f) // #fff1f2f6 +val DarkGray = oklch(0.2928853f, 0.003884885f, 264.5058f) // #ff2b2c2e +val HighOrLowlight = oklch(0.6265517f, 0.005036114f, 34.30441f) // #ff8b8786 val MessagePreviewDark = Color(179, 175, 174, 255) val MessagePreviewLight = Color(49, 45, 44, 255) val ToolbarLight = Color(220, 220, 220, 12) 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 index 74ffe3150c..3a69f9c690 100644 --- 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 @@ -677,20 +677,20 @@ val DarkColorPalette = darkColors( secondary = HighOrLowlight, secondaryVariant = DarkGray, // background = Color.Black, - surface = oklch(0.2519647f, 0f, 0f), + surface = oklch(0.2519647f, 0f, 0f), // #ff222222 // background = Color(0xFF121212), error = Color.Red, - onBackground = oklch(0.9908696f, 0.00447983f, 34.30938f), - onSurface = oklch(0.9908696f, 0.00447983f, 34.30938f), + onBackground = oklch(0.9908696f, 0.00447983f, 34.30938f), // #fffffbfa + onSurface = oklch(0.9908696f, 0.00447983f, 34.30938f), // #fffffbfa // onError: Color = Color.Black, ) val DarkColorPaletteApp = AppColors( title = SimplexBlue, - primaryVariant2 = oklch(0.2596116f, 0.02435695f, 234.0127f), - sentMessage = oklch(0.2596116f, 0.02435695f, 234.0127f), - sentQuote = oklch(0.3262685f, 0.04242656f, 234.4608f), - receivedMessage = oklch(0.2690091f, 0.001828474f, 286.2761f), - receivedQuote = oklch(0.3375424f, 0.003458181f, 286.2129f), + primaryVariant2 = oklch(0.2596116f, 0.02435695f, 234.0127f), // #ff18262e + sentMessage = oklch(0.2596116f, 0.02435695f, 234.0127f), // #ff18262e + sentQuote = oklch(0.3262685f, 0.04242656f, 234.4608f), // #ff1d3847 + receivedMessage = oklch(0.2690091f, 0.001828474f, 286.2761f), // #ff262627 + receivedQuote = oklch(0.3375424f, 0.003458181f, 286.2129f), // #ff373739 ) val LightColorPalette = lightColors( @@ -708,57 +708,57 @@ val LightColorPalette = lightColors( ) val LightColorPaletteApp = AppColors( title = SimplexBlue, - primaryVariant2 = oklch(0.9680794f, 0.0183117f, 232.503f), - sentMessage = oklch(0.9680794f, 0.0183117f, 232.503f), - sentQuote = oklch(0.9407676f, 0.03409827f, 233.0377f), - receivedMessage = oklch(0.9704316f, 0.001324867f, 286.3749f), - receivedQuote = oklch(0.943656f, 0.002669381f, 286.3484f), + primaryVariant2 = oklch(0.9680794f, 0.0183117f, 232.503f), // #ffe9f7ff + sentMessage = oklch(0.9680794f, 0.0183117f, 232.503f), // #ffe9f7ff + sentQuote = oklch(0.9407676f, 0.03409827f, 233.0377f), // #ffd6f0ff + receivedMessage = oklch(0.9704316f, 0.001324867f, 286.3749f), // #fff5f5f6 + receivedQuote = oklch(0.943656f, 0.002669381f, 286.3484f), // #ffececee ) val SimplexColorPalette = darkColors( primary = oklch(0.8862563f, 0.113699f, 201.5703f), // If this value changes also need to update #0088ff in string resource files - primaryVariant = oklch(0.6217762f, 0.1034518f, 205.799f), + primaryVariant = oklch(0.6217762f, 0.1034518f, 205.799f), // #ff1298a5 secondary = HighOrLowlight, - secondaryVariant = oklch(0.3761328f, 0.03384425f, 216.5493f), - background = oklch(0.2024453f, 0.03849037f, 273.4875f), + secondaryVariant = oklch(0.3761328f, 0.03384425f, 216.5493f), // #ff2c464d + background = oklch(0.2024453f, 0.03849037f, 273.4875f), // #ff111528 // surface = Color.Black, // background = Color(0xFF121212), - surface = oklch(0.2331016f, 0.05415408f, 266.8904f), + surface = oklch(0.2331016f, 0.05415408f, 266.8904f), // #ff121c37 error = Color.Red, // onBackground = Color(0xFFFFFBFA), // onSurface = Color(0xFFFFFBFA), // onError: Color = Color.Black, ) val SimplexColorPaletteApp = AppColors( - title = oklch(0.5909158f, 0.1793687f, 256.4473f), - primaryVariant2 = oklch(0.2782386f, 0.05068946f, 256.0234f), - sentMessage = oklch(0.2782386f, 0.05068946f, 256.0234f), - sentQuote = oklch(0.3401385f, 0.06268949f, 249.4274f), - receivedMessage = oklch(0.2823021f, 0.03341238f, 276.7299f), - receivedQuote = oklch(0.3488846f, 0.02991734f, 276.9226f), + title = oklch(0.5909158f, 0.1793687f, 256.4473f), // #ff267be5 + primaryVariant2 = oklch(0.2782386f, 0.05068946f, 256.0234f), // #ff172941 + sentMessage = oklch(0.2782386f, 0.05068946f, 256.0234f), // #ff172941 + sentQuote = oklch(0.3401385f, 0.06268949f, 249.4274f), // #ff1C3A57 + receivedMessage = oklch(0.2823021f, 0.03341238f, 276.7299f), // #ff25283a + receivedQuote = oklch(0.3488846f, 0.02991734f, 276.9226f), // #ff36394a ) val BlackColorPalette = darkColors( primary = oklch(0.5737125f, 0.1826329f, 254.0001f), // If this value changes also need to update #0088ff in string resource files - primaryVariant = oklch(0.5737125f, 0.1826329f, 254.0001f), + primaryVariant = oklch(0.5737125f, 0.1826329f, 254.0001f), // #ff0077e0 secondary = HighOrLowlight, secondaryVariant = DarkGray, - background = oklch(0.1285578f, 0f, 0f), - surface = oklch(0.200616f, 0.001969079f, 286.2208f), + background = oklch(0.1285578f, 0f, 0f), // #ff070707 + surface = oklch(0.200616f, 0.001969079f, 286.2208f), // #ff161617 // background = Color(0xFF121212), // surface = Color(0xFF121212), error = Color.Red, - onBackground = oklch(0.9908696f, 0.00447983f, 34.30938f), - onSurface = oklch(0.9908696f, 0.00447983f, 34.30938f), + onBackground = oklch(0.9908696f, 0.00447983f, 34.30938f), // #fffffbfa + onSurface = oklch(0.9908696f, 0.00447983f, 34.30938f), // #fffffbfa // onError: Color = Color.Black, ) val BlackColorPaletteApp = AppColors( - title = oklch(0.5737125f, 0.1826329f, 254.0001f), - primaryVariant2 = oklch(0.327876f, 0.03765742f, 244.7111f), - sentMessage = oklch(0.2596116f, 0.02435695f, 234.0127f), - sentQuote = oklch(0.3262685f, 0.04242656f, 234.4608f), - receivedMessage = oklch(0.2221287f, 0f, 0f), - receivedQuote = oklch(0.2817215f, 0.003620283f, 286.165f), + title = oklch(0.5737125f, 0.1826329f, 254.0001f), // #ff0077e0 + primaryVariant2 = oklch(0.327876f, 0.03765742f, 244.7111f), // #ff243747 + sentMessage = oklch(0.2596116f, 0.02435695f, 234.0127f), // #ff18262e + sentQuote = oklch(0.3262685f, 0.04242656f, 234.4608f), // #ff1d3847 + receivedMessage = oklch(0.2221287f, 0f, 0f), // #ff1b1b1b + receivedQuote = oklch(0.2817215f, 0.003620283f, 286.165f), // #ff29292b ) var systemInDarkThemeCurrently: Boolean = isInNightMode() diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatWallpaper.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatWallpaper.kt index 96f9223044..0e22566443 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatWallpaper.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatWallpaper.kt @@ -31,212 +31,212 @@ enum class PresetWallpaper( val colors: Map, ) { CATS(MR.images.wallpaper_cats, "cats", 0.63f, - wallpaperBackgrounds(light = oklch(0.9714242f, 0.01596467f, 98.99223f)), + wallpaperBackgrounds(light = oklch(0.9714242f, 0.01596467f, 98.99223f)), // #ffF8F6EA tint = mapOf( - DefaultTheme.LIGHT to oklch(0.897064f, 0.07281305f, 90.95935f), - DefaultTheme.DARK to oklch(0.3603656f, 0.0643012f, 88.54155f), - DefaultTheme.SIMPLEX to oklch(0.3797781f, 0.06842897f, 88.88896f), - DefaultTheme.BLACK to oklch(0.3603656f, 0.0643012f, 88.54155f) + DefaultTheme.LIGHT to oklch(0.897064f, 0.07281305f, 90.95935f), // #ffefdca6 + DefaultTheme.DARK to oklch(0.3603656f, 0.0643012f, 88.54155f), // #ff4b3b0e + DefaultTheme.SIMPLEX to oklch(0.3797781f, 0.06842897f, 88.88896f), // #ff51400f + DefaultTheme.BLACK to oklch(0.3603656f, 0.0643012f, 88.54155f) // #ff4b3b0e ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9854474f, 0.01790464f, 89.3544f), - sentQuote = oklch(0.9562038f, 0.0357691f, 89.44265f), - receivedMessage = oklch(0.9760699f, 0.004115805f, 91.44609f), - receivedQuote = oklch(0.9465333f, 0.005762915f, 84.56661f), + sentMessage = oklch(0.9854474f, 0.01790464f, 89.3544f), // #fffffaed + sentQuote = oklch(0.9562038f, 0.0357691f, 89.44265f), // #fffaf0d6 + receivedMessage = oklch(0.9760699f, 0.004115805f, 91.44609f), // #ffF8F7F4 + receivedQuote = oklch(0.9465333f, 0.005762915f, 84.56661f), // #ffefede9 ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.2827141f, 0.02844628f, 89.80136f), - sentQuote = oklch(0.3550253f, 0.04770112f, 85.80835f), - receivedMessage = oklch(0.2689313f, 0.003935312f, 84.58291f), - receivedQuote = oklch(0.332832f, 0.005361989f, 91.54412f), + sentMessage = oklch(0.2827141f, 0.02844628f, 89.80136f), // #ff2f2919 + sentQuote = oklch(0.3550253f, 0.04770112f, 85.80835f), // #ff473a1d + receivedMessage = oklch(0.2689313f, 0.003935312f, 84.58291f), // #ff272624 + receivedQuote = oklch(0.332832f, 0.005361989f, 91.54412f), // #ff373633 ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.3402031f, 0.04537511f, 90.2498f), - sentQuote = oklch(0.4398707f, 0.0737883f, 85.23908f), - receivedMessage = oklch(0.2689313f, 0.003935312f, 84.58291f), - receivedQuote = oklch(0.332832f, 0.005361989f, 91.54412f), + sentMessage = oklch(0.3402031f, 0.04537511f, 90.2498f), // #ff41371b + sentQuote = oklch(0.4398707f, 0.0737883f, 85.23908f), // #ff654f1c + receivedMessage = oklch(0.2689313f, 0.003935312f, 84.58291f), // #ff272624 + receivedQuote = oklch(0.332832f, 0.005361989f, 91.54412f), // #ff373633 ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.3402031f, 0.04537511f, 90.2498f), - sentQuote = oklch(0.4398707f, 0.0737883f, 85.23908f), - receivedMessage = oklch(0.2349937f, 0.005828091f, 91.60813f), - receivedQuote = oklch(0.2971596f, 0.01092985f, 91.6846f), + sentMessage = oklch(0.3402031f, 0.04537511f, 90.2498f), // #ff41371b + sentQuote = oklch(0.4398707f, 0.0737883f, 85.23908f), // #ff654f1c + receivedMessage = oklch(0.2349937f, 0.005828091f, 91.60813f), // #ff1f1e1b + receivedQuote = oklch(0.2971596f, 0.01092985f, 91.6846f), // #ff2f2d27 ), ) ), FLOWERS(MR.images.wallpaper_flowers, "flowers", 0.53f, - wallpaperBackgrounds(light = oklch(0.9718878f, 0.04671557f, 147.1246f)), + wallpaperBackgrounds(light = oklch(0.9718878f, 0.04671557f, 147.1246f)), // #ffE2FFE4 tint = mapOf( - DefaultTheme.LIGHT to oklch(0.8574244f, 0.1932141f, 133.0531f), - DefaultTheme.DARK to oklch(0.409874f, 0.1074549f, 133.4271f), - DefaultTheme.SIMPLEX to oklch(0.4415422f, 0.1170956f, 133.8571f), - DefaultTheme.BLACK to oklch(0.409874f, 0.1074549f, 133.4271f) + DefaultTheme.LIGHT to oklch(0.8574244f, 0.1932141f, 133.0531f), // #ff9CEA59 + DefaultTheme.DARK to oklch(0.409874f, 0.1074549f, 133.4271f), // #ff31560D + DefaultTheme.SIMPLEX to oklch(0.4415422f, 0.1170956f, 133.8571f), // #ff36600f + DefaultTheme.BLACK to oklch(0.409874f, 0.1074549f, 133.4271f) // #ff31560D ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9827452f, 0.03710413f, 130.3627f), - sentQuote = oklch(0.9477894f, 0.07588911f, 131.1257f), - receivedMessage = oklch(0.9744452f, 0.008958742f, 134.8726f), - receivedQuote = oklch(0.9378814f, 0.008518542f, 145.5074f), + sentMessage = oklch(0.9827452f, 0.03710413f, 130.3627f), // #fff1ffe5 + sentQuote = oklch(0.9477894f, 0.07588911f, 131.1257f), // #ffdcf9c4 + receivedMessage = oklch(0.9744452f, 0.008958742f, 134.8726f), // #ffF4F8F2 + receivedQuote = oklch(0.9378814f, 0.008518542f, 145.5074f), // #ffe7ece7 ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.2986395f, 0.05211595f, 153.5889f), - sentQuote = oklch(0.3954021f, 0.08319059f, 152.8037f), - receivedMessage = oklch(0.2626721f, 0.003936427f, 128.6285f), - receivedQuote = oklch(0.3334174f, 0.007411477f, 128.7105f), + sentMessage = oklch(0.2986395f, 0.05211595f, 153.5889f), // #ff163521 + sentQuote = oklch(0.3954021f, 0.08319059f, 152.8037f), // #ff1B5330 + receivedMessage = oklch(0.2626721f, 0.003936427f, 128.6285f), // #ff242523 + receivedQuote = oklch(0.3334174f, 0.007411477f, 128.7105f), // #ff353733 ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.3611755f, 0.05678164f, 170.3752f), - sentQuote = oklch(0.484029f, 0.09629127f, 159.5568f), - receivedMessage = oklch(0.2626721f, 0.003936427f, 128.6285f), - receivedQuote = oklch(0.3334174f, 0.007411477f, 128.7105f), + sentMessage = oklch(0.3611755f, 0.05678164f, 170.3752f), // #ff184739 + sentQuote = oklch(0.484029f, 0.09629127f, 159.5568f), // #ff1F6F4B + receivedMessage = oklch(0.2626721f, 0.003936427f, 128.6285f), // #ff242523 + receivedQuote = oklch(0.3334174f, 0.007411477f, 128.7105f), // #ff353733 ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.3611755f, 0.05678164f, 170.3752f), - sentQuote = oklch(0.484029f, 0.09629127f, 159.5568f), - receivedMessage = oklch(0.2342548f, 0.01039849f, 132.6996f), - receivedQuote = oklch(0.2838948f, 0.01154375f, 128.9221f), + sentMessage = oklch(0.3611755f, 0.05678164f, 170.3752f), // #ff184739 + sentQuote = oklch(0.484029f, 0.09629127f, 159.5568f), // #ff1F6F4B + receivedMessage = oklch(0.2342548f, 0.01039849f, 132.6996f), // #ff1c1f1a + receivedQuote = oklch(0.2838948f, 0.01154375f, 128.9221f), // #ff282b25 ), ) ), HEARTS(MR.images.wallpaper_hearts, "hearts", 0.59f, - wallpaperBackgrounds(light = oklch(0.9565624f, 0.01848713f, 17.48077f)), + wallpaperBackgrounds(light = oklch(0.9565624f, 0.01848713f, 17.48077f)), // #ffFDECEC tint = mapOf( - DefaultTheme.LIGHT to oklch(0.9304586f, 0.03207239f, 17.7425f), - DefaultTheme.DARK to oklch(0.2458526f, 0.07098409f, 23.94782f), - DefaultTheme.SIMPLEX to oklch(0.2574974f, 0.07614605f, 24.19117f), - DefaultTheme.BLACK to oklch(0.2458526f, 0.07098409f, 23.94782f) + DefaultTheme.LIGHT to oklch(0.9304586f, 0.03207239f, 17.7425f), // #fffde0e0 + DefaultTheme.DARK to oklch(0.2458526f, 0.07098409f, 23.94782f), // #ff3C0F0F + DefaultTheme.SIMPLEX to oklch(0.2574974f, 0.07614605f, 24.19117f), // #ff411010 + DefaultTheme.BLACK to oklch(0.2458526f, 0.07098409f, 23.94782f) // #ff3C0F0F ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9757184f, 0.01184164f, 17.35934f), - sentQuote = oklch(0.9300344f, 0.0354728f, 17.80723f), - receivedMessage = oklch(0.9746758f, 0.002137086f, 17.19433f), - receivedQuote = oklch(0.9431687f, 0.004317648f, 17.23361f), + sentMessage = oklch(0.9757184f, 0.01184164f, 17.35934f), // #fffff4f4 + sentQuote = oklch(0.9300344f, 0.0354728f, 17.80723f), // #ffffdfdf + receivedMessage = oklch(0.9746758f, 0.002137086f, 17.19433f), // #fff8f6f6 + receivedQuote = oklch(0.9431687f, 0.004317648f, 17.23361f), // #ffefebeb ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.2353791f, 0.04398437f, 20.94719f), - sentQuote = oklch(0.2920391f, 0.07914221f, 23.35544f), - receivedMessage = oklch(0.2510736f, 0.004554155f, 17.46058f), - receivedQuote = oklch(0.3352158f, 0.008515606f, 17.58481f), + sentMessage = oklch(0.2353791f, 0.04398437f, 20.94719f), // #ff301515 + sentQuote = oklch(0.2920391f, 0.07914221f, 23.35544f), // #ff4C1818 + receivedMessage = oklch(0.2510736f, 0.004554155f, 17.46058f), // #ff242121 + receivedQuote = oklch(0.3352158f, 0.008515606f, 17.58481f), // #ff3b3535 ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.2941874f, 0.07322977f, 4.102547f), - sentQuote = oklch(0.3831088f, 0.1201278f, 18.61089f), - receivedMessage = oklch(0.2510736f, 0.004554155f, 17.46058f), - receivedQuote = oklch(0.3352158f, 0.008515606f, 17.58481f), + sentMessage = oklch(0.2941874f, 0.07322977f, 4.102547f), // #ff491A28 + sentQuote = oklch(0.3831088f, 0.1201278f, 18.61089f), // #ff761F29 + receivedMessage = oklch(0.2510736f, 0.004554155f, 17.46058f), // #ff242121 + receivedQuote = oklch(0.3352158f, 0.008515606f, 17.58481f), // #ff3b3535 ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.2941874f, 0.07322977f, 4.102547f), - sentQuote = oklch(0.3831088f, 0.1201278f, 18.61089f), - receivedMessage = oklch(0.2267386f, 0.00626924f, 17.6236f), - receivedQuote = oklch(0.2776199f, 0.012034f, 17.89987f), + sentMessage = oklch(0.2941874f, 0.07322977f, 4.102547f), // #ff491A28 + sentQuote = oklch(0.3831088f, 0.1201278f, 18.61089f), // #ff761F29 + receivedMessage = oklch(0.2267386f, 0.00626924f, 17.6236f), // #ff1f1b1b + receivedQuote = oklch(0.2776199f, 0.012034f, 17.89987f), // #ff2e2626 ), ) ), KIDS(MR.images.wallpaper_kids, "kids", 0.53f, - wallpaperBackgrounds(light = oklch(0.9693045f, 0.03516977f, 192.2433f)), + wallpaperBackgrounds(light = oklch(0.9693045f, 0.03516977f, 192.2433f)), // #ffdbfdfb tint = mapOf( - DefaultTheme.LIGHT to oklch(0.9123625f, 0.06815507f, 211.1344f), - DefaultTheme.DARK to oklch(0.3473769f, 0.04958945f, 218.0525f), - DefaultTheme.SIMPLEX to oklch(0.3716418f, 0.05389406f, 217.7104f), - DefaultTheme.BLACK to oklch(0.3473769f, 0.04958945f, 218.0525f) + DefaultTheme.LIGHT to oklch(0.9123625f, 0.06815507f, 211.1344f), // #ffadeffc + DefaultTheme.DARK to oklch(0.3473769f, 0.04958945f, 218.0525f), // #ff16404B + DefaultTheme.SIMPLEX to oklch(0.3716418f, 0.05389406f, 217.7104f), // #ff184753 + DefaultTheme.BLACK to oklch(0.3473769f, 0.04958945f, 218.0525f) // #ff16404B ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9827091f, 0.02093746f, 200.4479f), - sentQuote = oklch(0.9392156f, 0.04239295f, 201.9221f), - receivedMessage = oklch(0.9798523f, 0.007408877f, 197.0357f), - receivedQuote = oklch(0.9438775f, 0.0117012f, 196.9581f), + sentMessage = oklch(0.9827091f, 0.02093746f, 200.4479f), // #ffeafeff + sentQuote = oklch(0.9392156f, 0.04239295f, 201.9221f), // #ffcbf4f7 + receivedMessage = oklch(0.9798523f, 0.007408877f, 197.0357f), // #fff3fafa + receivedQuote = oklch(0.9438775f, 0.0117012f, 196.9581f), // #ffe4efef ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.2881511f, 0.03214503f, 192.2759f), - sentQuote = oklch(0.3764664f, 0.05129536f, 193.292f), - receivedMessage = oklch(0.2675764f, 0.001466786f, 197.0692f), - receivedQuote = oklch(0.3451987f, 0.004436687f, 174.2088f), + sentMessage = oklch(0.2881511f, 0.03214503f, 192.2759f), // #ff16302F + sentQuote = oklch(0.3764664f, 0.05129536f, 193.292f), // #ff1a4a49 + receivedMessage = oklch(0.2675764f, 0.001466786f, 197.0692f), // #ff252626 + receivedQuote = oklch(0.3451987f, 0.004436687f, 174.2088f), // #ff373a39 ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.3662882f, 0.04909204f, 191.2229f), - sentQuote = oklch(0.4817563f, 0.07299667f, 192.4874f), - receivedMessage = oklch(0.2675764f, 0.001466786f, 197.0692f), - receivedQuote = oklch(0.3451987f, 0.004436687f, 174.2088f), + sentMessage = oklch(0.3662882f, 0.04909204f, 191.2229f), // #ff1a4745 + sentQuote = oklch(0.4817563f, 0.07299667f, 192.4874f), // #ff1d6b69 + receivedMessage = oklch(0.2675764f, 0.001466786f, 197.0692f), // #ff252626 + receivedQuote = oklch(0.3451987f, 0.004436687f, 174.2088f), // #ff373a39 ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.3662882f, 0.04909204f, 191.2229f), - sentQuote = oklch(0.4817563f, 0.07299667f, 192.4874f), - receivedMessage = oklch(0.2382215f, 0.001508911f, 197.0555f), - receivedQuote = oklch(0.2833724f, 0.007955636f, 169.798f), + sentMessage = oklch(0.3662882f, 0.04909204f, 191.2229f), // #ff1a4745 + sentQuote = oklch(0.4817563f, 0.07299667f, 192.4874f), // #ff1d6b69 + receivedMessage = oklch(0.2382215f, 0.001508911f, 197.0555f), // #ff1e1f1f + receivedQuote = oklch(0.2833724f, 0.007955636f, 169.798f), // #ff262b29 ), ) ), SCHOOL(MR.images.wallpaper_school, "school", 0.53f, - wallpaperBackgrounds(light = oklch(0.9626785f, 0.02004578f, 238.6614f)), + wallpaperBackgrounds(light = oklch(0.9626785f, 0.02004578f, 238.6614f)), // #ffE7F5FF tint = mapOf( - DefaultTheme.LIGHT to oklch(0.9252349f, 0.04096641f, 238.0518f), - DefaultTheme.DARK to oklch(0.2700986f, 0.04630937f, 241.5568f), - DefaultTheme.SIMPLEX to oklch(0.2929108f, 0.05102392f, 240.8139f), - DefaultTheme.BLACK to oklch(0.2700986f, 0.04630937f, 241.5568f) + DefaultTheme.LIGHT to oklch(0.9252349f, 0.04096641f, 238.0518f), // #ffCEEBFF + DefaultTheme.DARK to oklch(0.2700986f, 0.04630937f, 241.5568f), // #ff0F293B + DefaultTheme.SIMPLEX to oklch(0.2929108f, 0.05102392f, 240.8139f), // #ff112f43 + DefaultTheme.BLACK to oklch(0.2700986f, 0.04630937f, 241.5568f) // #ff0F293B ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9756479f, 0.01416295f, 231.2013f), - sentQuote = oklch(0.9331527f, 0.03006113f, 232.4212f), - receivedMessage = oklch(0.9697657f, 0.005748723f, 264.5325f), - receivedQuote = oklch(0.9296755f, 0.00918803f, 258.3366f), + sentMessage = oklch(0.9756479f, 0.01416295f, 231.2013f), // #ffeef9ff + sentQuote = oklch(0.9331527f, 0.03006113f, 232.4212f), // #ffD6EDFA + receivedMessage = oklch(0.9697657f, 0.005748723f, 264.5325f), // #ffF3F5F9 + receivedQuote = oklch(0.9296755f, 0.00918803f, 258.3366f), // #ffe4e8ee ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.267226f, 0.03061943f, 237.8609f), - sentQuote = oklch(0.3464064f, 0.04943852f, 232.4005f), - receivedMessage = oklch(0.2764251f, 0.007910622f, 264.4375f), - receivedQuote = oklch(0.3548081f, 0.008034593f, 255.5451f), + sentMessage = oklch(0.267226f, 0.03061943f, 237.8609f), // #ff172833 + sentQuote = oklch(0.3464064f, 0.04943852f, 232.4005f), // #ff1C3E4F + receivedMessage = oklch(0.2764251f, 0.007910622f, 264.4375f), // #ff26282c + receivedQuote = oklch(0.3548081f, 0.008034593f, 255.5451f), // #ff393c40 ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.3481476f, 0.07023845f, 249.9259f), - sentQuote = oklch(0.4520089f, 0.08394516f, 241.1934f), - receivedMessage = oklch(0.2764251f, 0.007910622f, 264.4375f), - receivedQuote = oklch(0.3548081f, 0.008034593f, 255.5451f), + sentMessage = oklch(0.3481476f, 0.07023845f, 249.9259f), // #ff1A3C5D + sentQuote = oklch(0.4520089f, 0.08394516f, 241.1934f), // #ff235b80 + receivedMessage = oklch(0.2764251f, 0.007910622f, 264.4375f), // #ff26282c + receivedQuote = oklch(0.3548081f, 0.008034593f, 255.5451f), // #ff393c40 ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.3481476f, 0.07023845f, 249.9259f), - sentQuote = oklch(0.4520089f, 0.08394516f, 241.1934f), - receivedMessage = oklch(0.2356588f, 0.007789041f, 274.6063f), - receivedQuote = oklch(0.2886546f, 0.007823012f, 264.445f), + sentMessage = oklch(0.3481476f, 0.07023845f, 249.9259f), // #ff1A3C5D + sentQuote = oklch(0.4520089f, 0.08394516f, 241.1934f), // #ff235b80 + receivedMessage = oklch(0.2356588f, 0.007789041f, 274.6063f), // #ff1d1e22 + receivedQuote = oklch(0.2886546f, 0.007823012f, 264.445f), // #ff292b2f ), ) ), TRAVEL(MR.images.wallpaper_travel, "travel", 0.68f, - wallpaperBackgrounds(light = oklch(0.9626377f, 0.0253131f, 313.9639f)), + wallpaperBackgrounds(light = oklch(0.9626377f, 0.0253131f, 313.9639f)), // #fff9eeff tint = mapOf( - DefaultTheme.LIGHT to oklch(0.9174161f, 0.05105522f, 309.6281f), - DefaultTheme.DARK to oklch(0.2817417f, 0.07665313f, 302.6645f), - DefaultTheme.SIMPLEX to oklch(0.2948376f, 0.08277514f, 302.7197f), - DefaultTheme.BLACK to oklch(0.2817417f, 0.07665313f, 302.6645f) + DefaultTheme.LIGHT to oklch(0.9174161f, 0.05105522f, 309.6281f), // #ffeedbfe + DefaultTheme.DARK to oklch(0.2817417f, 0.07665313f, 302.6645f), // #ff311E48 + DefaultTheme.SIMPLEX to oklch(0.2948376f, 0.08277514f, 302.7197f), // #ff35204e + DefaultTheme.BLACK to oklch(0.2817417f, 0.07665313f, 302.6645f) // #ff311E48 ), mapOf( DefaultTheme.LIGHT to ResolvedColors( - sentMessage = oklch(0.9803204f, 0.01342671f, 314.7601f), - sentQuote = oklch(0.9294779f, 0.04197705f, 313.6968f), - receivedMessage = oklch(0.9695303f, 0.004487354f, 314.8044f), - receivedQuote = oklch(0.9385522f, 0.007899312f, 319.4466f), + sentMessage = oklch(0.9803204f, 0.01342671f, 314.7601f), // #fffcf6ff + sentQuote = oklch(0.9294779f, 0.04197705f, 313.6968f), // #fff2e0fc + receivedMessage = oklch(0.9695303f, 0.004487354f, 314.8044f), // #ffF6F4F7 + receivedQuote = oklch(0.9385522f, 0.007899312f, 319.4466f), // #ffede9ee ), DefaultTheme.DARK to ResolvedColors( - sentMessage = oklch(0.2929984f, 0.04120036f, 312.1162f), - sentQuote = oklch(0.3876602f, 0.07087001f, 315.7654f), - receivedMessage = oklch(0.2678179f, 0.006190444f, 314.7144f), - receivedQuote = oklch(0.3435397f, 0.01317027f, 310.9424f), + sentMessage = oklch(0.2929984f, 0.04120036f, 312.1162f), // #ff33263B + sentQuote = oklch(0.3876602f, 0.07087001f, 315.7654f), // #ff53385E + receivedMessage = oklch(0.2678179f, 0.006190444f, 314.7144f), // #ff272528 + receivedQuote = oklch(0.3435397f, 0.01317027f, 310.9424f), // #ff3B373E ), DefaultTheme.SIMPLEX to ResolvedColors( - sentMessage = oklch(0.3234681f, 0.09690244f, 299.9634f), - sentQuote = oklch(0.4226042f, 0.1341495f, 307.8573f), - receivedMessage = oklch(0.2812692f, 0.03669397f, 281.5485f), - receivedQuote = oklch(0.355058f, 0.03791292f, 286.3773f), + sentMessage = oklch(0.3234681f, 0.09690244f, 299.9634f), // #ff3C255D + sentQuote = oklch(0.4226042f, 0.1341495f, 307.8573f), // #ff623485 + receivedMessage = oklch(0.2812692f, 0.03669397f, 281.5485f), // #ff26273B + receivedQuote = oklch(0.355058f, 0.03791292f, 286.3773f), // #ff3A394F ), DefaultTheme.BLACK to ResolvedColors( - sentMessage = oklch(0.3234681f, 0.09690244f, 299.9634f), - sentQuote = oklch(0.4226042f, 0.1341495f, 307.8573f), - receivedMessage = oklch(0.2454222f, 0.009540156f, 325.8636f), - receivedQuote = oklch(0.2874049f, 0.0149843f, 302.5009f), + sentMessage = oklch(0.3234681f, 0.09690244f, 299.9634f), // #ff3C255D + sentQuote = oklch(0.4226042f, 0.1341495f, 307.8573f), // #ff623485 + receivedMessage = oklch(0.2454222f, 0.009540156f, 325.8636f), // #ff231f23 + receivedQuote = oklch(0.2874049f, 0.0149843f, 302.5009f), // #ff2c2931 ), ) ); @@ -256,9 +256,9 @@ enum class PresetWallpaper( fun wallpaperBackgrounds(light: Color): Map = mapOf( DefaultTheme.LIGHT to light, - DefaultTheme.DARK to oklch(0.1822037f, 0f, 0f), - DefaultTheme.SIMPLEX to oklch(0.2024453f, 0.03849037f, 273.4875f), - DefaultTheme.BLACK to oklch(0.1285578f, 0f, 0f) + DefaultTheme.DARK to oklch(0.1822037f, 0f, 0f), // #ff121212 + DefaultTheme.SIMPLEX to oklch(0.2024453f, 0.03849037f, 273.4875f), // #ff111528 + DefaultTheme.BLACK to oklch(0.1285578f, 0f, 0f) // #ff070707 ) @Serializable