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

Migrate to FragmentContainerView #6957

Merged
merged 5 commits into from
Jan 16, 2025
Merged

Migrate to FragmentContainerView #6957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f7128f
Migrate to FragmentContainerView
Pittvandewitt Jan 15, 2025
03883f0
Migrate to FragmentContainerView
Pittvandewitt Jan 15, 2025
605ce62
Migrate to FragmentContainerView
Pittvandewitt Jan 15, 2025
5441c83
Merge remote-tracking branch 'origin/migrate/fragment-container-view'…
Pittvandewitt Jan 15, 2025
dea5d14
Restore container fragment
Pittvandewitt Jan 16, 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
9 changes: 3 additions & 6 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 @@ -24,7 +24,6 @@ import androidx.core.view.isNotEmpty
import androidx.core.widget.NestedScrollView
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.setupWithNavController
import androidx.recyclerview.widget.RecyclerView
Expand Down Expand Up @@ -125,7 +124,8 @@ class MainActivity : BaseActivity() {
// set the action bar for the activity
setSupportActionBar(binding.toolbar)

navController = findNavController(R.id.fragment)
val navHostFragment = binding.fragment.getFragment<NavHostFragment>()
navController = navHostFragment.navController
binding.bottomNav.setupWithNavController(navController)

// save start tab fragment id and apply navbar style
Expand All @@ -152,11 +152,8 @@ class MainActivity : BaseActivity() {
if (it.itemId != navController.currentDestination?.id) {
navigateToBottomSelectedItem(it)
} else {
// get the host fragment containing the current fragment
val navHostFragment =
supportFragmentManager.findFragmentById(R.id.fragment) as? NavHostFragment
// get the current fragment
val fragment = navHostFragment?.childFragmentManager?.fragments?.firstOrNull()
val fragment = navHostFragment.childFragmentManager.fragments.firstOrNull()
tryScrollToTop(fragment?.requireView())
}
}
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/github/libretube/ui/activities/NoInternetActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package com.github.libretube.ui.activities

import android.content.Intent
import android.os.Bundle
import androidx.navigation.findNavController
import com.github.libretube.R
import com.github.libretube.constants.IntentData
import com.github.libretube.databinding.ActivityNointernetBinding
import com.github.libretube.helpers.NavigationHelper
Expand All @@ -15,9 +13,6 @@ class NoInternetActivity : BaseActivity() {

val binding = ActivityNointernetBinding.inflate(layoutInflater)
setContentView(binding.root)

val navController = findNavController(R.id.fragment)
navController.graph = navController.navInflater.inflate(R.navigation.nav_nointernet)
}

override fun onNewIntent(intent: Intent) {
Expand Down
4 changes: 2 additions & 2 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 @@ -36,7 +36,7 @@
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/bottom_menu" />

<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
Expand All @@ -55,4 +55,4 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.motion.widget.MotionLayout>
</androidx.constraintlayout.motion.widget.MotionLayout>
11 changes: 7 additions & 4 deletions app/src/main/res/layout/activity_nointernet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

<fragment
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="20dp"
android:paddingTop="10dp" />
android:paddingTop="10dp"
app:defaultNavHost="true"
app:navGraph="@navigation/nav_nointernet" />

<FrameLayout
android:id="@+id/container"
android:layout_height="match_parent"
android:layout_width="match_parent" />
android:layout_width="match_parent"
android:layout_height="match_parent" />

</FrameLayout>
Loading