Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
533
Issue boards
Milestones
Wiki
Code
Merge requests
11
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
f2291f53
Commit
f2291f53
authored
6 years ago
by
Geoffrey Métais
Browse files
Options
Downloads
Patches
Plain Diff
Set correct icons for A-B repeat option
parent
40dffa5c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vlc-android/res/values/styles.xml
+5
-1
5 additions, 1 deletion
vlc-android/res/values/styles.xml
vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
+10
-9
10 additions, 9 deletions
...id/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
with
15 additions
and
10 deletions
vlc-android/res/values/styles.xml
+
5
−
1
View file @
f2291f53
...
...
@@ -269,7 +269,6 @@
<item
name=
"ic_audiodelay"
>
@drawable/ic_audiodelay_w
</item>
<item
name=
"ic_subtitledelay"
>
@drawable/ic_subtitledelay_w
</item>
<item
name=
"ic_passthrough"
>
@drawable/ic_passthrough_w
</item>
<item
name=
"ic_abrepeat"
>
@drawable/ic_abrepeat_w
</item>
<item
name=
"ic_repeat"
>
@drawable/ic_repeat_w
</item>
<item
name=
"ic_repeat_all"
>
@drawable/ic_repeat_all
</item>
<item
name=
"ic_repeat_one"
>
@drawable/ic_repeat_one
</item>
...
...
@@ -284,6 +283,11 @@
<item
name=
"list_title_last"
>
@color/list_title_last
</item>
<item
name=
"list_title"
>
@color/bt_list_title
</item>
<item
name=
"progress_background"
>
@color/grey400transparent
</item>
<item
name=
"ic_abrepeat"
>
@drawable/ic_abrepeat_w
</item>
<item
name=
"ic_abrepeat_seta"
>
@drawable/ic_abrepeat_seta_w
</item>
<item
name=
"ic_abrepeat_setb"
>
@drawable/ic_abrepeat_setb_w
</item>
<item
name=
"ic_abrepeat_reset"
>
@drawable/ic_abrepeat_reset_w
</item>
<item
name=
"ic_dial"
>
@drawable/ic_dial_w
</item>
</style>
<style
name=
"VLCTransparentTheme"
parent=
"Theme.VLC"
>
...
...
This diff is collapsed.
Click to expand it.
vlc-android/src/org/videolan/vlc/gui/dialogs/AdvOptionsDialog.java
+
10
−
9
View file @
f2291f53
...
...
@@ -27,7 +27,6 @@ import android.app.Activity;
import
android.app.AlarmManager
;
import
android.app.Dialog
;
import
android.app.PendingIntent
;
import
androidx.lifecycle.Observer
;
import
android.content.Context
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
...
...
@@ -36,10 +35,6 @@ import android.content.res.TypedArray;
import
android.graphics.Color
;
import
android.os.Build
;
import
android.os.Bundle
;
import
androidx.annotation.Nullable
;
import
androidx.fragment.app.DialogFragment
;
import
androidx.recyclerview.widget.GridLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
android.text.format.DateFormat
;
import
android.view.Gravity
;
import
android.view.KeyEvent
;
...
...
@@ -70,6 +65,12 @@ import java.util.ArrayList;
import
java.util.Calendar
;
import
java.util.List
;
import
androidx.annotation.Nullable
;
import
androidx.fragment.app.DialogFragment
;
import
androidx.lifecycle.Observer
;
import
androidx.recyclerview.widget.GridLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
public
class
AdvOptionsDialog
extends
DismissDialogFragment
implements
View
.
OnClickListener
,
PlaybackService
.
Client
.
Callback
,
View
.
OnFocusChangeListener
,
DialogInterface
.
OnKeyListener
{
public
final
static
String
TAG
=
"VLC/AdvOptionsDialog"
;
...
...
@@ -394,9 +395,9 @@ public class AdvOptionsDialog extends DismissDialogFragment implements View.OnCl
public
void
onChanged
(
@Nullable
ABRepeat
abr
)
{
if
(
abr
==
null
)
return
;
int
resid
;
if
(
abr
.
getStart
()
==
-
1L
)
resid
=
R
.
attr
.
ic_repeat
;
else
if
(
abr
.
getStop
()
==
-
1L
)
resid
=
R
.
attr
.
ic_repeat_
one
;
else
resid
=
R
.
attr
.
ic_repeat_
all
;
if
(
abr
.
getStart
()
==
-
1L
)
resid
=
R
.
attr
.
ic_
ab
repeat
_seta
;
else
if
(
abr
.
getStop
()
==
-
1L
)
resid
=
R
.
attr
.
ic_
ab
repeat_
setb
;
else
resid
=
R
.
attr
.
ic_
ab
repeat_
reset
;
final
int
icon
=
UiTools
.
getResourceFromAttribute
(
mABRepeat
.
getContext
(),
resid
);
mABRepeat
.
setCompoundDrawablesWithIntrinsicBounds
(
0
,
icon
,
0
,
0
);
}
...
...
@@ -578,7 +579,7 @@ public class AdvOptionsDialog extends DismissDialogFragment implements View.OnCl
mAdapter
.
addOption
(
new
Option
(
ID_REPEAT
,
R
.
attr
.
ic_repeat
,
getString
(
R
.
string
.
repeat_title
)));
if
(
mService
.
canShuffle
())
mAdapter
.
addOption
(
new
Option
(
ID_SHUFFLE
,
R
.
attr
.
ic_shuffle
,
getString
(
R
.
string
.
shuffle_title
)));
mAdapter
.
addOption
(
new
Option
(
ID_ABREPEAT
,
R
.
attr
.
ic_repeat
,
getString
(
R
.
string
.
ab_repeat
)));
mAdapter
.
addOption
(
new
Option
(
ID_ABREPEAT
,
R
.
attr
.
ic_
ab
repeat
,
getString
(
R
.
string
.
ab_repeat
)));
final
MediaPlayer
.
Chapter
[]
chapters
=
mService
.
getChapters
(-
1
);
final
int
chaptersCount
=
chapters
!=
null
?
chapters
.
length
:
0
;
...
...
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