From 6671cea2800845add1cf8955081bd709d0df4296 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sun, 26 Apr 2020 15:34:43 -0400
Subject: [PATCH] android: settings: Make texture filtering a premium setting.

---
 .../features/settings/ui/SettingsAdapter.java | 26 +++++++++++--------
 .../ui/SettingsFragmentPresenter.java         |  8 +++---
 .../app/src/main/res/values/strings.xml       |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
index bae1796e9..bfd7c71a9 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
@@ -196,9 +196,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         MainActivity.invokePremiumBilling(() -> onSingleChoiceClick(item));
     }
 
-    public void onStringSingleChoiceClick(StringSingleChoiceSetting item, int position) {
+    public void onStringSingleChoiceClick(StringSingleChoiceSetting item) {
         mClickedItem = item;
-        mClickedPosition = position;
 
         AlertDialog.Builder builder = new AlertDialog.Builder(mView.getActivity());
 
@@ -208,6 +207,19 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
         mDialog = builder.show();
     }
 
+    public void onStringSingleChoiceClick(StringSingleChoiceSetting item, int position) {
+        mClickedPosition = position;
+
+        if (!item.isPremium() || MainActivity.isPremiumActive()) {
+            // Setting is either not Premium, or the user has Premium
+            onStringSingleChoiceClick(item);
+            return;
+        }
+
+        // User needs Premium, invoke the billing flow
+        MainActivity.invokePremiumBilling(() -> onStringSingleChoiceClick(item));
+    }
+
     DialogInterface.OnClickListener defaultCancelListener = (dialog, which) -> closeDialog();
 
     public void onDateTimeClick(DateTimeSetting item, int position) {
@@ -347,15 +359,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
             closeDialog();
         } else if (mClickedItem instanceof PremiumSingleChoiceSetting) {
             PremiumSingleChoiceSetting scSetting = (PremiumSingleChoiceSetting) mClickedItem;
-
-            int value = getValueForSingleChoiceSelection(scSetting, which);
-            if (scSetting.getSelectedValue() != value) {
-                //mView.onSettingChanged();
-            }
-
-            // Get the backing Setting, which may be null (if for example it was missing from the file)
-            scSetting.setSelectedValue(value);
-
+            scSetting.setSelectedValue(getValueForSingleChoiceSelection(scSetting, which));
             closeDialog();
         } else if (mClickedItem instanceof StringSingleChoiceSetting) {
             StringSingleChoiceSetting scSetting = (StringSingleChoiceSetting) mClickedItem;
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
index f72e99014..09deca245 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
@@ -152,6 +152,10 @@ public final class SettingsFragmentPresenter {
             // Pre-Android 10 does not support System Default
             sl.add(new PremiumSingleChoiceSetting(SettingsFile.KEY_DESIGN, Settings.SECTION_PREMIUM, R.string.design, 0, R.array.designNamesOld, R.array.designValuesOld, 0, design, mView));
         }
+
+        String[] textureFilterNames = NativeLibrary.GetTextureFilterNames();
+        Setting textureFilterName = premiumSection.getSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME);
+        sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME, Settings.SECTION_PREMIUM, R.string.texture_filter_name, R.string.texture_filter_description, textureFilterNames, textureFilterNames, "none", textureFilterName));
     }
 
     private void addGeneralSettings(ArrayList<SettingsItem> sl) {
@@ -335,14 +339,10 @@ public final class SettingsFragmentPresenter {
         Setting shadersAccurateMul = rendererSection.getSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL);
         Setting resolutionFactor = rendererSection.getSetting(SettingsFile.KEY_RESOLUTION_FACTOR);
         Setting filterMode = rendererSection.getSetting(SettingsFile.KEY_FILTER_MODE);
-        Setting textureFilterName = rendererSection.getSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME);
-
-        String[] textureFilterNames = NativeLibrary.GetTextureFilterNames();
 
         sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL, Settings.SECTION_RENDERER, R.string.shaders_accurate_mul, R.string.shaders_accurate_mul_description, false, shadersAccurateMul));
         sl.add(new SliderSetting(SettingsFile.KEY_RESOLUTION_FACTOR, Settings.SECTION_RENDERER, R.string.internal_resolution, R.string.internal_resolution_description, 1, 4, "x", 1, resolutionFactor));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_FILTER_MODE, Settings.SECTION_RENDERER, R.string.linear_filtering, R.string.linear_filtering_description, true, filterMode));
-        sl.add(new StringSingleChoiceSetting(SettingsFile.KEY_TEXTURE_FILTER_NAME, Settings.SECTION_RENDERER, R.string.texture_filter_name, R.string.texture_filter_description, textureFilterNames, textureFilterNames, "none", textureFilterName));
     }
 
     private void addAudioSettings(ArrayList<SettingsItem> sl) {
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index e9ee26bb6..951e3e761 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -71,7 +71,7 @@
     <string name="linear_filtering">Enable linear filtering</string>
     <string name="linear_filtering_description">Enables linear filtering, which causes game visuals to appear smoother.</string>
     <string name="texture_filter_name">Texture Filter</string>
-    <string name="texture_filter_description">Applies a filter to textures.</string>
+    <string name="texture_filter_description">Enhances the visuals of games by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, and xBRZ freescale.</string>
     <string name="hw_renderer">Enable hardware renderer</string>
     <string name="hw_renderer_description">Uses hardware to emulate 3DS graphics. When enabled, game performance will be significantly improved.</string>
     <string name="hw_shaders">Enable hardware shader</string>