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

Commit 0916d957 authored by Georg Veichtlbauer's avatar Georg Veichtlbauer
Browse files

ExactCalculator: Completely rework operator panels 

* Use single-column solely for portrait
* Split the panel into a row above the number pad and
   a one-colum panel to the right

Change-Id: I6881a5b6a21c535b9d07dd0213d04d92f1368970
parent 91c8e94d

res/layout/activity_calculator_port.xml

+11 −4
Original line number Diff line number Diff line
@@ -28,11 +28,18 @@ 
    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="500">

        android:orientation="vertical"

        android:layout_weight="250">



        <include layout="@layout/pad_operator_aux" />



        <LinearLayout

            android:layout_width="fill_parent"

            android:layout_height="0dip"

            android:layout_weight="750">



            <include layout="@layout/pad_numeric"/>

            <include layout="@layout/pad_operator" />



        </LinearLayout>



      </LinearLayout>

</LinearLayout>

res/layout/pad_operator_one_col.xml

+12 −21
Original line number Diff line number Diff line
@@ -21,32 +21,15 @@ 
    android:id="@+id/pad_operator"

    style="@style/PadLayoutStyle.Operator"

    android:background="@color/pad_operator_background_color"

    app:rowCount="5"

    app:rowCount="4"

    app:columnCount="1">



    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Operator.Text"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        app:layout_row="0"

        app:layout_column="0" />





    <com.android.calculator2.HapticButton

        android:id="@+id/op_div"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_div"

        android:text="@string/op_div"

        app:layout_row="1"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_mul"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_mul"

        android:text="@string/op_mul"

        app:layout_row="2"

        app:layout_row="0"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton
@@ -54,7 +37,7 @@ 
        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_sub"

        android:text="@string/op_sub"

        app:layout_row="3"

        app:layout_row="1"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton
@@ -62,7 +45,15 @@ 
        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_add"

        android:text="@string/op_add"

        app:layout_row="4"

        app:layout_row="2"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/eq"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_eq"

        android:text="@string/eq"

        app:layout_row="3"

        app:layout_column="0" />



</androidx.gridlayout.widget.GridLayout>

res/layout/pad_operator_one_col_aux.xml

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

<!--

     SPDX-FileCopyrightText: 2023 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<androidx.gridlayout.widget.GridLayout

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/pad_operator_aux"

    style="@style/PadLayoutStyle.OperatorAux"

    android:background="@color/pad_operator_background_color"

    app:rowCount="1"

    app:columnCount="4">



    <com.android.calculator2.HapticButton

        android:id="@+id/clr"

        style="@style/PadButtonStyle.Operator.Text"

        android:contentDescription="@string/desc_clr"

        android:text="@string/clr"

        app:layout_row="0"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/paren"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_paren"

        android:text="@string/paren"

        app:layout_row="0"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/lparen"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_lparen"

        android:text="@string/lparen"

        android:visibility="gone"

        app:layout_row="0"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/rparen"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_rparen"

        android:text="@string/rparen"

        android:visibility="gone"

        app:layout_row="0"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_pct"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct"

        app:layout_row="0"

        app:layout_column="2" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_div"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_div"

        android:text="@string/op_div"

        app:layout_row="0"

        app:layout_column="3" />



</androidx.gridlayout.widget.GridLayout>

res/layout/pad_operator_two_col.xml

+34 −0
Original line number Diff line number Diff line
@@ -48,6 +48,32 @@ 
        app:layout_row="1"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/paren"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_paren"

        android:text="@string/paren"

        app:layout_row="1"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/lparen"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_lparen"

        android:text="@string/lparen"

        android:visibility="gone"

        app:layout_row="1"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/rparen"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_rparen"

        android:text="@string/rparen"

        android:visibility="gone"

        app:layout_row="1"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_sub"

        style="@style/PadButtonStyle.Operator"
@@ -56,6 +82,14 @@ 
        app:layout_row="2"

        app:layout_column="0" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_pct"

        style="@style/PadButtonStyle.Operator"

        android:contentDescription="@string/desc_op_pct"

        android:text="@string/op_pct"

        app:layout_row="2"

        app:layout_column="1" />



    <com.android.calculator2.HapticButton

        android:id="@+id/op_add"

        style="@style/PadButtonStyle.Operator"

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

+2 −1
Original line number Diff line number Diff line
@@ -18,5 +18,6 @@ 
<resources>

    <item name="display" type="layout">@layout/display_two_line</item>

    <item name="pad_advanced" type="layout">@layout/pad_advanced_4x3</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_two_col</item>

    <item name="pad_operator_aux" type="layout">@layout/pad_operator_one_col_aux</item>

    <item name="pad_operator" type="layout">@layout/pad_operator_one_col</item>

</resources>