diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt index 168926a41..8205dafdc 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt @@ -6,6 +6,8 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.view.updatePadding +import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager @@ -21,10 +23,12 @@ import com.github.libretube.enums.PlaylistType import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery import com.github.libretube.extensions.query +import com.github.libretube.extensions.toDp import com.github.libretube.extensions.toID import com.github.libretube.ui.adapters.PlaylistAdapter import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.extensions.serializable +import com.github.libretube.ui.models.PlayerViewModel import com.github.libretube.ui.sheets.PlaylistOptionsBottomSheet import com.github.libretube.util.ImageHelper import com.github.libretube.util.NavigationHelper @@ -43,6 +47,8 @@ class PlaylistFragment : BaseFragment() { private var isLoading = true private var isBookmarked = false + private val playerViewModel: PlayerViewModel by activityViewModels() + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) arguments?.let { @@ -73,6 +79,12 @@ class PlaylistFragment : BaseFragment() { } updateBookmarkRes() + playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { + binding.playlistRecView.updatePadding( + bottom = if (it) (64).toDp(resources).toInt() else 0 + ) + } + fetchPlaylist() } diff --git a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt index a9ae97a9a..69a06d390 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt @@ -4,19 +4,25 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.view.updatePadding +import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.github.libretube.databinding.FragmentWatchHistoryBinding import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.extensions.awaitQuery +import com.github.libretube.extensions.toDp import com.github.libretube.ui.adapters.WatchHistoryAdapter import com.github.libretube.ui.base.BaseFragment +import com.github.libretube.ui.models.PlayerViewModel import com.github.libretube.util.ProxyHelper class WatchHistoryFragment : BaseFragment() { private lateinit var binding: FragmentWatchHistoryBinding + private val playerViewModel: PlayerViewModel by activityViewModels() + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -29,6 +35,12 @@ class WatchHistoryFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { + binding.watchHistoryRecView.updatePadding( + bottom = if (it) (64).toDp(resources).toInt() else 0 + ) + } + val watchHistory = awaitQuery { Database.watchHistoryDao().getAll() } diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml index 1cdbeebc4..649896e25 100644 --- a/app/src/main/res/layout/fragment_playlist.xml +++ b/app/src/main/res/layout/fragment_playlist.xml @@ -109,8 +109,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipToPadding="false" - android:nestedScrollingEnabled="false" - android:paddingBottom="64dp" /> + android:nestedScrollingEnabled="false" /> diff --git a/app/src/main/res/layout/fragment_watch_history.xml b/app/src/main/res/layout/fragment_watch_history.xml index f8328f484..2cb061f89 100644 --- a/app/src/main/res/layout/fragment_watch_history.xml +++ b/app/src/main/res/layout/fragment_watch_history.xml @@ -32,7 +32,6 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:nestedScrollingEnabled="false" - android:paddingBottom="64dp" android:visibility="gone" /> \ No newline at end of file