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

fix backstack

Browse Source
This commit is contained in:
Bnyro 2022-07-15 22:26:22 +02:00
parent 49848be904
commit ced89f6f74
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -275,7 +275,8 @@ class MainActivity : AppCompatActivity() {
minimizePlayer() minimizePlayer()
} catch (e: Exception) { } catch (e: Exception) {
if (navController.currentDestination?.id == startFragmentId) { if (navController.currentDestination?.id == startFragmentId) {
super.onBackPressed() // close app
moveTaskToBack(true)
} else { } else {
navController.popBackStack() navController.popBackStack()
} }

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

@ -3,9 +3,10 @@ package com.github.libretube.activities
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.github.libretube.Globals
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.databinding.ActivitySettingsBinding import com.github.libretube.databinding.ActivitySettingsBinding
import com.github.libretube.preferences.AboutFragment
import com.github.libretube.preferences.CommunityFragment
import com.github.libretube.preferences.MainSettings import com.github.libretube.preferences.MainSettings
import com.github.libretube.util.ThemeHelper import com.github.libretube.util.ThemeHelper
@ -22,6 +23,8 @@ class SettingsActivity : AppCompatActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivitySettingsBinding.inflate(layoutInflater) binding = ActivitySettingsBinding.inflate(layoutInflater)
// animate the layout transition
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
overridePendingTransition(50, 50) overridePendingTransition(50, 50)
} }
@ -43,11 +46,18 @@ class SettingsActivity : AppCompatActivity() {
} }
override fun onBackPressed() { override fun onBackPressed() {
if (Globals.isCurrentViewMainSettings) { when (supportFragmentManager.findFragmentById(R.id.settings)) {
is MainSettings -> {
super.onBackPressed() super.onBackPressed()
finishAndRemoveTask() finishAndRemoveTask()
} else { }
Globals.isCurrentViewMainSettings = true is CommunityFragment -> {
supportFragmentManager
.beginTransaction()
.replace(R.id.settings, AboutFragment())
.commit()
}
else -> {
supportFragmentManager supportFragmentManager
.beginTransaction() .beginTransaction()
.replace(R.id.settings, MainSettings()) .replace(R.id.settings, MainSettings())
@ -55,6 +65,7 @@ class SettingsActivity : AppCompatActivity() {
changeTopBarText(getString(R.string.settings)) changeTopBarText(getString(R.string.settings))
} }
} }
}
fun changeTopBarText(text: String) { fun changeTopBarText(text: String) {
if (this::binding.isInitialized) binding.topBarTextView.text = text if (this::binding.isInitialized) binding.topBarTextView.text = text