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

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

ExactCalculator: Collapse all styles, move size definitions to dimens 

Change-Id: I8039fdd3b522d1de09fe510def5cd7c268581a83
parent 03b90105

res/values-land/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -31,4 +31,17 @@ 
    <dimen name="result_padding_start">16dip</dimen>

    <dimen name="result_padding_end">16dip</dimen>

    <dimen name="result_textsize">42dip</dimen>



    <!-- Pads -->

    <dimen name="pads_horizontal_edge_padding">8dp</dimen>

    <dimen name="pads_vertical_edge_padding">8dp</dimen>

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



    <!-- Buttons -->

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

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

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

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

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

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

</resources>
 
 No newline at end of file

res/values-land/styles.xml

+8 −34
Original line number Diff line number Diff line
@@ -17,44 +17,18 @@ 


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



    <style name="PadButtonStyle" parent="Widget.Material3.Button">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_height">0dip</item>

        <item name="android:gravity">center</item>

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

        <item name="android:textSize">22sp</item>

        <item name="android:onClick">onButtonClick</item>

        <item name="android:fontFeatureSettings">tnum, cv03, cv04</item>

        <item name="android:layout_marginHorizontal">4dp</item>

    </style>



    <style name="PadButtonStyle.Image">

        <item name="iconGravity">textStart</item>

        <item name="iconPadding">0dp</item>

        <item name="iconSize">22dp</item>

    </style>



    <style name="PadButtonStyle.SmallCaps">

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

        <item name="android:textSize">12sp</item>

    </style>



    <style name="PadButtonStyle.SmallText">

        <item name="android:textSize">14sp</item>

    </style>



    <style name="PadLayoutStyle">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:paddingEnd">12dip</item>

        <item name="android:paddingTop">@dimen/pads_vertical_edge_padding</item>

        <item name="android:paddingBottom">@dimen/pads_vertical_edge_padding</item>

        <item name="android:paddingStart">@dimen/pads_intra_padding</item>

        <item name="android:paddingEnd">@dimen/pads_horizontal_edge_padding</item>

    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">8dip</item>

        <item name="android:paddingEnd">12dip</item>

        <item name="android:paddingTop">@dimen/pads_vertical_edge_padding</item>

        <item name="android:paddingBottom">@dimen/pads_vertical_edge_padding</item>

        <item name="android:paddingStart">@dimen/pads_horizontal_edge_padding</item>

        <item name="android:paddingEnd">@dimen/pads_intra_padding</item>

    </style>



</resources>

res/values-sw600dp-land/styles.xml

deleted100644 → 0
+0 −34
Original line number 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="PadLayoutStyle">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">12dip</item>

        <item name="android:paddingEnd">12dip</item>

    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">12dip</item>

        <item name="android:paddingEnd">12dip</item>

    </style>



</resources>

res/values-sw600dp/dimens.xml

+13 −0
Original line number Diff line number Diff line
@@ -33,4 +33,17 @@ 
    <dimen name="result_padding_start">44dip</dimen>

    <dimen name="result_padding_end">44dip</dimen>

    <dimen name="result_textsize">72dip</dimen>



    <!-- Pads -->

    <dimen name="pads_horizontal_edge_padding">16dp</dimen>

    <dimen name="pads_vertical_edge_padding">16dp</dimen>

    <dimen name="pads_intra_padding">8dp</dimen>



    <!-- Buttons -->

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

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

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

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

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

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

</resources>
 
 No newline at end of file

res/values-sw600dp/styles.xml

deleted100644 → 0
+0 −60
Original line number 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" parent="Widget.Material3.Button">

        <item name="android:layout_width">0dip</item>

        <item name="android:layout_height">0dip</item>

        <item name="android:gravity">center</item>

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

        <item name="android:textSize">46sp</item>

        <item name="android:onClick">onButtonClick</item>

        <item name="android:fontFeatureSettings">tnum, cv03, cv04</item>

        <item name="android:layout_marginHorizontal">4dp</item>

    </style>



    <style name="PadButtonStyle.Image">

        <item name="iconGravity">textStart</item>

        <item name="iconPadding">0dp</item>

        <item name="iconSize">42dp</item>

    </style>



    <style name="PadButtonStyle.SmallCaps">

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

        <item name="android:textSize">28sp</item>

    </style>



    <style name="PadButtonStyle.SmallText">

        <item name="android:textSize">32sp</item>

    </style>



    <style name="PadLayoutStyle">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">16dip</item>

        <item name="android:paddingStart">16dip</item>

        <item name="android:paddingEnd">16dip</item>

    </style>



    <style name="PadLayoutStyle.Advanced">

        <item name="android:paddingTop">8dip</item>

        <item name="android:paddingBottom">8dip</item>

        <item name="android:paddingStart">16dip</item>

        <item name="android:paddingEnd">16dip</item>

    </style>



</resources>