he4et/yamf_launcher
1
0
Fork 0
mirror of https://github.com/He4eT/yamf_launcher.git synced 2026-05-04 17:37:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to settings reset and backup restore

Browse source
This commit is contained in:
ottoptj 2024-09-09 02:38:49 +03:00
commit 958d63399e
4 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt
View file

@ -217,11 +217,10 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
else { else {
unsetShortcutSetup(textView) unsetShortcutSetup(textView)
} }
uiUtils.setShortcutsAlignment(binding.homeView)
uiUtils.setShortcutsVAlignment(binding.topSpace, binding.bottomSpace)
} }
} }
uiUtils.setShortcutsAlignment(binding.homeView)
uiUtils.setShortcutsVAlignment(binding.topSpace, binding.bottomSpace)
} }
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
@ -578,6 +577,12 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
"shortcutNo" -> { "shortcutNo" -> {
setShortcuts() setShortcuts()
} }
"isRestored" -> {
preferences.edit().remove("isRestored").apply()
setPreferences()
setShortcuts()
}
} }
} }
} }

4
app/src/main/java/eu/ottop/yamlauncher/settings/SettingsActivity.kt
View file

@ -96,8 +96,7 @@ class SettingsActivity : AppCompatActivity() {
} }
private fun saveSharedPreferencesToFile(uri: Uri) { private fun saveSharedPreferencesToFile(uri: Uri) {
val sharedPreferences = preferences val allEntries = preferences.all
val allEntries = sharedPreferences.all
val backupData = JSONObject().apply { val backupData = JSONObject().apply {
put("app_id", application.packageName) put("app_id", application.packageName)
@ -165,6 +164,7 @@ class SettingsActivity : AppCompatActivity() {
"Float" -> editor.putFloat(key, entry.getDouble("value").toFloat()) "Float" -> editor.putFloat(key, entry.getDouble("value").toFloat())
} }
} }
editor.putBoolean("isRestored", true)
editor.apply() editor.apply()

2
app/src/main/java/eu/ottop/yamlauncher/settings/SettingsFragment.kt
View file

@ -79,7 +79,7 @@ class SettingsFragment : PreferenceFragmentCompat(), TitleProvider {
resetPref?.onPreferenceClickListener = resetPref?.onPreferenceClickListener =
Preference.OnPreferenceClickListener { Preference.OnPreferenceClickListener {
sharedPreferenceManager.resetAllPreferences(requireActivity()) sharedPreferenceManager.resetAllPreferences()
true } true }
} }

35
app/src/main/java/eu/ottop/yamlauncher/settings/SharedPreferenceManager.kt
View file

@ -3,13 +3,9 @@ package eu.ottop.yamlauncher.settings
import android.app.AlertDialog import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.os.Handler
import android.os.Looper
import android.util.TypedValue import android.util.TypedValue
import android.widget.TextView import android.widget.TextView
import androidx.fragment.app.FragmentActivity
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import eu.ottop.yamlauncher.R
class SharedPreferenceManager (private val context: Context) { class SharedPreferenceManager (private val context: Context) {
@ -100,7 +96,7 @@ class SharedPreferenceManager (private val context: Context) {
} }
fun getShortcutVAlignment(): String? { fun getShortcutVAlignment(): String? {
return preferences.getString("shortcutVAlignment", "left") return preferences.getString("shortcutVAlignment", "center")
} }
fun getShortcutSize(): String? { fun getShortcutSize(): String? {
@ -252,12 +248,12 @@ class SharedPreferenceManager (private val context: Context) {
editor.apply() editor.apply()
} }
fun resetAllPreferences(activity: FragmentActivity) { fun resetAllPreferences() {
AlertDialog.Builder(context).apply { AlertDialog.Builder(context).apply {
setTitle("Confirmation") setTitle("Confirmation")
setMessage("You will lose ALL changes that you have made to the launcher settings, shortcuts, hidden apps, etc.\n\nAre you sure?") setMessage("You will lose ALL changes that you have made to the launcher settings, shortcuts, hidden apps, etc.\n\nAre you sure?")
setPositiveButton("Yes") { _, _ -> setPositiveButton("Yes") { _, _ ->
performReset(activity) performReset()
} }
setNegativeButton("Cancel") { _, _ -> setNegativeButton("Cancel") { _, _ ->
@ -265,31 +261,10 @@ class SharedPreferenceManager (private val context: Context) {
}.create().show() }.create().show()
} }
private fun performReset(activity: FragmentActivity) { private fun performReset() {
val editor = preferences.edit() val editor = preferences.edit()
editor.clear() editor.clear()
editor.putBoolean("isRestored", true)
editor.apply() editor.apply()
// We need to navigate through the fragments to apply all settings properly
activity.supportFragmentManager
.beginTransaction()
.replace(R.id.settingsLayout, UISettingsFragment())
.commit()
// The swapping after ui settings needs to be delayed or font changes don't work in app menu
val handler = Handler(Looper.getMainLooper())
handler.postDelayed({
activity.supportFragmentManager
.beginTransaction()
.replace(R.id.settingsLayout, HomeSettingsFragment())
.commit()
activity.supportFragmentManager
.beginTransaction()
.replace(R.id.settingsLayout, AppMenuSettingsFragment())
.commit()
activity.supportFragmentManager
.beginTransaction()
.replace(R.id.settingsLayout, SettingsFragment())
.commit()
}, 50)
} }
} }