summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/drawable/overlay_drawable.xml35
-rw-r--r--res/drawable/overlay_drawable_dark.xml15
-rw-r--r--res/layout-land/mediaplayer_activity.xml2
-rw-r--r--res/layout/mediaplayer_activity.xml105
-rw-r--r--res/values/attrs.xml3
-rw-r--r--res/values/colors.xml5
-rw-r--r--res/values/styles.xml6
-rw-r--r--src/de/danoeh/antennapod/activity/AudioplayerActivity.java4
8 files changed, 100 insertions, 75 deletions
diff --git a/res/drawable/overlay_drawable.xml b/res/drawable/overlay_drawable.xml
new file mode 100644
index 000000000..c16656114
--- /dev/null
+++ b/res/drawable/overlay_drawable.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#20EAEAEA" />
+ </shape>
+ </item>
+ <item android:top="1dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="#20E5E5E5" />
+ </shape>
+ </item>
+ <item android:top="2dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="#20DDDDDD" />
+ </shape>
+ </item>
+ <item android:top="3dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="#10BABABA" />
+ </shape>
+ </item>
+ <item android:top="4dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="#D2D2D2" />
+ </shape>
+ </item>
+ <item android:top="5dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/overlay_light" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/drawable/overlay_drawable_dark.xml b/res/drawable/overlay_drawable_dark.xml
new file mode 100644
index 000000000..fb78f5633
--- /dev/null
+++ b/res/drawable/overlay_drawable_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item>
+ <shape android:shape="rectangle" >
+ <solid android:color="#45B3E1" />
+ </shape>
+ </item>
+ <item android:top="1dp">
+ <shape android:shape="rectangle" >
+ <solid android:color="@color/overlay_dark" />
+ </shape>
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/res/layout-land/mediaplayer_activity.xml b/res/layout-land/mediaplayer_activity.xml
index 6f505c874..675d9709d 100644
--- a/res/layout-land/mediaplayer_activity.xml
+++ b/res/layout-land/mediaplayer_activity.xml
@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
- android:background="?attr/video_overlay_background"
+ android:background="?attr/overlay_background"
android:orientation="vertical" >
<RelativeLayout
diff --git a/res/layout/mediaplayer_activity.xml b/res/layout/mediaplayer_activity.xml
index 356ee1cc1..d984aeb8f 100644
--- a/res/layout/mediaplayer_activity.xml
+++ b/res/layout/mediaplayer_activity.xml
@@ -11,87 +11,59 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true" />
- <LinearLayout
+ <RelativeLayout
android:id="@+id/player_control"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_alignParentBottom="true"
- android:layout_marginTop="8dp" >
-
- <ImageButton
- android:id="@+id/butRev"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_weight="0.02"
- android:background="?attr/borderless_button"
- android:src="?attr/av_rewind" />
-
- <View
- android:layout_width="0.5dp"
- android:layout_height="match_parent"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:background="@color/gray" />
+ android:background="?attr/overlay_background" >
<ImageButton
android:id="@+id/butPlay"
- android:layout_width="wrap_content"
+ android:layout_width="60dp"
android:layout_height="match_parent"
- android:layout_weight="0.14"
+ android:layout_centerHorizontal="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
android:background="?attr/borderless_button"
android:src="?attr/av_pause" />
- <View
- android:layout_width="0.5dp"
+ <ImageButton
+ android:id="@+id/butRev"
+ android:layout_width="60dp"
android:layout_height="match_parent"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
- android:background="@color/gray" />
+ android:layout_toLeftOf="@id/butPlay"
+ android:background="?attr/borderless_button"
+ android:src="?attr/av_rewind" />
<ImageButton
android:id="@+id/butFF"
- android:layout_width="wrap_content"
+ android:layout_width="60dp"
android:layout_height="match_parent"
- android:layout_weight="0.02"
+ android:layout_toRightOf="@id/butPlay"
android:background="?attr/borderless_button"
android:src="?attr/av_fast_forward" />
- </LinearLayout>
-
- <SeekBar
- android:id="@+id/sbPosition"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/player_control"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginTop="8dp"
- android:max="500" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/sbPosition"
- android:layout_margin="8dp"
- android:background="@color/gray" />
+ </RelativeLayout>
<RelativeLayout
android:id="@+id/playtime_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_above="@+id/sbPosition"
+ android:layout_above="@id/player_control"
android:layout_alignParentLeft="true"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginTop="8dp" >
+ android:background="?attr/overlay_drawable" >
<TextView
android:id="@+id/txtvPosition"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:text="@string/position_default_label" />
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginTop="16dp"
+ android:text="@string/position_default_label"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="@dimen/text_size_micro" />
<TextView
android:id="@+id/txtvLength"
@@ -99,15 +71,24 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
- android:text="@string/position_default_label" />
-
- <TextView
- android:id="@+id/txtvStatus"
- android:layout_width="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="8dp"
+ android:layout_marginTop="16dp"
+ android:text="@string/position_default_label"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="@dimen/text_size_micro" />
+
+ <SeekBar
+ android:id="@+id/sbPosition"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:textColor="?android:attr/textColorTertiary" />
+ android:layout_centerVertical="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_toLeftOf="@id/txtvLength"
+ android:layout_toRightOf="@id/txtvPosition"
+ android:max="500" />
</RelativeLayout>
<android.support.v4.view.ViewPager
@@ -118,10 +99,4 @@
android:layout_below="@id/tabs" >
</android.support.v4.view.ViewPager>
- <View
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:layout_below="@id/viewpager"
- android:background="@color/ics_gray" />
-
</RelativeLayout> \ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ec8329aca..6375d4ddb 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -27,8 +27,9 @@
<attr name="type_video" format="reference" />
<attr name="borderless_button" format="reference" />
<attr name="spinner_button" format="reference" />
+ <attr name="overlay_drawable" format="reference" />
<!-- Used in itemdescription -->
<attr name="non_transparent_background" format="reference" />
- <attr name="video_overlay_background" format="color" />
+ <attr name="overlay_background" format="color" />
</resources> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e4a7864d6..a4ce3c2ed 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -26,8 +26,9 @@
<color name="status_unread">#99CC00</color>
<color name="status_progress">#FFBB33</color>
<color name="status_playing">#EE5F52</color>
- <color name="video_overlay_dark">#262C31</color>
- <color name="video_overlay_light">#DDDDDD</color>
+ <color name="overlay_dark">#262C31</color>
+ <color name="overlay_light">#DDDDDD</color>
+
<!-- Use Gingerbread-orange -->
<color name="selection_background_color_dark">#FEBB20</color>
<color name="selection_background_color_light">#FEBB20</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 846469781..3878031a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,8 +29,9 @@
<item name="attr/type_video">@drawable/type_video</item>
<item name="attr/non_transparent_background">@color/white</item>
<item name="attr/borderless_button">@drawable/borderless_button</item>
- <item name="attr/video_overlay_background">@color/video_overlay_light</item>
+ <item name="attr/overlay_background">@color/overlay_light</item>
<item name="attr/spinner_button">@drawable/spinner_button</item>
+ <item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
</style>
<style name="AntennaPod.TabPageIndicator" parent="Widget.TabPageIndicator">
@@ -76,8 +77,9 @@
<item name="attr/type_video">@drawable/type_video_dark</item>
<item name="attr/non_transparent_background">@color/black</item>
<item name="attr/borderless_button">@drawable/borderless_button_dark</item>
- <item name="attr/video_overlay_background">@color/video_overlay_dark</item>
+ <item name="attr/overlay_background">@color/overlay_dark</item>
<item name="attr/spinner_button">@drawable/spinner_button_dark</item>
+ <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
</style>
<style name="AntennaPod.DarkTabPageIndicator" parent="AntennaPod.TabPageIndicator">
diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
index 0c99b6954..ac1cf6ddb 100644
--- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -34,7 +34,6 @@ public class AudioplayerActivity extends MediaplayerActivity {
ViewPager viewpager;
TabPageIndicator tabs;
MediaPlayerPagerAdapter pagerAdapter;
- TextView txtvStatus;
@Override
protected void onAwaitingVideoSurface() {
@@ -43,20 +42,17 @@ public class AudioplayerActivity extends MediaplayerActivity {
@Override
protected void postStatusMsg(int resId) {
- txtvStatus.setText(resId);
}
@Override
protected void clearStatusMsg() {
- txtvStatus.setText("");
}
@Override
protected void setupGUI() {
super.setupGUI();
- txtvStatus = (TextView) findViewById(R.id.txtvStatus);
viewpager = (ViewPager) findViewById(R.id.viewpager);
tabs = (TabPageIndicator) findViewById(R.id.tabs);
pagerAdapter = new MediaPlayerPagerAdapter(getSupportFragmentManager());
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 13:22:40 +0000