diff options
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/addfeed.xml | 9 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_itunes_search.xml | 26 | ||||
-rw-r--r-- | app/src/main/res/layout/itunes_podcast_listitem.xml | 38 | ||||
-rw-r--r-- | app/src/main/res/layout/queue_listitem.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/menu/feedlist.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/new_episodes.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/queue.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 5 |
8 files changed, 83 insertions, 6 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index 09502eb7b..a740d88cf 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -66,12 +66,19 @@ android:layout_margin="8dp" android:text="@string/browse_gpoddernet_label"/> + <Button + android:id="@+id/butSearchItunes" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/butBrowseGpoddernet" + android:layout_margin="8dp" + android:text="@string/search_itunes_label"/> <TextView android:id="@+id/txtvOpmlImport" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butBrowseGpoddernet" + android:layout_below="@id/butSearchItunes" android:layout_margin="8dp" style="@style/AntennaPod.TextView.Heading" android:text="@string/opml_import_label"/> diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml new file mode 100644 index 000000000..17ffe349b --- /dev/null +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -0,0 +1,26 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +xmlns:tools="http://schemas.android.com/tools" +android:layout_width="match_parent" +android:layout_height="match_parent" +tools:context="de.danoeh.antennapod.activity.ITunesSearchActivity"> +<android.support.v7.widget.SearchView + android:id="@+id/itunes_search_view" + android:layout_height="wrap_content" + android:layout_width="match_parent" + /> +<GridView + android:id="@+id/gridView" + android:layout_below="@id/itunes_search_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:columnWidth="200dp" + android:gravity="center" + android:horizontalSpacing="8dp" + android:numColumns="auto_fit" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:stretchMode="columnWidth" + android:verticalSpacing="8dp" + tools:listitem="@layout/gpodnet_podcast_listitem" /> +</RelativeLayout> diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml new file mode 100644 index 000000000..41b1f495f --- /dev/null +++ b/app/src/main/res/layout/itunes_podcast_listitem.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +xmlns:tools="http://schemas.android.com/tools" +android:layout_width="match_parent" +android:layout_height="@dimen/listitem_threeline_height" +tools:background="@android:color/darker_gray"> + +<ImageView + android:id="@+id/imgvCover" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="8dp" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:adjustViewBounds="true" + android:contentDescription="@string/cover_label" + android:cropToPadding="true" + android:scaleType="fitXY" + tools:src="@drawable/ic_stat_antenna_default" + tools:background="@android:color/holo_green_dark" /> + +<TextView + android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" + android:layout_toRightOf="@id/imgvCover" + android:maxLines="1" + tools:text="Podcast title" + tools:background="@android:color/holo_green_dark" /> +</RelativeLayout> diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 5d41c52cd..d2d51378b 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -9,9 +9,10 @@ <ImageView android:id="@+id/drag_handle" - android:layout_width="24dp" + android:layout_width="104dp" android:layout_height="match_parent" - android:layout_margin="8dp" + android:layout_marginLeft="-32dp" + android:layout_marginRight="-32dp" android:contentDescription="@string/drag_handle_content_description" android:scaleType="center" android:src="?attr/dragview_background" diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 8d2d9e367..b6512e828 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -7,7 +7,7 @@ android:icon="?attr/navigation_refresh" android:menuCategory="container" android:title="@string/refresh_label" - custom:showAsAction="ifRoom"> + custom:showAsAction="always"> </item> <item android:id="@+id/refresh_complete_item" diff --git a/app/src/main/res/menu/new_episodes.xml b/app/src/main/res/menu/new_episodes.xml index d74e70b3b..72661a17e 100644 --- a/app/src/main/res/menu/new_episodes.xml +++ b/app/src/main/res/menu/new_episodes.xml @@ -7,7 +7,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="ifRoom" + custom:showAsAction="always" android:icon="?attr/navigation_refresh"/> <item diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml index 51e47c061..c7dd4d371 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -7,7 +7,7 @@ android:id="@+id/refresh_item" android:title="@string/refresh_label" android:menuCategory="container" - custom:showAsAction="ifRoom" + custom:showAsAction="always" android:icon="?attr/navigation_refresh"/> <item diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index cf1be1a74..9da2d75e6 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -95,6 +95,11 @@ android:key="prefMobileUpdate" android:summary="@string/pref_mobileUpdate_sum" android:title="@string/pref_mobileUpdate_title"/> + <EditTextPreference + android:defaultValue="6" + android:inputType="number" + android:key="prefParallelDownloads" + android:title="@string/pref_parallel_downloads_title"/> <ListPreference android:defaultValue="20" android:entries="@array/episode_cache_size_entries" |