kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

SponsorBlock Settings BackPress fixed

Browse Source
This commit is contained in:
Bnyro 2022-05-22 11:58:27 +02:00
parent 232cd2f82a
commit 50499a0947
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/github/libretube/SettingsActivity.kt
View File

@ -14,6 +14,7 @@ import android.text.Html
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.widget.FrameLayout
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
@ -36,6 +37,8 @@ import org.json.JSONObject
import org.json.JSONTokener import org.json.JSONTokener
import retrofit2.HttpException import retrofit2.HttpException
private var isCurrentViewMainSettings = true
class SettingsActivity : class SettingsActivity :
AppCompatActivity(), AppCompatActivity(),
SharedPreferences.OnSharedPreferenceChangeListener { SharedPreferences.OnSharedPreferenceChangeListener {
@ -176,6 +179,7 @@ class SettingsActivity :
val sponsorblock = findPreference<Preference>("sponsorblock") val sponsorblock = findPreference<Preference>("sponsorblock")
sponsorblock?.setOnPreferenceClickListener { sponsorblock?.setOnPreferenceClickListener {
isCurrentViewMainSettings = false
val newFragment = SponsorBlockSettings() val newFragment = SponsorBlockSettings()
parentFragmentManager.beginTransaction() parentFragmentManager.beginTransaction()
.replace(R.id.settings, newFragment) .replace(R.id.settings, newFragment)
@ -237,7 +241,7 @@ class SettingsActivity :
} }
val themeToggle = findPreference<ListPreference>("theme_togglee") val themeToggle = findPreference<ListPreference>("theme_togglee")
themeToggle?.setOnPreferenceChangeListener { _, newValue -> themeToggle?.setOnPreferenceChangeListener { _, _ ->
val refresh = Intent(context, SettingsActivity::class.java) val refresh = Intent(context, SettingsActivity::class.java)
startActivity(refresh) startActivity(refresh)
true true
@ -373,9 +377,17 @@ class SettingsActivity :
} }
override fun onBackPressed() { override fun onBackPressed() {
PreferenceManager.getDefaultSharedPreferences(this) if (isCurrentViewMainSettings) {
.unregisterOnSharedPreferenceChangeListener(this) PreferenceManager.getDefaultSharedPreferences(this)
intent = Intent(this, MainActivity::class.java) .unregisterOnSharedPreferenceChangeListener(this)
startActivity(intent) intent = Intent(this, MainActivity::class.java)
startActivity(intent)
} else {
isCurrentViewMainSettings = true
supportFragmentManager
.beginTransaction()
.replace(R.id.settings, SettingsFragment())
.commit()
}
} }
} }