Merge pull request #3935 from ByteHamster/black-icons

Made icons black instead of grey

app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java

@@ -93,9 +93,6 @@ public class AudioplayerActivity extends MediaplayerInfoActivity {
             return;
         }
         super.setupGUI();
-        if (butCastDisconnect != null) {
-            butCastDisconnect.setVisibility(View.GONE);
-        }
         if (butPlaybackSpeed != null) {
             butPlaybackSpeed.setOnClickListener(v -> {
                 if (controller == null) {

app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java

@@ -51,10 +51,6 @@ public class CastplayerActivity extends MediaplayerInfoActivity {
             butPlaybackSpeed.setVisibility(View.GONE);
             txtvPlaybackSpeed.setVisibility(View.GONE);
         }
-//        if (butCastDisconnect != null) {
-//            butCastDisconnect.setOnClickListener(v -> castManager.disconnect());
-//            butCastDisconnect.setVisibility(View.VISIBLE);
-//        }
     }
 
     @Override

app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java

@@ -6,17 +6,9 @@ import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,11 +19,13 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.content.ContextCompat;
 import com.bumptech.glide.Glide;
-import com.joanzapata.iconify.IconDrawable;
-import com.joanzapata.iconify.fonts.FontAwesomeIcons;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.event.PlaybackPositionEvent;
 import de.danoeh.antennapod.core.feed.FeedItem;
@@ -360,19 +354,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
 
         menu.findItem(R.id.set_sleeptimer_item).setVisible(!controller.sleepTimerActive());
         menu.findItem(R.id.disable_sleeptimer_item).setVisible(controller.sleepTimerActive());
-
-        if (this instanceof AudioplayerActivity) {
-            int[] attrs = {R.attr.action_bar_icon_color};
-            TypedArray ta = obtainStyledAttributes(UserPreferences.getTheme(), attrs);
-            int textColor = ta.getColor(0, Color.GRAY);
-            ta.recycle();
-            menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this,
-                    FontAwesomeIcons.fa_sliders).color(textColor).actionBarSize());
-        } else {
-            menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this,
-                    FontAwesomeIcons.fa_sliders).color(0xffffffff).actionBarSize());
-        }
-
         return true;
     }
 

app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java

@@ -94,7 +94,6 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
 
     PlaybackSpeedIndicatorView butPlaybackSpeed;
     TextView txtvPlaybackSpeed;
-    ImageButton butCastDisconnect;
     private DrawerLayout drawerLayout;
     private NavListAdapter navAdapter;
     private ListView navList;
@@ -251,7 +250,6 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
 
         butPlaybackSpeed = findViewById(R.id.butPlaybackSpeed);
         txtvPlaybackSpeed = findViewById(R.id.txtvPlaybackSpeed);
-        butCastDisconnect = findViewById(R.id.butCastDisconnect);
 
         pager = findViewById(R.id.pager);
         pager.setOffscreenPageLimit(3);

app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java

@@ -382,6 +382,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         if (PictureInPictureUtil.supportsPictureInPicture(this)) {
             menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true);
         }
+        menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders_white);
         return true;
     }
 

app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java

@@ -50,7 +50,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         final FeedItem item = getItem(position);
         holder.bind(item);
         holder.dragHandle.setVisibility(View.GONE);
-        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.content_discard));
+        holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.ic_delete));
         holder.secondaryActionButton.setOnClickListener(v -> itemAccess.onFeedItemSecondaryAction(item));
         holder.hideSeparatorIfNecessary();
 

app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java

@@ -24,7 +24,7 @@ public class DeleteActionButton extends ItemActionButton {
     @Override
     @AttrRes
     public int getDrawable() {
-        return R.attr.content_discard;
+        return R.attr.ic_delete;
     }
 
     @Override

app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java

@@ -153,7 +153,7 @@ public class DownloadLogFragment extends ListFragment {
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
         MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard});
+        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete});
         clearHistory.setIcon(drawables.getDrawable(0));
         drawables.recycle();
     }

app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java

@@ -114,7 +114,7 @@ public class PlaybackHistoryFragment extends Fragment implements AdapterView.OnI
         super.onCreateOptionsMenu(menu, inflater);
         MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
         MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard});
+        TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete});
         clearHistory.setIcon(drawables.getDrawable(0));
         drawables.recycle();
     }

app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java

