From 469f0ec019752b041262acb6c704f0a822bbac65 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 7 Mar 2023 21:14:19 -0500 Subject: [PATCH] android: Convert SettingsActivityView to Kotlin --- ...ivityView.java => SettingsActivityView.kt} | 47 ++++++++----------- 1 file changed, 20 insertions(+), 27 deletions(-) rename src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/{SettingsActivityView.java => SettingsActivityView.kt} (59%) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.kt similarity index 59% rename from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.java rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.kt index 58ccf31b75..5a5c5d9cf2 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityView.kt @@ -1,21 +1,20 @@ -package org.yuzu.yuzu_emu.features.settings.ui; +package org.yuzu.yuzu_emu.features.settings.ui -import android.content.IntentFilter; - -import org.yuzu.yuzu_emu.features.settings.model.Settings; -import org.yuzu.yuzu_emu.utils.DirectoryStateReceiver; +import android.content.IntentFilter +import org.yuzu.yuzu_emu.features.settings.model.Settings +import org.yuzu.yuzu_emu.utils.DirectoryStateReceiver /** * Abstraction for the Activity that manages SettingsFragments. */ -public interface SettingsActivityView { +interface SettingsActivityView { /** * Show a new SettingsFragment. * * @param menuTag Identifier for the settings group that should be displayed. * @param addToStack Whether or not this fragment should replace a previous one. */ - void showSettingsFragment(String menuTag, boolean addToStack, String gameId); + fun showSettingsFragment(menuTag: String, addToStack: Boolean, gameId: String) /** * Called by a contained Fragment to get access to the Setting HashMap @@ -24,28 +23,19 @@ public interface SettingsActivityView { * * @return A possibly null HashMap of Settings. */ - Settings getSettings(); - - /** - * Used to provide the Activity with Settings HashMaps if a Fragment already - * has one; for example, if a rotation occurs, the Fragment will not be killed, - * but the Activity will, so the Activity needs to have its HashMaps resupplied. - * - * @param settings The ArrayList of all the Settings HashMaps. - */ - void setSettings(Settings settings); + var settings: Settings? /** * Called when an asynchronous load operation completes. * * @param settings The (possibly null) result of the ini load operation. */ - void onSettingsFileLoaded(Settings settings); + fun onSettingsFileLoaded(settings: Settings?) /** * Called when an asynchronous load operation fails. */ - void onSettingsFileNotFound(); + fun onSettingsFileNotFound() /** * Display a popup text message on screen. @@ -53,33 +43,33 @@ public interface SettingsActivityView { * @param message The contents of the onscreen message. * @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) /** * End the activity. */ - void finish(); + fun finish() /** * Called by a containing Fragment to tell the Activity that a setting was changed; * unless this has been called, the Activity will not save to disk. */ - void onSettingChanged(); + fun onSettingChanged() /** * Show loading dialog while loading the settings */ - void showLoading(); + fun showLoading() /** * Hide the loading the dialog */ - void hideLoading(); + fun hideLoading() /** * Show a hint to the user that the app needs the external storage to be mounted */ - void showExternalStorageNotMountedHint(); + fun showExternalStorageNotMountedHint() /** * Start the DirectoryInitialization and listen for the result. @@ -87,12 +77,15 @@ public interface SettingsActivityView { * @param receiver the broadcast receiver for the DirectoryInitialization * @param filter the Intent broadcasts to be received. */ - void startDirectoryInitializationService(DirectoryStateReceiver receiver, IntentFilter filter); + fun startDirectoryInitializationService( + receiver: DirectoryStateReceiver?, + filter: IntentFilter + ) /** * Stop listening to the DirectoryInitialization. * * @param receiver The broadcast receiver to unregister. */ - void stopListeningToDirectoryInitializationService(DirectoryStateReceiver receiver); + fun stopListeningToDirectoryInitializationService(receiver: DirectoryStateReceiver) }