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

Unverified Commit d4242253 authored by Patrick Gaskin's avatar Patrick Gaskin
Browse files

ExactCalculator: Support Material You colors 

Also tweak some button styles to match Google Calculator.

Change-Id: I22bf65ff87823b4b77f2878915c349939d7d4bc8
parent d468e49a

res/layout-land/input_pad.xml

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        android:theme="@style/Theme.Button.Action"

        android:theme="@style/Theme.Button.Equals"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/columnGuide4"

        app:layout_constraintStart_toEndOf="@id/columnGuide3"

res/layout/input_pad.xml

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 
        style="@style/PadButtonStyle"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        android:theme="@style/Theme.Button.Action"

        android:theme="@style/Theme.Button.Equals"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toEndOf="@id/columnGuide3"

res/values-night-v34/color.xml

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

<!--

     SPDX-FileCopyrightText: 2015 The Android Open Source Project

     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Display background -->

    <color name="history_background_color">@android:color/system_surface_container_dark</color>

    <color name="display_background_color">@android:color/system_surface_dark</color>



    <!-- Display text -->

    <color name="display_formula_text_color">@android:color/system_on_surface_dark</color>

    <color name="display_result_text_color">@android:color/system_tertiary_dark</color>

    <color name="display_result_exponent_text_color">@android:color/system_tertiary_dark</color>



</resources>

res/values-v34/color.xml

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

<!--

     SPDX-FileCopyrightText: 2015 The Android Open Source Project

     SPDX-License-Identifier: Apache-2.0

-->

<resources>



    <!-- Display background -->

    <color name="history_background_color">@android:color/system_surface_container_light</color>

    <color name="display_background_color">@android:color/system_surface_light</color>



    <!-- Display text -->

    <color name="display_formula_text_color">@android:color/system_on_surface_light</color>

    <color name="display_result_text_color">@android:color/system_tertiary_light</color>

    <color name="display_result_exponent_text_color">@android:color/system_tertiary_light</color>



</resources>

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
    <!-- Buttons -->

    <dimen name="button_horizontal_margin">4dp</dimen>

    <dimen name="button_small_horizontal_margin">2dp</dimen>

    <dimen name="button_textsize">32sp</dimen>

    <dimen name="button_iconsize">32dp</dimen>

    <dimen name="button_textsize">48sp</dimen>

    <dimen name="button_iconsize">48dp</dimen>

    <dimen name="button_small_textsize">18sp</dimen>

    <dimen name="button_smallcaps_textsize">16sp</dimen>

</resources>