Eleven: Fix White on White Bug.
Change-Id: I8b762990a11703f26ea40c377995310cbf86421a
diff --git a/res/drawable/btn_playback_next_widget.xml b/res/drawable/btn_playback_next_widget.xml
new file mode 100644
index 0000000..4070ab3
--- /dev/null
+++ b/res/drawable/btn_playback_next_widget.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M6 18l8.5-6L6 6v12zm2-8.14L11.03 12 8 14.14V9.86zM16 6h2v12h-2z"
+ android:fillType="evenOdd" />
+</vector>
diff --git a/res/drawable/btn_playback_pause_widget.xml b/res/drawable/btn_playback_pause_widget.xml
new file mode 100644
index 0000000..dc271fe
--- /dev/null
+++ b/res/drawable/btn_playback_pause_widget.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M17 6H15V18H17V6ZM15 4H13V6V18V20H15H17H19V18V6V4H17H15ZM8 6H6V18H8V6ZM6 4H4V6V18V20H6H8H10V18V6V4H8H6Z"
+ android:fillType="evenOdd" />
+</vector>
diff --git a/res/drawable/btn_playback_play_widget.xml b/res/drawable/btn_playback_play_widget.xml
new file mode 100644
index 0000000..32fba27
--- /dev/null
+++ b/res/drawable/btn_playback_play_widget.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M10,8.64L15.27,12L10,15.36V8.64M8,5v14l11,-7L8,5L8,5z" />
+</vector>
diff --git a/res/drawable/btn_playback_previous_widget.xml b/res/drawable/btn_playback_previous_widget.xml
new file mode 100644
index 0000000..dd4fa98
--- /dev/null
+++ b/res/drawable/btn_playback_previous_widget.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M6 6h2v12H6zm3.5 6l8.5 6V6l-8.5 6zm6.5 2.14L12.97 12 16 9.86v4.28z"
+ android:fillType="evenOdd" />
+</vector>
diff --git a/res/drawable/btn_playback_repeat_all_widget.xml b/res/drawable/btn_playback_repeat_all_widget.xml
new file mode 100644
index 0000000..9d4fe5b
--- /dev/null
+++ b/res/drawable/btn_playback_repeat_all_widget.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4z" />
+</vector>
diff --git a/res/drawable/btn_playback_repeat_one_widget.xml b/res/drawable/btn_playback_repeat_one_widget.xml
new file mode 100644
index 0000000..6720875
--- /dev/null
+++ b/res/drawable/btn_playback_repeat_one_widget.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4zm-4-2V9h-1l-2
+1v1h1.5v4H13z" />
+</vector>
diff --git a/res/drawable/btn_playback_shuffle_all_widget.xml b/res/drawable/btn_playback_shuffle_all_widget.xml
new file mode 100644
index 0000000..63de04d
--- /dev/null
+++ b/res/drawable/btn_playback_shuffle_all_widget.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:fillColor="@color/default_text_color"
+ android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
+17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
+2.04-3.13-3.13z" />
+</vector>
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
index 9bb647b..71efcb4 100644
--- a/res/layout/app_widget_large.xml
+++ b/res/layout/app_widget_large.xml
@@ -79,7 +79,7 @@
android:contentDescription="@string/accessibility_prev"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_previous" />
+ android:src="@drawable/btn_playback_previous_widget" />
<ImageButton
android:id="@+id/app_widget_large_play"
@@ -89,7 +89,7 @@
android:background="?android:selectableItemBackground"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_pause" />
+ android:src="@drawable/btn_playback_pause_widget" />
<ImageButton
android:id="@+id/app_widget_large_next"
@@ -100,7 +100,7 @@
android:contentDescription="@string/accessibility_next"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_next" />
+ android:src="@drawable/btn_playback_next_widget" />
</LinearLayout>
</GridLayout>
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
index 8bb3504..4ea0e67 100644
--- a/res/layout/app_widget_large_alternate.xml
+++ b/res/layout/app_widget_large_alternate.xml
@@ -78,7 +78,7 @@
android:contentDescription="@string/accessibility_shuffle"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_shuffle_all" />
+ android:src="@drawable/btn_playback_shuffle_all_widget" />
<ImageButton
android:id="@+id/app_widget_large_alternate_previous"
@@ -89,7 +89,7 @@
android:contentDescription="@string/accessibility_prev"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_previous" />
+ android:src="@drawable/btn_playback_previous_widget" />
<ImageButton
android:id="@+id/app_widget_large_alternate_play"
@@ -99,7 +99,7 @@
android:background="?android:selectableItemBackground"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_pause" />
+ android:src="@drawable/btn_playback_pause_widget" />
<ImageButton
android:id="@+id/app_widget_large_alternate_next"
@@ -110,7 +110,7 @@
android:contentDescription="@string/accessibility_next"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_next" />
+ android:src="@drawable/btn_playback_next_widget" />
<ImageButton
android:id="@+id/app_widget_large_alternate_repeat"
@@ -121,7 +121,7 @@
android:contentDescription="@string/accessibility_repeat"
android:padding="@dimen/notification_expanded_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_repeat_all" />
+ android:src="@drawable/btn_playback_repeat_all_widget" />
</LinearLayout>
</GridLayout>
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
index 97e55a9..77c9c3d 100644
--- a/res/layout/app_widget_small.xml
+++ b/res/layout/app_widget_small.xml
@@ -49,7 +49,7 @@
android:focusable="true"
android:padding="@dimen/app_widget_small_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_previous" />
+ android:src="@drawable/btn_playback_previous_widget" />
<ImageButton
android:id="@+id/app_widget_small_play"
@@ -61,7 +61,7 @@
android:focusable="true"
android:padding="@dimen/app_widget_small_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_play" />
+ android:src="@drawable/btn_playback_play_widget" />
<ImageButton
android:id="@+id/app_widget_small_next"
@@ -73,7 +73,7 @@
android:focusable="true"
android:padding="@dimen/app_widget_small_button_padding"
android:scaleType="fitCenter"
- android:src="@drawable/btn_playback_next" />
+ android:src="@drawable/btn_playback_next_widget" />
</LinearLayout>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 420ed34..0661fb7 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -33,6 +33,9 @@
<!-- Transparent colors -->
<color name="background_color">#121212</color>
+ <!-- Color for the Position Number -->
+ <color name="position_number_color">@color/black</color>
+
<!-- Color for the action bar -->
<color name="header_action_bar_text_color">@color/white</color>
<color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7706d25..4cf34ae 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -109,7 +109,7 @@
<color name="now_playing_divider">@color/transparent</color>
<!-- App widget colors -->
- <color name="widget_text">@color/white</color>
+ <color name="widget_text">@color/default_text_color</color>
<!-- Background Lyrics Color -->
<color name="lyrics_background_color">#b2212121</color>
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
index 820a149..97b06b8 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
@@ -126,12 +126,12 @@
final boolean isPlaying = service.isPlaying();
if (isPlaying) {
appWidgetView.setImageViewResource(R.id.app_widget_large_play,
- R.drawable.btn_playback_pause);
+ R.drawable.btn_playback_pause_widget);
appWidgetView.setContentDescription(R.id.app_widget_large_play,
service.getString(R.string.accessibility_pause));
} else {
appWidgetView.setImageViewResource(R.id.app_widget_large_play,
- R.drawable.btn_playback_play);
+ R.drawable.btn_playback_play_widget);
appWidgetView.setContentDescription(R.id.app_widget_large_play,
service.getString(R.string.accessibility_play));
}
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
index 3cfd044..c0254ac 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
@@ -131,12 +131,12 @@
final boolean isPlaying = service.isPlaying();
if (isPlaying) {
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
- R.drawable.btn_playback_pause);
+ R.drawable.btn_playback_pause_widget);
appWidgetView.setContentDescription(R.id.app_widget_large_alternate_play,
service.getString(R.string.accessibility_pause));
} else {
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_play,
- R.drawable.btn_playback_play);
+ R.drawable.btn_playback_play_widget);
appWidgetView.setContentDescription(R.id.app_widget_large_alternate_play,
service.getString(R.string.accessibility_play));
}
@@ -145,19 +145,19 @@
switch (service.getRepeatMode()) {
case MusicPlaybackService.REPEAT_ALL:
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
- R.drawable.btn_playback_repeat_all);
+ R.drawable.btn_playback_repeat_all_widget);
appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
(int)(RepeatButton.ACTIVE_ALPHA * 255));
break;
case MusicPlaybackService.REPEAT_CURRENT:
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
- R.drawable.btn_playback_repeat_one);
+ R.drawable.btn_playback_repeat_one_widget);
appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
(int)(RepeatButton.ACTIVE_ALPHA * 255));
break;
default:
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_repeat,
- R.drawable.btn_playback_repeat_all);
+ R.drawable.btn_playback_repeat_all_widget);
appWidgetView.setInt(R.id.app_widget_large_alternate_repeat, "setAlpha",
(int)(RepeatButton.INACTIVE_ALPHA * 255));
break;
@@ -167,7 +167,7 @@
switch (service.getShuffleMode()) {
case MusicPlaybackService.SHUFFLE_NONE:
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_shuffle,
- R.drawable.btn_playback_shuffle_all);
+ R.drawable.btn_playback_shuffle_all_widget);
appWidgetView.setInt(R.id.app_widget_large_alternate_shuffle, "setAlpha",
(int)(ShuffleButton.INACTIVE_ALPHA * 255));
break;
@@ -175,7 +175,7 @@
case MusicPlaybackService.SHUFFLE_NORMAL:
default:
appWidgetView.setImageViewResource(R.id.app_widget_large_alternate_shuffle,
- R.drawable.btn_playback_shuffle_all);
+ R.drawable.btn_playback_shuffle_all_widget);
appWidgetView.setInt(R.id.app_widget_large_alternate_shuffle, "setAlpha",
(int)(ShuffleButton.ACTIVE_ALPHA * 255));
break;
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
index b0a2b4e..00690a4 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
@@ -132,12 +132,12 @@
final boolean isPlaying = service.isPlaying();
if (isPlaying) {
appWidgetView.setImageViewResource(R.id.app_widget_small_play,
- R.drawable.btn_playback_pause);
+ R.drawable.btn_playback_pause_widget);
appWidgetView.setContentDescription(R.id.app_widget_small_play,
service.getString(R.string.accessibility_pause));
} else {
appWidgetView.setImageViewResource(R.id.app_widget_small_play,
- R.drawable.btn_playback_play);
+ R.drawable.btn_playback_play_widget);
appWidgetView.setContentDescription(R.id.app_widget_small_play,
service.getString(R.string.accessibility_play));
}