From 97fbe73edf3d2c86ac5aed881fcffb3349f0aac1 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Wed, 17 Mar 2021 21:46:51 +0800 Subject: [PATCH] Use alertdialog.builder --- .../com/hippo/app/CheckBoxDialogBuilder.java | 5 +++-- .../com/hippo/app/EditTextDialogBuilder.java | 3 +-- .../hippo/app/ListCheckBoxDialogBuilder.java | 3 +-- .../hippo/ehviewer/ui/GalleryActivity.java | 5 ++--- .../com/hippo/ehviewer/ui/MainActivity.java | 4 ++-- .../ui/fragment/AdvancedFragment.java | 5 ++--- .../ehviewer/ui/fragment/FilterFragment.java | 7 +++---- .../ehviewer/ui/fragment/HostsFragment.java | 3 +-- .../ehviewer/ui/scene/CookieSignInScene.java | 4 ++-- .../ehviewer/ui/scene/DownloadsScene.java | 11 +++++------ .../ehviewer/ui/scene/FavoritesScene.java | 7 +++---- .../ui/scene/GalleryCommentsScene.java | 5 ++--- .../ehviewer/ui/scene/GalleryDetailScene.java | 19 +++++++++---------- .../ehviewer/ui/scene/GalleryListScene.java | 9 ++++----- .../ui/scene/GalleryPreviewsScene.java | 3 +-- .../hippo/ehviewer/ui/scene/HistoryScene.java | 10 +++++----- .../hippo/ehviewer/ui/scene/SignInScene.java | 4 ++-- .../widget/DialogWebChromeClient.java | 9 +++++---- .../com/hippo/ehviewer/widget/SearchBar.java | 4 ++-- .../hippo/ehviewer/widget/SearchLayout.java | 7 ++++--- .../hippo/preference/DialogPreference.java | 3 +-- 21 files changed, 60 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java b/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java index 2cfe2202b..5b0216168 100644 --- a/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/CheckBoxDialogBuilder.java @@ -22,10 +22,11 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import androidx.appcompat.app.AlertDialog; + import com.hippo.ehviewer.R; -public class CheckBoxDialogBuilder extends MaterialAlertDialogBuilder { +public class CheckBoxDialogBuilder extends AlertDialog.Builder { private final CheckBox mCheckBox; diff --git a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java index 550741544..31aa65046 100644 --- a/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/EditTextDialogBuilder.java @@ -29,11 +29,10 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textfield.TextInputLayout; import com.hippo.ehviewer.R; -public class EditTextDialogBuilder extends MaterialAlertDialogBuilder implements EditText.OnEditorActionListener { +public class EditTextDialogBuilder extends AlertDialog.Builder implements EditText.OnEditorActionListener { private final TextInputLayout mTextInputLayout; private final EditText mEditText; diff --git a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java b/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java index 9059f7123..640874fdf 100644 --- a/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java +++ b/app/src/main/java/com/hippo/app/ListCheckBoxDialogBuilder.java @@ -27,11 +27,10 @@ import android.widget.ListView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.ehviewer.R; import com.hippo.yorozuya.ViewUtils; -public class ListCheckBoxDialogBuilder extends MaterialAlertDialogBuilder { +public class ListCheckBoxDialogBuilder extends AlertDialog.Builder { private final CheckBox mCheckBox; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index 7892bff9a..168e63d42 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -58,7 +58,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.android.resource.AttrResources; import com.hippo.ehviewer.AppConfig; import com.hippo.ehviewer.BuildConfig; @@ -935,7 +934,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan private void showPageDialog(final int page) { Resources resources = GalleryActivity.this.getResources(); - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(GalleryActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(GalleryActivity.this); builder.setTitle(resources.getString(R.string.page_menu_title, page + 1)); final CharSequence[] items; @@ -1137,7 +1136,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } private void onTapMenuArea() { - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(GalleryActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(GalleryActivity.this); GalleryMenuHelper helper = new GalleryMenuHelper(builder.getContext()); builder.setTitle(R.string.gallery_menu_title) .setView(helper.getView()) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java index dd0d0dde8..4c1b9ba90 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -39,11 +39,11 @@ import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatDelegate; import androidx.core.view.WindowCompat; import androidx.drawerlayout.widget.DrawerLayout; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.navigation.NavigationView; import com.google.android.material.snackbar.Snackbar; import com.hippo.ehviewer.AppConfig; @@ -350,7 +350,7 @@ public final class MainActivity extends StageActivity if (null == uniFile || uniFile.ensureDir()) { return; } - new MaterialAlertDialogBuilder(this) + new AlertDialog.Builder(this) .setTitle(R.string.waring) .setMessage(R.string.invalid_download_location) .setPositiveButton(R.string.get_it, null) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java index cf0f941d0..08eddf209 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java @@ -26,7 +26,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.ehviewer.AppConfig; import com.hippo.ehviewer.BuildConfig; import com.hippo.ehviewer.EhApplication; @@ -73,7 +72,7 @@ public class AdvancedFragment extends BasePreferenceFragment { e.printStackTrace(); } try { - AlertDialog alertDialog = new MaterialAlertDialogBuilder(requireActivity()) + AlertDialog alertDialog = new AlertDialog.Builder(requireActivity()) .setCancelable(false) .setView(R.layout.preference_dialog_task) .show(); @@ -190,7 +189,7 @@ public class AdvancedFragment extends BasePreferenceFragment { e.printStackTrace(); } try { - AlertDialog alertDialog = new MaterialAlertDialogBuilder(requireActivity()) + AlertDialog alertDialog = new AlertDialog.Builder(requireActivity()) .setCancelable(false) .setView(R.layout.preference_dialog_task) .show(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.java index 65ffa3d02..ffe91ac76 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/FilterFragment.java @@ -24,7 +24,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.checkbox.MaterialCheckBox; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.textfield.TextInputLayout; import com.hippo.android.resource.AttrResources; @@ -137,7 +136,7 @@ public class FilterFragment extends BaseFragment { } private void showTipDialog() { - new MaterialAlertDialogBuilder(requireActivity()) + new AlertDialog.Builder(requireActivity()) .setTitle(R.string.filter) .setMessage(R.string.filter_tip) .setPositiveButton(android.R.string.ok, null) @@ -145,7 +144,7 @@ public class FilterFragment extends BaseFragment { } private void showAddFilterDialog() { - AlertDialog dialog = new MaterialAlertDialogBuilder(requireActivity()) + AlertDialog dialog = new AlertDialog.Builder(requireActivity()) .setTitle(R.string.add_filter) .setView(R.layout.dialog_add_filter) .setPositiveButton(R.string.add, null) @@ -157,7 +156,7 @@ public class FilterFragment extends BaseFragment { private void showDeleteFilterDialog(final Filter filter) { String message = getString(R.string.delete_filter, filter.text); - new MaterialAlertDialogBuilder(requireActivity()) + new AlertDialog.Builder(requireActivity()) .setMessage(message) .setPositiveButton(R.string.delete, (dialog, which) -> { if (DialogInterface.BUTTON_POSITIVE != which || null == mFilterList) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.java index c6542de95..5dcfc1a0f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/HostsFragment.java @@ -16,7 +16,6 @@ import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.textfield.TextInputLayout; import com.hippo.android.resource.AttrResources; @@ -135,7 +134,7 @@ public class HostsFragment extends BaseFragment ip.setText(arguments.getString(KEY_IP)); } - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireContext()).setView(view); + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()).setView(view); onCreateDialogBuilder(builder); AlertDialog dialog = builder.create(); dialog.setOnShowListener(d -> onCreateDialog((AlertDialog) d)); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java index 29efb9b14..04669f87e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CookieSignInScene.java @@ -30,8 +30,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textfield.TextInputLayout; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; @@ -217,7 +217,7 @@ public class CookieSignInScene extends SolidScene implements EditText.OnEditorAc hideSoftInput(); if (!checkIpbMemberId(ipbMemberId) || !(checkIpbPassHash(ipbPassHash))) { - new MaterialAlertDialogBuilder(context).setTitle(R.string.waring) + new AlertDialog.Builder(context).setTitle(R.string.waring) .setMessage(R.string.wrong_cookie_warning) .setPositiveButton(R.string.i_will_check_it, null) .setNegativeButton(R.string.i_dont_think_so, (dialog, which) -> { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index cc5cbae2e..86ecb203a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -57,7 +57,6 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.getkeepsafe.taptargetview.TapTarget; import com.getkeepsafe.taptargetview.TapTargetView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; @@ -524,7 +523,7 @@ public class DownloadsScene extends ToolbarScene int id = item.getItemId(); if (id == R.id.action_filter) { - new MaterialAlertDialogBuilder(requireActivity()) + new AlertDialog.Builder(requireActivity()) .setSingleChoiceItems(R.array.download_state, mType + 1, (dialog, which) -> { mType = which - 1; updateForLabel(); @@ -547,7 +546,7 @@ public class DownloadsScene extends ToolbarScene openDrawer(Gravity.RIGHT); return true; } else if (id == R.id.action_reset_reading_progress) { - new MaterialAlertDialogBuilder(getContext()) + new AlertDialog.Builder(getContext()) .setMessage(R.string.reset_reading_progress_message) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, (dialog, which) -> { @@ -620,7 +619,7 @@ public class DownloadsScene extends ToolbarScene for (int i = 0, n = list.size(); i < n; i++) { items[i + 2] = list.get(i).getLabel(); } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.default_download_label) .setItems(items, (dialog1, which) -> { if (which == 0) { @@ -820,7 +819,7 @@ public class DownloadsScene extends ToolbarScene MoveDialogHelper helper = new MoveDialogHelper(labels, downloadInfoList); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_move_dialog_title) .setItems(labels, helper) .show(); @@ -1066,7 +1065,7 @@ public class DownloadsScene extends ToolbarScene AlertDialog dialog = builder.show(); new RenameLabelDialogHelper(builder, dialog, label); } else if (itemId == R.id.menu_label_remove) { - new MaterialAlertDialogBuilder(requireContext()) + new AlertDialog.Builder(requireContext()) .setTitle(getString(R.string.delete_label_title)) .setMessage(getString(R.string.delete_label_message, label)) .setPositiveButton(R.string.delete, (dialog, which) -> { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index 1e407fe07..7c91a66b4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -48,7 +48,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.getkeepsafe.taptargetview.TapTarget; import com.getkeepsafe.taptargetview.TapTargetView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.hippo.android.resource.AttrResources; import com.hippo.annotation.Implemented; @@ -481,7 +480,7 @@ public class FavoritesScene extends BaseScene implements items[1] = getString(R.string.local_favorites); String[] favCat = Settings.getFavCat(); System.arraycopy(favCat, 0, items, 2, 10); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.default_favorites_collection) .setItems(items, (dialog, which) -> Settings.putDefaultFavSlot(which - 2)).show(); return true; @@ -821,7 +820,7 @@ public class FavoritesScene extends BaseScene implements } case 4: { // Delete DeleteDialogHelper helper = new DeleteDialogHelper(); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.delete_favorites_dialog_title) .setMessage(getString(R.string.delete_favorites_dialog_message, mModifyGiList.size())) .setPositiveButton(android.R.string.ok, helper) @@ -835,7 +834,7 @@ public class FavoritesScene extends BaseScene implements String[] array = new String[11]; array[0] = getString(R.string.local_favorites); System.arraycopy(Settings.getFavCat(), 0, array, 1, 10); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.move_favorites_dialog_title) .setItems(array, helper) .setOnCancelListener(helper) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index ca8b1f814..d68146733 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -56,7 +56,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; @@ -392,7 +391,7 @@ public final class GalleryCommentsScene extends ToolbarScene } } - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context); + AlertDialog.Builder builder = new AlertDialog.Builder(context); context = builder.getContext(); final LayoutInflater inflater = LayoutInflater.from(context); EasyRecyclerView rv = (EasyRecyclerView) inflater.inflate(R.layout.dialog_recycler_view, null); @@ -454,7 +453,7 @@ public final class GalleryCommentsScene extends ToolbarScene menuId.add(R.id.check_vote_status); } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setItems(menu.toArray(new String[0]), (dialog, which) -> { if (which < 0 || which >= menuId.size()) { return; diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 5afe600bd..0f2016d64 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -65,7 +65,6 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.transition.TransitionInflater; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.progressindicator.CircularProgressIndicator; import com.hippo.android.resource.AttrResources; import com.hippo.app.EditTextDialogBuilder; @@ -270,7 +269,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene result -> { if (result && mGalleryDetail != null) { TorrentListDialogHelper helper = new TorrentListDialogHelper(); - Dialog dialog = new MaterialAlertDialogBuilder(requireActivity()) + Dialog dialog = new AlertDialog.Builder(requireActivity()) .setTitle(R.string.torrents) .setView(R.layout.dialog_torrent_list) .setOnDismissListener(helper) @@ -1202,7 +1201,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene if (EhApplication.getDownloadManager(context).getDownloadState(galleryInfo.gid) == DownloadInfo.STATE_INVALID) { CommonOperations.startDownload(activity, galleryInfo, false); } else { - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_remove_dialog_title) .setMessage(getString(R.string.download_remove_dialog_message, galleryInfo.title)) .setPositiveButton(android.R.string.ok, (dialog1, which1) -> EhApplication.getDownloadManager(context).deleteDownload(galleryInfo.gid)) @@ -1228,7 +1227,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene for (GalleryInfo newerVersion : mGalleryDetail.newerVersions) { titles.add(getString(R.string.newer_version_title, newerVersion.title, newerVersion.posted)); } - new MaterialAlertDialogBuilder(requireContext()) + new AlertDialog.Builder(requireContext()) .setItems(titles.toArray(new CharSequence[0]), (dialog, which) -> { GalleryInfo newerVersion = mGalleryDetail.newerVersions.get(which); Bundle args = new Bundle(); @@ -1274,7 +1273,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene requestStoragePermissionLauncher.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE); } else { TorrentListDialogHelper helper = new TorrentListDialogHelper(); - Dialog dialog = new MaterialAlertDialogBuilder(context) + Dialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.torrents) .setView(R.layout.dialog_torrent_list) .setOnDismissListener(helper) @@ -1291,7 +1290,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return; } ArchiveListDialogHelper helper = new ArchiveListDialogHelper(); - Dialog dialog = new MaterialAlertDialogBuilder(context) + Dialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.dialog_archive_title) .setView(R.layout.dialog_archive_list) .setOnDismissListener(helper) @@ -1306,7 +1305,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return; } RateDialogHelper helper = new RateDialogHelper(); - Dialog dialog = new MaterialAlertDialogBuilder(context) + Dialog dialog = new AlertDialog.Builder(context) .setTitle(R.string.rate) .setView(R.layout.dialog_rate) .setNegativeButton(android.R.string.cancel, null) @@ -1367,7 +1366,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return; } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setMessage(getString(R.string.filter_the_uploader, uploader)) .setPositiveButton(android.R.string.ok, (dialog, which) -> { Filter filter = new Filter(); @@ -1387,7 +1386,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene return; } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setMessage(getString(R.string.filter_the_tag, tag)) .setPositiveButton(android.R.string.ok, (dialog, which) -> { Filter filter = new Filter(); @@ -1430,7 +1429,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene menuId.add(R.id.vote_down); } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(tag) .setItems(menu.toArray(new String[0]), (dialog, which) -> { if (which < 0 || which >= menuId.size()) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index 1868eb96d..d6268530b 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -60,7 +60,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.getkeepsafe.taptargetview.TapTarget; import com.getkeepsafe.taptargetview.TapTargetView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; @@ -1108,7 +1107,7 @@ public final class GalleryListScene extends BaseScene favourited ? R.drawable.v_heart_broken_x24 : R.drawable.v_heart_x24, }; - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(EhUtils.getSuitableTitle(gi)) .setAdapter(new SelectItemWithIconAdapter(context, items, icons), (dialog, which) -> { switch (which) { @@ -1120,7 +1119,7 @@ public final class GalleryListScene extends BaseScene break; case 1: // Download if (downloaded) { - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_remove_dialog_title) .setMessage(getString(R.string.download_remove_dialog_message, gi.title)) .setPositiveButton(android.R.string.ok, (dialog1, which1) -> mDownloadManager.deleteDownload(gi.gid)) @@ -1147,7 +1146,7 @@ public final class GalleryListScene extends BaseScene MoveDialogHelper helper = new MoveDialogHelper(labels, gi); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_move_dialog_title) .setItems(labels, helper) .show(); @@ -1701,7 +1700,7 @@ public final class GalleryListScene extends BaseScene @Override public boolean onMenuItemClick(MenuItem item) { if (item.getItemId() == R.id.menu_qs_remove) { - new MaterialAlertDialogBuilder(requireContext()) + new AlertDialog.Builder(requireContext()) .setTitle(getString(R.string.delete_quick_search_title)) .setMessage(getString(R.string.delete_quick_search_message, quickSearch.name)) .setPositiveButton(R.string.delete, (dialog, which) -> { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java index 33a76d199..1eceb48d4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryPreviewsScene.java @@ -35,7 +35,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.MarginItemDecoration; import com.hippo.ehviewer.EhApplication; @@ -213,7 +212,7 @@ public class GalleryPreviewsScene extends ToolbarScene { int pages = mHelper.getPages(); if (pages > 0 && mHelper.canGoTo()) { GoToDialogHelper helper = new GoToDialogHelper(pages, mHelper.getPageForTop()); - AlertDialog dialog = new MaterialAlertDialogBuilder(context).setTitle(R.string.go_to) + AlertDialog dialog = new AlertDialog.Builder(context).setTitle(R.string.go_to) .setView(R.layout.dialog_go_to) .setPositiveButton(android.R.string.ok, null) .create(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index 848c881d1..9bb395966 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java @@ -34,12 +34,12 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.h6ah4i.android.widget.advrecyclerview.animator.GeneralItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.animator.SwipeDismissItemAnimator; import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager; @@ -306,7 +306,7 @@ public class HistoryScene extends ToolbarScene { } private void showClearAllDialog() { - new MaterialAlertDialogBuilder(requireContext()) + new AlertDialog.Builder(requireContext()) .setMessage(R.string.clear_all_history) .setPositiveButton(R.string.clear_all, (dialog, which) -> { if (DialogInterface.BUTTON_POSITIVE != which || null == mAdapter) { @@ -397,7 +397,7 @@ public class HistoryScene extends ToolbarScene { R.drawable.v_delete_x24, }; - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(EhUtils.getSuitableTitle(gi)) .setAdapter(new SelectItemWithIconAdapter(context, items, icons), (dialog, which) -> { switch (which) { @@ -409,7 +409,7 @@ public class HistoryScene extends ToolbarScene { break; case 1: // Download if (downloaded) { - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_remove_dialog_title) .setMessage(getString(R.string.download_remove_dialog_message, gi.title)) .setPositiveButton(android.R.string.ok, (dialog1, which1) -> mDownloadManager.deleteDownload(gi.gid)) @@ -447,7 +447,7 @@ public class HistoryScene extends ToolbarScene { MoveDialogHelper helper = new MoveDialogHelper(labels, gi); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.download_move_dialog_title) .setItems(labels, helper) .show(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java index 85441c445..172748f1c 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SignInScene.java @@ -29,8 +29,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.textfield.TextInputLayout; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; @@ -333,7 +333,7 @@ public final class SignInScene extends SolidScene implements EditText.OnEditorAc return; } - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setTitle(R.string.sign_in_failed) .setMessage(ExceptionUtils.getReadableString(e) + "\n\n" + getString(R.string.sign_in_failed_tip)) .setPositiveButton(R.string.get_it, null) diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java b/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java index 8fc9deebf..5b6399a90 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/DialogWebChromeClient.java @@ -26,7 +26,8 @@ import android.webkit.WebView; import android.widget.EditText; import android.widget.TextView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import androidx.appcompat.app.AlertDialog; + import com.hippo.ehviewer.R; public class DialogWebChromeClient extends WebChromeClient { @@ -39,7 +40,7 @@ public class DialogWebChromeClient extends WebChromeClient { @Override public boolean onJsAlert(WebView view, String url, String message, JsResult result) { - new MaterialAlertDialogBuilder(view.getContext()) + new AlertDialog.Builder(view.getContext()) .setMessage(message) .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm()) .setOnCancelListener(dialog -> result.cancel()) @@ -49,7 +50,7 @@ public class DialogWebChromeClient extends WebChromeClient { @Override public boolean onJsConfirm(WebView view, String url, String message, JsResult result) { - new MaterialAlertDialogBuilder(view.getContext()) + new AlertDialog.Builder(view.getContext()) .setMessage(message) .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm()) .setNegativeButton(android.R.string.cancel, (dialog, which) -> result.cancel()) @@ -67,7 +68,7 @@ public class DialogWebChromeClient extends WebChromeClient { final EditText valueView = promptView.findViewById(R.id.value); valueView.setText(defaultValue); - new MaterialAlertDialogBuilder(context) + new AlertDialog.Builder(context) .setView(promptView) .setPositiveButton(android.R.string.ok, (dialog, which) -> result.confirm(valueView.getText().toString())) .setOnCancelListener(dialog -> result.cancel()) diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java index 6ea02bc8d..46f22143a 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -39,12 +39,12 @@ import android.widget.TextView; import androidx.annotation.Keep; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.core.util.Pair; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.card.MaterialCardView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.android.resource.AttrResources; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.LinearDividerItemDecoration; @@ -642,7 +642,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, @Override public boolean onLongClick() { - new MaterialAlertDialogBuilder(getContext()) + new AlertDialog.Builder(getContext()) .setMessage(getContext().getString(R.string.delete_search_history, mKeyword)) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.delete, (dialog, which) -> { diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index ec54a5367..9cfc48403 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -35,11 +35,11 @@ import android.widget.TextView; import androidx.annotation.IntDef; import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.tabs.TabLayout; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.MarginItemDecoration; @@ -52,6 +52,7 @@ import com.hippo.yorozuya.ViewUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Objects; public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnCheckedChangeListener, View.OnClickListener, ImageSearchLayout.Helper, TabLayout.OnTabSelectedListener { @@ -112,7 +113,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC setAdapter(mAdapter); setHasFixedSize(true); setClipToPadding(false); - ((DefaultItemAnimator) getItemAnimator()).setSupportsChangeAnimations(false); + ((DefaultItemAnimator) Objects.requireNonNull(getItemAnimator())).setSupportsChangeAnimations(false); int interval = resources.getDimensionPixelOffset(R.dimen.search_layout_interval); int paddingH = resources.getDimensionPixelOffset(R.dimen.search_layout_margin_h); int paddingV = resources.getDimensionPixelOffset(R.dimen.search_layout_margin_v); @@ -273,7 +274,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC @Override public void onClick(View v) { if (mNormalSearchModeHelp == v) { - new MaterialAlertDialogBuilder(getContext()) + new AlertDialog.Builder(getContext()) .setMessage(R.string.search_tip) .show(); } diff --git a/app/src/main/java/com/hippo/preference/DialogPreference.java b/app/src/main/java/com/hippo/preference/DialogPreference.java index 350265b7e..80f41f2c6 100644 --- a/app/src/main/java/com/hippo/preference/DialogPreference.java +++ b/app/src/main/java/com/hippo/preference/DialogPreference.java @@ -37,7 +37,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.preference.Preference; -import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.ehviewer.R; /** @@ -255,7 +254,7 @@ public abstract class DialogPreference extends Preference implements mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE; - mBuilder = new MaterialAlertDialogBuilder(context) + mBuilder = new AlertDialog.Builder(context) .setTitle(mDialogTitle) .setIcon(mDialogIcon) .setPositiveButton(mPositiveButtonText, this)