From c39bf17f835122bdd1292271aac01498bb43286e Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 7 Mar 2023 21:15:02 -0500 Subject: [PATCH] android: Convert SettingsFragmentView to Kotlin --- ...gmentView.java => SettingsFragmentView.kt} | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) rename src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/{SettingsFragmentView.java => SettingsFragmentView.kt} (73%) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.kt similarity index 73% rename from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.java rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.kt index 3c1743fabd..c4a5863297 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.kt @@ -1,25 +1,22 @@ -package org.yuzu.yuzu_emu.features.settings.ui; +package org.yuzu.yuzu_emu.features.settings.ui -import androidx.fragment.app.FragmentActivity; - -import org.yuzu.yuzu_emu.features.settings.model.Setting; -import org.yuzu.yuzu_emu.features.settings.model.Settings; -import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem; - -import java.util.ArrayList; +import androidx.fragment.app.FragmentActivity +import org.yuzu.yuzu_emu.features.settings.model.Setting +import org.yuzu.yuzu_emu.features.settings.model.Settings +import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem /** * Abstraction for a screen showing a list of settings. Instances of * this type of view will each display a layer of the setting hierarchy. */ -public interface SettingsFragmentView { +interface SettingsFragmentView { /** * Called by the containing Activity to notify the Fragment that an * asynchronous load operation completed. * * @param settings The (possibly null) result of the ini load operation. */ - void onSettingsFileLoaded(Settings settings); + fun onSettingsFileLoaded(settings: Settings?) /** * Pass a settings HashMap to the containing activity, so that it can @@ -28,25 +25,25 @@ public interface SettingsFragmentView { * * @param settings An ArrayList containing all the settings HashMaps. */ - void passSettingsToActivity(Settings settings); + fun passSettingsToActivity(settings: Settings) /** * Pass an ArrayList to the View so that it can be displayed on screen. * * @param settingsList The result of converting the HashMap to an ArrayList */ - void showSettingsList(ArrayList settingsList); + fun showSettingsList(settingsList: ArrayList) /** * Called by the containing Activity when an asynchronous load operation fails. * Instructs the Fragment to load the settings screen with defaults selected. */ - void loadDefaultSettings(); + fun loadDefaultSettings() /** * @return The Fragment's containing activity. */ - FragmentActivity getActivity(); + val fragmentActivity: FragmentActivity /** * Tell the Fragment to tell the containing Activity to show a new @@ -54,7 +51,7 @@ public interface SettingsFragmentView { * * @param menuKey Identifier for the settings group that should be shown. */ - void loadSubMenu(String menuKey); + fun loadSubMenu(menuKey: String) /** * Tell the Fragment to tell the containing activity to display a toast message. @@ -62,17 +59,17 @@ public interface SettingsFragmentView { * @param message Text to be shown in the Toast * @param is_long Whether this should be a long Toast or short one. */ - void showToastMessage(String message, boolean is_long); + fun showToastMessage(message: String?, is_long: Boolean) /** * Have the fragment add a setting to the HashMap. * * @param setting The (possibly previously missing) new setting. */ - void putSetting(Setting setting); + fun putSetting(setting: Setting) /** * Have the fragment tell the containing Activity that a setting was modified. */ - void onSettingChanged(); + fun onSettingChanged() }