diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.java b/app/src/main/java/com/hippo/ehviewer/EhApplication.java index c5c0ca7b0..858ddff76 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.java +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.java @@ -37,6 +37,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.collection.LruCache; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.Native; import com.hippo.beerbelly.SimpleDiskCache; import com.hippo.conaco.Conaco; @@ -431,7 +432,7 @@ public class EhApplication extends SceneApplication { Activity activity = getTopActivity(); if (activity != null) { activity.runOnUiThread(() -> { - AlertDialog dialog = new AlertDialog.Builder(activity) + AlertDialog dialog = new MaterialAlertDialogBuilder(activity) .setMessage(Html.fromHtml(html)) .setPositiveButton(android.R.string.ok, null) .create(); 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 fad885177..90c33146d 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -65,6 +65,7 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.hippo.ehviewer.AppConfig; import com.hippo.ehviewer.BuildConfig; import com.hippo.ehviewer.R; @@ -981,7 +982,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan private void showPageDialog(final int page) { Resources resources = GalleryActivity.this.getResources(); - AlertDialog.Builder builder = new AlertDialog.Builder(GalleryActivity.this); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(GalleryActivity.this); builder.setTitle(resources.getString(R.string.page_menu_title, page + 1)); final CharSequence[] items; @@ -1194,7 +1195,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan } private void onTapMenuArea() { - AlertDialog.Builder builder = new AlertDialog.Builder(GalleryActivity.this); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(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 5bfd9bd8d..b24f08dce 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -333,7 +333,7 @@ public final class MainActivity extends StageActivity mAvatar = (LoadImageView) ViewUtils.$$(headerLayout, R.id.avatar); mDisplayName = (TextView) ViewUtils.$$(headerLayout, R.id.display_name); ViewUtils.$$(headerLayout, R.id.night_mode).setOnClickListener(v -> { - int theme = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0 ? AppCompatDelegate.MODE_NIGHT_NO : AppCompatDelegate.MODE_NIGHT_YES; + int theme = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0 ? DayNightDelegate.MODE_NIGHT_NO : DayNightDelegate.MODE_NIGHT_YES; DayNightDelegate.setDefaultNightMode(theme); recreate(); if (Settings.getTheme() != AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) { @@ -389,7 +389,7 @@ public final class MainActivity extends StageActivity break; } if (hasUnverified) { - new AlertDialog.Builder(this) + new MaterialAlertDialogBuilder(this) .setTitle(R.string.app_link_not_verified_title) .setMessage(R.string.app_link_not_verified_message) .setPositiveButton(R.string.open_settings, (dialogInterface, i) -> { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java index 8ada95ac1..6217a715e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/DownloadFragment.java @@ -26,6 +26,7 @@ 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.R; import com.hippo.ehviewer.Settings; @@ -99,7 +100,7 @@ public class DownloadFragment extends BasePreferenceFragment { if (KEY_DOWNLOAD_LOCATION.equals(key)) { UniFile file = Settings.getDownloadLocation(); if (file != null && !UniFile.isFileUri(Settings.getDownloadLocation().getUri())) { - new AlertDialog.Builder(requireContext()) + new MaterialAlertDialogBuilder(requireContext()) .setTitle(R.string.settings_download_download_location) .setMessage(file.getUri().toString()) .setPositiveButton(R.string.pick_new_download_location, (dialogInterface, i) -> openDirPickerL()) 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 fff26f8e4..1a990b251 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 @@ -136,7 +136,7 @@ public class HostsFragment extends BaseFragment ip.setText(arguments.getString(KEY_IP)); } - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireContext()).setView(view); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(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/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index ef02bf1d0..3e35a144f 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 @@ -309,7 +309,7 @@ public final class GalleryCommentsScene extends ToolbarScene } } - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context); + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context); context = builder.getContext(); final LayoutInflater inflater = LayoutInflater.from(context); EasyRecyclerView rv = (EasyRecyclerView) inflater.inflate(R.layout.dialog_recycler_view, null); 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 038b388cb..9f29ba080 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -46,6 +46,7 @@ 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.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.ehviewer.R; @@ -654,7 +655,7 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, @Override public boolean onLongClick() { - new AlertDialog.Builder(getContext()) + new MaterialAlertDialogBuilder(getContext()) .setMessage(getContext().getString(R.string.delete_search_history, mKeyword)) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(R.string.delete, (dialog, which) -> {