Implement new color palette.

greyson-signal · greyson-signal · commit 127505af0b00 · 2018-10-03T14:23:59.000-07:00
diff --git a/res/drawable/archived_indicator_background.xml b/res/drawable/archived_indicator_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <solid android:color="@color/core_light_35"/>
+    <solid android:color="@color/core_grey_45"/>
     <corners android:radius="10dp"/>
 </shape>
diff --git a/res/drawable/compose_background_camera.xml b/res/drawable/compose_background_camera.xml
@@ -5,7 +5,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/core_light_45" />
+        android:color="@color/core_grey_25" />
 
     <solid
         android:color="@color/transparent_black_90" />
diff --git a/res/drawable/compose_background_dark.xml b/res/drawable/compose_background_dark.xml
@@ -5,10 +5,10 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/core_dark_70" />
+        android:color="@color/core_grey_75" />
 
     <solid
-        android:color="@color/core_dark_85" />
+        android:color="@color/core_grey_90" />
 
     <corners
         android:radius="20dp" />
diff --git a/res/drawable/compose_background_light.xml b/res/drawable/compose_background_light.xml
@@ -5,10 +5,10 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/core_light_10" />
+        android:color="@color/core_grey_05" />
 
     <solid
-        android:color="@color/core_light_02" />
+        android:color="@color/core_grey_02" />
 
     <corners
         android:radius="20dp" />
diff --git a/res/drawable/sticky_date_header_background_dark.xml b/res/drawable/sticky_date_header_background_dark.xml
@@ -4,5 +4,5 @@
     android:shape="rectangle">
 
     <corners android:radius="4dp" />
-    <solid android:color="@color/core_dark_85" />
+    <solid android:color="@color/core_grey_90" />
 </shape>
diff --git a/res/drawable/sticky_date_header_background_light.xml b/res/drawable/sticky_date_header_background_light.xml
@@ -4,5 +4,5 @@
     android:shape="rectangle">
 
     <corners android:radius="4dp" />
-    <solid android:color="@color/core_light_02" />
+    <solid android:color="@color/core_grey_02" />
 </shape>
diff --git a/res/layout/alert_view.xml b/res/layout/alert_view.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_error"
-        android:tint="@color/core_light_60"
+        android:tint="@color/core_grey_60"
         android:visibility="gone"
         tools:visibility="visible"
         android:layout_gravity="center_vertical"
diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -53,8 +53,8 @@
             android:paddingLeft="@dimen/message_bubble_horizontal_padding"
             android:paddingRight="@dimen/message_bubble_horizontal_padding"
             android:background="@drawable/message_bubble_background_sent_alone"
-            app:doc_titleColor="?attr/conversation_item_sent_text_primary_color"
-            app:doc_captionColor="?attr/conversation_item_sent_text_secondary_color"/>
+            app:doc_titleColor="?attr/conversation_item_received_text_primary_color"
+            app:doc_captionColor="?attr/conversation_item_received_text_secondary_color"/>
 
     </org.thoughtcrime.securesms.components.RemovableEditableMediaView>
 
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
@@ -41,8 +41,8 @@
                 android:layout_marginTop="6dp"
                 android:visibility="gone"
                 app:message_type="preview"
-                app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
-                app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
+                app:quote_colorPrimary="?attr/conversation_item_received_text_primary_color"
+                app:quote_colorSecondary="?attr/conversation_item_received_text_primary_color"
                 tools:visibility="visible"/>
 
             <FrameLayout
@@ -189,7 +189,7 @@
                         android:layout_marginStart="20dp"
                         style="@style/Signal.Text.Body"
                         android:text="00:00"
-                        android:textColor="@color/core_light_60"
+                        android:textColor="@color/core_grey_60"
                         android:singleLine="true"
                         android:visibility="gone"
                         tools:visibility="visible"/>
@@ -209,7 +209,7 @@
                             style="@style/Signal.Text.Caption"
                             android:text="@string/conversation_input_panel__slide_to_cancel"
                             android:textAllCaps="true"
-                            android:textColor="@color/core_light_60"
+                            android:textColor="@color/core_grey_60"
                             android:ellipsize="none"
                             android:visibility="gone"
                             android:paddingRight="50dp"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
@@ -36,7 +36,7 @@
             android:clipToPadding="false"
             android:clipChildren="false"
             android:background="@color/white"
-            tools:backgroundTint="@color/core_light_10">
+            tools:backgroundTint="@color/core_grey_05">
 
             <org.thoughtcrime.securesms.components.QuoteView
                 android:id="@+id/quote_view"
