From f7ad065408dd65d4ca04ae6404c3e08423bef604 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Mar 2023 03:26:12 -0400 Subject: [PATCH] Android: Convert FilePicker to Kotlin --- .../settings/model/view/FilePicker.java | 60 ------------------- .../settings/model/view/FilePicker.kt | 26 ++++++++ 2 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java deleted file mode 100644 index 4b0ae749a9..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu.features.settings.model.view; - -import android.content.Context; - -import androidx.annotation.Nullable; - -import org.dolphinemu.dolphinemu.features.settings.model.AbstractSetting; -import org.dolphinemu.dolphinemu.features.settings.model.AbstractStringSetting; -import org.dolphinemu.dolphinemu.features.settings.model.Settings; - -public final class FilePicker extends SettingsItem -{ - private AbstractStringSetting mSetting; - private int mRequestType; - private String mDefaultPathRelativeToUserDirectory; - - public FilePicker(Context context, AbstractStringSetting setting, int titleId, int descriptionId, - int requestType, @Nullable String defaultPathRelativeToUserDirectory) - { - super(context, titleId, descriptionId); - mSetting = setting; - mRequestType = requestType; - mDefaultPathRelativeToUserDirectory = defaultPathRelativeToUserDirectory; - } - - public String getSelectedValue() - { - return mSetting.getString(); - } - - public void setSelectedValue(Settings settings, String selection) - { - mSetting.setString(settings, selection); - } - - public int getRequestType() - { - return mRequestType; - } - - @Nullable - public String getDefaultPathRelativeToUserDirectory() - { - return mDefaultPathRelativeToUserDirectory; - } - - @Override - public int getType() - { - return TYPE_FILE_PICKER; - } - - @Override - public AbstractSetting getSetting() - { - return mSetting; - } -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.kt new file mode 100644 index 0000000000..2b5bd70162 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.kt @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu.features.settings.model.view + +import android.content.Context +import org.dolphinemu.dolphinemu.features.settings.model.AbstractStringSetting +import org.dolphinemu.dolphinemu.features.settings.model.Settings + +class FilePicker( + context: Context, + override var setting: AbstractStringSetting, + titleId: Int, + descriptionId: Int, + val requestType: Int, + val defaultPathRelativeToUserDirectory: String? +) : SettingsItem(context, titleId, descriptionId) { + override val type: Int = TYPE_FILE_PICKER + + fun getSelectedValue() : String { + return setting.string + } + + fun setSelectedValue(settings: Settings, selection: String) { + setting.setString(settings, selection) + } +}