Added global preferences object

2020-08-30 19:52:51 +09:00
parent fdd9b02388
commit 7ca4418a50
23 changed files with 157 additions and 248 deletions
--- a/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/LockActivity.kt
@@ -27,7 +27,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
-import androidx.preference.PreferenceManager
 import com.andrognito.patternlockview.PatternLockView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity_lock.*
@@ -38,6 +37,7 @@ import xyz.quaver.pupil.ui.fragment.PINLockFragment
 import xyz.quaver.pupil.ui.fragment.PatternLockFragment
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.Preferences

 class LockActivity : AppCompatActivity() {

@@ -195,7 +195,7 @@ class LockActivity : AppCompatActivity() {
                }

                if (
-                    PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lock_fingerprint", false)
+                    Preferences["lock_fingerprint"]
                    && BiometricManager.from(this).canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS
                ) {
                    lock_fingerprint.apply {
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -22,7 +22,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.graphics.drawable.Animatable
-import android.net.Proxy
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -41,7 +40,6 @@ import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.GravityCompat
-import androidx.preference.PreferenceManager
 import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
 import com.arlib.floatingsearchview.FloatingSearchView
 import com.arlib.floatingsearchview.FloatingSearchViewDayNight
@@ -88,7 +86,7 @@ class MainActivity : AppCompatActivity() {
        DOWNLOAD,
        FAVORITE
    }
-    
+
    enum class SortMode {
        NEWEST,
        POPULAR
@@ -134,17 +132,15 @@ class MainActivity : AppCompatActivity() {
        if (lockManager.isNotEmpty())
            startActivityForResult(Intent(this, LockActivity::class.java), R.id.request_lock.normalizeID())

-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-
        if (Locale.getDefault().language == "ko") {
-            if (!preference.getBoolean("https_block_alert", false)) {
+            if (Preferences["https_block_alert"]) {
                android.app.AlertDialog.Builder(this).apply {
                    setTitle(R.string.https_block_alert_title)
                    setMessage(R.string.https_block_alert)
                    setPositiveButton(android.R.string.ok) { _, _ -> }
                }.show()

-                preference.edit().putBoolean("https_block_alert", true).apply()
+                Preferences["https_block_alert"] = false
            }
        }

@@ -199,9 +195,7 @@ class MainActivity : AppCompatActivity() {
    }

    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
+        if (Preferences["security_mode"])
            window.setFlags(
                WindowManager.LayoutParams.FLAG_SECURE,
                WindowManager.LayoutParams.FLAG_SECURE)
@@ -212,8 +206,7 @@ class MainActivity : AppCompatActivity() {
    }

    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-        val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
+        val perPage = Preferences["per_page", "25"].toInt()
        val maxPage = ceil(totalItems / perPage.toDouble()).roundToInt()

        return when(keyCode) {
@@ -362,8 +355,7 @@ class MainActivity : AppCompatActivity() {
        with(main_fab_jump) {
            setImageResource(R.drawable.ic_jump)
            setOnClickListener {
-                val preference = PreferenceManager.getDefaultSharedPreferences(context)
-                val perPage = preference.getString("per_page", "25")!!.toIntOrNull() ?: 25
+                val perPage = Preferences["per_page", "25"].toInt()
                val editText = EditText(context)

                AlertDialog.Builder(context).apply {
@@ -469,7 +461,7 @@ class MainActivity : AppCompatActivity() {
                onDownloadClickedHandler = { position ->
                    val galleryID = galleries[position].id
                    val worker = DownloadWorker.getInstance(context)
-                    if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("cache_disable", false))
+                    if (Preferences["cache_disable"])
                        Toast.makeText(context, R.string.settings_download_when_cache_disable_warning, Toast.LENGTH_SHORT).show()
                    else {
                        if (worker.progress.indexOfKey(galleryID) >= 0 && Cache(context).isDownloading(galleryID)) {     //download in progress
@@ -554,8 +546,7 @@ class MainActivity : AppCompatActivity() {

            var origin = 0f
            var target = -1
-            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-            val perPage = preferences.getString("per_page", "25")!!.toInt()
+            val perPage = Preferences["per_page", "25"].toInt()
            setOnTouchListener { _, event ->
                when(event.action) {
                    MotionEvent.ACTION_UP -> {
@@ -1006,8 +997,7 @@ class MainActivity : AppCompatActivity() {
    }

    private fun fetchGalleries(query: String, sortMode: SortMode) {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-        val defaultQuery = preference.getString("default_query", "")!!
+        val defaultQuery: String = Preferences["default_query"]

        if (query != queryStack.lastOrNull()) {
            queryStack.remove(query)
@@ -1104,8 +1094,7 @@ class MainActivity : AppCompatActivity() {
    }

    private fun loadBlocks() {
-        val preference = PreferenceManager.getDefaultSharedPreferences(this)
-        val perPage = preference.getString("per_page", "25")?.toInt() ?: 25
+        val perPage = Preferences["per_page", "25"].toInt()

        loadingJob = CoroutineScope(Dispatchers.IO).launch {
            val galleryIDs = try {
--- a/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt
@@ -43,12 +43,11 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import xyz.quaver.Code
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.adapters.ReaderAdapter
 import xyz.quaver.pupil.favorites
 import xyz.quaver.pupil.histories
-import xyz.quaver.pupil.util.GalleryList
+import xyz.quaver.pupil.util.Preferences
 import xyz.quaver.pupil.util.download.Cache
 import xyz.quaver.pupil.util.download.DownloadWorker
 import java.util.*
@@ -103,7 +102,7 @@ class ReaderActivity : AppCompatActivity() {
        }

        initView()
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("cache_disable", false)) {
+        if (Preferences["cache_disable"]) {
            reader_download_progressbar.visibility = View.GONE
            CoroutineScope(Dispatchers.IO).launch {
                val reader = Cache(this@ReaderActivity).getReader(galleryID)
@@ -159,9 +158,7 @@ class ReaderActivity : AppCompatActivity() {
    }

    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
+        if (Preferences["security_mode"])
            window.setFlags(
                WindowManager.LayoutParams.FLAG_SECURE,
                WindowManager.LayoutParams.FLAG_SECURE)
--- a/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SettingsActivity.kt
@@ -27,12 +27,14 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.settings_activity.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import net.rdrei.android.dirchooser.DirectoryChooserActivity
+import xyz.quaver.io.util.toFile
 import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.favorites
@@ -60,9 +62,7 @@ class SettingsActivity : AppCompatActivity() {
    }

    override fun onResume() {
-        val preferences = PreferenceManager.getDefaultSharedPreferences(this)
-
-        if (preferences.getBoolean("security_mode", false))
+        if (Preferences["security_mode"])
            window.setFlags(
                WindowManager.LayoutParams.FLAG_SECURE,
                WindowManager.LayoutParams.FLAG_SECURE)
@@ -135,9 +135,7 @@ class SettingsActivity : AppCompatActivity() {
                                Snackbar.LENGTH_LONG
                            ).show()
                        else
-                            PreferenceManager.getDefaultSharedPreferences(this).edit()
-                                .putString("dl_location", file.canonicalPath)
-                                .apply()
+                            Preferences["dl_location"] = file.canonicalPath
                    }
                }
            }
@@ -152,9 +150,7 @@ class SettingsActivity : AppCompatActivity() {
                            Snackbar.LENGTH_LONG
                        ).show()
                    else
-                        PreferenceManager.getDefaultSharedPreferences(this).edit()
-                            .putString("dl_location", File(directory).canonicalPath)
-                            .apply()
+                        Preferences["dl_location"] = File(directory).canonicalPath
                }
            }
            else -> super.onActivityResult(requestCode, resultCode, data)
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DefaultQueryDialog.kt
+++ b/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)
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialog.kt
+++ b/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)
            })
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/MirrorDialog.kt
+++ b/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(">")]
                }
            }
        }
--- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/ProxyDialog.kt
+++ b/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
            }
--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/LockSettingsFragment.kt
@@ -24,12 +24,12 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import androidx.preference.SwitchPreferenceCompat
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.ui.LockActivity
 import xyz.quaver.pupil.util.Lock
 import xyz.quaver.pupil.util.LockManager
+import xyz.quaver.pupil.util.Preferences

 class LockSettingsFragment : PreferenceFragmentCompat() {

@@ -53,7 +53,7 @@ class LockSettingsFragment : PreferenceFragmentCompat() {
        if (lockManager.isEmpty()) {
            (findPreference<Preference>("lock_fingerprint") as SwitchPreferenceCompat).isChecked = false

-            PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("lock_fingerprint", false).apply()
+            Preferences["lock_fingerprint"] = false
        }
    }

--- a/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
@@ -18,27 +18,17 @@

 package xyz.quaver.pupil.ui.fragment

-import android.Manifest
 import android.content.*
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import net.rdrei.android.dirchooser.DirectoryChooserActivity
-import net.rdrei.android.dirchooser.DirectoryChooserConfig
-import xyz.quaver.pupil.Pupil
 import xyz.quaver.pupil.R
 import xyz.quaver.pupil.histories
 import xyz.quaver.pupil.ui.LockActivity
@@ -52,15 +42,12 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.InputStreamReader

-
 class SettingsFragment :
    PreferenceFragmentCompat(),
    Preference.OnPreferenceClickListener,
    Preference.OnPreferenceChangeListener,
    SharedPreferences.OnSharedPreferenceChangeListener {

-    lateinit var sharedPreference: SharedPreferences
-
    override fun onResume() {
        super.onResume()

@@ -160,7 +147,7 @@ class SettingsFragment :
                "default_query" -> {
                    DefaultQueryDialog(requireContext()).apply {
                        onPositiveButtonClickListener = { newTags ->
-                            sharedPreferences.edit().putString("default_query", newTags.toString()).apply()
+                            Preferences["default_query"] = newTags.toString()
                            summary = newTags.toString()
                        }
                    }.show()
@@ -182,7 +169,7 @@ class SettingsFragment :
                }
                "user_id" -> {
                    (context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager).setPrimaryClip(
-                        ClipData.newPlainText("user_id", sharedPreference.getString("user_id", ""))
+                        ClipData.newPlainText("user_id", Preferences.get<String>("user_id"))
                    )
                    Toast.makeText(context, R.string.settings_user_id_toast, Toast.LENGTH_SHORT).show()
                }
@@ -219,7 +206,7 @@ class SettingsFragment :

            when (key) {
                "proxy" -> {
-                    summary = context?.let { getProxyInfo(it).type.name }
+                    summary = context?.let { getProxyInfo().type.name }
                }
                "dl_location" -> {
                    summary = context?.let { getDownloadDirectory(it).canonicalPath }
@@ -231,8 +218,7 @@ class SettingsFragment :
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        setPreferencesFromResource(R.xml.root_preferences, rootKey)

-        sharedPreference = PreferenceManager.getDefaultSharedPreferences(requireContext())
-        sharedPreference.registerOnSharedPreferenceChangeListener(this)
+        Preferences.registerOnSharedPreferenceChangeListener(this)

        initPreferences()
    }
@@ -295,7 +281,7 @@ class SettingsFragment :
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "default_query" -> {
-                            summary = sharedPreference.getString("default_query", "") ?: ""
+                            summary = Preferences.get<String>("default_query")

                            onPreferenceClickListener = this@SettingsFragment
                        }
@@ -320,7 +306,7 @@ class SettingsFragment :
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "proxy" -> {
-                            summary = getProxyInfo(requireContext()).type.name
+                            summary = getProxyInfo().type.name

                            onPreferenceClickListener = this@SettingsFragment
                        }
@@ -334,7 +320,7 @@ class SettingsFragment :
                            onPreferenceClickListener = this@SettingsFragment
                        }
                        "user_id" -> {
-                            summary = sharedPreference.getString("user_id", "")
+                            summary = Preferences.get<String>("user_id")
                            onPreferenceClickListener = this@SettingsFragment
                        }
                    }