@@ -1,13 +1,14 @@
 package de.danoeh.antennapod.view;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.view.View;
 import androidx.annotation.Nullable;
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.util.ThemeUtils;
 
 public class CircularProgressBar extends View {
     private static final float EPSILON = 0.005f;
@@ -41,11 +42,9 @@ public class CircularProgressBar extends View {
         paintProgress.setStyle(Paint.Style.STROKE);
         paintProgress.setStrokeCap(Paint.Cap.ROUND);
 
-        int[] colorAttrs = new int[] { android.R.attr.textColorPrimary, android.R.attr.textColorSecondary };
+        int color = ThemeUtils.getColorFromAttr(getContext(), R.attr.action_icon_color);
-        TypedArray a = getContext().obtainStyledAttributes(colorAttrs);
+        paintProgress.setColor(color);
-        paintProgress.setColor(a.getColor(0, 0xffffffff));
+        paintBackground.setColor(color);
-        paintBackground.setColor(a.getColor(1, 0xffffffff));
-        a.recycle();
     }
 
     /**
@@ -68,7 +67,7 @@ public class CircularProgressBar extends View {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        float padding = getHeight() * 0.06f;
+        float padding = getHeight() * 0.07f;
         paintBackground.setStrokeWidth(getHeight() * 0.02f);
         paintProgress.setStrokeWidth(padding);
         RectF bounds = new RectF(padding, padding, getWidth() - padding, getHeight() - padding);

app/src/main/res/layout/all_episodes_fragment.xml

@@ -29,10 +29,10 @@
         android:paddingBottom="@dimen/list_vertical_padding"
         android:layout_above="@id/loadingMore"
         app:fastScrollEnabled="true"
-        app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollHorizontalThumbDrawable="@drawable/scrollbar_thumb_drawable"
-        app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+        app:fastScrollHorizontalTrackDrawable="@drawable/scrollbar_line_drawable"
-        app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+        app:fastScrollVerticalThumbDrawable="@drawable/scrollbar_thumb_drawable"
-        app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
+        app:fastScrollVerticalTrackDrawable="@drawable/scrollbar_line_drawable"
         tools:itemCount="13"
         tools:listitem="@layout/feeditemlist_item" />
 

app/src/main/res/layout/empty_view_layout.xml

@@ -12,11 +12,10 @@
 
     <ImageView
             android:id="@+id/emptyViewIcon"
-            android:layout_width="40dp"
+            android:layout_width="32dp"
-            android:layout_height="40dp"
+            android:layout_height="32dp"
-            android:paddingBottom="8dp"
             android:visibility="gone"
-            tools:src="@drawable/ic_feed_grey600_24dp"
+            tools:src="@drawable/ic_feed_black"
             tools:visibility="visible"/>
 
     <TextView
@@ -25,8 +24,7 @@
             android:layout_height="wrap_content"
             tools:text="Title"
             android:textSize="16sp"
-            android:textStyle="bold"
+            android:textColor="?android:attr/textColorPrimary"/>
-            android:paddingBottom="8dp"/>
 
     <TextView
             android:id="@+id/emptyViewMessage"

app/src/main/res/layout/feeditemlist_header.xml

@@ -2,6 +2,7 @@
 <LinearLayout
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -65,7 +66,7 @@
                         android:layout_height="40dp"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/show_info_label"
-                        android:src="@drawable/ic_info_white_24dp"
+                        app:srcCompat="@drawable/ic_info_white"
                         tools:background="@android:color/holo_green_dark"
                         android:layout_marginLeft="-8dp"
                         android:layout_marginStart="-8dp"
@@ -78,7 +79,7 @@
                         android:layout_height="40dp"
                         android:background="?attr/selectableItemBackground"
                         android:contentDescription="@string/show_feed_settings_label"
-                        android:src="@drawable/ic_settings_white_24dp"
+                        app:srcCompat="@drawable/ic_settings_white"
                         tools:background="@android:color/holo_green_dark"
                         android:scaleType="fitXY"
                         android:padding="8dp"/>

app/src/main/res/layout/feeditemlist_item.xml

@@ -99,21 +99,21 @@
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/type_video"
-                    tools:srcCompat="@drawable/ic_videocam_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_videocam_black_24dp"
                     android:id="@+id/ivIsVideo"/>
 
             <ImageView
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/ic_unfav"
-                    tools:srcCompat="@drawable/ic_star_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_star_black"
                     android:id="@+id/isFavorite"/>
 
             <ImageView
                     android:layout_width="14sp"
                     android:layout_height="14sp"
                     app:srcCompat="?attr/stat_playlist"
-                    tools:srcCompat="@drawable/ic_list_grey600_24dp"
+                    tools:srcCompat="@drawable/ic_playlist_black"
                     android:id="@+id/ivInPlaylist"/>
 
             <TextView

app/src/main/res/layout/fragment_subscriptions.xml

@@ -35,5 +35,5 @@
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:contentDescription="@string/add_feed_label"
-            android:src="@drawable/ic_add_white_24dp"/>
+            app:srcCompat="@drawable/ic_add_white"/>
 </RelativeLayout>

app/src/main/res/layout/mediaplayerinfo_activity.xml

@@ -167,7 +167,7 @@
                     android:layout_centerVertical="true"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/set_playback_speed_label"
-                    tools:srcCompat="@drawable/ic_playback_speed_white_48dp"
+                    tools:srcCompat="@drawable/ic_playback_speed_white"
                     tools:visibility="gone"
                     tools:background="@android:color/holo_green_dark" />
 
@@ -186,22 +186,6 @@
                     android:textColor="?android:attr/textColorSecondary"
                     android:clickable="false" />
 
-                <ImageButton
-                    android:id="@+id/butCastDisconnect"
-                    android:layout_width="@dimen/audioplayer_playercontrols_length"
-                    android:layout_height="@dimen/audioplayer_playercontrols_length"
-                    android:layout_toLeftOf="@id/butRev"
-                    android:layout_toStartOf="@id/butRev"
-                    android:layout_centerVertical="true"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/cast_disconnect_label"
-                    android:src="?attr/ic_cast_disconnect"
-                    android:scaleType="fitCenter"
-                    android:visibility="gone"
-                    tools:visibility="visible"
-                    tools:src="@drawable/ic_cast_disconnect_white_36dp"
-                    tools:background="@android:color/holo_green_dark" />
-
                 <ImageButton
                     android:id="@+id/butFF"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"

app/src/main/res/layout/storage_error.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -13,7 +14,7 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_margin="8dp"
-        android:src="?attr/ic_sd_storage" />
+        app:srcCompat="?attr/storage" />
 
     <TextView
         android:id="@+id/textView1"

app/src/main/res/menu/directory_chooser.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:custom="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/new_folder_item"
         android:title="@string/create_folder_label"
-        android:icon="?attr/ic_create_new_folder"
+        app:icon="?attr/content_new"
-        custom:showAsAction="ifRoom|withText" />
+        app:showAsAction="ifRoom|withText" />
     <item
         android:id="@+id/set_to_default_folder_item"
         android:title="@string/set_to_default_folder"
-        custom:showAsAction="collapseActionView" />
+        app:showAsAction="collapseActionView" />
 
 </menu>

app/src/main/res/menu/downloads_completed.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/episode_actions"
         android:menuCategory="container"
         android:title="@string/multi_select"
         android:icon="?attr/checkbox_multiple"
-        android:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/menu/episodes_apply_action_speeddial.xml

@@ -6,7 +6,7 @@
          visually it will be shown at the bottom of the list of actions.
       -->
     <item android:id="@+id/delete_batch"
-        android:icon="?attr/content_discard"
+        android:icon="?attr/ic_delete"
         android:title="@string/delete_episode_label"
         />
     <item android:id="@+id/download_batch"

app/src/main/res/menu/feedlist.xml

@@ -73,7 +73,7 @@
 
     <item
         android:id="@+id/remove_item"
-        android:icon="?attr/content_discard"
+        android:icon="?attr/ic_delete"
         android:menuCategory="container"
         android:title="@string/remove_feed_label"
         android:visible="true"

app/src/main/res/menu/mediaplayer.xml

@@ -30,6 +30,7 @@
 
     <item
         android:id="@+id/audio_controls"
+        android:icon="?attr/ic_sliders"
         android:title="@string/audio_controls"
         custom:showAsAction="always">
     </item>
@@ -59,9 +60,8 @@
 
     <item
         android:id="@+id/share_item"
-        android:icon="?attr/social_share"
         android:menuCategory="container"
-        custom:showAsAction="ifRoom"
+        custom:showAsAction="never"
         android:title="@string/share_label">
         <menu>
             <item

app/src/main/res/xml/feed_settings.xml

@@ -23,7 +23,7 @@
     <ListPreference
             android:entries="@array/spnAutoDeleteItems"
             android:entryValues="@array/spnAutoDeleteValues"
-            android:icon="?attr/content_discard"
+            android:icon="?attr/ic_delete"
             android:title="@string/auto_delete_label"
             android:summary="@string/feed_auto_download_global"
             android:key="autoDelete"/>

app/src/main/res/xml/preferences.xml

@@ -13,7 +13,7 @@
             android:key="prefScreenInterface"
             android:title="@string/user_interface_label"
             android:summary="@string/user_interface_sum"
-            android:icon="?attr/ic_cellphone_text" />
+            android:icon="?attr/ic_appearance" />
 
     <Preference
             android:key="prefScreenPlayback"
@@ -25,7 +25,7 @@
             android:key="prefScreenNetwork"
             android:title="@string/network_pref"
             android:summary="@string/network_pref_sum"
-            android:icon="?attr/ic_swap" />
+            android:icon="?attr/ic_network" />
 
     <Preference
             android:key="prefScreenIntegrations"

core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java

@@ -400,8 +400,8 @@ public class PlaybackController {
 
         if (PlaybackService.getCurrentMediaType() == MediaType.AUDIO  ||  PlaybackService.isCasting()) {
             TypedArray res = activity.obtainStyledAttributes(new int[]{ R.attr.av_play, R.attr.av_pause});
-            playResource = res.getResourceId(0, R.drawable.ic_av_play_dark_48dp);
+            playResource = res.getResourceId(0, R.drawable.ic_av_play_black_48dp);
-            pauseResource = res.getResourceId(1, R.drawable.ic_av_pause_dark_48dp);
+            pauseResource = res.getResourceId(1, R.drawable.ic_av_pause_black_48dp);
             res.recycle();
         } else {
             playResource = R.drawable.ic_av_play_white_80dp;