Merge pull request #11892 from t895/kotlin-adapters

Android: Convert "adapters" package to Kotlin

4 files changed, 81 insertions, 106 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
deleted file mode 100644
index 68d46a6b57..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.adapters;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.ui.platform.Platform;
-import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesFragment;
-
-public class PlatformPagerAdapter extends FragmentPagerAdapter
-{
-  private SwipeRefreshLayout.OnRefreshListener mOnRefreshListener;
-
-  public final static int[] TAB_ICONS =
-          {
-                  R.drawable.ic_gamecube,
-                  R.drawable.ic_wii,
-                  R.drawable.ic_folder
-          };
-
-  public PlatformPagerAdapter(FragmentManager fm,
-          SwipeRefreshLayout.OnRefreshListener onRefreshListener)
-  {
-    super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-    mOnRefreshListener = onRefreshListener;
-  }
-
-  @NonNull
-  @Override
-  public Fragment getItem(int position)
-  {
-    Platform platform = Platform.fromPosition(position);
-
-    PlatformGamesFragment fragment = PlatformGamesFragment.newInstance(platform);
-    fragment.setOnRefreshListener(mOnRefreshListener);
-    return fragment;
-  }
-
-  @Override
-  public int getCount()
-  {
-    return TAB_ICONS.length;
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.kt
new file mode 100644
index 0000000000..27bb122a0f
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.kt
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.adapters
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
+import org.dolphinemu.dolphinemu.R
+import org.dolphinemu.dolphinemu.ui.platform.Platform
+import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesFragment
+
+class PlatformPagerAdapter(
+    fm: FragmentManager,
+    private val onRefreshListener: OnRefreshListener
+) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
+    override fun getItem(position: Int): Fragment {
+        val platform = Platform.fromPosition(position)
+        val fragment = PlatformGamesFragment.newInstance(platform)
+        fragment.setOnRefreshListener(onRefreshListener)
+        return fragment
+    }
+
+    override fun getCount(): Int = TAB_ICONS.size
+
+    companion object {
+        @JvmField
+        val TAB_ICONS = intArrayOf(
+            R.drawable.ic_gamecube,
+            R.drawable.ic_wii,
+            R.drawable.ic_folder
+        )
+    }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
deleted file mode 100644
index f05cffb983..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.adapters;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.view.ViewGroup;
-
-import androidx.core.content.ContextCompat;
-import androidx.leanback.widget.ImageCardView;
-import androidx.leanback.widget.Presenter;
-
-import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.model.TvSettingsItem;
-import org.dolphinemu.dolphinemu.viewholders.TvSettingsViewHolder;
-
-public final class SettingsRowPresenter extends Presenter
-{
-  public Presenter.ViewHolder onCreateViewHolder(ViewGroup parent)
-  {
-    // Create a new view.
-    ImageCardView settingsCard = new ImageCardView(parent.getContext());
-
-    settingsCard.setMainImageAdjustViewBounds(true);
-    settingsCard.setMainImageDimensions(192, 160);
-
-    settingsCard.setFocusable(true);
-    settingsCard.setFocusableInTouchMode(true);
-
-    // Use that view to create a ViewHolder.
-    return new TvSettingsViewHolder(settingsCard);
-  }
-
-  public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object item)
-  {
-    TvSettingsViewHolder holder = (TvSettingsViewHolder) viewHolder;
-    Context context = holder.cardParent.getContext();
-    TvSettingsItem settingsItem = (TvSettingsItem) item;
-
-    Resources resources = holder.cardParent.getResources();
-
-    holder.itemId = settingsItem.getItemId();
-
-    holder.cardParent.setTitleText(resources.getString(settingsItem.getLabelId()));
-    holder.cardParent.setMainImage(resources.getDrawable(settingsItem.getIconId()));
-
-    // Set the background color of the card
-    Drawable background = ContextCompat.getDrawable(context, R.drawable.tv_card_background);
-    holder.cardParent.setInfoAreaBackground(background);
-  }
-
-  public void onUnbindViewHolder(Presenter.ViewHolder viewHolder)
-  {
-    // no op
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt
new file mode 100644
index 0000000000..c52039c5b2
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.adapters
+
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.leanback.widget.ImageCardView
+import androidx.leanback.widget.Presenter
+import org.dolphinemu.dolphinemu.R
+import org.dolphinemu.dolphinemu.model.TvSettingsItem
+import org.dolphinemu.dolphinemu.viewholders.TvSettingsViewHolder
+
+class SettingsRowPresenter : Presenter() {
+    override fun onCreateViewHolder(parent: ViewGroup): ViewHolder {
+        // Create a new view.
+        val settingsCard = ImageCardView(parent.context)
+        settingsCard.apply {
+            setMainImageAdjustViewBounds(true)
+            setMainImageDimensions(192, 160)
+            isFocusable = true
+            isFocusableInTouchMode = true
+        }
+
+        // Use that view to create a ViewHolder.
+        return TvSettingsViewHolder(settingsCard)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, item: Any) {
+        val holder = viewHolder as TvSettingsViewHolder
+        val context = holder.cardParent.context
+        val settingsItem = item as TvSettingsItem
+        val resources = holder.cardParent.resources
+        holder.apply {
+            itemId = settingsItem.itemId
+            cardParent.titleText = resources.getString(settingsItem.labelId)
+            cardParent.mainImage = ContextCompat.getDrawable(context, settingsItem.iconId)
+
+            // Set the background color of the card
+            val background = ContextCompat.getDrawable(context, R.drawable.tv_card_background)
+            cardParent.infoAreaBackground = background
+        }
+    }
+
+    override fun onUnbindViewHolder(viewHolder: ViewHolder) {
+        // no op
+    }
+}