Messaging: Use Material You colors
Co-authored-by: Golbinex <2061409-Golbinex@users.noreply.gitlab.com>
Co-authored-by: Semavi Ulusoy <doc.divxm@gmail.com>
Co-authored-by: minarypenguin <alexfinhart@gmail.com>
Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
Change-Id: Ib3c4b7f17cc48516dafb641fdb03e27135e4d3e8
diff --git a/res/color/tab_text_color.xml b/res/color/tab_text_color.xml
index dec20dd..498d1e4 100644
--- a/res/color/tab_text_color.xml
+++ b/res/color/tab_text_color.xml
@@ -16,7 +16,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:color="@android:color/white"
+ android:color="@android:color/system_accent1_50"
android:state_selected="true"/>
<item
android:color="@color/translucent_white" />
diff --git a/res/drawable/ic_message.xml b/res/drawable/ic_message.xml
new file mode 100644
index 0000000..dcab3ac
--- /dev/null
+++ b/res/drawable/ic_message.xml
@@ -0,0 +1,24 @@
+<!--
+ ~ Copyright (C) 2021 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+ android:viewportWidth="48"
+ android:viewportHeight="48"
+ android:width="24dp"
+ android:height="24dp">
+ <path
+ android:pathData="M40 4H8C5.79 4 4.02 5.79 4.02 8L4 44l8 -8h28c2.21 0 4 -1.79 4 -4V8c0 -2.21 -1.79 -4 -4 -4zM12 18h24v4H12v-4zm16 10H12v-4h16v4zm8 -12H12v-4h24v4z"
+ android:fillColor="#fff" />
+</vector>
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index 7fa2a9a..27c9357 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -46,7 +46,7 @@
android:background="@drawable/fab_new_message_bg"
android:elevation="@dimen/fab_elevation"
android:scaleType="center"
- android:src="@drawable/ic_add_white"
+ android:src="@drawable/ic_message"
android:stateListAnimator="@animator/fab_anim"
android:contentDescription="@string/start_new_conversation"/>
diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml
new file mode 100644
index 0000000..95f84ab
--- /dev/null
+++ b/res/values-night/lineage_colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 The CyanogenMod Project
+ Copyright (C) 2018, 2022-2023 The LineageOS Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <color name="lineage_accent">@*android:color/system_accent1_100</color>
+
+ <color name="window_background">@*android:color/system_neutral1_900</color>
+</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index a380383..c4e0fb4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,16 +15,16 @@
limitations under the License.
-->
<resources>
- <color name="primary_color">#689F38</color>
+ <color name="primary_color">@*android:color/system_accent1_600</color>
<color name="permission_check_activity_background">@color/primary_color</color>
<!-- Action bar -->
- <color name="action_bar_title_text_color">#ffffff</color>
- <color name="action_bar_background_color">@color/primary_color</color>
- <color name="action_bar_background_color_dark">#537F2D</color>
- <color name="contextual_action_bar_background_color">#ffffff</color>
- <color name="archived_conversation_action_bar_background_color">#9D9D9D</color>
- <color name="archived_conversation_action_bar_background_color_dark">#838383</color>
+ <color name="action_bar_title_text_color">@*android:color/system_neutral1_0</color>
+ <color name="action_bar_background_color">@android:color/system_accent1_600</color>
+ <color name="action_bar_background_color_dark">@*android:color/system_accent1_700</color>
+ <color name="contextual_action_bar_background_color">@*android:color/system_accent1_600</color>
+ <color name="archived_conversation_action_bar_background_color">@*android:color/system_accent1_700</color>
+ <color name="archived_conversation_action_bar_background_color_dark">@*android:color/system_accent1_600</color>
<!-- Conversation list -->
<color name="conversation_list_item_read">#636363</color>
@@ -60,15 +60,15 @@
<color name="message_text_color_incoming">#ffffffff</color>
<color name="message_text_color_incoming_download_failed">#6a6a6a</color>
<color name="message_text_color_outgoing">#ff323232</color>
- <color name="conversation_background">#eeeeee</color>
+ <color name="conversation_background">@color/window_background</color>
<color name="conversation_edge_effect">#9d9d9d</color>
<color name="compose_message_send_color">@color/lineage_accent</color>
<color name="compose_message_send_color_pressed">#999999</color>
<color name="message_bubble_color_outgoing">#ffffffff</color>
<color name="message_error_bubble_color_incoming">#e2e2e2</color>
<color name="message_audio_button_color_incoming">#ffffffff</color>
- <color name="message_bubble_color_selected">#8BC34A</color>
- <color name="message_image_selected_tint">#80689F38</color>
+ <color name="message_bubble_color_selected">@*android:color/system_accent3_300</color>
+ <color name="message_image_selected_tint">#7f040000</color>
<color name="generic_video_icon">#ff808080</color>
<!-- Base color used for color filtering. -->
@@ -103,20 +103,18 @@
<color name="attachment_preview_more_items_text_background">#44000000</color>
<array name="letter_tile_colors">
- <item>#DB4437</item>
- <item>#E91E63</item>
- <item>#9C27B0</item>
- <item>#673AB7</item>
- <item>#3F51B5</item>
- <item>#4285F4</item>
- <item>#039BE5</item>
- <item>#0097A7</item>
- <item>#009688</item>
- <item>#0F9D58</item>
- <item>#689F38</item>
- <item>#EF6C00</item>
- <item>#FF5722</item>
- <item>#757575</item>
+ <item>@*android:color/system_accent1_300</item>
+ <item>@*android:color/system_accent2_300</item>
+ <item>@*android:color/system_accent3_300</item>
+ <item>@*android:color/system_accent1_400</item>
+ <item>@*android:color/system_accent2_400</item>
+ <item>@*android:color/system_accent3_400</item>
+ <item>@*android:color/system_accent1_500</item>
+ <item>@*android:color/system_accent2_500</item>
+ <item>@*android:color/system_accent3_500</item>
+ <item>@*android:color/system_accent1_600</item>
+ <item>@*android:color/system_accent2_600</item>
+ <item>@*android:color/system_accent3_600</item>
</array>
<color name="letter_tile_font_color">#ffffff</color>
@@ -143,7 +141,7 @@
<color name="people_and_options_list_divider">#cccccc</color>
<color name="fab_color">@color/lineage_accent</color>
- <color name="fab_pressed_color">#3ea4dc</color>
+ <color name="fab_pressed_color">@*android:color/primary_device_default_light</color>
<color name="fab_ripple">#40ffffff</color>
<color name="message_body_size_text_color">#555555</color>
@@ -161,7 +159,7 @@
<color name="sim_indicator_color_light">#ffffff</color>
<color name="sim_indicator_color_dark">#323232</color>
- <color name="text_highlight_color">#80689F38</color>
+ <color name="text_highlight_color">@android:color/system_accent1_100</color>
<color name="search_view_text_cursor">#b0dddddd</color>
<color name="button_bar_action_button_text_color">#03a9f4</color>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index 787d5e5..784d624 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2016 The CyanogenMod Project
- Copyright (C) 2018 The LineageOS Project
+ Copyright (C) 2018, 2022-2023 The LineageOS Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,9 +16,12 @@
limitations under the License.
-->
<resources>
- <color name="lineage_accent">#FF9800</color>
- <color name="button_text">#000000</color>
+ <color name="lineage_accent">@*android:color/system_accent1_600</color>
- <color name="navigation_bar_bg">@android:color/white</color>
- <color name="navigation_bar_divider">#1f000000</color>
+ <color name="window_background">@*android:color/system_neutral1_50</color>
+
+ <color name="button_text">@*android:color/system_neutral1_900</color>
+
+ <color name="navigation_bar_bg">@*android:color/system_neutral1_10</color>
+ <color name="navigation_bar_divider">@*android:color/system_neutral1_800</color>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 02b71b4..2589a8d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -50,7 +50,7 @@
</style>
<style name="BugleTheme.ConversationActivityBase" parent="BugleTheme">
- <item name="android:windowBackground">@color/conversation_background</item>
+ <item name="android:windowBackground">@color/window_background</item>
<item name="windowActionBarOverlay">true</item>
<item name="colorAccent">@color/lineage_accent</item>
<item name="android:fastScrollPreviewBackgroundLeft">@drawable/contacts_fastscroll_label_left</item>
@@ -61,7 +61,7 @@
</style>
<style name="BugleTheme.ConversationListActivity" parent="BugleTheme">
- <item name="android:windowBackground">@android:color/background_light</item>
+ <item name="android:windowBackground">@color/window_background</item>
</style>
<style name="BugleTheme.ArchivedConversationListActivity" parent="BugleTheme.ConversationListActivity">
@@ -70,6 +70,7 @@
</style>
<style name="BugleTheme.SettingsActivity" parent="BugleTheme">
+ <item name="android:windowBackground">@color/window_background</item>
<item name="android:textSize">@dimen/settings_list_text_size</item>
</style>