[Android] Use new circle icons in vide player
Sébastien Toque
git at videolan.org
Sun Nov 24 16:42:53 CET 2013
vlc-ports/android | branch: master | Sébastien Toque <xilasz at gmail.com> | Sun Nov 24 16:36:32 2013 +0100| [2fadebcf7bef459e42be60be271403aef14e9814] | committer: Sébastien Toque
Use new circle icons in vide player
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=2fadebcf7bef459e42be60be271403aef14e9814
---
vlc-android/res/drawable/audio_circle.xml | 7 +++++
vlc-android/res/drawable/crop_circle.xml | 7 +++++
vlc-android/res/drawable/header_icon_subtitle.png | Bin 1116 -> 0 bytes
vlc-android/res/drawable/ic_size.xml | 7 -----
vlc-android/res/drawable/ic_size_glow.png | Bin 10166 -> 0 bytes
vlc-android/res/drawable/ic_size_normal.png | Bin 9100 -> 0 bytes
vlc-android/res/drawable/pause_circle.xml | 7 +++++
vlc-android/res/drawable/play_circle.xml | 7 +++++
vlc-android/res/drawable/text_circle.xml | 7 +++++
vlc-android/res/layout/player.xml | 29 +++++++++-----------
.../vlc/gui/video/VideoPlayerActivity.java | 2 +-
11 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/vlc-android/res/drawable/audio_circle.xml b/vlc-android/res/drawable/audio_circle.xml
new file mode 100644
index 0000000..008deef
--- /dev/null
+++ b/vlc-android/res/drawable/audio_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/audio_circle_normal" android:state_focused="true" android:state_pressed="false"/>
+ <item android:drawable="@drawable/audio_circle_pressed" android:state_focused="true" android:state_pressed="true"/>
+ <item android:drawable="@drawable/audio_circle_pressed" android:state_focused="false" android:state_pressed="true"/>
+ <item android:drawable="@drawable/audio_circle_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/crop_circle.xml b/vlc-android/res/drawable/crop_circle.xml
new file mode 100644
index 0000000..83ebfe9
--- /dev/null
+++ b/vlc-android/res/drawable/crop_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/crop_circle_normal" android:state_focused="true" android:state_pressed="false"/>
+ <item android:drawable="@drawable/crop_circle_pressed" android:state_focused="true" android:state_pressed="true"/>
+ <item android:drawable="@drawable/crop_circle_pressed" android:state_focused="false" android:state_pressed="true"/>
+ <item android:drawable="@drawable/crop_circle_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/header_icon_subtitle.png b/vlc-android/res/drawable/header_icon_subtitle.png
deleted file mode 100644
index dfe8609..0000000
Binary files a/vlc-android/res/drawable/header_icon_subtitle.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_size.xml b/vlc-android/res/drawable/ic_size.xml
deleted file mode 100644
index ddde672..0000000
--- a/vlc-android/res/drawable/ic_size.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_size_normal" android:state_focused="true" android:state_pressed="false"/>
- <item android:drawable="@drawable/ic_size_glow" android:state_focused="true" android:state_pressed="true"/>
- <item android:drawable="@drawable/ic_size_glow" android:state_focused="false" android:state_pressed="true"/>
- <item android:drawable="@drawable/ic_size_normal"/>
-</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/ic_size_glow.png b/vlc-android/res/drawable/ic_size_glow.png
deleted file mode 100644
index 7ffec58..0000000
Binary files a/vlc-android/res/drawable/ic_size_glow.png and /dev/null differ
diff --git a/vlc-android/res/drawable/ic_size_normal.png b/vlc-android/res/drawable/ic_size_normal.png
deleted file mode 100644
index 5555ef7..0000000
Binary files a/vlc-android/res/drawable/ic_size_normal.png and /dev/null differ
diff --git a/vlc-android/res/drawable/pause_circle.xml b/vlc-android/res/drawable/pause_circle.xml
new file mode 100644
index 0000000..56e4142
--- /dev/null
+++ b/vlc-android/res/drawable/pause_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/pause_circle_normal" android:state_focused="true" android:state_pressed="false"/>
+ <item android:drawable="@drawable/pause_circle_pressed" android:state_focused="true" android:state_pressed="true"/>
+ <item android:drawable="@drawable/pause_circle_pressed" android:state_focused="false" android:state_pressed="true"/>
+ <item android:drawable="@drawable/pause_circle_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/play_circle.xml b/vlc-android/res/drawable/play_circle.xml
new file mode 100644
index 0000000..88e0071
--- /dev/null
+++ b/vlc-android/res/drawable/play_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/play_circle_normal" android:state_focused="true" android:state_pressed="false"/>
+ <item android:drawable="@drawable/play_circle_pressed" android:state_focused="true" android:state_pressed="true"/>
+ <item android:drawable="@drawable/play_circle_pressed" android:state_focused="false" android:state_pressed="true"/>
+ <item android:drawable="@drawable/play_circle_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/drawable/text_circle.xml b/vlc-android/res/drawable/text_circle.xml
new file mode 100644
index 0000000..ac4fd09
--- /dev/null
+++ b/vlc-android/res/drawable/text_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/text_circle_normal" android:state_focused="true" android:state_pressed="false"/>
+ <item android:drawable="@drawable/text_circle_pressed" android:state_focused="true" android:state_pressed="true"/>
+ <item android:drawable="@drawable/text_circle_pressed" android:state_focused="false" android:state_pressed="true"/>
+ <item android:drawable="@drawable/text_circle_normal"/>
+</selector>
\ No newline at end of file
diff --git a/vlc-android/res/layout/player.xml b/vlc-android/res/layout/player.xml
index ba4cf1b..7f8079b 100644
--- a/vlc-android/res/layout/player.xml
+++ b/vlc-android/res/layout/player.xml
@@ -34,10 +34,10 @@
<ImageButton
android:id="@+id/player_overlay_play"
- android:layout_width="40dip"
- android:layout_height="40dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerInParent="true"
- android:background="@drawable/ic_pause" />
+ android:background="@drawable/pause_circle" />
<TextView
android:id="@+id/player_overlay_info"
@@ -95,28 +95,25 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/player_overlay_header"
android:gravity="bottom|center_horizontal"
- android:orientation="vertical"
- android:padding="10dp" >
+ android:orientation="vertical" >
<ImageButton
android:id="@+id/player_overlay_subtitle"
- android:layout_width="35dp"
- android:layout_height="35dp"
- android:layout_marginBottom="10dp"
- android:background="@drawable/header_icon_subtitle" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/text_circle" />
<ImageButton
android:id="@+id/player_overlay_audio"
- android:layout_width="35dp"
- android:layout_height="35dp"
- android:layout_marginBottom="10dp"
- android:background="@drawable/header_icon_audio" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/audio_circle" />
<ImageButton
android:id="@+id/player_overlay_size"
- android:layout_width="40dip"
- android:layout_height="40dip"
- android:background="@drawable/ic_size" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/crop_circle" />
</LinearLayout>
<RelativeLayout
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index b18e0ee..5f31ece 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -1348,7 +1348,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
}
mPlayPause.setBackgroundResource(mLibVLC.isPlaying()
- ? R.drawable.ic_pause : R.drawable.ic_play);
+ ? R.drawable.pause_circle : R.drawable.play_circle);
}
/**
More information about the Android
mailing list