diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/activity_widget_config.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/addfeed.xml | 30 | ||||
-rw-r--r-- | app/src/main/res/layout/audioplayer_fragment.xml | 20 | ||||
-rw-r--r-- | app/src/main/res/layout/edit_tags_dialog.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/empty_view_layout.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/episodes_apply_action_fragment.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/external_player_fragment.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditem_fragment.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/feeditemlist_item.xml | 11 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_subscriptions.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/gpodnet_podcast_listitem.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/gpodnetauth_credentials.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/gpodnetauth_finish.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/layout/nav_list.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/storage_error.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/videoplayer_activity.xml | 6 |
16 files changed, 51 insertions, 50 deletions
diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml index 6e31aec0d..8c540fcc6 100644 --- a/app/src/main/res/layout/activity_widget_config.xml +++ b/app/src/main/res/layout/activity_widget_config.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -15,7 +16,7 @@ android:id="@+id/widget_config_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/teaser" + app:srcCompat="@drawable/teaser" android:scaleType="centerCrop" /> <include diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index d6ebd58d7..a6e0fc9ea 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -34,7 +34,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:contentDescription="@string/search_podcast_hint" - app:srcCompat="?attr/action_search" + app:srcCompat="@drawable/ic_search" android:id="@+id/searchButton" android:scaleType="center"/> @@ -90,8 +90,8 @@ android:id="@+id/addViaUrlButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/feed" - app:drawableLeftCompat="?attr/feed" + app:drawableStartCompat="@drawable/ic_feed" + app:drawableLeftCompat="@drawable/ic_feed" style="@style/AddPodcastTextView" android:text="@string/add_podcast_by_url"/> @@ -99,8 +99,8 @@ android:id="@+id/addLocalFolderButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/ic_folder" - app:drawableLeftCompat="?attr/ic_folder" + app:drawableStartCompat="@drawable/ic_folder" + app:drawableLeftCompat="@drawable/ic_folder" style="@style/AddPodcastTextView" android:text="@string/add_local_folder"/> @@ -108,8 +108,8 @@ android:id="@+id/searchItunesButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_itunes_label"/> @@ -117,8 +117,8 @@ android:id="@+id/searchFyydButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_fyyd_label"/> @@ -126,8 +126,8 @@ android:id="@+id/searchGPodderButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/browse_gpoddernet_label"/> @@ -135,8 +135,8 @@ android:id="@+id/searchPodcastIndexButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_podcastindex_label"/> @@ -144,8 +144,8 @@ android:id="@+id/opmlImportButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/av_download" - app:drawableLeftCompat="?attr/av_download" + app:drawableStartCompat="@drawable/ic_download" + app:drawableLeftCompat="@drawable/ic_download" style="@style/AddPodcastTextView" android:text="@string/opml_add_podcast_label"/> </LinearLayout> diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index 3685032e6..c173371d3 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="8dp" android:layout_alignBottom="@id/pager" - android:src="@drawable/bg_gradient" + app:srcCompat="@drawable/bg_gradient" app:tint="?android:attr/windowBackground" android:importantForAccessibility="no"/> @@ -153,9 +153,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/pause_label" - app:srcCompat="?attr/av_play" + app:srcCompat="@drawable/ic_play_48dp" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_play_white_24dp"/> + tools:srcCompat="@drawable/ic_play_48dp"/> <de.danoeh.antennapod.ui.common.CircularProgressBar android:layout_width="@dimen/audioplayer_playercontrols_length_big" @@ -188,9 +188,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/rewind_label" - app:srcCompat="?attr/av_rewind" + app:srcCompat="@drawable/ic_fast_rewind" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"/> + tools:srcCompat="@drawable/ic_fast_rewind"/> <TextView android:id="@+id/txtvRev" @@ -216,7 +216,7 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/playback_speed" - tools:srcCompat="@drawable/ic_playback_speed_white" + tools:srcCompat="@drawable/ic_playback_speed" app:foregroundColor="?attr/action_icon_color"/> <TextView @@ -245,9 +245,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/fast_forward_label" - app:srcCompat="?attr/av_fast_forward" + app:srcCompat="@drawable/ic_fast_forward" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"/> + tools:srcCompat="@drawable/ic_fast_forward"/> <TextView android:id="@+id/txtvFF" @@ -273,9 +273,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" - app:srcCompat="?attr/av_skip" + app:srcCompat="@drawable/ic_skip_48dp" android:contentDescription="@string/skip_episode_label" - tools:srcCompat="@drawable/ic_av_skip_white_48dp"/> + tools:srcCompat="@drawable/ic_skip_48dp"/> </RelativeLayout> </LinearLayout> diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml index e83cce9cf..2e7774cea 100644 --- a/app/src/main/res/layout/edit_tags_dialog.xml +++ b/app/src/main/res/layout/edit_tags_dialog.xml @@ -1,5 +1,6 @@ <?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" @@ -32,7 +33,7 @@ <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="?attr/content_new" + app:srcCompat="@drawable/ic_add" android:contentDescription="@string/new_label" android:id="@+id/newTagButton"/> </LinearLayout> diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml index da2040d93..c6de8d2d0 100644 --- a/app/src/main/res/layout/empty_view_layout.xml +++ b/app/src/main/res/layout/empty_view_layout.xml @@ -14,7 +14,7 @@ android:layout_width="32dp"
android:layout_height="32dp"
android:visibility="gone"
- tools:src="@drawable/ic_feed_black"
+ tools:src="@drawable/ic_feed"
tools:visibility="visible"/>
<TextView
diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml index 304588e3e..78827a12a 100644 --- a/app/src/main/res/layout/episodes_apply_action_fragment.xml +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -47,7 +47,7 @@ android:id="@+id/fabSD" android:layout_width="match_parent" android:layout_height="wrap_content" - app:sdMainFabClosedSrc="?attr/batch_edit_fab_icon" + app:sdMainFabClosedSrc="@drawable/ic_fab_edit" app:sdOverlayLayout="@id/fabSDOverlay" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml index 4f200162a..fa881e622 100644 --- a/app/src/main/res/layout/external_player_fragment.xml +++ b/app/src/main/res/layout/external_player_fragment.xml @@ -63,10 +63,10 @@ android:layout_height="match_parent" android:contentDescription="@string/pause_label" android:background="?attr/selectableItemBackground" - app:srcCompat="?attr/av_play" + app:srcCompat="@drawable/ic_play_48dp" android:scaleType="fitCenter" android:padding="8dp" - tools:src="@drawable/ic_av_play_white_48dp"/> + tools:src="@drawable/ic_play_48dp"/> </LinearLayout> diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index 049182803..256f45fe7 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -126,7 +126,7 @@ android:layout_marginEnd="8dp" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" - tools:src="@drawable/ic_settings_black" /> + tools:src="@drawable/ic_settings" /> <TextView android:textAppearance="@style/TextAppearance.AppCompat.Button" @@ -154,7 +154,7 @@ android:layout_marginEnd="8dp" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" - tools:src="@drawable/ic_settings_black" /> + tools:src="@drawable/ic_settings" /> <TextView android:textAppearance="@style/TextAppearance.AppCompat.Button" diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index e1f382e46..37b88d1b5 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -35,7 +35,7 @@ android:layout_height="match_parent" android:importantForAccessibility="no" android:scaleType="fitCenter" - android:src="?attr/dragview_background" + app:srcCompat="?attr/dragview_background" android:paddingStart="0dp" android:paddingLeft="0dp" android:paddingEnd="4dp" @@ -114,24 +114,21 @@ <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/type_video" - tools:srcCompat="@drawable/ic_videocam_black_24dp" + app:srcCompat="@drawable/ic_videocam" android:contentDescription="@string/media_type_video_label" android:id="@+id/ivIsVideo"/> <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/ic_unfav" - tools:srcCompat="@drawable/ic_star_black" + app:srcCompat="@drawable/ic_star" android:contentDescription="@string/is_favorite_label" android:id="@+id/isFavorite"/> <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/stat_playlist" - tools:srcCompat="@drawable/ic_playlist_black" + app:srcCompat="@drawable/ic_playlist" android:contentDescription="@string/in_queue_label" android:id="@+id/ivInPlaylist"/> diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index c738300c5..61d33f534 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -65,5 +65,5 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:contentDescription="@string/add_feed_label" - app:srcCompat="@drawable/ic_add_white"/> + app:srcCompat="@drawable/ic_add"/> </RelativeLayout> diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 99991e919..56d351d62 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -65,7 +65,7 @@ <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/feed"/> + app:srcCompat="@drawable/ic_feed"/> <TextView android:id="@+id/txtvSubscribers" style="@style/AntennaPod.TextView.ListItemSecondaryTitle" diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index 9fcf67cff..8cf6941c9 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -15,7 +16,7 @@ <ImageView android:layout_width="64dp" android:layout_height="64dp" - android:src="@drawable/gpodder_icon"/> + app:srcCompat="@drawable/gpodder_icon"/> <TextView android:id="@+id/createAccountButton" diff --git a/app/src/main/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml index f0bcfd4dc..8eced7304 100644 --- a/app/src/main/res/layout/gpodnetauth_finish.xml +++ b/app/src/main/res/layout/gpodnetauth_finish.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="wrap_content" android:orientation="vertical"> @@ -9,7 +10,7 @@ android:id="@id/icon" android:layout_width="64dp" android:layout_height="64dp" - android:src="@drawable/gpodder_icon" /> + app:srcCompat="@drawable/gpodder_icon" /> <TextView android:id="@+id/txtvDescription" diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index 70a71a453..a24ea3fba 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,6 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nav_layout" android:layout_width="match_parent" android:layout_height="match_parent" @@ -18,7 +19,6 @@ android:focusable="true"> <ImageView - android:id="@+id/imgvCover" android:layout_width="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist" android:layout_marginBottom="4dp" @@ -30,7 +30,7 @@ android:cropToPadding="true" android:padding="8dp" android:scaleType="centerCrop" - android:src="?attr/ic_settings" + app:srcCompat="@drawable/ic_settings" tools:background="@android:color/holo_orange_dark" tools:src="@android:drawable/sym_def_app_icon" /> diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml index 7b0579927..6a7fda341 100644 --- a/app/src/main/res/layout/storage_error.xml +++ b/app/src/main/res/layout/storage_error.xml @@ -14,7 +14,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_margin="8dp" - app:srcCompat="?attr/storage" /> + app:srcCompat="@drawable/ic_storage" /> <TextView android:id="@+id/textView1" diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml index fc902602c..f5a163849 100644 --- a/app/src/main/res/layout/videoplayer_activity.xml +++ b/app/src/main/res/layout/videoplayer_activity.xml @@ -39,7 +39,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/rewind_label" - app:srcCompat="@drawable/ic_av_fast_rewind_white_80dp" /> + app:srcCompat="@drawable/ic_fast_rewind_video_white" /> <de.danoeh.antennapod.view.PlayButton android:id="@+id/butPlay" @@ -48,7 +48,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/pause_label" - app:srcCompat="@drawable/ic_av_pause_white_80dp" /> + app:srcCompat="@drawable/ic_pause_video_white" /> <ImageButton android:id="@+id/butFF" @@ -57,7 +57,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/fast_forward_label" - app:srcCompat="@drawable/ic_av_fast_forward_white_80dp" /> + app:srcCompat="@drawable/ic_fast_forward_video_white" /> </LinearLayout> |