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

Commit 05cfcdd0 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Improve the scrim on the cover card 

Use a translucent wallpaper and black header text, as well
as always use a bottom scrim to ensure the QSB is fully
visible as well as the "Tap to edit" button

Bug: 131296977
Change-Id: I6bca899065919812e5771f5e60e0864169f25098
parent feb02d4b

res/drawable/theme_cover_scrim.xml

+4 −3
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ 
       android:shape="rectangle">

   <gradient

        android:angle="90"

        android:startColor="@android:color/transparent"

        android:centerY="25%"

        android:startColor="@color/black_38_alpha"

        android:centerColor="@android:color/transparent"

        android:endColor="@color/translucent_black_darker"

        android:endColor="@android:color/transparent"

        android:type="linear" />

</shape>
 
 No newline at end of file

res/drawable/theme_cover_scrim_custom.xml

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

<!--



     Copyright (C) 2019 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.

-->

<layer-list

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

    <item android:drawable="@drawable/theme_cover_scrim"/>

    <item>

        <shape android:shape="rectangle">

            <gradient

                android:angle="90"

                android:centerY="25%"

                android:startColor="@color/black_67_alpha"

                android:centerColor="@android:color/transparent"

                android:endColor="@android:color/transparent"

                android:type="linear" />

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

res/values-night/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<resources>

    <color name="theme_preview_icon_color">@color/white_70_alpha</color>



    <color name="icon_thumbnail_color">@color/white_70_alpha</color>

    <color name="icon_thumbnail_color">@color/black_87_alpha</color>



    <color name="control_grey">#b3b3b3</color>

    <color name="switch_track_tint">#171717</color>

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <color name="system_navigation_bar_divider">#1f000000</color>



    <color name="shape_thumbnail_color">#b2b2b2</color>

    <color name="icon_thumbnail_color">@color/white_70_alpha</color>

    <color name="icon_thumbnail_color">@color/black_87_alpha</color>



    <color name="clockface_preview_background">@android:color/black</color>

res/values/styles.xml

+3 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 


    <style name="CoverTitleTextAppearance" parent="CardTitleTextAppearance">

        <item name="android:textSize">@dimen/card_cover_title_text_size</item>

        <item name="android:textColor">@color/white_70_alpha</item>

        <item name="android:textColor">@color/black_87_alpha</item>

    </style>



    <style name="FontCardTitleStyle" parent="HeaderTextAppearance">
@@ -107,8 +107,9 @@ 


    <!-- Custom theme editor -->

    <style name="EditLabelStyle">

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault</item>

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item>

        <item name="android:textColor">@color/material_white_100</item>

        <item name="android:textAllCaps">false</item>

    </style>



    <style name="CustomThemeNameEditText" parent="@android:style/Widget.DeviceDefault.EditText">