Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44523c87 authored by Michael W's avatar Michael W
Browse files

Contacts: MD3-ify more 

* Round corners in QuickContacts
* Align contact tile colors with Messaging and Dialer
* Replace bright pink color for starred contacts and FAB
* Remove divider lines in Settings
* Round some corners of dialogs

Change-Id: I45f03bebe5867de3f19d236a9d86d169413b5c69
parent bce6851a

res/drawable/dialog_background.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2014 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

  -->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="?android:attr/colorBackgroundFloating"/>

    <corners android:radius="16dp"/>

</shape>

res/drawable/fab_bg.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  SPDX-FileCopyrightText: The LineageOS Project

  SPDX-License-Identifier: Apache-2.0

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="oval">

    <solid android:color="@color/fab_color"/>

</shape>

res/layout/floating_action_button.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    android:layout_gravity="bottom|end"

    android:layout_marginBottom="@dimen/floating_action_button_margin_bottom"

    android:layout_marginEnd="@dimen/floating_action_button_margin_right"

    android:background="@drawable/fab_pink"

    android:background="@drawable/fab_bg"

    android:elevation="@dimen/design_fab_elevation"

    app:layout_dodgeInsetEdges="bottom" >
@@ -37,5 +37,5 @@ 
        android:background="@drawable/floating_action_button"

        android:contentDescription="@string/action_menu_add_new_contact_button"

        android:src="@drawable/quantum_ic_add_vd_theme_24"

        android:tint="@color/floating_action_button_icon_color"/>

        app:tint="@color/floating_action_button_icon_color" />

</FrameLayout>

res/values-night/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -13,4 +13,6 @@ 
    <!-- Color of the background of the contact detail and editor pages -->

    <color name="background_primary">@*android:color/system_neutral1_900</color>

    <color name="contact_all_list_background_color">@*android:color/system_neutral1_900</color>



    <color name="fab_color">@android:color/system_accent1_100</color>

</resources>

res/values/colors.xml

+26 −35
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
    <color name="contacts_accent_color">@*android:color/system_neutral1_0</color>



    <color name="floating_action_button_icon_color">@color/contacts_accent_color</color>

    <color name="fab_color">@android:color/system_accent1_600</color>



    <!-- Horizontal separator line should be 12% dark in the light theme. -->

    <color name="divider_line_color_light">@*android:color/transparent</color>
@@ -87,12 +88,6 @@ 
    <!-- Color of background of all empty states. -->

    <color name="empty_state_background">#efefef</color>



    <!-- Colors of swipeRefreshLayout's spinning circle. -->

    <color name="swipe_refresh_color1">#0f9d58</color>

    <color name="swipe_refresh_color2">#dd4b37</color>

    <color name="swipe_refresh_color3">#4285f4</color>

    <color name="swipe_refresh_color4">#f4b400</color>



    <!-- Color of ripples used for views with dark backgrounds -->

    <color name="ripple_material_dark">#a0ffffff</color>
@@ -132,39 +127,35 @@ 
        These colors are also used by MaterialColorMapUtils to generate primary activity colors.

    -->

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



    <!-- Darker versions of letter_tile_colors, two shades darker. These colors are used

        for settings secondary activity colors. -->

    <array name="letter_tile_colors_dark">

        <item>#C53929</item>

        <item>#C2185B</item>

        <item>#7B1FA2</item>

        <item>#512DA8</item>

        <item>#303F9F</item>

        <item>#3367D6</item>

        <item>#0277BD</item>

        <item>#006064</item>

        <item>#00796B</item>

        <item>#0B8043</item>

        <item>#33691E</item>

        <item>#E65100</item>

        <item>#E64A19</item>

        <item>#424242</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>

        <item>@*android:color/system_accent1_700</item>

        <item>@*android:color/system_accent2_700</item>

        <item>@*android:color/system_accent3_700</item>

        <item>@*android:color/system_accent1_800</item>

        <item>@*android:color/system_accent2_800</item>

        <item>@*android:color/system_accent3_800</item>

    </array>



    <!-- The default color used for tinting photos when no color can be extracted via Palette,
@@ -233,7 +224,7 @@ 
    <color name="account_filter_text_color">@color/actionbar_text_color_black</color>

    <color name="custom_filter_divider">#dbdbdb</color>



    <color name="material_star_pink">#f50057</color>

    <color name="material_star_pink">@color/primary_color</color>



    <!-- Primary text color in Contacts app -->

    <color name="contacts_text_color">#333333</color>