Merge branch 'develop' into feedinfo-fragment

1 files changed, 6 insertions, 21 deletions

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index fb69e54e7..d2ba4bb50 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -23,6 +23,7 @@
         <item name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
         <item name="av_pause">@drawable/ic_pause_grey600_24dp</item>
         <item name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
+        <item name="av_speed">@drawable/ic_playback_speed_dark</item>
         <item name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
         <item name="content_discard">@drawable/ic_delete_grey600_24dp</item>
         <item name="content_new">@drawable/ic_add_grey600_24dp</item>
@@ -68,9 +69,9 @@
         <item name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
         <item name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
-        <item name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item name="ic_questionmark">@drawable/ic_questionmark_grey600</item>
+        <item name="ic_chat">@drawable/ic_chat_grey600</item>
         <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>
@@ -108,6 +109,7 @@
         <item name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
         <item name="av_pause">@drawable/ic_pause_white_24dp</item>
         <item name="av_play">@drawable/ic_play_arrow_white_24dp</item>
+        <item name="av_speed">@drawable/ic_playback_speed_white</item>
         <item name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
         <item name="content_discard">@drawable/ic_delete_white_24dp</item>
         <item name="content_new">@drawable/ic_add_white_24dp</item>
@@ -153,9 +155,9 @@
         <item name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
         <item name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
-        <item name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item name="ic_questionmark">@drawable/ic_questionmark_white</item>
+        <item name="ic_chat">@drawable/ic_chat_white</item>
         <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>
@@ -258,13 +260,6 @@
         <item name="android:ellipsize">end</item>
     </style>
 
-    <style name="AntennaPod.Dialog.Title" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
     <style name="AntennaPod.TextView.UnreadIndicator" parent="@android:style/TextAppearance.Small">
         <item name="android:textSize">@dimen/text_size_micro</item>
         <item name="android:textColor">@color/new_indicator_green</item>
@@ -276,16 +271,6 @@
         <item name="textAllCaps">false</item>
     </style>
 
-    <style name="Divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
-        <item name="android:background">?android:attr/listDivider</item>
-    </style>
-
     <style name="AntennaPod.Dialog.Light" parent="Theme.AppCompat.Light.Dialog">
         <item name="colorAccent">@color/holo_blue_light</item>
     </style>