@@ -127,6 +127,7 @@
                 android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
                 android:clipChildren="false"
                 android:clipToPadding="false"
+                android:alpha="0.8"
                 app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
                 app:footer_icon_color="?attr/conversation_item_sent_icon_color"/>
 
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
@@ -13,7 +13,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:minHeight="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/conversation_list_toolbar_background"
             app:contentInsetStart="14dp"
             app:contentInsetLeft="14dp"
             android:elevation="4dp"
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
@@ -77,6 +77,7 @@
                            android:visibility="gone"
                            android:background="@drawable/circle_touch_highlight_background"
                            android:src="@drawable/ic_download_circle_fill_white_48dp"
+                           android:tint="@color/core_grey_60"
                            android:contentDescription="@string/audio_view__download_accessibility_description"/>
 
             </org.thoughtcrime.securesms.components.AnimatingToggle>
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
@@ -75,7 +75,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/Signal.Text.Body"
-                        android:textColor="@color/core_light_90"
+                        android:textColor="@color/core_grey_90"
                         android:maxLines="1"
                         android:ellipsize="end"
                         tools:text="The-Amazing-Spider-Man.cba" />
@@ -88,7 +88,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginRight="8dp"
                     style="@style/Signal.Text.Caption"
-                    android:textColor="@color/core_light_90"
+                    android:textColor="@color/core_grey_90"
                     android:paddingTop="4dp"
                     android:textStyle="italic"
                     android:visibility="gone"
@@ -168,7 +168,7 @@
                 android:layout_height="wrap_content"
                 style="@style/Signal.Text.Caption"
                 android:text="@string/QuoteView_original_missing"
-                android:textColor="@color/core_light_90"/>
+                android:textColor="@color/core_grey_90"/>
 
         </LinearLayout>
 
diff --git a/res/layout/scribble_fragment_emojidrawer_stub.xml b/res/layout/scribble_fragment_emojidrawer_stub.xml
@@ -4,5 +4,5 @@
         android:id="@+id/emoji_drawer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/core_light_90"
+        android:background="@color/core_grey_90"
         android:visibility="gone" />
diff --git a/res/layout/scribble_hud.xml b/res/layout/scribble_hud.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:parentTag="android.widget.LinearLayout"
-    tools:background="@color/core_light_60">
+    tools:background="@color/core_grey_60">
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/res/layout/transfer_controls_view.xml b/res/layout/transfer_controls_view.xml
@@ -18,7 +18,7 @@
               android:padding="15dp"
               android:gravity="center"
               android:longClickable="false"
-              android:textColor="?conversation_item_received_text_primary_color"
+              android:textColor="?conversation_item_sent_text_primary_color"
               android:drawableLeft="@drawable/ic_file_download_white_36dp"
               android:textSize="16dp"
               android:visibility="gone"
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
@@ -13,6 +13,7 @@
     <attr name="conversation_list_item_date_color" format="reference|color"/>
     <attr name="conversation_list_item_unread_color" format="reference|color"/>
     <attr name="conversation_list_item_divider" format="reference"/>
+    <attr name="conversation_list_toolbar_background" format="reference"/>
 
     <attr name="conversation_sent_card_background" format="reference|color"/>
     <attr name="conversation_group_member_name" format="reference|color"/>
diff --git a/res/values/conversation_colors.xml b/res/values/conversation_colors.xml
@@ -1,32 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="conversation_red">#d32f2f</color>
-    <color name="conversation_red_shade">#9a0007</color>
+    <color name="conversation_crimson">#cc163d</color>
+    <color name="conversation_crimson_tint">#eda6ae</color>
+    <color name="conversation_crimson_shade">#8a0f29</color>
 
-    <color name="conversation_pink">#d81b60</color>
-    <color name="conversation_pink_shade">#a00037</color>
+    <color name="conversation_vermillion">#c73800</color>
+    <color name="conversation_vermillion_tint">#eba78e</color>
+    <color name="conversation_vermillion_shade">#872600</color>
 
-    <color name="conversation_purple">#8e24aa</color>
-    <color name="conversation_purple_shade">#5c007a</color>
+    <color name="conversation_burlap">#756c53</color>
+    <color name="conversation_burlap_tint">#c4b997</color>
+    <color name="conversation_burlap_shade">#58513c</color>
 
-    <color name="conversation_indigo">#3949ab</color>
-    <color name="conversation_indigo_shade">#00227b</color>
+    <color name="conversation_forest">#3b7845</color>
+    <color name="conversation_forest_tint">#8fcc9a</color>
+    <color name="conversation_forest_shade">#2b5934</color>
 
