From 5eeb0a540bd76661aecd16ff3bb395aa162ada27 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 25 Jan 2023 14:09:38 -0500 Subject: [PATCH] Android: Convert OnlineUpdateRegionSelectDialogFragment to Kotlin --- ...nlineUpdateRegionSelectDialogFragment.java | 44 ------------------- .../OnlineUpdateRegionSelectDialogFragment.kt | 36 +++++++++++++++ 2 files changed, 36 insertions(+), 44 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java deleted file mode 100644 index ea1c535ca4..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu.features.sysupdate.ui; - -import android.app.Dialog; -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.lifecycle.ViewModelProvider; - -import com.google.android.material.dialog.MaterialAlertDialogBuilder; - -import org.dolphinemu.dolphinemu.R; - -public class OnlineUpdateRegionSelectDialogFragment extends DialogFragment -{ - @NonNull - @Override - public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) - { - String[] items = - {getString(R.string.country_europe), getString(R.string.country_japan), getString( - R.string.country_korea), getString(R.string.country_usa)}; - int checkedItem = -1; - - return new MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.region_select_title) - .setSingleChoiceItems(items, checkedItem, (dialog, which) -> - { - SystemUpdateViewModel viewModel = - new ViewModelProvider(requireActivity()).get(SystemUpdateViewModel.class); - viewModel.setRegion(which); - - SystemUpdateProgressBarDialogFragment progressBarFragment = - new SystemUpdateProgressBarDialogFragment(); - progressBarFragment - .show(getParentFragmentManager(), "OnlineUpdateProgressBarDialogFragment"); - dismiss(); - }) - .create(); - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.kt new file mode 100644 index 0000000000..1e3b7235da --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/OnlineUpdateRegionSelectDialogFragment.kt @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu.features.sysupdate.ui + +import android.app.Dialog +import android.content.DialogInterface +import android.os.Bundle +import androidx.fragment.app.DialogFragment +import androidx.lifecycle.ViewModelProvider +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import org.dolphinemu.dolphinemu.R + +class OnlineUpdateRegionSelectDialogFragment : DialogFragment() { + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + val items = arrayOf( + getString(R.string.country_europe), + getString(R.string.country_japan), + getString(R.string.country_korea), + getString(R.string.country_usa) + ) + val checkedItem = -1 + return MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.region_select_title) + .setSingleChoiceItems(items, checkedItem) { _: DialogInterface?, which: Int -> + val viewModel = + ViewModelProvider(requireActivity())[SystemUpdateViewModel::class.java] + viewModel.region = which + SystemUpdateProgressBarDialogFragment().show( + parentFragmentManager, + "OnlineUpdateProgressBarDialogFragment" + ) + dismiss() + } + .create() + } +}