diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/abstract_fragment_activity.xml | 16 | ||||
-rw-r--r-- | app/src/main/res/layout/appwidget4x1.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/appwidget4x2.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/appwidget4x3.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/appwidget4x4.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/download_media_buttons.xml | 14 | ||||
-rw-r--r-- | app/src/main/res/layout/notification.xml | 30 | ||||
-rw-r--r-- | app/src/main/res/layout/notification_expanded.xml | 30 |
8 files changed, 38 insertions, 76 deletions
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml index b51922fd..04e6ec81 100644 --- a/app/src/main/res/layout/abstract_fragment_activity.xml +++ b/app/src/main/res/layout/abstract_fragment_activity.xml @@ -104,25 +104,21 @@ android:layout_weight="1"> <ImageButton - style="@style/PlaybackControl.Match" + style="@style/PlaybackControl.BottomBar" android:id="@+id/download_previous" android:src="?attr/actionbar_backward" - android:layout_width="0dp" - android:layout_weight="1"/> + android:padding="2dp"/> <ImageButton - style="@style/PlaybackControl.Match" + style="@style/PlaybackControl.BottomBar" android:id="@+id/download_start" - android:src="?attr/actionbar_start" - android:layout_width="0dp" - android:layout_weight="1"/> + android:src="?attr/actionbar_start"/> <ImageButton - style="@style/PlaybackControl.Match" + style="@style/PlaybackControl.BottomBar" android:id="@+id/download_next" android:src="?attr/actionbar_forward" - android:layout_width="0dp" - android:layout_weight="1"/> + android:padding="2dp"/> </LinearLayout> </LinearLayout> </FrameLayout> diff --git a/app/src/main/res/layout/appwidget4x1.xml b/app/src/main/res/layout/appwidget4x1.xml index 81e77852..86ddade0 100644 --- a/app/src/main/res/layout/appwidget4x1.xml +++ b/app/src/main/res/layout/appwidget4x1.xml @@ -82,7 +82,7 @@ android:layout_weight="1" android:scaleType="center" style="@style/NotificationButton" - android:src="@drawable/ic_appwidget_music_previous" /> + android:src="@drawable/media_backward_dark" /> <ImageButton android:id="@+id/control_play" @@ -90,7 +90,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_play" + android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> <ImageButton @@ -99,7 +99,7 @@ android:layout_height="fill_parent" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_next" + android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x2.xml b/app/src/main/res/layout/appwidget4x2.xml index d2a42ff0..52d0c15c 100644 --- a/app/src/main/res/layout/appwidget4x2.xml +++ b/app/src/main/res/layout/appwidget4x2.xml @@ -105,7 +105,7 @@ android:layout_weight="1" android:scaleType="center" style="@style/NotificationButton" - android:src="@drawable/ic_appwidget_music_previous" /> + android:src="@drawable/media_backward_dark" /> <ImageButton android:id="@+id/control_play" @@ -113,7 +113,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_play" + android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> <ImageButton @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_next" + android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x3.xml b/app/src/main/res/layout/appwidget4x3.xml index 77a15ad5..4cfb4b77 100644 --- a/app/src/main/res/layout/appwidget4x3.xml +++ b/app/src/main/res/layout/appwidget4x3.xml @@ -87,7 +87,7 @@ android:layout_weight="1" android:scaleType="center" style="@style/NotificationButton" - android:src="@drawable/ic_appwidget_music_previous" /> + android:src="@drawable/media_backward_dark" /> <ImageButton android:id="@+id/control_play" @@ -95,7 +95,7 @@ android:layout_height="56dip" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_play" + android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> <ImageButton @@ -104,7 +104,7 @@ android:layout_height="56dip" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_next" + android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/layout/appwidget4x4.xml b/app/src/main/res/layout/appwidget4x4.xml index 56f5c622..681d9252 100644 --- a/app/src/main/res/layout/appwidget4x4.xml +++ b/app/src/main/res/layout/appwidget4x4.xml @@ -89,7 +89,7 @@ android:layout_weight="1" android:scaleType="center" style="@style/NotificationButton" - android:src="@drawable/ic_appwidget_music_previous" /> + android:src="@drawable/media_backward_dark" /> <ImageButton android:id="@+id/control_play" @@ -97,7 +97,7 @@ android:layout_height="56dip" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_play" + android:src="@drawable/media_start_dark" style="@style/NotificationButton" /> <ImageButton @@ -106,7 +106,7 @@ android:layout_height="56dip" android:layout_weight="1" android:scaleType="center" - android:src="@drawable/ic_appwidget_music_next" + android:src="@drawable/media_forward_dark" style="@style/NotificationButton" /> </LinearLayout> diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml index 1affb164..c75b5d73 100644 --- a/app/src/main/res/layout/download_media_buttons.xml +++ b/app/src/main/res/layout/download_media_buttons.xml @@ -7,7 +7,7 @@ android:background="@android:color/transparent"> <ImageButton - style="@style/PlaybackControl.Small" + style="@style/PlaybackControl" android:id="@+id/download_repeat" android:src="?attr/media_button_repeat_off" android:layout_alignParentLeft="true" @@ -15,7 +15,7 @@ /> <github.daneren2005.dsub.view.AutoRepeatButton - style="@style/PlaybackControl" + style="@style/PlaybackControl.Small" android:id="@+id/download_previous" android:src="?attr/media_button_backward" android:layout_toLeftOf="@+id/download_pause" @@ -23,7 +23,7 @@ /> <ImageButton - style="@style/PlaybackControl" + style="@style/PlaybackControl.Large" android:id="@+id/download_pause" android:src="?attr/media_button_pause" android:layout_centerInParent="true" @@ -31,7 +31,7 @@ /> <ImageButton - style="@style/PlaybackControl" + style="@style/PlaybackControl.Large" android:id="@+id/download_stop" android:src="?attr/media_button_stop" android:layout_centerInParent="true" @@ -39,14 +39,14 @@ /> <ImageButton - style="@style/PlaybackControl" + style="@style/PlaybackControl.Large" android:id="@+id/download_start" android:src="?attr/media_button_start" android:layout_centerInParent="true" /> <github.daneren2005.dsub.view.AutoRepeatButton - style="@style/PlaybackControl" + style="@style/PlaybackControl.Small" android:id="@+id/download_next" android:src="?attr/media_button_forward" android:layout_toRightOf="@+id/download_start" @@ -54,7 +54,7 @@ /> <ImageButton - style="@style/PlaybackControl.Small" + style="@style/PlaybackControl" android:id="@+id/download_toggle_list" android:src="?attr/toggle_list" android:layout_alignParentRight="true" diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml index e7c24acf..7e1c98bf 100644 --- a/app/src/main/res/layout/notification.xml +++ b/app/src/main/res/layout/notification.xml @@ -50,34 +50,18 @@ <ImageButton android:id="@+id/control_previous" - android:src="@drawable/notification_previous" - style="@style/NotificationButton" - android:layout_width="46dip" - android:layout_height="fill_parent" - android:layout_gravity="center|right" - android:padding="8.0dip" - android:layout_weight="0.0" - android:scaleType="fitCenter"/> + android:src="@drawable/media_backward_dark" + style="@style/NotificationButton"/> <ImageButton android:id="@+id/control_pause" - android:src="@drawable/notification_pause" + android:src="@drawable/media_pause_dark" style="@style/NotificationButton" - android:layout_width="46dip" - android:layout_height="fill_parent" - android:layout_gravity="center|right" - android:padding="8.0dip" - android:layout_weight="0.0" - android:scaleType="fitCenter"/> + android:layout_width="54dip" + android:padding="0dip"/> <ImageButton android:id="@+id/control_next" - android:src="@drawable/notification_next" - style="@style/NotificationButton" - android:layout_width="46dip" - android:layout_height="fill_parent" - android:layout_gravity="center|right" - android:padding="8.0dip" - android:layout_weight="0.0" - android:scaleType="fitCenter"/> + android:src="@drawable/media_forward_dark" + style="@style/NotificationButton"/> </LinearLayout> diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml index 79d694db..bfd3c757 100644 --- a/app/src/main/res/layout/notification_expanded.xml +++ b/app/src/main/res/layout/notification_expanded.xml @@ -86,36 +86,18 @@ <ImageButton android:id="@+id/control_previous" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:padding="10dip" - style="@style/NotificationButton" - android:scaleType="fitCenter" - android:src="@drawable/notification_previous" /> + style="@style/NotificationButton.Expanded" + android:src="@drawable/media_backward_dark" /> <ImageButton android:id="@+id/control_pause" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:padding="10dip" - style="@style/NotificationButton" - android:scaleType="fitCenter" - android:src="@drawable/notification_pause" /> + style="@style/NotificationButton.Expanded" + android:src="@drawable/media_pause_dark" /> <ImageButton android:id="@+id/control_next" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:layout_weight="1" - android:padding="10dip" - style="@style/NotificationButton" - android:scaleType="fitCenter" - android:src="@drawable/notification_next" /> + style="@style/NotificationButton.Expanded" + android:src="@drawable/media_forward_dark" /> </LinearLayout> </LinearLayout> |