-    <color name="conversation_blue">#1976d2</color>
-    <color name="conversation_blue_shade">#004ba0</color>
+    <color name="conversation_wintergreen">#1c8260</color>
+    <color name="conversation_wintergreen_tint">#9bcfbd</color>
+    <color name="conversation_wintergreen_shade">#36544a</color>
 
-    <color name="conversation_cyan">#00838f</color>
-    <color name="conversation_cyan_shade">#005662</color>
+    <color name="conversation_teal">#067589</color>
+    <color name="conversation_teal_tint">#a5cad5</color>
+    <color name="conversation_teal_shade">#055968</color>
 
-    <color name="conversation_teal">#00796b</color>
-    <color name="conversation_teal_shade">#004c40</color>
+    <color name="conversation_blue">#336ba3</color>
+    <color name="conversation_blue_tint">#adc8e1</color>
+    <color name="conversation_blue_shade">#285480</color>
 
-    <color name="conversation_green">#2e7d32</color>
-    <color name="conversation_green_shade">#005005</color>
+    <color name="conversation_indigo">#5951c8</color>
+    <color name="conversation_indigo_tint">#c2c1e8</color>
+    <color name="conversation_indigo_shade">#4840a0</color>
 
-    <color name="conversation_orange">#bf360c</color>
-    <color name="conversation_orange_shade">#870000</color>
+    <color name="conversation_violet">#862caf</color>
+    <color name="conversation_violet_tint">#cdaddc</color>
+    <color name="conversation_violet_shade">#6b248a</color>
 
-    <color name="conversation_grey">#757575</color>
-    <color name="conversation_grey_shade">#494949</color>
+    <color name="conversation_plumb">#a23474</color>
+    <color name="conversation_plumb_tint">#dcb2ca</color>
+    <color name="conversation_plumb_shade">#881b5b</color>
+
+    <color name="conversation_taupe">#895d66</color>
+    <color name="conversation_taupe_tint">#cfb5bb</color>
+    <color name="conversation_taupe_shade">#6a4e54</color>
+
+    <color name="conversation_steel">#6b6b78</color>
+    <color name="conversation_steel_tint">#bebec6</color>
+    <color name="conversation_steel_shade">#5a5a63</color>
 </resources>
diff --git a/res/values/core_colors.xml b/res/values/core_colors.xml
@@ -6,19 +6,16 @@
     <color name="core_red_highlight">#ef5350</color>
 
     <color name="core_white">#ffffff</color>
-    <color name="core_light_02">#F9FAFA</color>
-    <color name="core_light_10">#EEEFEF</color>
-    <color name="core_light_35">#A4A6A9</color>
-    <color name="core_light_45">#8B8E91</color>
-    <color name="core_light_60">#62656A</color>
-    <color name="core_light_90">#070C14</color>
-
     <color name="core_black">#000000</color>
-    <color name="core_dark_05">#EFEFEF</color>
-    <color name="core_dark_30">#A8A9AA</color>
-    <color name="core_dark_55">#88898C</color>
-    <color name="core_dark_60">#797A7C</color>
-    <color name="core_dark_70">#414347</color>
-    <color name="core_dark_85">#1A1C20</color>
-    <color name="core_dark_95">#0A0C11</color>
+
+    <color name="core_grey_02">#f8f9f9</color>
+    <color name="core_grey_05">#eeefef</color>
+    <color name="core_grey_15">#d5d6d6</color>
+    <color name="core_grey_25">#bbbdbe</color>
+    <color name="core_grey_45">#898a8c</color>
+    <color name="core_grey_60">#636467</color>
+    <color name="core_grey_75">#3d3e44</color>
+    <color name="core_grey_85">#23252a</color>
+    <color name="core_grey_90">#17191d</color>
+    <color name="core_grey_95">#0f1012</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
@@ -174,7 +174,7 @@
         <item name="android:background">@null</item>
         <item name="android:maxLines">4</item>
         <item name="android:maxLength">2000</item>
-        <item name="android:textColor">?conversation_item_sent_text_primary_color</item>
+        <item name="android:textColor">?conversation_item_received_text_primary_color</item>
         <item name="android:capitalize">sentences</item>
         <item name="android:autoText">true</item>
         <item name="android:gravity">center_vertical</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/src/org/thoughtcrime/securesms/color/MaterialColor.java
diff --git a/src/org/thoughtcrime/securesms/color/MaterialColors.java b/src/org/thoughtcrime/securesms/color/MaterialColors.java
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
