kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Reduce the player top bar margin (#2846)

Browse Source
This commit is contained in:
Bnyro 2023-01-23 18:29:59 +01:00 committed by GitHub
parent dbd6516b62
commit 9a8a048c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/extensions/ToPixel.kt
View File

@ -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
}

6
app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
View File

@ -16,9 +16,9 @@ import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.AllCaughtUpRowBinding
import com.github.libretube.databinding.TrendingRowBinding
import com.github.libretube.databinding.VideoRowBinding
import com.github.libretube.extensions.dpToPx
import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toPixel
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

4
app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt
View File

@ -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
}

4
app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt
View File

@ -22,9 +22,9 @@ import com.github.libretube.db.DatabaseHolder
import com.github.libretube.enums.PlaylistType
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.awaitQuery
import com.github.libretube.extensions.dpToPx
import com.github.libretube.extensions.query
import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toPixel
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
)
}

4
app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt
View File

@ -16,8 +16,8 @@ import com.github.libretube.api.obj.StreamItem
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.dpToPx
import com.github.libretube.extensions.query
import com.github.libretube.extensions.toPixel
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
)
}

4
app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt
View File

@ -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())
}
}
})

10
app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
View File

@ -19,8 +19,8 @@ import com.github.libretube.R
import com.github.libretube.databinding.DoubleTapOverlayBinding
import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding
import com.github.libretube.databinding.PlayerGestureControlsViewBinding
import com.github.libretube.extensions.dpToPx
import com.github.libretube.extensions.normalize
import com.github.libretube.extensions.toPixel
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()
}
}

4
app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt
View File

@ -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)