Added global preferences object

app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt

@@ -28,11 +28,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
-import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.dialog_default_query.*
 import kotlinx.android.synthetic.main.dialog_default_query.view.*
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.types.Tags
+import xyz.quaver.pupil.util.Preferences
 
 class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
@@ -82,9 +82,8 @@ class DefaultQueryDialog(context : Context) : AlertDialog(context) {
 
     @SuppressLint("InflateParams")
     private fun build() : View {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
         val tags = Tags.parse(
-            preferences.getString("default_query", "") ?: ""
+            Preferences["default_query"]
         )
 
         val view = LayoutInflater.from(context).inflate(R.layout.dialog_default_query, null)

app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt

@@ -32,7 +32,6 @@ import android.widget.RadioButton
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.item_dl_location.view.*
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
 import net.rdrei.android.dirchooser.DirectoryChooserConfig
@@ -42,8 +41,6 @@ import java.io.File
 
 @SuppressLint("InflateParams")
 class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
-
-    private val preference = PreferenceManager.getDefaultSharedPreferences(context)
     private val buttons = mutableListOf<Pair<RadioButton, File?>>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -79,7 +76,7 @@ class DownloadLocationDialog(val activity: Activity) : AlertDialog(activity) {
                         pair.first.isChecked = false
                     }
                     button.performClick()
-                    preference.edit().putString("dl_location", dir.canonicalPath).apply()
+                    Preferences["dl_location"] = dir.canonicalPath
                 }
                 buttons.add(button to dir)
             })

app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt

@@ -24,13 +24,13 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.MirrorAdapter
+import xyz.quaver.pupil.util.Preferences
 
 class MirrorDialog(context: Context) : AlertDialog(context) {
 
@@ -82,10 +82,7 @@ class MirrorDialog(context: Context) : AlertDialog(context) {
                 }
 
                 onItemMoved = {
-                    PreferenceManager.getDefaultSharedPreferences(context)
-                        .edit()
-                        .putString("mirrors", it.joinToString(">"))
-                        .apply()
+                    Preferences["mirrors", it.joinToString(">")]
                 }
             }
         }

app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt

@@ -27,7 +27,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
-import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.dialog_proxy.view.*
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -35,8 +34,10 @@ import xyz.quaver.pupil.R
 import xyz.quaver.pupil.client
 import xyz.quaver.pupil.clientBuilder
 import xyz.quaver.pupil.clientHolder
+import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.ProxyInfo
 import xyz.quaver.pupil.util.getProxyInfo
+import xyz.quaver.pupil.util.proxyInfo
 import java.net.Proxy
 
 class ProxyDialog(context: Context) : Dialog(context) {
@@ -54,7 +55,7 @@ class ProxyDialog(context: Context) : Dialog(context) {
 
     @SuppressLint("InflateParams")
     private fun build() : View {
-        val proxyInfo = getProxyInfo(context)
+        val proxyInfo = getProxyInfo()
 
         val view = LayoutInflater.from(context).inflate(R.layout.dialog_proxy, null)
 
@@ -119,13 +120,10 @@ class ProxyDialog(context: Context) : Dialog(context) {
             }
 
             ProxyInfo(type, addr, port, username, password).let {
-                PreferenceManager.getDefaultSharedPreferences(context).edit().putString("proxy",
-                    Json.encodeToString(it)
-                ).apply()
+                Preferences["proxy"] = Json.encodeToString(it)
 
                 clientBuilder
-                    .proxy(it.proxy())
-                    .proxyAuthenticator(it.authenticator())
+                    .proxyInfo(it)
                 clientHolder = null
                 client
             }