Commit e0b12ab0 authored by Thomas's avatar Thomas
Browse files

Change alert dialogs

parent 5ce553f8

app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import androidx.appcompat.app.AlertDialog; 
import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import com.google.android.exoplayer2.ExoPlayer;

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



import org.jetbrains.annotations.NotNull;
@@ -96,7 +97,7 @@ public class BasePeertubeActivity extends BaseBarActivity { 
        if (item.getItemId() == R.id.action_cast) {

            if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) {

                String[] chromecast_choice = new String[PeertubeBaseMainActivity.chromeCasts.size()];

                AlertDialog.Builder alt_bld = new AlertDialog.Builder(this);

                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

                alt_bld.setTitle(R.string.chromecast_choice);

                int i = 0;

                for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) {

app/src/fdroid/java/app/fedilab/android/activities/PeertubeBaseMainActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.os.Handler; 
import android.os.Looper;

import android.view.View;



import androidx.appcompat.app.AppCompatActivity;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import java.io.IOException;
@@ -36,6 +35,7 @@ import java.util.List; 


import app.fedilab.android.R;

import app.fedilab.android.databinding.ActivityMainPeertubeBinding;

import app.fedilab.android.mastodon.activities.BaseActivity;

import app.fedilab.android.peertube.client.data.VideoData;

import app.fedilab.android.peertube.helper.Helper;

import su.litvak.chromecast.api.v2.ChromeCast;
@@ -43,7 +43,7 @@ import su.litvak.chromecast.api.v2.ChromeCasts; 
import su.litvak.chromecast.api.v2.ChromeCastsListener;

import su.litvak.chromecast.api.v2.MediaStatus;



public abstract class PeertubeBaseMainActivity extends AppCompatActivity implements ChromeCastsListener {

public abstract class PeertubeBaseMainActivity extends BaseActivity implements ChromeCastsListener {



    public static List<ChromeCast> chromeCasts;

    public static ChromeCast chromeCast;

app/src/main/java/app/fedilab/android/peertube/activities/AllPlaylistsActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.bumptech.glide.Glide; 
import com.bumptech.glide.load.resource.bitmap.CenterCrop;

import com.bumptech.glide.load.resource.bitmap.RoundedCorners;

import com.bumptech.glide.request.RequestOptions;

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



import java.util.ArrayList;

import java.util.HashMap;
@@ -160,7 +161,7 @@ public class AllPlaylistsActivity extends BaseBarActivity implements PlaylistAda 
    public void manageAlert(Playlist playlistParam) {



        playlistToEdit = playlistParam;

        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(AllPlaylistsActivity.this);

        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(AllPlaylistsActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

        bindingDialog = AddPlaylistPeertubeBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false);

        dialogBuilder.setView(bindingDialog.getRoot());

app/src/main/java/app/fedilab/android/peertube/activities/InstancePickerActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import androidx.lifecycle.ViewModelProvider; 
import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;



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



import java.util.ArrayList;

import java.util.Iterator;

import java.util.LinkedHashMap;
@@ -106,7 +108,7 @@ public class InstancePickerActivity extends BaseBarActivity { 
            itemsKeyLanguage = new String[languages.size()];



            binding.pickupLanguages.setOnClickListener(v -> {

                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(InstancePickerActivity.this);

                AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(InstancePickerActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());



                int i = 0;

                if (languages.size() > 0) {
@@ -173,7 +175,7 @@ public class InstancePickerActivity extends BaseBarActivity { 




            binding.pickupCategories.setOnClickListener(v -> {

                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(InstancePickerActivity.this);

                AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(InstancePickerActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

                int i = 0;

                if (categories.size() > 0) {

                    Iterator<Map.Entry<Integer, String>> it = categories.entrySet().iterator();

app/src/main/java/app/fedilab/android/peertube/activities/PeertubeActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; 
import com.google.android.exoplayer2.util.MimeTypes;

import com.google.android.exoplayer2.util.Util;

import com.google.android.exoplayer2.video.VideoSize;

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

import com.google.android.material.snackbar.Snackbar;



import org.jetbrains.annotations.NotNull;
@@ -674,7 +675,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
    }



    private void reportAlert(RetrofitPeertubeAPI.ActionType type, AlertDialog alertDialog) {

        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PeertubeActivity.this);

        AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

        LayoutInflater inflater1 = getLayoutInflater();

        View dialogView = inflater1.inflate(R.layout.popup_report_peertube, new LinearLayout(PeertubeActivity.this), false);

        dialogBuilder.setView(dialogView);
@@ -874,7 +875,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
        });



        binding.videoInformation.setOnClickListener(v -> {

            AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(PeertubeActivity.this);

            AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

            LayoutInflater inflater = getLayoutInflater();

            View dialogView = inflater.inflate(R.layout.popup_video_info_peertube, new LinearLayout(PeertubeActivity.this), false);

            TextView info_privacy = dialogView.findViewById(R.id.info_privacy);
@@ -1111,7 +1112,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
                } else if (itemId == R.id.action_report) {

                    AlertDialog alertDialog;

                    AlertDialog.Builder dialogBuilder;

                    dialogBuilder = new AlertDialog.Builder(PeertubeActivity.this);

                    dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

                    LayoutInflater inflater1 = getLayoutInflater();

                    View dialogView = inflater1.inflate(R.layout.popup_report_choice, new LinearLayout(PeertubeActivity.this), false);

                    dialogBuilder.setView(dialogView);
@@ -1243,7 +1244,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
        if (promptNSFW && peertube != null && peertube.isNsfw() && (nsfwAction.compareTo(Helper.BLUR) == 0 || nsfwAction.compareTo(Helper.DO_NOT_LIST) == 0)) {

            AlertDialog alertDialog;

            AlertDialog.Builder dialogBuilder;

            dialogBuilder = new AlertDialog.Builder(PeertubeActivity.this);

            dialogBuilder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

            dialogBuilder.setTitle(R.string.nsfw_title_warning);

            dialogBuilder.setCancelable(false);

            dialogBuilder.setMessage(R.string.nsfw_message_warning);
@@ -2035,7 +2036,7 @@ public class PeertubeActivity extends BasePeertubeActivity implements CommentLis 
            return;

        }

        if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {

            AlertDialog.Builder builder = new AlertDialog.Builder(PeertubeActivity.this);

            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(PeertubeActivity.this, app.fedilab.android.mastodon.helper.Helper.dialogStyle());

            builder.setTitle(R.string.modify_playlists);



            List<PlaylistData.Playlist> ownerPlaylists = apiResponse.getPlaylists();