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

Unverified Commit cb5a7510 authored by David Luhmer's avatar David Luhmer Committed by GitHub
Browse files

Merge pull request #495 from nextcloud/material-3 

Use material 3 for error dialogs and sample app
parents cb02dfd6 edb34d1c

lib/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ dependencies { 
    implementation 'androidx.core:core:1.8.0'

    implementation 'androidx.fragment:fragment:1.5.4'



    implementation 'com.google.android.material:material:1.6.1'



    compileOnly "org.projectlombok:lombok:1.18.24"

    annotationProcessor "org.projectlombok:lombok:1.18.24"

lib/src/main/java/com/nextcloud/android/sso/ui/UiExceptionManager.java

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import android.widget.TextView; 
import androidx.appcompat.app.AlertDialog;

import androidx.core.app.NotificationCompat;



import com.google.android.material.dialog.MaterialAlertDialogBuilder;

import com.nextcloud.android.sso.R;

import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException;

import com.nextcloud.android.sso.exceptions.SSOException;
@@ -53,7 +54,7 @@ public final class UiExceptionManager { 
        final SpannableString message = new SpannableString(exception.getMessage(context));

        Linkify.addLinks(message, Linkify.ALL);



        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context)

        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(context)

                .setTitle(exception.getTitle(context))

                .setMessage(message)

                .setPositiveButton(android.R.string.yes, callback)

sample/src/main/res/values-night/themes.xml

+2 −2
Original line number Diff line number Diff line 
<resources xmlns:tools="http://schemas.android.com/tools">

    <!-- Base application theme. -->

    <style name="Theme.AndroidSingleSignOn" parent="Theme.MaterialComponents.DayNight.NoActionBar">

    <style name="Theme.AndroidSingleSignOn" parent="Theme.Material3.DayNight.NoActionBar">

        <!-- Primary brand color. -->

        <item name="colorPrimary">@color/nextcloud_blue</item>

        <item name="colorPrimaryVariant">@color/nextcloud_blue</item>

sample/src/main/res/values/themes.xml

+2 −2
Original line number Diff line number Diff line 
<resources xmlns:tools="http://schemas.android.com/tools">

    <!-- Base application theme. -->

    <style name="Theme.AndroidSingleSignOn" parent="Theme.MaterialComponents.DayNight.NoActionBar">

    <style name="Theme.AndroidSingleSignOn" parent="Theme.Material3.DayNight.NoActionBar">

        <!-- Primary brand color. -->

        <item name="colorPrimary">@color/nextcloud_blue</item>

        <item name="colorPrimaryVariant">@color/nextcloud_blue</item>