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

Merge pull request #711 from Bnyro/master

Browse Source 
attempt to fix back stack
This commit is contained in:
Bnyro 2022-07-07 16:24:03 +02:00 committed by GitHub
commit 7304c3097b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.constraintlayout.motion.widget.MotionLayout import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.NavController import androidx.navigation.NavController
import androidx.navigation.findNavController import androidx.navigation.findNavController
@ -259,10 +260,15 @@ class MainActivity : AppCompatActivity() {
} }
override fun onBackPressed() { override fun onBackPressed() {
if (binding.mainMotionLayout.progress == 0F) { if (
try { minimizePlayer() } catch (e: Exception) {} binding.mainMotionLayout.progress == 0F
) {
try {
minimizePlayer()
} catch (e: Exception) {
super.onBackPressed()
}
} else if (navController.currentDestination?.id == startFragmentId) { } else if (navController.currentDestination?.id == startFragmentId) {
navController.popBackStack()
super.onBackPressed() super.onBackPressed()
} else { } else {
navController.popBackStack() navController.popBackStack()

2
app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
View File

@ -955,7 +955,7 @@ class PlayerFragment : Fragment() {
} }
} }
playerBinding.qualitySelect.setOnClickListener { playerBinding.qualityLinLayout.setOnClickListener {
// Dialog for quality selection // Dialog for quality selection
val builder: MaterialAlertDialogBuilder? = activity?.let { val builder: MaterialAlertDialogBuilder? = activity?.let {
MaterialAlertDialogBuilder(it) MaterialAlertDialogBuilder(it)