From 08cbb0bf96b935ef1cb8a9b6862e4f9c116e036b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 21 Nov 2019 11:08:31 +0100
Subject: [PATCH] Updated streaming icon

---
 .../antennapod/fragment/ItemFragment.java     |  52 +++++++++++-------
 app/src/main/res/layout/feeditem_fragment.xml |  41 ++++++++------
 ...ic_settings_input_antenna_grey600_24dp.png | Bin 569 -> 0 bytes
 .../ic_settings_input_antenna_white_24dp.png  | Bin 553 -> 0 bytes
 ...ic_settings_input_antenna_grey600_24dp.png | Bin 388 -> 0 bytes
 .../ic_settings_input_antenna_white_24dp.png  | Bin 371 -> 0 bytes
 ...ic_settings_input_antenna_grey600_24dp.png | Bin 698 -> 0 bytes
 .../ic_settings_input_antenna_white_24dp.png  | Bin 675 -> 0 bytes
 ...ic_settings_input_antenna_grey600_24dp.png | Bin 1063 -> 0 bytes
 .../ic_settings_input_antenna_white_24dp.png  | Bin 1019 -> 0 bytes
 .../main/res/drawable/ic_stream_grey600.xml   |  14 +++++
 .../src/main/res/drawable/ic_stream_white.xml |  17 ++++--
 core/src/main/res/values/styles.xml           |   4 +-
 13 files changed, 84 insertions(+), 44 deletions(-)
 delete mode 100644 core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png
 delete mode 100644 core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png
 delete mode 100644 core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png
 delete mode 100644 core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png
 delete mode 100644 core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png
 delete mode 100644 core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png
 create mode 100644 core/src/main/res/drawable/ic_stream_grey600.xml

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 f8f215236faf25686ac6c1bb7a9510bec6689be6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 569
zcmV-90>=G`P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD00062Nkl<ZcmeH`
z1FT$85J2~-Zmcq>jTp7tShdaY)W-LZQ@2rV+l<vlwQXCI$z<`@bvvu!**i1$g?@@q
zoo<X_GLsoYH>zcVs82DM_#E}RNFnu7hty#UpR_dg^@&Z?N)B<E!dokP#sL<PLk<f#
z$aC|*VLVPEOgVOH>PObo5kEYNPbW6oS+`O)9;Q4eHR(7F<NjIWu&i<=Hf5)ogKNI#
z43e!4q8Zu@9yyx1t%L@dtijQ0S7a*J2_N${CR0J9<J31XW>Y%iIcm4%Mu|JSPHWA`
z)v?!%1Z~l-r73#xUJD<yo+5Hs!+rI<qlY$lTI`LH*YA^TN=8gu#oS{kf#n1Y<gTJx
zil?bmeWI>`D3*lvIvZ(<vs90nV`a|hw91RUNvwQJ(1)R;=u`DHh6xv{a8Kfs#OfmY
zd3!YV7W=Yr*%U*qq0ww(2V>AC87%RuI1+s+Ruu`+O^gGgH`fsdiaBWeI%GZ>J59to
zEP7`FF-D99q7Tw(i7?tQ;WuoZSOY{~B>JfEtC$m}7iq~h!a>{Z2HBKMPb}<+1!W*H
zt&Pka6tLegd+|e=3qC6avl1_qoiI~CGvmeogK*g*pe;DrVV2wam*HfM(brO(>@bU2
ztlAQsY%mT^#wZ407_kjSpY%WuOEHY0)RQi%4^GLRKSRC%SRNplCiOPP00000NkvXX
Hu0mjfQUU!d

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 eb2611f95c053bcf4d03d4d3a3fb09ebda6f0e7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005-Nkl<ZcmeIw
z1I*u76o>IY=fxU>*@!WFi#6K}Yuj<^HmYr#vD&DeZ5#j3lAH75_u77f>nAzidvaZZ
zOFiN(!wvVAM_ket#kFR6A6ecr!!<3JTxElb#;925ismH+Bm5=svpwdRY_d7_`bFSR
zgXNpjoMS8CKdarZlsPSVz*-f+MrSvsIoDCZVb|vx!Hu<UozrkpTLBXks`qa7g5idH
z!7ZW~MUw%W)GyF*z?-o?-$<XR&Bum2FHYY946XN55%Gjr-|bWN;S+bpjVTfP<yp~&
zs5%wp3I70ou-Z(Mt?&)tZ;wTR$HCfc`&ICt6tTNQ^R<_ibAhtweHE(P)6UH*sJOaD
zGz+YbY(51iU0N^43!R9x&Q0reU|P+E_rd*XJ`#K_G+A8aYcMRW9s;N1(52vKrS##S
zfS0QadebIbyd{eCBKSx?o&E+cN=F_6d(!;Yh`1b@y#o8hUc`P=TI~l9CXu(moHTzS
z(n@#}$aa`j;JGxP2i~aNij!jwGvmo7wb`8Mpkdj0lh{&U)CTI6_IlezWxEA-D&^Xa
zlBHm&Vy=A{3&u8fJ|I%C0c?<OpJuVZBKh`ffQ9ny)66#?ut2^&n!J3QRh~m=(mGUl
rs&%5gg$PZxDt20{dP=_Oou1AATFxLVUzTeg00000NkvXXu0mjf*n$n)

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 dafbeca33ee7e4f6fd67f3bcfe306cdb0ed589c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 388
zcmV-~0ek+5P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003?Nkl<ZcmcJN
zHC}{K48(D7aBGk&;C2n18uvK>&RuYK&ahtM(BrV^BoEisq?q~T%|D-p_*qCs2bORM
zH~SEaXhYKP;W&)q5>H?H0z-)XDV_%>j~}_e9=V7_6ekT>QOJhe@9`5JI8gX)Q88RR
zIsSwoPPcC&o<1An1aH`Oj3JAY1Z?Y7V%~vK-7fKZTzq<hbJQpzR~dYNGnaTop~R_A
zm_!9)*p--;r&6R;;Uoie;0a55GqSz+(-VM`Gi1=M(zTf35^X(oT(;{Z6<z2=iuzej
zN2pEIc>^5M=29Kh3XLD>{T~W~Dmp7QpSo`VH*F;Kh8jcdqMGiIH%PsvMpJKp{^Ff)
zK)YxEQwsJqzKbMJf59XL827jYpacy-ngB@iJnmG$LB!*@jV(y3r}0#_Aa<nw2RJ0I
io{0LtOLl+ve$+GHFZ-|r^ro2r0000<MNUMnLSTXsN2&Y(

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 ccf89acea105c0b56fa3faeda55a45741c6eb3d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003xNkl<ZcmcK0
zMUqru5JlmK>!jT#$QE$h2F@6F7J#!C+#6j($*UUTFvp#bj2~?+?VE#}k#WvnlC>CJ
z_POb~FEP*Eut(>_@O)>yH!{3)(!BBTB`WygrmYs6Wp-S)xeZDdkHudhw|vY)D^>Aw
zgkru5?pqN1kaKdMV#>}MjLSj~Q8M?Ra0Yq8w|WNv-rAIuDo*_SXWsi^dBT6-f_3J`
ztak}NlCnC<ok_3{H=~EV!{HIX;27TMk8K#c($P(9jXsA9>C)qX{kqeB1*fBT;93$q
z$KvQ5>k|F~JQs=$C`K>E(<JzUS<#;`H~Ij8ed!<MWAq$+&c=)V0QP3}M7O8lvCgc%
z=!C%Q4@6CwpcnMkk5@phw|=}7L$0S@yeFoFvYuK(t|UQ1N&DmxZ;#kp%}?a+c+dBm
RuZ;iz002ovPDHLkV1hG-vS|PS

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 49813c945f77fe0ee88b5a8d8fc0c6d22436ce18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 698
zcmV;r0!96aP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0007kNkl<ZcmeH}
z1I%4P5QS?8MNnH&ZQJJi|Da}^d@*Z=Ra`Tu?KY@w#J_EOGTr<38ByPzXwIHJXEC$6
z_5O#CR?K1#*ZDyPCDoC^53aGh8f_V_bbV%Xi6Sb!L?IWL8M^#3K2jM#yk~Ln;=Oqg
zh`7dGdIlpOPp)J7Zw}*PAZ=(;9c>thizEDTaB^4~sQhkYS{bJq>6JN(Gn5(Z?SaT2
zH74AomtTHg?ie!;`=jqtYCfw2KGJm*1hfm{m6pUHN4ZYo0MALLq&kv##(pMH-(U<O
zS?8|sUOBlc-&@g!tao0g#xK^=z&NTDy>8DHrG=S~uAct9@mZd)=%d`B6bgFVV_WGY
zJ$q)8=eGlLnW6j*iY~Ms1?}3KhJ1-mDB=W*=|bb`=)z)784pN_VR28eckTwWwC;Q9
z;ppl)M+a-i9l2=iLJo?4+7~mN^h*Mt)~kIhNI9FlR^3+0h4m7-Zq5mE-ti#ohNWv+
zud7peFBWb$#~6KSTi6HmOY-_!nCJX8nI6<n>I?E$km*WdkF(L4s8?&8Jxh2-VRbxZ
zk%4xiSlHtPIVSloC2?IKm*fW|KVb+RbQI@4W8}18d)?lHD@x&qKm#RzF8ShrtGDWZ
zfsQQ|<f-ICB>$!cWC+wo@?^=oDC3!B@I=SD36dyzJIPbkKpU!wTi#e1g_c3Sjx`me
z*v|cb-VF*O`|DyK(c{P(EVK;fMN(gTMPp|){_y5UZS`s)2L72bgP4Ke-?F&q$d{=>
z8Lnu`t3@>A%c?^yq9MP66-Kr);_|hKZ4pU%%VI@%262?xLTaISI2JC-Y#FgoJUok)
gwv1RrLO%9Y0sicfEmu<)IsgCw07*qoM6N<$f+j3R2mk;8

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 bac1560a24f89dfe63f89cc7564cac7055473357..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0007NNkl<ZcmeH{
z1FRfT7=`aMgCeM{sJ3lm71WGv)C{Y*W>DL0P`uiTYip5t`Kmv6Zl<%|jk;g7=j7!4
zbG7P!fJ%n5oI^a~0}&#8;1LH|#&9aqt<GZvdkGPZAiEisdi`W>lL$ANkbHRyPLm8L
zXqHTUfUlT5WgR}+QIledsYyG0tmhdfU+^YczYH6TZFGy8?9O&9Y!)R_zX6*gG>@Ba
z#c^!b#fvWm;XBh*f-sXG39W(v2(M^w_<8haHJ5lzgb1&=$SV4hXCylE8U#=DoAXuI
zx6p0@vv`IZPnbczu~l#Mal79reKEh=Ur!sVh{aV}>TD;1;vRE<R)W3vjNlvb_{vb7
zpAEt|XMLW2wMUHl2nZoIGl7N_QA9%~u$2%95o5$j@oqQ=4A=L*x!xT6>vvLDIiMbU
zj8(`+(HcuU87i<>>}~pJuZvU7TonZtP%Wt|$Z@k%oLy$HQZKlhII|F<*2@Uz$<b4E
zkn(>w=!rg&XX5NsanKv}m^^Wwi!;OyEeG?V(@!6*vG+{mB0+*&V7%ehCoJjS;%pSX
z)D9gI%O`rZ=*>#Q8cbFy4co+9;rKt;Z$}=9)lT#!(G!fXcQRH9OcLjU=#HWv*aJR@
zRa5k9(G7LtB2LaLfyUyz6kS{NTYEr6tYU{Q(up8WzAJ$eal-C8KJEj4s7&IrMdva*
zU>r_HtIWc3OqQt3!<cM+y#_(0NNzxG009L2*{Qb>u<&KGUPff6-ZFmqvQh8BV<>ON
z>(wtDBQjlYju1B;@MF0Z;W7QRz=!2lgGc=I!RuawCnNPaegfeO7Jv4QLaG1&002ov
JPDHLkV1f?>G)4db

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 37ce4c61ad92ed3f1835874c6c1b8e6d68abcd21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1063
zcmV+?1laqDP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000B-Nkl<ZcmeH~
zQ-CZv6o!{IcWv9YZQHiZZ*AMQt;X8#Yvbi=bZs<u_U-(WR8KXt=##hnImy?_LG=u6
z``;KVas;=L;yb#TLa}d5p^NWGaVv+jLhC?gWe=XDlkxy#IFGX%vo;rIIc{ep<toMq
zZey9|z^uy46e!m)3cSEdjfI(?hpLB>k>@_<Z4}Od^ipoX=w{#gVP@x<nC(k^%RQXL
zHZ05hL`2NbvTVc2+{<^AV!R$_P(3)y@Vyu1Gmd3}ik=H{9G`o!zG10aan_^T*=`yS
zv0UOEmgf<sJ9~7pb}cxYFxJ`XSr)H)pCx#~*=GzJRed`S&hKnh^V4t3pAOR6RmG0;
zST8VVUCA*QuQ(64RPxNyP%d%4cU=eDa~&yuWi&Z*jOJI~;aaw%!@K?>N@#e`mJH}=
zw4@#BS+gNeFfO*@jO8&l@OT|VUW-7YGN`xX;;=p+B`Sm;u&xJ5Z)x9wn}k;7^PT6s
zpJEkV>>dU=4`)|&4bV_{NJH6aus>DZFn(ZV-Gx_0zo&9XFG!+GX0bVAYU*L5*i`nJ
zTZ%xQ72|<kmW{Sj940$QO((?}Y|27JL@dOnoJpFTvu+ZbXk8NZx%khog00GWch2pM
z;Yt>W>0?(r88}KGju+*Qmi7bPE<I~88_G`Xyu?BkV{s8)MLoW^;mwlL<8JkSE6c~}
zL!#Y}=FTaJ>e(3-#P4oVA2UiXv$*biNcCAx>P}H`_D|d}4icmS>lkeXsYtuH&QBWo
zGf}h*o>Em0J6(L=6YWc*JnFi38u?gh5)wOA(D<s(`bIgy%nxz?_Q`|IZ<Hq_vpk{9
zLL9=Sed7=o^o6%%+#^O=SRQRzbvwdH-`b8Y+g<57?itfCb3Dbu&YElGCq+j2(I|(i
z({27@&h}CU`_&!RqRaDvx~5Z?Y^mHjCVOvIr<9RSGV|A&`IK`zUH(7O{U4UBQLi@h
zr<(aU)#W=QZ4(1}h8`n-kaRquD>>U}Z<+b+%>38t((Ml~el_!(YABPB1<Gl7vxU)q
zmS$z{Re`1$$>!K-GcOOpAx3e>L9%vXql}d3G7VUOY%P{N$mzUMF0BZ3iGF?C)QFic
z%uu~m1=Jd=;>lWOQeAXN#cI7tJJ#{|3?YmK80y6tD)-Y$V>J)b5LOL<Vs7a%!FkkF
zu~24#g2S|d+CXifHc)t@!vYb7$H@v%R*-_?C{lPFMGB9jBSRD%$3+T@lOm-vq=`b}
zL_|KMU^ss(exzVHf+T7XoIpqlq=zX|>+UEb8-J7{>6&IDW%MXNlCEhsQd*DlBk7uE
hBSneU1hBTX?Jtfk@QmJAW;_4@002ovPDHLkV1lfi0t)~D

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 0609c3154246e49ae08197e1019cd107148ae8ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000BRNkl<ZcmeIz
z1GFnw6oBDf&3$zn)wXThwr$(CZQHo0y^PvesB-gcMt{3__MSP(i>Ju97@mL4k^FCT
zu`~y9BfWe{j>(iLF_}TWq?a2wkfo$kn1!8qge=qZCl9d$vq(F!1UE5)dJN}A7L#^h
zd7h(4BZ@rDGSW&UxR)Z$C~zn9NNcb+!)S#ZyGyf}jmPmT^98qa44bhy2?7EVEY4;e
z%N=}48NY`ZB8_7)zVfDg$l)ZV3Q`=wN8YT@SwtGc8srF@%DpThHDXEbXBuHyR+aj(
z9%Bf5f(4~cEX31<jb@$tpH4XECpM7=u{pm)l2)y6?c}hYW)5irbMib^mPKmcSzn=*
zIa567VN0&0mme5Ko;;)Yf!Dc$E$9&s&ZUg@IkQSFcnqz;!4kpRJj_@s8N-9DB@rA(
z0qvpMjzO&)&0$U6r510qx+kfOw)^xiiD77GMyB&FO4O>z?F@-boHjU}3x#{po{n6w
z-%_uySyl{QK)b#Ajb79n-R>+lWHgN!$@-!&mpKFqEG?Dr9NH!}he?D@qnDFdpELmh
zY1Zdt`p6SDk@f7kg!ZKPu>?h&C+xFhG}dS?Az9%byNt0|BkjcT3{HVX#fO{Bowa~j
z%HLu=OIoU6K3>53N-u8~W*W{762&Zxz`0ix?m{baoYa7mD5Bja3J>B8V`d3sC!8`%
zm~*FOa`u!Ov5!eAvYPsADatt8Nf?jdd?*U<q8%r7;6$`HMd1^i2PBLv&f(^g(4Lh#
z@dDbK>XV~zeiMtOampmrClBL{_AO=7?8gOMz<#8>%X=)&{pynpWt_!D;~<<b%#A)4
z=Mv9wkE;ta&!c1{ge!1H6R1zV!P#FlZuB4KY>6|Cq!_HiAYoZnj+{$*oJ}k2-s?o8
z7v~uD{*^erk*70=&!42lU;yVb_5SfVuZYH%IGa@nJxL56r;>-o;8dJf)%#oEd?p$>
z|MKDo9D7BkDNsq?E^ju%`OaKc&Yz+&8AtE2Q8;N)*pF)V5rquS2(!AJiK0=$(fc58
z-dDJQYR(sh9-L_v-Y-i1>JMtWI;O0{)ajzB6RY!hgi0QgIFRIbe10b>@n8i{(r+v;
z@gd2BXb+H(xS>egx<TEbZcsNUe)OOP@#hSn4G_eiL;OiLC-x+r<JV6Re~v#Xwwzvi
zvHA$&%n1nmNipTf-~36j<>(~)X>2($B-tQ6m`&>BGYS~+4`q|upQDHCw?p}p+MlC`
p>$5}oliHu7hYM=@P7J!b{sIXIK|~0#98drN002ovPDHLkV1fX*<c$CT

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 476ad247a..12bbcacc2 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>
@@ -104,7 +104,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>