diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/all_episodes_fragment.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/empty_view_layout.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditemlist_header.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditemlist_item.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_subscriptions.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/mediaplayerinfo_activity.xml | 18 | ||||
-rw-r--r-- | app/src/main/res/layout/storage_error.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/menu/directory_chooser.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/menu/downloads_completed.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/menu/episodes_apply_action_speeddial.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/feedlist.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/mediaplayer.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/xml/feed_settings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 4 |
14 files changed, 32 insertions, 47 deletions
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 2ccfe2494..ca84439da 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/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:fastScrollHorizontalTrackDrawable="@drawable/line_drawable" - app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable" - app:fastScrollVerticalTrackDrawable="@drawable/line_drawable" + app:fastScrollHorizontalThumbDrawable="@drawable/scrollbar_thumb_drawable" + app:fastScrollHorizontalTrackDrawable="@drawable/scrollbar_line_drawable" + app:fastScrollVerticalThumbDrawable="@drawable/scrollbar_thumb_drawable" + app:fastScrollVerticalTrackDrawable="@drawable/scrollbar_line_drawable" tools:itemCount="13" tools:listitem="@layout/feeditemlist_item" /> diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml index 4ccbf45db..768f74c41 100644 --- a/app/src/main/res/layout/empty_view_layout.xml +++ b/app/src/main/res/layout/empty_view_layout.xml @@ -12,11 +12,10 @@ <ImageView
android:id="@+id/emptyViewIcon"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:paddingBottom="8dp"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
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:paddingBottom="8dp"/>
+ android:textColor="?android:attr/textColorPrimary"/>
<TextView
android:id="@+id/emptyViewMessage"
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 50ef20a06..f00fb349b 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/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"/> diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 6e2f2c43c..1bc18dc0a 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/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 diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index d16331a10..4cfd369a7 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/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> diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml index 212d8b9d8..c46672ceb 100644 --- a/app/src/main/res/layout/mediaplayerinfo_activity.xml +++ b/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" /> @@ -187,22 +187,6 @@ 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" android:layout_height="@dimen/audioplayer_playercontrols_length" diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml index 8ff28b3c1..7b0579927 100644 --- a/app/src/main/res/layout/storage_error.xml +++ b/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" diff --git a/app/src/main/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml index 3f860d636..e6150ac20 100644 --- a/app/src/main/res/menu/directory_chooser.xml +++ b/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" - custom:showAsAction="ifRoom|withText" /> + app:icon="?attr/content_new" + 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> diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml index 9f297988d..8badc4927 100644 --- a/app/src/main/res/menu/downloads_completed.xml +++ b/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> diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml index 39083e41b..370cedd90 100644 --- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml +++ b/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" diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 7f32ef744..939a51ab2 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/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" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 055951760..a61616ce9 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/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 diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml index 08e7572af..d65280061 100644 --- a/app/src/main/res/xml/feed_settings.xml +++ b/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"/> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index ef7b9357f..8cd1b8be0 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/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" |