From e7bb615b91d05d25ab84d9ed355a7bfdb0b2a353 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 3 Oct 2019 13:40:36 +0300
Subject: Fix chat and loading colors

---
 Juick/Colors.xcassets/Chat.colorset/Contents.json | 18 ++++++++++++++++++
 Juick/Views/BubbleMessageCell.m                   |  2 +-
 Juick/Views/ContentLoadingCell.xib                | 20 ++++++++++----------
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Juick/Colors.xcassets/Chat.colorset/Contents.json b/Juick/Colors.xcassets/Chat.colorset/Contents.json
index 2702bf1..e96c07d 100644
--- a/Juick/Colors.xcassets/Chat.colorset/Contents.json
+++ b/Juick/Colors.xcassets/Chat.colorset/Contents.json
@@ -15,6 +15,24 @@
           "green" : "0xF8"
         }
       }
+    },
+    {
+      "idiom" : "universal",
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.200",
+          "alpha" : "1.000",
+          "blue" : "0.200",
+          "green" : "0.200"
+        }
+      }
     }
   ]
 }
\ No newline at end of file
diff --git a/Juick/Views/BubbleMessageCell.m b/Juick/Views/BubbleMessageCell.m
index 53c4b2c..f889200 100644
--- a/Juick/Views/BubbleMessageCell.m
+++ b/Juick/Views/BubbleMessageCell.m
@@ -23,7 +23,7 @@
 }
 
 -(void) configureWithMessage:(Message *)message isMe:(BOOL)isMe {
-    self.message.backgroundColor = isMe ? [UIColor colorNamed:@"Funny"] : [UIColor colorNamed:@"Background"];
+    self.message.backgroundColor = isMe ? [UIColor colorNamed:@"Funny"] : [UIColor colorNamed:@"Chat"];
     self.message.textColor = isMe ? [UIColor whiteColor] : [UIColor colorNamed:@"Text"];
     self.message.dataDetectorTypes = UIDataDetectorTypeAll;
     self.message.tintColor = isMe? [UIColor whiteColor] : [UIColor colorNamed:@"Title"];
diff --git a/Juick/Views/ContentLoadingCell.xib b/Juick/Views/ContentLoadingCell.xib
index fea4046..f7ca251 100644
--- a/Juick/Views/ContentLoadingCell.xib
+++ b/Juick/Views/ContentLoadingCell.xib
@@ -26,7 +26,7 @@
                                 <subviews>
                                     <view contentMode="scaleToFill" verticalCompressionResistancePriority="748" translatesAutoresizingMaskIntoConstraints="NO" id="Xfd-wK-nGQ">
                                         <rect key="frame" x="0.0" y="0.0" width="48" height="48"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="48" id="gWm-7q-ure"/>
@@ -35,7 +35,7 @@
                                     </view>
                                     <view contentMode="scaleToFill" verticalCompressionResistancePriority="748" translatesAutoresizingMaskIntoConstraints="NO" id="RpL-2E-Dtt">
                                         <rect key="frame" x="60" y="12" width="202" height="24"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="jxf-Sb-SeH"/>
@@ -48,27 +48,27 @@
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TF4-pH-jy5">
                                         <rect key="frame" x="0.0" y="0.0" width="262" height="17"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iLC-oW-h16">
                                         <rect key="frame" x="0.0" y="29" width="262" height="17.5"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e26-WV-V2J">
                                         <rect key="frame" x="0.0" y="58.5" width="262" height="17"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5HE-g4-DHe">
                                         <rect key="frame" x="0.0" y="87.5" width="262" height="17.5"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O0R-kH-hzS">
                                         <rect key="frame" x="0.0" y="117" width="262" height="17"/>
-                                        <color key="backgroundColor" name="Background"/>
+                                        <color key="backgroundColor" name="Chat"/>
                                         <color key="tintColor" name="Title"/>
                                     </view>
                                 </subviews>
@@ -88,11 +88,11 @@
         </tableViewCell>
     </objects>
     <resources>
-        <namedColor name="Background">
-            <color red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="Chat">
+            <color red="0.97254901960784312" green="0.97254901960784312" blue="0.97254901960784312" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="Title">
-            <color red="0.76470588235294112" green="0.53333333333333333" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.40000000000000002" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>
-- 
cgit v1.2.3