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

Commit b552b2c4 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Use new Material theme

parent 3b6e552e

build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ dependencies { 
    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'

    implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'

    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'

    implementation 'com.google.android.material:material:1.2.0-alpha03'

    implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"



    androidTestImplementation 'androidx.test:runner:1.2.0'

src/main/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    xmlns:tools="http://schemas.android.com/tools"

    package="at.bitfire.cert4android">



    <application>

src/main/res/layout/activity_trust_certificate.xml

+14 −11
Original line number Diff line number Diff line
@@ -25,21 +25,22 @@ 
                android:text="@string/trust_certificate_unknown_certificate_found"

                android:textAppearance="?android:attr/textAppearanceMedium"/>



            <androidx.cardview.widget.CardView

            <com.google.android.material.card.MaterialCardView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                app:cardElevation="8dp">

                style="@style/Widget.MaterialComponents.CardView">



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:layout_margin="8dp">

                    android:layout_margin="8dp"

                    android:padding="8dp">



                    <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        style="@style/TextView.Heading"

                        style="@style/TextAppearance.MaterialComponents.Headline5"

                        android:layout_marginBottom="16dp"

                        android:text="@string/trust_certificate_x509_certificate_details"/>
@@ -106,14 +107,16 @@ 
                        android:checked="@={model.verifiedByUser}"

                        android:text="@string/trust_certificate_fingerprint_verified"/>



                    <androidx.appcompat.widget.ButtonBarLayout

                    <LinearLayout

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content">

                        android:layout_height="wrap_content"

                        android:orientation="horizontal">



                        <Button

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            style="@style/Widget.AppCompat.Button.Borderless.Colored"

                            android:layout_marginRight="16dp"

                            style="@style/Widget.MaterialComponents.Button"

                            android:text="@string/trust_certificate_accept"

                            android:onClick="acceptCertificate"

                            android:enabled="@{model.verifiedByUser}" />
@@ -121,15 +124,15 @@ 
                        <Button

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            style="@style/Widget.AppCompat.Button.Borderless"

                            style="@style/Widget.MaterialComponents.Button.TextButton"

                            android:text="@string/trust_certificate_reject"

                            android:onClick="rejectCertificate"/>



                    </androidx.appcompat.widget.ButtonBarLayout>

                    </LinearLayout>



                </LinearLayout>



            </androidx.cardview.widget.CardView>

            </com.google.android.material.card.MaterialCardView>



            <TextView

                android:layout_width="match_parent"