Просмотр исходного кода

android: Convert SettingsFragmentView to Kotlin

Charles Lombardo 3 лет назад
Родитель
Сommit
c39bf17f83

+ 15 - 18
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentView.java → 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
  * Abstraction for a screen showing a list of settings. Instances of
  * this type of view will each display a layer of the setting hierarchy.
  * 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
      * Called by the containing Activity to notify the Fragment that an
      * asynchronous load operation completed.
      * asynchronous load operation completed.
      *
      *
      * @param settings The (possibly null) result of the ini load operation.
      * @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
      * 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.
      * @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.
      * 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
      * @param settingsList The result of converting the HashMap to an ArrayList
      */
      */
-    void showSettingsList(ArrayList<SettingsItem> settingsList);
+    fun showSettingsList(settingsList: ArrayList<SettingsItem>)
 
 
     /**
     /**
      * Called by the containing Activity when an asynchronous load operation fails.
      * Called by the containing Activity when an asynchronous load operation fails.
      * Instructs the Fragment to load the settings screen with defaults selected.
      * Instructs the Fragment to load the settings screen with defaults selected.
      */
      */
-    void loadDefaultSettings();
+    fun loadDefaultSettings()
 
 
     /**
     /**
      * @return The Fragment's containing activity.
      * @return The Fragment's containing activity.
      */
      */
-    FragmentActivity getActivity();
+    val fragmentActivity: FragmentActivity
 
 
     /**
     /**
      * Tell the Fragment to tell the containing Activity to show a new
      * 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.
      * @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.
      * 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 message Text to be shown in the Toast
      * @param is_long Whether this should be a long Toast or short one.
      * @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.
      * Have the fragment add a setting to the HashMap.
      *
      *
      * @param setting The (possibly previously missing) new setting.
      * @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.
      * Have the fragment tell the containing Activity that a setting was modified.
      */
      */
-    void onSettingChanged();
+    fun onSettingChanged()
 }
 }