From f27360d02ca8c7ef49174f7aeea72056e5b090c3 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Mon, 23 Jan 2023 18:29:05 +0100 Subject: [PATCH] Reduce the player top bar margin --- .../java/com/github/libretube/extensions/ToPixel.kt | 4 ++-- .../com/github/libretube/ui/adapters/VideosAdapter.kt | 6 +++--- .../github/libretube/ui/fragments/LibraryFragment.kt | 4 ++-- .../github/libretube/ui/fragments/PlaylistFragment.kt | 4 ++-- .../libretube/ui/fragments/WatchHistoryFragment.kt | 4 ++-- .../com/github/libretube/ui/sheets/CommentsSheet.kt | 4 ++-- .../github/libretube/ui/views/CustomExoPlayerView.kt | 10 +++++----- .../com/github/libretube/ui/views/MarkableTimeBar.kt | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/github/libretube/extensions/ToPixel.kt b/app/src/main/java/com/github/libretube/extensions/ToPixel.kt index 1af59c65c..c37e29fe9 100644 --- a/app/src/main/java/com/github/libretube/extensions/ToPixel.kt +++ b/app/src/main/java/com/github/libretube/extensions/ToPixel.kt @@ -3,8 +3,8 @@ package com.github.libretube.extensions import android.content.res.Resources /** - * Convert DP to pixels + * Convert dp to pixels */ -fun Int.toPixel(): Float { +fun Int.dpToPx(): Float { return this * Resources.getSystem().displayMetrics.density + 0.5f } diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt index fccbcaa0a..2f9a830ad 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt @@ -18,7 +18,7 @@ import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.databinding.VideoRowBinding import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.toID -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.extensions.setFormattedDuration import com.github.libretube.ui.extensions.setWatchProgressLength @@ -119,8 +119,8 @@ class VideosAdapter( // set a fixed width for better visuals val params = root.layoutParams when (forceMode) { - ForceMode.RELATED -> params.width = (210).toPixel().toInt() - ForceMode.HOME -> params.width = (250).toPixel().toInt() + ForceMode.RELATED -> params.width = (210).dpToPx().toInt() + ForceMode.HOME -> params.width = (250).dpToPx().toInt() else -> {} } root.layoutParams = params diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt index 1c26b5f85..832253e9d 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt @@ -18,7 +18,7 @@ import com.github.libretube.databinding.FragmentLibraryBinding import com.github.libretube.db.DatabaseHolder import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter import com.github.libretube.ui.adapters.PlaylistsAdapter import com.github.libretube.ui.base.BaseFragment @@ -103,7 +103,7 @@ class LibraryFragment : BaseFragment() { // optimize CreatePlaylistFab bottom margin if miniPlayer active val bottomMargin = if (isMiniPlayerVisible) 64 else 16 val layoutParams = binding.createPlaylist.layoutParams as ViewGroup.MarginLayoutParams - layoutParams.bottomMargin = bottomMargin.toPixel().toInt() + layoutParams.bottomMargin = bottomMargin.dpToPx().toInt() binding.createPlaylist.layoutParams = layoutParams } 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 a38ce7b70..72146c732 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 @@ -24,7 +24,7 @@ import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery import com.github.libretube.extensions.query import com.github.libretube.extensions.toID -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.extensions.toPlaylistBookmark import com.github.libretube.ui.adapters.PlaylistAdapter import com.github.libretube.ui.base.BaseFragment @@ -86,7 +86,7 @@ class PlaylistFragment : BaseFragment() { playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { binding.playlistRecView.updatePadding( - bottom = if (it) (64).toPixel().toInt() else 0 + bottom = if (it) (64).dpToPx().toInt() else 0 ) } 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 1fc8395c0..ad2e93440 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 @@ -17,7 +17,7 @@ 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.query -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.adapters.WatchHistoryAdapter import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.models.PlayerViewModel @@ -46,7 +46,7 @@ class WatchHistoryFragment : BaseFragment() { playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { binding.watchHistoryRecView.updatePadding( - bottom = if (it) (64).toPixel().toInt() else 0 + bottom = if (it) (64).dpToPx().toInt() else 0 ) } diff --git a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt index 62acc6541..000a4d407 100644 --- a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt +++ b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt @@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.github.libretube.R import com.github.libretube.databinding.CommentsSheetBinding -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.adapters.CommentsAdapter import com.github.libretube.ui.models.CommentsViewModel @@ -37,7 +37,7 @@ class CommentsSheet : ExpandedBottomSheet() { binding.dragHandle.viewTreeObserver.removeOnGlobalLayoutListener(this) // limit the recyclerview height to not cover the video binding.commentsRV.layoutParams = binding.commentsRV.layoutParams.apply { - height = viewModel.maxHeight - (binding.dragHandle.height + (20).toPixel().toInt()) + height = viewModel.maxHeight - (binding.dragHandle.height + (20).dpToPx().toInt()) } } }) diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt index 33a4f2502..8e859a754 100644 --- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt @@ -20,7 +20,7 @@ import com.github.libretube.databinding.DoubleTapOverlayBinding import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding import com.github.libretube.databinding.PlayerGestureControlsViewBinding import com.github.libretube.extensions.normalize -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.obj.BottomSheetItem import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.base.BaseActivity @@ -573,8 +573,8 @@ internal class CustomExoPlayerView( // add a larger bottom margin to the time bar in landscape mode val offset = when (newConfig?.orientation) { - Configuration.ORIENTATION_LANDSCAPE -> 20.toPixel() - else -> 10.toPixel() + Configuration.ORIENTATION_LANDSCAPE -> 20.dpToPx() + else -> 10.dpToPx() } binding.progressBar.let { @@ -624,7 +624,7 @@ internal class CustomExoPlayerView( playerViewModel?.isFullscreen?.value == true binding.topBar.let { it.layoutParams = (it.layoutParams as MarginLayoutParams).apply { - topMargin = (if (isFullscreen) 25 else 5).toPixel().toInt() + topMargin = (if (isFullscreen) 10 else 5).dpToPx().toInt() } } } @@ -719,6 +719,6 @@ internal class CustomExoPlayerView( private const val SUBTITLE_BOTTOM_PADDING_FRACTION = 0.158f private const val ANIMATION_DURATION = 100L private const val AUTO_HIDE_CONTROLLER_DELAY = 2000L - private val LANDSCAPE_MARGIN_HORIZONTAL = (20).toPixel().toInt() + private val LANDSCAPE_MARGIN_HORIZONTAL = (20).dpToPx().toInt() } } diff --git a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt index 061e04f85..ffd97eefb 100644 --- a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt +++ b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt @@ -10,7 +10,7 @@ import androidx.core.view.marginLeft import com.github.libretube.R import com.github.libretube.api.obj.Segment import com.github.libretube.constants.PreferenceKeys -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.ThemeHelper import com.google.android.exoplayer2.Player @@ -28,7 +28,7 @@ class MarkableTimeBar( private var player: Player? = null private var length: Int = 0 - private val progressBarHeight = (2).toPixel().toInt() + private val progressBarHeight = (2).dpToPx().toInt() override fun onDraw(canvas: Canvas) { super.onDraw(canvas)