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

Use OnBackPressedDispatcher.addCallback() extension.

Browse Source
This commit is contained in:
Isira Seneviratne 2023-01-22 05:28:11 +05:30
parent 5337083bdb
commit 16922455d0
3 changed files with 48 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ScrollView import android.widget.ScrollView
import androidx.activity.OnBackPressedCallback import androidx.activity.addCallback
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.view.children import androidx.core.view.children
@ -144,21 +144,20 @@ class MainActivity : BaseActivity() {
val playerViewModel = ViewModelProvider(this)[PlayerViewModel::class.java] val playerViewModel = ViewModelProvider(this)[PlayerViewModel::class.java]
// new way of handling back presses // new way of handling back presses
onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { onBackPressedDispatcher.addCallback {
override fun handleOnBackPressed() {
if (playerViewModel.isFullscreen.value == true) { if (playerViewModel.isFullscreen.value == true) {
for (fragment in supportFragmentManager.fragments) { supportFragmentManager.fragments.filterIsInstance<PlayerFragment>()
if (fragment is PlayerFragment) { .firstOrNull()
fragment.unsetFullscreen() ?.let {
return it.unsetFullscreen()
} return@addCallback
} }
} }
if (binding.mainMotionLayout.progress == 0F) { if (binding.mainMotionLayout.progress == 0F) {
runCatching { runCatching {
minimizePlayer() minimizePlayer()
return return@addCallback
} }
} }
@ -175,7 +174,6 @@ class MainActivity : BaseActivity() {
} }
} }
} }
})
loadIntentData() loadIntentData()
} }

23
app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt
View File

@ -2,7 +2,8 @@ package com.github.libretube.ui.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.activity.OnBackPressedCallback import androidx.activity.addCallback
import androidx.fragment.app.commit
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.databinding.ActivityNointernetBinding import com.github.libretube.databinding.ActivityNointernetBinding
import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.base.BaseActivity
@ -40,21 +41,15 @@ class NoInternetActivity : BaseActivity() {
setContentView(binding.root) setContentView(binding.root)
onBackPressedDispatcher.addCallback( onBackPressedDispatcher.addCallback(this) {
this, supportFragmentManager.fragments.filterIsInstance<DownloadsFragment>()
object : OnBackPressedCallback(true) { .firstOrNull()
override fun handleOnBackPressed() { ?.let {
supportFragmentManager.fragments.forEach { supportFragmentManager.commit {
if (it is DownloadsFragment) { remove(it)
supportFragmentManager.beginTransaction()
.remove(it)
.commit()
return
} }
} }
finishAffinity() ?: finishAffinity()
} }
} }
)
}
} }

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

@ -1,7 +1,9 @@
package com.github.libretube.ui.activities package com.github.libretube.ui.activities
import android.os.Bundle import android.os.Bundle
import androidx.activity.OnBackPressedCallback import androidx.activity.addCallback
import androidx.fragment.app.commit
import androidx.fragment.app.replace
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.ui.base.BaseActivity import com.github.libretube.ui.base.BaseActivity
@ -29,26 +31,17 @@ class SettingsActivity : BaseActivity() {
} }
// new way of dealing with back presses instead of onBackPressed() // new way of dealing with back presses instead of onBackPressed()
onBackPressedDispatcher.addCallback( onBackPressedDispatcher.addCallback(this) {
this, // lifecycle owner if (supportFragmentManager.findFragmentById(R.id.settings) is MainSettings) {
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
when (supportFragmentManager.findFragmentById(R.id.settings)) {
is MainSettings -> {
finishAndRemoveTask() finishAndRemoveTask()
} else {
supportFragmentManager.commit {
replace<MainSettings>(R.id.settings)
} }
else -> {
supportFragmentManager
.beginTransaction()
.replace(R.id.settings, MainSettings())
.commit()
changeTopBarText(getString(R.string.settings)) changeTopBarText(getString(R.string.settings))
} }
} }
} }
}
)
}
fun changeTopBarText(text: String) { fun changeTopBarText(text: String) {
if (this::binding.isInitialized) binding.toolbar.title = text if (this::binding.isInitialized) binding.toolbar.title = text