Implement new color palette.

This commit is contained in:
Greyson Parrelli
2018-09-21 15:16:52 -07:00
parent cfd20d23e8
commit 127505af0b
28 changed files with 215 additions and 218 deletions

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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" />

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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>

View File

@@ -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"

View File

@@ -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>

View File

@@ -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"

View File

@@ -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"/>

View File

@@ -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"

View File

@@ -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>

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"/>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -21,8 +21,8 @@
<item name="media_overview_toolbar_background">@color/white</item>
<item name="media_overview_toolbar_foreground">@color/gray70</item>
<item name="media_overview_header_foreground">@color/gray50</item>
<item name="media_overview_document_primary">@color/core_light_90</item>
<item name="media_overview_document_secondary">@color/core_light_60</item>
<item name="media_overview_document_primary">@color/core_grey_90</item>
<item name="media_overview_document_secondary">@color/core_grey_60</item>
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.DarkTheme">
@@ -45,8 +45,8 @@
<item name="media_overview_toolbar_background">@color/black</item>
<item name="media_overview_toolbar_foreground">@color/white</item>
<item name="media_overview_header_foreground">@color/gray10</item>
<item name="media_overview_document_primary">@color/core_dark_05</item>
<item name="media_overview_document_secondary">@color/core_dark_30</item>
<item name="media_overview_document_primary">@color/core_grey_05</item>
<item name="media_overview_document_secondary">@color/core_grey_25</item>
</style>
<style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
@@ -86,7 +86,7 @@
<item name="centered_app_title_color">@color/gray27</item>
<item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
<item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="android:windowBackground">@color/core_grey_95</item>
<item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
<item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
@@ -132,12 +132,13 @@
<item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
<item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
<item name="conversation_list_item_contact_color">@color/core_light_90</item>
<item name="conversation_list_item_subject_color">@color/core_light_60</item>
<item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
<item name="conversation_list_item_date_color">@color/core_light_60</item>
<item name="conversation_list_item_contact_color">@color/core_grey_90</item>
<item name="conversation_list_item_subject_color">@color/core_grey_60</item>
<item name="conversation_list_item_delivery_icon_color">@color/core_grey_45</item>
<item name="conversation_list_item_date_color">@color/core_grey_60</item>
<item name="conversation_list_item_unread_color">@color/core_black</item>
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
<item name="conversation_list_toolbar_background">@color/core_blue</item>
<item name="fab_color">@color/textsecure_primary</item>
<item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
@@ -148,7 +149,7 @@
<item name="conversation_editor_background">#22000000</item>
<item name="conversation_editor_text_color">#ff111111</item>
<item name="conversation_input_background">@drawable/compose_background_light</item>
<item name="conversation_input_inline_attach_icon_tint">@color/core_light_60</item>
<item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
<item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
<item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
<item name="conversation_transport_popup_background">@color/white</item>
@@ -185,20 +186,20 @@
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_light</item>
<item name="conversation_item_bubble_background">@color/core_light_10</item>
<item name="conversation_item_sent_text_primary_color">@color/core_light_90</item>
<item name="conversation_item_sent_text_secondary_color">@color/core_light_60</item>
<item name="conversation_item_bubble_background">@color/core_grey_05</item>
<item name="conversation_item_sent_text_primary_color">@color/core_white</item>
<item name="conversation_item_sent_text_secondary_color">@color/core_white</item>
<item name="conversation_item_sent_icon_color">@color/core_white</item>
<item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
<item name="conversation_item_received_text_primary_color">@color/white</item>
<item name="conversation_item_received_text_secondary_color">#ffffff</item>
<item name="conversation_item_update_text_color">@color/core_light_60</item>
<item name="conversation_item_last_seen_text_color">@color/core_light_90</item>
<item name="conversation_item_last_seen_line_color">@color/core_light_60</item>
<item name="conversation_item_date_line_color">@color/core_light_45</item>
<item name="conversation_item_quote_text_color">@color/core_light_90</item>
<item name="conversation_item_received_text_primary_color">@color/core_grey_90</item>
<item name="conversation_item_received_text_secondary_color">@color/core_grey_60</item>
<item name="conversation_item_update_text_color">@color/core_grey_60</item>
<item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
<item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
<item name="conversation_item_date_line_color">@color/core_grey_25</item>
<item name="conversation_item_quote_text_color">@color/core_grey_90</item>
<item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
<item name="conversation_item_sticky_date_text_color">@color/core_light_60</item>
<item name="conversation_item_sent_icon_color">@color/core_light_45</item>
<item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
<item name="quick_camera_icon">@drawable/quick_camera_light</item>
<item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
@@ -243,7 +244,7 @@
<item name="pref_divider">@drawable/preference_divider_light</item>
<item name="quote_missing_icon_color">@color/core_light_60</item>
<item name="quote_missing_icon_color">@color/core_grey_60</item>
<item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
@@ -254,7 +255,7 @@
<item name="shared_contact_details_header_background">@color/grey_100</item>
<item name="shared_contact_details_titlebar">@color/grey_400</item>
<item name="shared_contact_item_button_color">@color/core_light_02</item>
<item name="shared_contact_item_button_color">@color/core_grey_02</item>
</style>
<style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
@@ -269,7 +270,7 @@
<item name="colorAccent">@color/textsecure_primary_dark</item>
<item name="colorControlActivated">@color/signal_primary_dark</item>
<item name="colorControlHighlight">@color/signal_primary_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="android:windowBackground">@color/core_grey_95</item>
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
@@ -280,28 +281,29 @@
<item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
<item name="conversation_list_item_contact_color">#ffdddddd</item>
<item name="conversation_list_item_subject_color">#ffdddddd</item>
<item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>
<item name="conversation_list_item_delivery_icon_color">@color/core_grey_45</item>
<item name="conversation_list_item_date_color">#ffdddddd</item>
<item name="conversation_list_item_unread_color">@color/core_white</item>
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
<item name="conversation_list_toolbar_background">@color/core_grey_90</item>
<item name="conversation_group_member_name">#99ffffff</item>
<item name="conversation_item_bubble_background">@color/core_dark_70</item>
<item name="conversation_item_sent_text_primary_color">@color/core_dark_05</item>
<item name="conversation_item_sent_text_secondary_color">@color/core_dark_30</item>
<item name="conversation_item_bubble_background">@color/core_grey_75</item>
<item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
<item name="conversation_item_sent_text_secondary_color">@color/core_grey_05</item>
<item name="conversation_item_sent_icon_color">@color/core_grey_05</item>
<item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
<item name="conversation_item_received_text_primary_color">@color/core_dark_05</item>
<item name="conversation_item_received_text_secondary_color">#efefef</item>
<item name="conversation_item_received_text_primary_color">@color/core_grey_05</item>
<item name="conversation_item_received_text_secondary_color">@color/core_grey_25</item>
<item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
<item name="conversation_item_update_text_color">@color/core_light_35</item>
<item name="conversation_item_last_seen_text_color">@color/core_dark_30</item>
<item name="conversation_item_last_seen_line_color">@color/core_dark_30</item>
<item name="conversation_item_date_line_color">@color/core_dark_55</item>
<item name="conversation_item_quote_text_color">@color/core_dark_05</item>
<item name="conversation_item_update_text_color">@color/core_grey_45</item>
<item name="conversation_item_last_seen_text_color">@color/core_grey_25</item>
<item name="conversation_item_last_seen_line_color">@color/core_grey_25</item>
<item name="conversation_item_date_line_color">@color/core_grey_45</item>
<item name="conversation_item_quote_text_color">@color/core_grey_05</item>
<item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
<item name="conversation_item_sticky_date_text_color">@color/core_dark_30</item>
<item name="conversation_item_sent_icon_color">@color/core_dark_60</item>
<item name="conversation_item_sticky_date_text_color">@color/core_grey_25</item>
<item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
@@ -320,11 +322,11 @@
<item name="fab_color">@color/textsecure_primary_dark</item>
<item name="lower_right_divet">@drawable/divet_lower_right_light</item>
<item name="conversation_background">@color/black</item>
<item name="conversation_background">@color/core_grey_95</item>
<item name="conversation_editor_background">#22ffffff</item>
<item name="conversation_editor_text_color">#ffeeeeee</item>
<item name="conversation_input_background">@drawable/compose_background_dark</item>
<item name="conversation_input_inline_attach_icon_tint">@color/core_dark_05</item>
<item name="conversation_input_inline_attach_icon_tint">@color/core_grey_05</item>
<item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
<item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
<item name="conversation_transport_popup_background">@color/black</item>
@@ -388,7 +390,7 @@
<item name="pref_divider">@drawable/preference_divider_dark</item>
<item name="quote_missing_icon_color">@color/core_dark_05</item>
<item name="quote_missing_icon_color">@color/core_grey_05</item>
<item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
@@ -398,7 +400,7 @@
<item name="shared_contact_details_header_background">@color/grey_800</item>
<item name="shared_contact_details_titlebar">@color/grey_900</item>
<item name="shared_contact_item_button_color">@color/core_dark_85</item>
<item name="shared_contact_item_button_color">@color/core_grey_90</item>
</style>
<style name="RationaleDialog" parent="Theme.AppCompat.Light.Dialog.Alert">