From c76660b2772122109529d3616289980a7084eeeb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Fri, 1 May 2020 12:58:52 +0200
Subject: [PATCH] Switch to app compat preferences.

---
 build.gradle                                  |  7 +++++
 res/layout/preference_activity.xml            | 10 +++++++
 res/values-v11/styles.xml                     |  2 ++
 res/values/styles.xml                         |  3 +-
 .../dictionary/DictionaryActivity.java        |  2 +-
 .../dictionary/DictionaryApplication.java     |  2 +-
 .../dictionary/DictionaryManagerActivity.java |  2 +-
 .../dictionary/HtmlDisplayActivity.java       |  2 +-
 .../dictionary/PreferenceActivity.java        | 23 ++++-----------
 .../dictionary/PreferenceFragment.java        | 29 +++++++++++++++++++
 10 files changed, 59 insertions(+), 23 deletions(-)
 create mode 100644 res/layout/preference_activity.xml
 create mode 100644 src/com/hughes/android/dictionary/PreferenceFragment.java

diff --git a/build.gradle b/build.gradle
index 378cc82..aafb2b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     implementation files("$buildDir/icu4j-57.1.small.jar") {
         builtBy 'makesmallicu'
     }
+    implementation 'com.android.support:preference-v7:25.3.1'
 }
 
 task makesmallicu (type:Exec, dependsOn: configurations.smallicu) {
@@ -41,6 +42,12 @@ task makesmallicu (type:Exec, dependsOn: configurations.smallicu) {
 
 def utildir = hasProperty("quickdicUtilDir") ? quickdicUtilDir : "Util"
 
+allprojects {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+    }
+}
+
 android {
     compileSdkVersion 29
     lintOptions {
diff --git a/res/layout/preference_activity.xml b/res/layout/preference_activity.xml
new file mode 100644
index 0000000..1607909
--- /dev/null
+++ b/res/layout/preference_activity.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    <fragment
+        android:name="com.hughes.android.dictionary.PreferenceFragment"
+        android:tag="com.hughes.android.dictionary.PreferenceFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
index 937ade5..f16a235 100644
--- a/res/values-v11/styles.xml
+++ b/res/values-v11/styles.xml
@@ -1,6 +1,7 @@
 <resources>
 
     <style name="AppBaseThemeLight" parent="@style/Theme.AppCompat.Light">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -9,6 +10,7 @@
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 24d59c0..784eb77 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -5,7 +5,7 @@
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
     <style name="AppBaseThemeLight" parent="@style/Theme.AppCompat.Light">
-
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
@@ -22,6 +22,7 @@
     </style>
 
     <style name="AppBaseThemeDark" parent="@style/Theme.AppCompat">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index ef5a9cc..e2558a0 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -28,7 +28,7 @@ import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.support.annotation.NonNull;
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 92bb8b7..1e3788b 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -21,7 +21,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.util.TypedValue;
diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index cd40483..faf507d 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -31,7 +31,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index e2e3d60..f6a37e9 100644
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -18,7 +18,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Base64;
diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index d8ded03..c4197e2 100644
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -19,13 +19,14 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Build;
 import android.os.Environment;
-import android.preference.ListPreference;
-import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.ListPreference;
 
 import java.io.File;
 import java.util.List;
 
-public class PreferenceActivity extends android.preference.PreferenceActivity
+public class PreferenceActivity extends AppCompatActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     static boolean prefsMightHaveChanged = false;
@@ -51,21 +52,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
          *         fashion
          */
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
-        ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(
-                                        R.string.defaultDicKey));
-        List<DictionaryInfo> dicts = application.getDictionariesOnDevice(null);
-
-        final CharSequence[] entries = new CharSequence[dicts.size()];
-        final CharSequence[] entryvalues = new CharSequence[dicts.size()];
-
-        for (int i = 0; i < entries.length; ++i) {
-            entries[i] = dicts.get(i).dictInfo;
-            entryvalues[i] = dicts.get(i).uncompressedFilename;
-        }
-
-        defaultDic.setEntries(entries);
-        defaultDic.setEntryValues(entryvalues);
+        setContentView(R.layout.preference_activity);
     }
 
     @Override
diff --git a/src/com/hughes/android/dictionary/PreferenceFragment.java b/src/com/hughes/android/dictionary/PreferenceFragment.java
new file mode 100644
index 0000000..17544e1
--- /dev/null
+++ b/src/com/hughes/android/dictionary/PreferenceFragment.java
@@ -0,0 +1,29 @@
+package com.hughes.android.dictionary;
+
+import android.os.Bundle;
+import android.support.v7.preference.ListPreference;
+import android.support.v7.preference.PreferenceFragmentCompat;
+
+import java.util.List;
+
+public class PreferenceFragment extends PreferenceFragmentCompat {
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String s) {
+        final DictionaryApplication application = DictionaryApplication.INSTANCE;
+        addPreferencesFromResource(R.xml.preferences);
+        ListPreference defaultDic = (ListPreference) findPreference(getResources().getString(
+                R.string.defaultDicKey));
+        List<DictionaryInfo> dicts = application.getDictionariesOnDevice(null);
+
+        final CharSequence[] entries = new CharSequence[dicts.size()];
+        final CharSequence[] entryvalues = new CharSequence[dicts.size()];
+
+        for (int i = 0; i < entries.length; ++i) {
+            entries[i] = dicts.get(i).dictInfo;
+            entryvalues[i] = dicts.get(i).uncompressedFilename;
+        }
+
+        defaultDic.setEntries(entries);
+        defaultDic.setEntryValues(entryvalues);
+    }
+}
-- 
2.43.0