Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
528
Issue boards
Milestones
Wiki
Code
Merge requests
14
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC-Android
Commits
687986d1
Verified
Commit
687986d1
authored
2 years ago
by
Nicolas Pomepuy
Committed by
Andrew Churyla
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Simplify hud layout by removing the cascading constraintlayouts
parent
2e2aa2df
No related branches found
Branches containing commit
No related tags found
1 merge request
!1379
Optimize UI performance
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
application/vlc-android/res/layout/player_hud.xml
+108
-137
108 additions, 137 deletions
application/vlc-android/res/layout/player_hud.xml
application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
+7
-4
7 additions, 4 deletions
.../org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
with
115 additions
and
141 deletions
application/vlc-android/res/layout/player_hud.xml
+
108
−
137
View file @
687986d1
...
...
@@ -29,6 +29,7 @@
android:id=
"@+id/progress_overlay"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/transparent"
android:visibility=
"invisible"
tools:theme=
"@style/Theme.VLC.Player"
tools:visibility=
"visible"
>
...
...
@@ -41,9 +42,9 @@
android:layout_marginBottom=
"8dp"
android:background=
"@drawable/rounded_corners"
android:visibility=
"gone"
vlc:layout_constraintBottom_toTopOf=
"@+id/
constraintLayout2
"
vlc:layout_constraintEnd_toEndOf=
"
@+id/constraintLayout2
"
vlc:layout_constraintStart_toStartOf=
"
@+id/constraintLayout2
"
vlc:layout_constraintBottom_toTopOf=
"@+id/
player_overlay_seekbar
"
vlc:layout_constraintEnd_toEndOf=
"
parent
"
vlc:layout_constraintStart_toStartOf=
"
parent
"
vlc:layout_constraintTop_toTopOf=
"parent"
>
<androidx.core.widget.NestedScrollView
...
...
@@ -133,7 +134,7 @@
android:layout_height=
"wrap_content"
android:layout_marginStart=
"16dp"
android:layout_marginBottom=
"8dp"
vlc:layout_constraintBottom_toTopOf=
"@+id/
constraintLayout2
"
vlc:layout_constraintBottom_toTopOf=
"@+id/
player_overlay_time_container
"
vlc:layout_constraintStart_toStartOf=
"parent"
/>
...
...
@@ -149,9 +150,8 @@
android:focusable=
"true"
android:visibility=
"gone"
tools:visibility=
"visible"
vlc:layout_constraintBottom_toTopOf=
"@+id/
constraintLayout2
"
vlc:layout_constraintBottom_toTopOf=
"@+id/
player_overlay_time_container
"
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:layout_constraintTop_toBottomOf=
"@+id/player_overlay_title"
vlc:layout_constraintVertical_chainStyle=
"packed"
vlc:srcCompat=
"@drawable/ic_abrepeat_reset_marker_circle"
/>
...
...
@@ -167,7 +167,7 @@
android:focusable=
"true"
android:visibility=
"gone"
tools:visibility=
"visible"
vlc:layout_constraintBottom_toTopOf=
"@+id/
constraintLayout2
"
vlc:layout_constraintBottom_toTopOf=
"@+id/
player_overlay_time_container
"
vlc:layout_constraintStart_toEndOf=
"@+id/ab_repeat_reset"
vlc:layout_constraintTop_toBottomOf=
"@+id/player_overlay_title"
vlc:srcCompat=
"@drawable/ic_abrepeat_reset_circle"
/>
...
...
@@ -183,145 +183,118 @@
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/constraintLayout2"
android:layout_width=
"match_parent"
<TextView
android:id=
"@+id/player_overlay_time"
style=
"@style/VLC.Player.TimeText"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:background=
"@color/transparent"
android:paddingTop=
"@dimen/overlay_padding_top"
android:paddingBottom=
"@dimen/overlay_padding_bottom"
tools:theme=
"@style/Theme.VLC.Player"
tools:visibility=
"visible"
vlc:layout_constraintBottom_toBottomOf=
"parent"
android:layout_marginStart=
"24dp"
android:background=
"?attr/selectableItemBackground"
android:nextFocusUp=
"@+id/ab_repeat_add_marker"
android:onClick=
"@{(v) -> player.toggleTimeDisplay()}"
android:text=
"@{Tools.millisToString(progress.time)}"
tools:text=
"0:32"
vlc:layout_constraintBottom_toTopOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toStartOf=
"@+id/player_overlay_length"
vlc:layout_constraintHorizontal_chainStyle=
"spread"
vlc:layout_constraintStart_toStartOf=
"parent"
/>
<TextView
android:id=
"@+id/player_overlay_length"
style=
"@style/VLC.Player.TimeText"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"24dp"
android:background=
"?attr/selectableItemBackground"
android:gravity=
"right"
android:nextFocusUp=
"@+id/ab_repeat_add_marker"
android:onClick=
"@{(v) -> player.toggleTimeDisplay()}"
tools:text=
"56:37"
vlc:layout_constraintBottom_toTopOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toEndOf=
"parent"
vlc:layout_constraintStart_toStartOf=
"parent"
>
vlc:layout_constraintStart_toEndOf=
"@+id/player_overlay_time"
vlc:length=
"@{progress.length}"
vlc:time=
"@{progress.time}"
/>
<FrameLayout
android:id=
"@+id/player_overlay_time_container"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"24dp"
vlc:layout_constraintEnd_toStartOf=
"@+id/player_overlay_length_container"
vlc:layout_constraintHorizontal_bias=
"0.5"
vlc:layout_constraintHorizontal_chainStyle=
"spread_inside"
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:layout_constraintTop_toTopOf=
"parent"
>
<!-- ⚠️ margin are set in code!!!-->
<SeekBar
android:id=
"@+id/player_overlay_seekbar"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:focusable=
"true"
android:layoutDirection=
"ltr"
android:maxHeight=
"@dimen/seekbar_height"
android:minHeight=
"@dimen/seekbar_height"
android:paddingStart=
"0dp"
android:paddingEnd=
"0dp"
android:progress=
"@{player.service.getTime(progress.time)}"
android:progressDrawable=
"@drawable/po_seekbar_video"
android:splitTrack=
"false"
android:thumb=
"@drawable/ic_seekbar_thumb"
vlc:layout_constraintBottom_toTopOf=
"@+id/player_overlay_play"
vlc:layout_constraintEnd_toEndOf=
"parent"
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:mediamax=
"@{(int)progress.length}"
/>
<TextView
android:id=
"@+id/player_overlay_time"
style=
"@style/VLC.Player.TimeText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:nextFocusUp=
"@+id/ab_repeat_add_marker"
android:onClick=
"@{(v) -> player.toggleTimeDisplay()}"
android:text=
"@{Tools.millisToString(progress.time)}"
tools:text=
"0:32"
/>
</FrameLayout>
<FrameLayout
android:id=
"@+id/player_overlay_length_container"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"24dp"
vlc:layout_constraintEnd_toEndOf=
"parent"
vlc:layout_constraintHorizontal_bias=
"0.5"
vlc:layout_constraintStart_toEndOf=
"@+id/player_overlay_time_container"
vlc:layout_constraintTop_toTopOf=
"parent"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/bookmark_marker_container"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"16dp"
android:paddingLeft=
"8dp"
android:paddingRight=
"8dp"
vlc:layout_constraintBottom_toBottomOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toEndOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintStart_toStartOf=
"@+id/player_overlay_seekbar"
/>
<TextView
android:id=
"@+id/player_overlay_length"
style=
"@style/VLC.Player.TimeText"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"right"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:nextFocusUp=
"@+id/ab_repeat_add_marker"
android:onClick=
"@{(v) -> player.toggleTimeDisplay()}"
tools:text=
"56:37"
vlc:length=
"@{progress.length}"
vlc:time=
"@{progress.time}"
/>
</FrameLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/ab_repeat_marker_guideline_container"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:layoutDirection=
"ltr"
android:paddingLeft=
"8dp"
android:paddingRight=
"8dp"
vlc:layout_constraintBottom_toTopOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toEndOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintStart_toStartOf=
"@+id/player_overlay_seekbar"
>
<androidx.constraintlayout.widget.Guideline
android:id=
"@+id/ab_repeat_marker_guideline_a"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
vlc:constraintPercent=
"@{ab_repeat_a}"
/>
<!-- ⚠️ margin are set in code!!!-->
<SeekBar
android:id=
"@+id/player_overlay_seekbar"
android:layout_width=
"0dp"
<androidx.constraintlayout.widget.Guideline
android:id=
"@+id/ab_repeat_marker_guideline_b"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:focusable=
"true"
android:layoutDirection=
"ltr"
android:maxHeight=
"@dimen/seekbar_height"
android:minHeight=
"@dimen/seekbar_height"
android:paddingStart=
"0dp"
android:paddingEnd=
"0dp"
android:progress=
"@{player.service.getTime(progress.time)}"
android:progressDrawable=
"@drawable/po_seekbar_video"
android:splitTrack=
"false"
android:thumb=
"@drawable/ic_seekbar_thumb"
vlc:layout_constraintEnd_toEndOf=
"parent"
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:layout_constraintTop_toBottomOf=
"@+id/player_overlay_time_container"
vlc:mediamax=
"@{(int)progress.length}"
/>
android:orientation=
"vertical"
vlc:constraintPercent=
"@{ab_repeat_b}"
/>
<
androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/
bookmark_marker_container
"
android:layout_width=
"
0dp
"
<
ImageView
android:id=
"@+id/
ab_repeat_marker_a
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"4dp"
android:paddingLeft=
"8dp"
android:paddingRight=
"8dp"
vlc:layout_constraintBottom_toBottomOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toEndOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintStart_toStartOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintTop_toTopOf=
"parent"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/ab_repeat_marker_guideline_container"
android:layout_width=
"0dp"
vlc:layout_constraintLeft_toLeftOf=
"@+id/ab_repeat_marker_guideline_a"
vlc:layout_constraintRight_toRightOf=
"@+id/ab_repeat_marker_guideline_a"
vlc:layout_constraintTop_toTopOf=
"parent"
vlc:srcCompat=
"@drawable/ic_abrepeat_marker"
/>
<ImageView
android:id=
"@+id/ab_repeat_marker_b"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:clipToPadding=
"false"
android:layoutDirection=
"ltr"
android:paddingLeft=
"8dp"
android:paddingRight=
"8dp"
vlc:layout_constraintBottom_toTopOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintEnd_toEndOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintStart_toStartOf=
"@+id/player_overlay_seekbar"
vlc:layout_constraintTop_toTopOf=
"parent"
>
vlc:layout_constraintLeft_toLeftOf=
"@+id/ab_repeat_marker_guideline_b"
vlc:layout_constraintRight_toRightOf=
"@+id/ab_repeat_marker_guideline_b"
vlc:layout_constraintTop_toTopOf=
"parent"
vlc:srcCompat=
"@drawable/ic_abrepeat_marker"
/>
<androidx.constraintlayout.widget.Guideline
android:id=
"@+id/ab_repeat_marker_guideline_a"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
vlc:constraintPercent=
"@{ab_repeat_a}"
/>
<androidx.constraintlayout.widget.Guideline
android:id=
"@+id/ab_repeat_marker_guideline_b"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
vlc:constraintPercent=
"@{ab_repeat_b}"
/>
<ImageView
android:id=
"@+id/ab_repeat_marker_a"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
vlc:layout_constraintLeft_toLeftOf=
"@+id/ab_repeat_marker_guideline_a"
vlc:layout_constraintRight_toRightOf=
"@+id/ab_repeat_marker_guideline_a"
vlc:layout_constraintTop_toTopOf=
"parent"
vlc:srcCompat=
"@drawable/ic_abrepeat_marker"
/>
<ImageView
android:id=
"@+id/ab_repeat_marker_b"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
vlc:layout_constraintLeft_toLeftOf=
"@+id/ab_repeat_marker_guideline_b"
vlc:layout_constraintRight_toRightOf=
"@+id/ab_repeat_marker_guideline_b"
vlc:layout_constraintTop_toTopOf=
"parent"
vlc:srcCompat=
"@drawable/ic_abrepeat_marker"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id=
"@+id/player_overlay_tracks"
...
...
@@ -435,7 +408,6 @@
vlc:layout_constraintBottom_toBottomOf=
"parent"
vlc:layout_constraintEnd_toStartOf=
"@+id/player_overlay_forward"
vlc:layout_constraintStart_toEndOf=
"@+id/player_overlay_rewind"
vlc:layout_constraintTop_toBottomOf=
"@+id/player_overlay_seekbar"
vlc:srcCompat=
"@drawable/ic_pause_player"
/>
<ImageView
...
...
@@ -550,7 +522,6 @@
vlc:layout_constraintStart_toStartOf=
"parent"
vlc:layout_constraintTop_toBottomOf=
"@id/player_overlay_seekbar"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- Media control buttons -->
...
...
This diff is collapsed.
Click to expand it.
application/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerOverlayDelegate.kt
+
7
−
4
View file @
687986d1
...
...
@@ -73,8 +73,10 @@ import org.videolan.vlc.gui.helpers.UiTools.showVideoTrack
import
org.videolan.vlc.gui.view.PlayerProgress
import
org.videolan.vlc.manageAbRepeatStep
import
org.videolan.vlc.media.MediaUtils
import
org.videolan.vlc.util.*
import
org.videolan.vlc.util.FileUtils
import
org.videolan.vlc.util.getScreenWidth
import
org.videolan.vlc.util.isSchemeFile
import
org.videolan.vlc.util.isSchemeNetwork
import
org.videolan.vlc.viewmodels.PlaylistModel
import
java.text.DateFormat
import
java.util.*
...
...
@@ -694,8 +696,8 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
hudBinding
.
bookmarkMarkerContainer
.
setPadding
(
overscanHorizontal
,
0
,
overscanHorizontal
,
0
)
if
(
player
.
isTv
)
{
applyMargin
(
hudBinding
.
playerOverlayTime
Container
,
overscanHorizontal
,
false
)
applyMargin
(
hudBinding
.
playerOverlayLength
Container
,
overscanHorizontal
,
true
)
applyMargin
(
hudBinding
.
playerOverlayTime
,
overscanHorizontal
,
false
)
applyMargin
(
hudBinding
.
playerOverlayLength
,
overscanHorizontal
,
true
)
}
if
(
player
.
resources
.
configuration
.
orientation
==
Configuration
.
ORIENTATION_PORTRAIT
)
{
...
...
@@ -935,7 +937,8 @@ class VideoPlayerOverlayDelegate (private val player: VideoPlayerActivity) {
}
}
bookmarkListDelegate
.
show
()
bookmarkListDelegate
.
setProgressHeight
((
player
.
getScreenHeight
()
-
hudBinding
.
constraintLayout2
.
height
+
12
.
dp
).
toFloat
())
val
top
=
hudBinding
.
playerOverlaySeekbar
.
top
bookmarkListDelegate
.
setProgressHeight
((
top
+
12
.
dp
).
toFloat
())
}
}
...
...
This diff is collapsed.
Click to expand it.
Nicolas Pomepuy
@Aza
mentioned in issue
#2546 (closed)
·
2 years ago
mentioned in issue
#2546 (closed)
mentioned in issue #2546
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment