Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
531
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
1f192a19
Commit
1f192a19
authored
1 year ago
by
Nicolas Pomepuy
Committed by
Duncan McNamara
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix audio animated drawable on lower Android versions
Fixes
#2991
parent
8d639cbe
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1781
Fix audio animated drawable on lower Android versions
Pipeline
#381665
passed with stage
in 17 minutes and 27 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
+7
-1
7 additions, 1 deletion
...vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
with
7 additions
and
1 deletion
application/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.kt
+
7
−
1
View file @
1f192a19
...
...
@@ -111,6 +111,8 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
private
var
playerState
=
0
private
lateinit
var
pauseToPlay
:
AnimatedVectorDrawableCompat
private
lateinit
var
playToPause
:
AnimatedVectorDrawableCompat
private
lateinit
var
pauseToPlayHeader
:
AnimatedVectorDrawableCompat
private
lateinit
var
playToPauseHeader
:
AnimatedVectorDrawableCompat
private
lateinit
var
pauseToPlaySmall
:
AnimatedVectorDrawableCompat
private
lateinit
var
playToPauseSmall
:
AnimatedVectorDrawableCompat
...
...
@@ -196,6 +198,8 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
//For resizing purpose, we have to cache this twice even if it's from the same resource
playToPause
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_play_pause_video
)
!!
pauseToPlay
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_pause_play_video
)
!!
playToPauseHeader
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_play_pause_video
)
!!
pauseToPlayHeader
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_pause_play_video
)
!!
playToPauseSmall
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_play_pause_video
)
!!
pauseToPlaySmall
=
AnimatedVectorDrawableCompat
.
create
(
requireActivity
(),
R
.
drawable
.
anim_pause_play_video
)
!!
onSlide
(
0f
)
...
...
@@ -386,12 +390,14 @@ class AudioPlayer : Fragment(), PlaylistAdapter.IPlayer, TextWatcher, IAudioPlay
val
drawable
=
if
(
playing
)
playToPause
else
pauseToPlay
val
drawableSmall
=
if
(
playing
)
playToPauseSmall
else
pauseToPlaySmall
val
drawableHeaderLarge
=
if
(
playing
)
playToPauseHeader
else
pauseToPlayHeader
binding
.
playPause
.
setImageDrawable
(
drawable
)
binding
.
headerLargePlayPause
.
setImageDrawable
(
drawable
)
binding
.
headerLargePlayPause
.
setImageDrawable
(
drawable
HeaderLarge
)
binding
.
headerPlayPause
.
setImageDrawable
(
drawableSmall
)
if
(
playing
!=
wasPlaying
)
{
drawable
.
start
()
drawableSmall
.
start
()
drawableHeaderLarge
.
start
()
}
playlistAdapter
.
setCurrentlyPlaying
(
playing
)
...
...
This diff is collapsed.
Click to expand it.
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