Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve platform navigation implementation #6956

Merged
merged 3 commits into from
Jan 16, 2025
+5 −8
Merged

Preserve platform navigation implementation #6956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0331e3e
Preserve platform navigation implementation
Pittvandewitt Jan 15, 2025
f7ddb51
Add missing import
Pittvandewitt Jan 15, 2025
632e62c
Set defaultNavHost
Pittvandewitt Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.onNavDestinationSelected
import androidx.navigation.ui.setupWithNavController
import androidx.recyclerview.widget.RecyclerView
import com.github.libretube.BuildConfig
Expand Down Expand Up @@ -163,7 +164,6 @@ class MainActivity : BaseActivity() {

binding.bottomNav.setOnItemSelectedListener {
navigateToBottomSelectedItem(it)
false
}

if (binding.bottomNav.menu.children.none { it.itemId == startFragmentId }) deselectBottomBarItems()
Expand Down Expand Up @@ -551,21 +551,17 @@ class MainActivity : BaseActivity() {
}
}

private fun navigateToBottomSelectedItem(item: MenuItem) {
private fun navigateToBottomSelectedItem(item: MenuItem): Boolean {
if (item.itemId == R.id.subscriptionsFragment) {
binding.bottomNav.removeBadge(R.id.subscriptionsFragment)
}

// navigate to the selected fragment, if the fragment already
// exists in backstack then pop up to that entry
if (!navController.popBackStack(item.itemId, false)) {
navController.navigate(item.itemId)
}

// Remove focus from search view when navigating to bottom view.
// Call only after navigate to destination, so it can be used in
// onMenuItemActionCollapse for backstack management
removeSearchFocus()

return item.onNavDestinationSelected(navController)
}

override fun onUserLeaveHint() {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@+id/bottomNav"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
Loading