From f2d856b661130afac6d55f5904afa04832392918 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Thu, 25 May 2023 21:20:32 +0200
Subject: [PATCH] Actually properly remove font scale setting

---
 app/build.gradle                              |  1 -
 .../preferences/SettingsActivity.java         | 30 -------------------
 app/src/main/res/xml/preferences.xml          | 11 -------
 3 files changed, 42 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b73d8cf2d..0ce00b095 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -102,7 +102,6 @@ dependencies {
     implementation 'com.google.zxing:core:3.5.1'
     implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
     implementation 'net.lingala.zip4j:zip4j:2.11.5'
 
 // SpotBugs
diff --git a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
index 5c4f1bb52..2b8d8856e 100644
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -13,18 +13,13 @@ import java.util.List;
 import java.util.Locale;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentResultListener;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
-import kotlin.Suppress;
-import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
-import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.MainActivity;
 import protect.card_locker.R;
@@ -164,30 +159,5 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 activity.recreate();
             }
         }
-
-        @Override
-        @SuppressWarnings("deprecation") // setTargetFragment
-        // androidx.preference.PreferenceDialogFragmentCompat uses the deprecated method
-        // `getTargetFragment()`, which throws if `setTargetFragment()` isn't used before.
-        // While this isn't fixed on upstream, suppress the deprecation warning
-        // https://issuetracker.google.com/issues/181793702
-        public void onDisplayPreferenceDialog(Preference preference) {
-            if (preference instanceof NumberDialogPreference) {
-                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
-                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
-                        .newInstance(
-                                dialogPreference.getKey(),
-                                dialogPreference.getMinValue(),
-                                dialogPreference.getMaxValue(),
-                                dialogPreference.getStepValue(),
-                                dialogPreference.getUnitText()
-                        );
-                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
-            } else {
-                super.onDisplayPreferenceDialog(preference);
-            }
-        }
     }
 }
-
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dcfa4dee6..0599bf6e7 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -41,17 +41,6 @@
             app:iconSpaceReserved="false"
             app:singleLineTitle="false" />
 
-        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
-            android:key="@string/settings_key_max_font_size_scale"
-            android:title="@string/settings_max_font_size_scale"
-            app:defaultValue="@integer/settings_max_font_size_scale_pct"
-            app:iconSpaceReserved="false"
-            app:numberPickerPreference_maxValue="@integer/settings_max_font_size_scale_pct_max"
-            app:numberPickerPreference_minValue="@integer/settings_max_font_size_scale_pct_min"
-            app:numberPickerPreference_stepValue="10"
-            app:numberPickerPreference_unitText="%"
-            app:singleLineTitle="false" />
-
         <SwitchPreferenceCompat
             android:widgetLayout="@layout/preference_material_switch"
             android:defaultValue="true"