Fixed white on white icon

5 files changed, 14 insertions, 18 deletions

diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml
index 984e960d8..d6e18bb37 100644
--- a/app/src/main/res/layout/episodes_apply_action_fragment.xml
+++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml
@@ -39,7 +39,7 @@
             android:id="@+id/fabSD"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:sdMainFabClosedSrc="@drawable/ic_fab_edit"
+            app:sdMainFabClosedSrc="?attr/batch_edit_fab_icon"
             app:sdOverlayLayout="@id/fabSDOverlay"
             android:layout_marginEnd="16dp"
             android:layout_marginRight="16dp"
diff --git a/core/src/main/res/drawable/ic_fab_edit_black.xml b/core/src/main/res/drawable/ic_fab_edit_black.xml
new file mode 100644
index 000000000..a9fec7080
--- /dev/null
+++ b/core/src/main/res/drawable/ic_fab_edit_black.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_fab_edit.xml b/core/src/main/res/drawable/ic_fab_edit_white.xml
index cb2e394b0..cb2e394b0 100644
--- a/core/src/main/res/drawable/ic_fab_edit.xml
+++ b/core/src/main/res/drawable/ic_fab_edit_white.xml
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index eb7f065ce..5b0bf5717 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -74,4 +74,5 @@
     <attr name="about_screen_card_background" format="color"/>
     <attr name="about_screen_card_border" format="color"/>
     <attr name="about_screen_font_color" format="color"/>
+    <attr name="batch_edit_fab_icon" format="reference"/>
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 4c69306a9..fb69e54e7 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -72,6 +72,7 @@
         <item name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
         <item name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_grey600_24dp</item>
+        <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
         <item name="master_switch_background">@color/master_switch_background_light</item>
         <item name="currently_playing_background">@color/highlight_light</item>
 
@@ -156,6 +157,7 @@
         <item name="ic_bug">@drawable/ic_bug_white_24dp</item>
         <item name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
+        <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item>
         <item name="master_switch_background">@color/master_switch_background_dark</item>
         <item name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -176,6 +178,7 @@
         <item name="overlay_background">@color/black</item>
         <item name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
         <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_black</item>
         <item name="dragview_float_background">@color/black</item>
         <item name="nav_drawer_background">@color/black</item>
         <item name="drawer_activated_color">@color/highlight_trueblack</item>
@@ -213,23 +216,10 @@
         <!-- Room for API dependent attributes -->
     </style>
 
-    <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
-        <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
-        <item name="non_transparent_background">@color/black</item>
-        <item name="overlay_background">@color/black</item>
-        <item name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
-        <item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
-        <item name="dragview_float_background">@color/black</item>
-        <item name="nav_drawer_background">@color/black</item>
-        <item name="drawer_activated_color">@color/highlight_trueblack</item>
-        <item name="currently_playing_background">@color/highlight_trueblack</item>
-        <item name="android:textColorPrimary">@color/white</item>
-        <item name="android:color">@color/white</item>
-        <item name="android:colorBackground">@color/black</item>
-        <item name="android:windowBackground">@color/black</item>
-        <item name="android:actionBarStyle">@color/black</item>
-        <item name="colorPrimary">@color/black</item>
-        <item name="colorPrimaryDark">@color/black</item>
+    <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionModeOverlay">true</item>
     </style>