Merge pull request #3629 from ByteHamster/streaming-icon

Updated streaming icon

13 files changed, 84 insertions, 44 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 5af69a4ca..9a88441e0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -3,12 +3,14 @@ package de.danoeh.antennapod.fragment;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.Layout;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -18,12 +20,16 @@ import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import com.bumptech.glide.Glide;
@@ -101,8 +107,8 @@ public class ItemFragment extends Fragment {
     private ImageView imgvCover;
     private ProgressBar progbarDownload;
     private ProgressBar progbarLoading;
-    private IconButton butAction1;
-    private IconButton butAction2;
+    private Button butAction1;
+    private Button butAction2;
 
     private Disposable disposable;
 
@@ -295,53 +301,59 @@ public class ItemFragment extends Fragment {
         }
 
         FeedMedia media = item.getMedia();
-        String butAction1Icon = null;
-        int butAction1Text = 0;
-        String butAction2Icon = null;
-        int butAction2Text = 0;
+        @AttrRes int butAction1Icon = 0;
+        @StringRes int butAction1Text = 0;
+        @AttrRes int butAction2Icon = 0;
+        @StringRes int butAction2Text = 0;
         if (media == null) {
             if (!item.isPlayed()) {
-                butAction1Icon = "{fa-check 24sp}";
+                butAction1Icon = R.attr.navigation_accept;
                 butAction1Text = R.string.mark_read_label;
             }
             if (item.getLink() != null) {
-                butAction2Icon = "{md-web 24sp}";
+                butAction2Icon = R.attr.location_web_site;
                 butAction2Text = R.string.visit_website_label;
             }
         } else {
-            if(media.getDuration() > 0) {
+            if (media.getDuration() > 0) {
                 txtvDuration.setText(Converter.getDurationStringLong(media.getDuration()));
             }
             boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
             if (!media.isDownloaded()) {
-                butAction2Icon = "{md-settings-input-antenna 24sp}";
+                butAction2Icon = R.attr.action_stream;
                 butAction2Text = R.string.stream_label;
             } else {
-                butAction2Icon = "{md-delete 24sp}";
+                butAction2Icon = R.attr.content_discard;
                 butAction2Text = R.string.delete_label;
             }
             if (isDownloading) {
-                butAction1Icon = "{md-cancel 24sp}";
+                butAction1Icon = R.attr.navigation_cancel;
                 butAction1Text = R.string.cancel_label;
             } else if (media.isDownloaded()) {
-                butAction1Icon = "{md-play-arrow 24sp}";
+                butAction1Icon = R.attr.av_play;
                 butAction1Text = R.string.play_label;
             } else {
-                butAction1Icon = "{md-file-download 24sp}";
+                butAction1Icon = R.attr.av_download;
                 butAction1Text = R.string.download_label;
             }
         }
 
-        if(butAction1Icon != null && butAction1Text != 0) {
-            butAction1.setText(butAction1Icon +"\u0020\u0020" + getActivity().getString(butAction1Text));
-            Iconify.addIcons(butAction1);
+        if (butAction1Icon != 0 && butAction1Text != 0) {
+            butAction1.setText(butAction1Text);
+            butAction1.setTransformationMethod(null);
+            TypedValue typedValue = new TypedValue();
+            getContext().getTheme().resolveAttribute(butAction1Icon, typedValue, true);
+            butAction1.setCompoundDrawablesWithIntrinsicBounds(typedValue.resourceId, 0, 0, 0);
             butAction1.setVisibility(View.VISIBLE);
         } else {
             butAction1.setVisibility(View.INVISIBLE);
         }
-        if(butAction2Icon != null && butAction2Text != 0) {
-            butAction2.setText(butAction2Icon +"\u0020\u0020" + getActivity().getString(butAction2Text));
-            Iconify.addIcons(butAction2);
+        if (butAction2Icon != 0 && butAction2Text != 0) {
+            butAction2.setText(butAction2Text);
+            butAction2.setTransformationMethod(null);
+            TypedValue typedValue = new TypedValue();
+            getContext().getTheme().resolveAttribute(butAction2Icon, typedValue, true);
+            butAction2.setCompoundDrawablesWithIntrinsicBounds(typedValue.resourceId, 0, 0, 0);
             butAction2.setVisibility(View.VISIBLE);
         } else {
             butAction2.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index b047b3da0..3352fdf19 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -112,38 +112,43 @@
             android:orientation="horizontal"
             tools:background="@android:color/holo_blue_bright">
 
-            <com.joanzapata.iconify.widget.IconButton
-                android:id="@+id/butAction1"
+            <View
                 android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/butAction1"
+                style="?attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="48dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_weight="1"
-                android:background="?attr/selectableItemBackground"
                 android:ellipsize="end"
-                android:gravity="center"
+                android:drawablePadding="8dp"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/text_size_small"
                 tools:text="Button 1"
                 tools:background="@android:color/holo_red_light" />
 
-            <com.joanzapata.iconify.widget.IconButton
-                android:id="@+id/butAction2"
+            <View
                 android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/butAction2"
+                style="?attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
                 android:layout_height="48dp"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_weight="1"
-                android:background="?attr/selectableItemBackground"
+                android:drawablePadding="8dp"
                 android:ellipsize="end"
-                android:gravity="center"
                 android:textColor="?android:attr/textColorPrimary"
-                android:textSize="@dimen/text_size_small"
                 tools:text="Button 2"
                 tools:background="@android:color/holo_orange_dark" />
 
+            <View
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_weight="1" />
+
         </LinearLayout>
 
         <View
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png
deleted file mode 100644
index f8f215236..000000000
--- a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png
deleted file mode 100644
index eb2611f95..000000000
--- a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png
deleted file mode 100644
index dafbeca33..000000000
--- a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png
deleted file mode 100644
index ccf89acea..000000000
--- a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png
deleted file mode 100644
index 49813c945..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png
deleted file mode 100644
index bac1560a2..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png
deleted file mode 100644
index 37ce4c61a..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png
deleted file mode 100644
index 0609c3154..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable/ic_stream_grey600.xml b/core/src/main/res/drawable/ic_stream_grey600.xml
new file mode 100644
index 000000000..da9636f8c
--- /dev/null
+++ b/core/src/main/res/drawable/ic_stream_grey600.xml
@@ -0,0 +1,14 @@
+<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="#FF757575"
+      android:pathData="m20.5099,12.0219c0,-1.41 -1.143,-2.553 -2.553,-2.553h-1.2765v-0.4255c0,-2.5849 -2.0955,-4.6804 -4.6804,-4.6804 -2.1275,0 -3.9401,1.4382 -4.5017,3.4039H6.8941c-1.8799,0 -3.4039,1.524 -3.4039,3.4039 0,1.8799 1.524,3.4039 3.4039,3.4039h2.553v1.702H6.8941c-2.8199,0 -5.1059,-2.286 -5.1059,-5.1059 0,-2.6381 1.9913,-4.7996 4.5528,-5.0719C7.4047,4.0566 9.5407,2.661 12,2.661c3.0976,0 5.6761,2.2041 6.2633,5.14 2.2041,0.1532 3.9486,1.9743 3.9486,4.2209 0,1.4041 -0.6445,2.3463 -1.5471,3.1885 -0.4185,-0.2876 -0.8313,-0.5368 -1.3724,-0.8908 1.092,-0.8808 1.2175,-1.8722 1.2175,-2.2977z"
+      android:strokeWidth="0.85098612"/>
+  <path
+      android:fillColor="#FF757575"
+      android:pathData="m12.2085,13.3476v9.4907l7.4569,-4.7453z"
+      android:strokeWidth="0.67790419"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_stream_white.xml b/core/src/main/res/drawable/ic_stream_white.xml
index 3c59bbad7..aca761365 100644
--- a/core/src/main/res/drawable/ic_stream_white.xml
+++ b/core/src/main/res/drawable/ic_stream_white.xml
@@ -1,5 +1,14 @@
-<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="#FFFFFFFF" android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
+<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="#FFFFFFFF"
+      android:pathData="m20.5099,12.0219c0,-1.41 -1.143,-2.553 -2.553,-2.553h-1.2765v-0.4255c0,-2.5849 -2.0955,-4.6804 -4.6804,-4.6804 -2.1275,0 -3.9401,1.4382 -4.5017,3.4039H6.8941c-1.8799,0 -3.4039,1.524 -3.4039,3.4039 0,1.8799 1.524,3.4039 3.4039,3.4039h2.553v1.702H6.8941c-2.8199,0 -5.1059,-2.286 -5.1059,-5.1059 0,-2.6381 1.9913,-4.7996 4.5528,-5.0719C7.4047,4.0566 9.5407,2.661 12,2.661c3.0976,0 5.6761,2.2041 6.2633,5.14 2.2041,0.1532 3.9486,1.9743 3.9486,4.2209 0,1.4041 -0.6445,2.3463 -1.5471,3.1885 -0.4185,-0.2876 -0.8313,-0.5368 -1.3724,-0.8908 1.092,-0.8808 1.2175,-1.8722 1.2175,-2.2977z"
+      android:strokeWidth="0.85098612"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m12.2085,13.3476v9.4907l7.4569,-4.7453z"
+      android:strokeWidth="0.67790419"/>
 </vector>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index f4aa88b06..7fd074a5e 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -18,7 +18,7 @@
         <item name="action_about">@drawable/ic_info_grey600_24dp</item>
         <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_grey600_24dp</item>
         <item name="action_search">@drawable/ic_search_grey600_24dp</item>
-        <item name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
+        <item name="action_stream">@drawable/ic_stream_grey600</item>
         <item name="av_download">@drawable/ic_file_download_grey600_24dp</item>
         <item name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
         <item name="av_pause">@drawable/ic_pause_grey600_24dp</item>
@@ -105,7 +105,7 @@
         <item name="action_about">@drawable/ic_info_white_24dp</item>
         <item name="checkbox_multiple">@drawable/ic_checkbox_multiple_marked_outline_white_24dp</item>
         <item name="action_search">@drawable/ic_search_white_24dp</item>
-        <item name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
+        <item name="action_stream">@drawable/ic_stream_white</item>
         <item name="av_download">@drawable/ic_file_download_white_24dp</item>
         <item name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
         <item name="av_pause">@drawable/ic_pause_white_24dp</item>