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

Unverified Commit a9ce2abb authored by Inhishonor's avatar Inhishonor Committed by Luca Stefani
Browse files

ExactCalculator: Migrate to Material 3 Expressive 

Change-Id: I4a791aadcbc0ed7d76ccfeddfb9821ec1f642bac
parent 49d72c01

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ android_app { 


    static_libs: [

        // DO NOT EDIT THIS SECTION MANUALLY

        "androidx.graphics_graphics-shapes",

        "androidx.gridlayout_gridlayout",

        "androidx.webkit_webkit",

        "com.google.android.material_material",

build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ android { 
dependencies {

    implementation("androidx.gridlayout:gridlayout:1.0.0")

    implementation("androidx.webkit:webkit:1.7.0-alpha02")

    implementation("com.google.android.material:material:1.11.0")

    implementation("com.google.android.material:material:1.14.0-alpha09")

    implementation("com.hp:crcalc:1.0")

}

res/layout-land/input_pad.xml

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 
        android:id="@+id/del"

        style="@style/PadButtonStyle.Image"

        android:contentDescription="@string/desc_del"

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

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

        app:icon="@drawable/ic_del"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/columnGuide3"

res/layout/input_pad.xml

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 
        android:id="@+id/del"

        style="@style/PadButtonStyle.Image"

        android:contentDescription="@string/desc_del"

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

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

        app:icon="@drawable/ic_del"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toStartOf="@id/columnGuide3"

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
        <item name="android:textSize">@dimen/result_textsize</item>

    </style>



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

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

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

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

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