Merge pull request #5486 from abGit9/Show_Channel_Page

Bnyro · web-flow · commit 4cd6552c38ca · 2024-01-15T18:03:24.000+01:00
fix: don't show history when closing video on channel page
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -247,7 +247,7 @@ class MainActivity : BaseActivity() {
     private fun isSearchInProgress(): Boolean {
         if (!::navController.isInitialized) return false
         val id = navController.currentDestination?.id ?: return false
-        return id in listOf(R.id.searchFragment, R.id.searchResultFragment)
+        return id in listOf(R.id.searchFragment, R.id.searchResultFragment, R.id.channelFragment)
     }
 
     override fun invalidateMenu() {

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ class MainActivity : BaseActivity() {`
`247`	`247`	`private fun isSearchInProgress(): Boolean {`
`248`	`248`	`if (!::navController.isInitialized) return false`
`249`	`249`	`val id = navController.currentDestination?.id ?: return false`
`250`		`- return id in listOf(R.id.searchFragment, R.id.searchResultFragment)`
	`250`	`+ return id in listOf(R.id.searchFragment, R.id.searchResultFragment, R.id.channelFragment)`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`override fun invalidateMenu() {`