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

Commit f2cc98f9 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Inherit Material3, drop Lineage style and color defs 

Change-Id: I77279a5e416efc3932a57cdd51067c0bca1d5dc8
parent ee5f01cb

res/layout/fragment_history.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -26,13 +26,10 @@ 
        android:id="@+id/history_toolbar"

        android:id="@+id/history_toolbar"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:background="?attr/colorPrimary"

        android:elevation="4dip"

        android:elevation="4dip"

        android:minHeight="?attr/actionBarSize"

        android:minHeight="?attr/actionBarSize"

        android:navigationContentDescription="@string/desc_navigate_up"

        android:navigationContentDescription="@string/desc_navigate_up"

        app:navigationIcon="?attr/homeAsUpIndicator"

        app:navigationIcon="?attr/homeAsUpIndicator"

        android:popupTheme="@style/ThemeOverlay.AppCompat.Light"

        android:theme="@style/Theme.Toolbar"

        app:title="@string/title_history" />

        app:title="@string/title_history" />





    <androidx.recyclerview.widget.RecyclerView

    <androidx.recyclerview.widget.RecyclerView

res/layout/history_item.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ 
        android:paddingStart="@dimen/result_padding_start"

        android:paddingStart="@dimen/result_padding_start"

        android:paddingEnd="@dimen/result_padding_end"

        android:paddingEnd="@dimen/result_padding_end"

        android:text="@string/title_current_expression"

        android:text="@string/title_current_expression"

        android:textColor="?attr/colorAccent"

        android:textSize="14dp" />

        android:textSize="14dp" />





    <com.android.calculator2.CalculatorScrollView

    <com.android.calculator2.CalculatorScrollView

res/values-night/lineage_colors.xml

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

<!--

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

    <!-- Primary color (Color for the toolbars). -->

    <color name="calculator_primary_color">#212121</color>



    <!-- Status bar color. -->

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



    <!-- Background color for the operator pad. -->

    <color name="pad_operator_background_color">#1E1E1E</color>



    <!-- Text color for the formula in the calculator display. -->

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



    <!-- Text color for the result in the calculator display. -->

    <color name="display_result_text_color">#6CFFFFFF</color>



    <!-- Lighter color for exponent while scrolling. -->

    <color name="display_result_exponent_text_color">#40FFFFFF</color>



    <!-- Text color for a button in a pad. -->

    <color name="pad_button_text_color">@android:color/white</color>



    <!-- Ripple color when a button is pressed in a pad. -->

    <color name="pad_button_ripple_color">#33FFFFFF</color>

</resources>

res/values-night/lineage_styles.xml

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

<!--

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

    <style name="Theme" parent="@android:style/Theme.Material">

        <item name="android:colorPrimary">@color/calculator_primary_color</item>

        <item name="android:colorAccent">@color/calculator_accent_color</item>

        <item name="android:statusBarColor">@color/calculator_statusbar_color</item>

        <item name="android:windowSoftInputMode">stateAlwaysHidden</item>

    </style>



    <style name="Theme.Toolbar" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar" />

</resources>

res/values-w375dp-h768dp-port/styles.xml

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

<!--

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

  -->



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



    <style name="PadButtonStyle.Advanced">

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

        <item name="android:textSize">27dip</item>

    </style>



    <style name="PadButtonStyle.Advanced.Text">

        <item name="textAllCaps">true</item>

        <item name="android:textSize">24dip</item>

    </style>



    <style name="PadButtonStyle.Numeric">

        <item name="android:textSize">36dip</item>

    </style>



    <style name="PadButtonStyle.Operator">

        <item name="android:textSize">36dip</item>

    </style>



    <style name="PadButtonStyle.Operator.Text">

        <item name="textAllCaps">true</item>

        <item name="android:textSize">24dip</item>

    </style>



</resources>