Commit e0e2f778 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent ef5a211f

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.bumptech.glide.request.FutureTarget; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.target.Target;

import com.bumptech.glide.request.transition.Transition;

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

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

import com.google.android.material.tabs.TabLayout;
@@ -562,7 +563,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
            popup.setOnMenuItemClickListener(item -> {

                int itemId = item.getItemId();

                if (itemId == R.id.action_logout_account) {

                    AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());

                    AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(BaseMainActivity.this, Helper.dialogStyle());

                    alt_bld.setTitle(R.string.action_logout);

                    if (currentAccount.mastodon_account != null && currentAccount.mastodon_account.username != null && currentAccount.instance != null) {

                        alt_bld.setMessage(getString(R.string.logout_account_confirmation, currentAccount.mastodon_account.username, currentAccount.instance));
@@ -1406,7 +1407,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                itemShowDMs.setChecked(show_dms);

                editor.apply();

            } else if (itemId == R.id.action_filter) {

                AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());

                AlertDialog.Builder dialogBuilder = new MaterialAlertDialogBuilder(BaseMainActivity.this, Helper.dialogStyle());

                LayoutInflater inflater = getLayoutInflater();

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

                dialogBuilder.setView(dialogView);
@@ -1727,7 +1728,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        if (item.getItemId() == R.id.action_logout) {

            AlertDialog.Builder alt_bld = new AlertDialog.Builder(BaseMainActivity.this, Helper.dialogStyle());

            AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(BaseMainActivity.this, Helper.dialogStyle());

            alt_bld.setTitle(R.string.action_logout);

            alt_bld.setMessage(getString(R.string.logout_account_confirmation, account.mastodon_account.username, account.instance));

            alt_bld.setPositiveButton(R.string.action_logout, (dialog, id) -> {

app/src/main/java/app/fedilab/android/activities/CacheActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import androidx.annotation.Nullable; 
import androidx.appcompat.app.AlertDialog;

import androidx.recyclerview.widget.LinearLayoutManager;



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



import java.util.ArrayList;

import java.util.List;

import java.util.Locale;
@@ -119,7 +121,7 @@ public class CacheActivity extends BaseBarActivity { 
            finish();

            return true;

        } else if (item.getItemId() == R.id.action_clear) {

            AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());

            AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());

            deleteConfirm.setTitle(getString(R.string.delete_cache));

            deleteConfirm.setMessage(getString(R.string.delete_cache_message));

            deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -129,7 +131,7 @@ public class CacheActivity extends BaseBarActivity { 
                        size = size / 1000000.0f;

                    }

                    binding.fileCacheSize.setText(String.format("%s %s", String.format(Locale.getDefault(), "%.2f", size), getString(R.string.cache_units)));

                    AlertDialog.Builder restartBuilder = new AlertDialog.Builder(CacheActivity.this, Helper.dialogStyle());

                    AlertDialog.Builder restartBuilder = new MaterialAlertDialogBuilder(CacheActivity.this, Helper.dialogStyle());

                    restartBuilder.setMessage(getString(R.string.restart_the_app));

                    restartBuilder.setNegativeButton(R.string.no, (dialogRestart, whichRestart) -> {

                        recreate();

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ import androidx.work.OneTimeWorkRequest; 
import androidx.work.OutOfQuotaPolicy;

import androidx.work.WorkManager;



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



import java.io.File;

import java.text.ParseException;

import java.text.SimpleDateFormat;
@@ -211,7 +213,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
        }

        if (canBeSent(statusDraft)) {

            if (promptSaveDraft) {

                AlertDialog.Builder alt_bld = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());

                AlertDialog.Builder alt_bld = new MaterialAlertDialogBuilder(ComposeActivity.this, Helper.dialogStyle());

                alt_bld.setMessage(R.string.save_draft);

                alt_bld.setPositiveButton(R.string.save, (dialog, id) -> {

                    dialog.dismiss();
@@ -312,7 +314,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
        } else if (item.getItemId() == R.id.action_photo_camera) {

            photoFileUri = MediaHelper.dispatchTakePictureIntent(ComposeActivity.this);

        } else if (item.getItemId() == R.id.action_contacts) {

            AlertDialog.Builder builderSingle = new AlertDialog.Builder(ComposeActivity.this, Helper.dialogStyle());

            AlertDialog.Builder builderSingle = new MaterialAlertDialogBuilder(ComposeActivity.this, Helper.dialogStyle());



            builderSingle.setTitle(getString(R.string.select_accounts));

            PopupContactBinding popupContactBinding = PopupContactBinding.inflate(getLayoutInflater(), new LinearLayout(ComposeActivity.this), false);

app/src/main/java/app/fedilab/android/activities/DraftActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import androidx.lifecycle.ViewModelProvider; 
import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.LinearLayoutManager;



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



import java.io.File;

import java.util.ArrayList;

import java.util.List;
@@ -98,7 +100,7 @@ public class DraftActivity extends BaseActivity implements StatusDraftAdapter.Dr 
            finish();

            return true;

        } else if (item.getItemId() == R.id.action_delete) {

            AlertDialog.Builder unfollowConfirm = new AlertDialog.Builder(DraftActivity.this, Helper.dialogStyle());

            AlertDialog.Builder unfollowConfirm = new MaterialAlertDialogBuilder(DraftActivity.this, Helper.dialogStyle());

            unfollowConfirm.setTitle(getString(R.string.delete_all));

            unfollowConfirm.setMessage(getString(R.string.remove_draft));

            unfollowConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());

app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.lifecycle.ViewModelProvider; 
import androidx.localbroadcastmanager.content.LocalBroadcastManager;



import com.bumptech.glide.Glide;

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

import com.google.android.material.textfield.TextInputEditText;



import java.util.LinkedHashMap;
@@ -135,7 +136,7 @@ public class EditProfileActivity extends BaseBarActivity { 
                    value = Html.fromHtml(field.value).toString();

                fieldItemBinding.value.setText(value);

                fieldItemBinding.remove.setOnClickListener(v -> {

                    AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());

                    AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());

                    deleteConfirm.setTitle(getString(R.string.delete_field));

                    deleteConfirm.setMessage(getString(R.string.delete_field_confirm));

                    deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
@@ -157,7 +158,7 @@ public class EditProfileActivity extends BaseBarActivity { 
        binding.addField.setOnClickListener(view -> {

            AccountFieldItemBinding fieldItemBinding = AccountFieldItemBinding.inflate(getLayoutInflater());

            fieldItemBinding.remove.setOnClickListener(v -> {

                AlertDialog.Builder deleteConfirm = new AlertDialog.Builder(EditProfileActivity.this, Helper.dialogStyle());

                AlertDialog.Builder deleteConfirm = new MaterialAlertDialogBuilder(EditProfileActivity.this, Helper.dialogStyle());

                deleteConfirm.setTitle(getString(R.string.delete_field));

                deleteConfirm.setMessage(getString(R.string.delete_field_confirm));

                deleteConfirm.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());