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

Commit 9474b9c7 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Fix custom style editor crashing in dark theme 

Add missing style attributes in night theme, and update
the toolbar elements colors

Fixes: 130750270
Change-Id: Id11ab1b0c9d9dc70bd35ee29e65c44015726cd2a
parent 8204b164

res/drawable/ic_close_24px.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24"

    android:tint="@color/toolbar_icon_color">

  <path

      android:fillColor="#FF000000"

      android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41z"/>

res/drawable/ic_delete_24px.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24"

    android:tint="@color/toolbar_icon_color">

  <path

      android:fillColor="#FF000000"

      android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

res/values-night/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -30,4 +30,7 @@ 


    <color name="tip_dot_color">#81C995</color>

    <color name="tip_dot_line_color">#000000</color>



    <color name="toolbar_icon_color">@color/text_color_light</color>

    <color name="toolbar_color">#000000</color>

</resources>

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -47,4 +47,7 @@ 


    <color name="tip_dot_color">#34A853</color>

    <color name="tip_dot_line_color">#FFFFFF</color>



    <color name="toolbar_icon_color">@color/text_color_dark</color>

    <color name="toolbar_color">@color/material_white_100</color>

</resources>

res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
        <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>

        <item name="dialogPreferredPadding">24dp</item>

        <item name="colorControlHighlight">@color/ripple_material_dark</item>



        <item name="actionButtonStyle">?android:actionButtonStyle</item>

        <item name="actionMenuTextColor">?android:actionMenuTextColor</item>

    </style>

    <style name="CustomizationTheme.NoActionBar">

        <item name="android:windowActionBar">false</item>
@@ -46,7 +49,9 @@ 
        <item name="android:textSize">@dimen/bottom_navbar_font_text_size</item>

    </style>

    <style name="RegularToolbarStyle" parent="@android:style/Widget.DeviceDefault.Light.ActionBar.Solid">

        <item name="android:background">@color/toolbar_color</item>

        <item name="android:elevation">0dp</item>

        <item name="android:theme">@style/WallpaperTheme</item>

    </style>



    <style name="HeaderTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"/>