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

Merge pull request #6930 from Bnyro/master

Browse Source 
fix: wrong predictive back order in offline downloads
This commit is contained in:
Bnyro 2025-01-08 14:52:46 +01:00 committed by GitHub
commit ebebeae263
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ class NoInternetActivity : BaseActivity() {
val binding = ActivityNointernetBinding.inflate(layoutInflater)
setContentView(binding.root)
val navController = findNavController(R.id.container)
val navController = findNavController(R.id.fragment)
navController.graph = navController.navInflater.inflate(R.navigation.nav_nointernet)
}

19
app/src/main/java/com/github/libretube/ui/fragments/AudioPlayerFragment.kt
View File

@ -72,6 +72,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
private lateinit var audioHelper: AudioHelper
private val activity get() = context as BaseActivity
private val mainActivity get() = activity as? MainActivity
private val mainActivityMotionLayout get() = mainActivity?.binding?.mainMotionLayout
private val viewModel: CommonPlayerViewModel by activityViewModels()
private val chaptersModel: ChaptersViewModel by activityViewModels()
@ -121,7 +122,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
(activity as? MainActivity)?.getBottomNavColor()?.let { color ->
mainActivity?.getBottomNavColor()?.let { color ->
binding.audioPlayerContainer.setBackgroundColor(color)
}
@ -137,7 +138,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
}
binding.minimizePlayer.setOnClickListener {
mainActivity?.binding?.mainMotionLayout?.transitionToStart()
mainActivityMotionLayout?.transitionToStart()
binding.playerMotionLayout.transitionToEnd()
}
@ -246,7 +247,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
override fun handleOnBackPressed() {
binding.audioPlayerContainer.isClickable = false
binding.playerMotionLayout.transitionToEnd()
mainActivity?.binding?.mainMotionLayout?.transitionToEnd()
mainActivityMotionLayout?.transitionToEnd()
mainActivity?.requestOrientationChange()
}
@ -284,11 +285,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
@SuppressLint("ClickableViewAccessibility")
private fun initializeTransitionLayout() {
if (mainActivity == null) return
mainActivity!!.binding.container.isVisible = true
val mainMotionLayout = mainActivity!!.binding.mainMotionLayout
mainMotionLayout.progress = 0F
mainActivityMotionLayout?.progress = 0F
binding.playerMotionLayout.addTransitionListener(object : TransitionAdapter() {
override fun onTransitionChange(
@ -298,7 +295,7 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
progress: Float
) {
if (NavBarHelper.hasTabs()) {
mainMotionLayout.progress = abs(progress)
mainActivityMotionLayout?.progress = abs(progress)
}
transitionEndId = endId
transitionStartId = startId
@ -308,11 +305,11 @@ class AudioPlayerFragment : Fragment(), AudioPlayerOptions {
if (currentId == transitionEndId) {
viewModel.isMiniPlayerVisible.value = true
if (NavBarHelper.hasTabs()) {
mainMotionLayout.progress = 1F
mainActivityMotionLayout?.progress = 1F
}
} else if (currentId == transitionStartId) {
viewModel.isMiniPlayerVisible.value = false
mainMotionLayout.progress = 0F
mainActivityMotionLayout?.progress = 0F
}
}
})

7
app/src/main/res/layout/activity_nointernet.xml
View File

@ -4,11 +4,16 @@
android:layout_height="match_parent">
<fragment
android:id="@+id/container"
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" />
<FrameLayout
android:id="@+id/container"
android:layout_height="match_parent"
android:layout_width="match_parent" />
</FrameLayout>