diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/addfeed.xml | 53 | ||||
| -rw-r--r-- | app/src/main/res/layout/authentication_dialog.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/cover_fragment.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layout/download_authentication_activity.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/episodes_apply_action_fragment.xml | 120 | ||||
| -rw-r--r-- | app/src/main/res/layout/feedinfo.xml | 57 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditem_fragment_header.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_itunes_search.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/gpodnet_podcast_list.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/gpodnetauth_credentials.xml | 10 | ||||
| -rw-r--r-- | app/src/main/res/layout/new_episodes_listitem.xml | 42 | ||||
| -rw-r--r-- | app/src/main/res/layout/queue_fragment.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/queue_listitem.xml | 37 |
13 files changed, 305 insertions, 75 deletions
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index b7babbafa..dff24c650 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -15,26 +15,33 @@ android:orientation="vertical"> <TextView - android:id="@+id/txtvFeedurl" + android:id="@+id/txtvPodcastDirectories" android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/AntennaPod.TextView.Heading" - android:text="@string/txtvfeedurl_label"/> + android:text="@string/podcastdirectories_label"/> - <EditText - android:id="@+id/etxtFeedurl" + <TextView + android:id="@+id/txtvPodcastDirectoriesDescr" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:hint="@string/etxtFeedurlHint" - android:inputType="textUri"/> + android:text="@string/podcastdirectories_descr" + android:textSize="@dimen/text_size_medium" + android:layout_marginTop="4dp"/> <Button - android:id="@+id/butConfirm" + android:id="@+id/butSearchItunes" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/confirm_label"/> + android:text="@string/search_itunes_label"/> + + <Button + android:id="@+id/butBrowseGpoddernet" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/browse_gpoddernet_label"/> <View android:id="@+id/divider1" @@ -44,34 +51,30 @@ android:background="?android:attr/listDivider"/> <TextView - android:id="@+id/txtvPodcastDirectories" + android:id="@+id/txtvFeedurl" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/divider1" style="@style/AntennaPod.TextView.Heading" - android:text="@string/podcastdirectories_label"/> - - <TextView - android:id="@+id/txtvPodcastDirectoriesDescr" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/podcastdirectories_descr" - android:textSize="@dimen/text_size_medium" - android:layout_marginTop="4dp"/> + android:text="@string/txtvfeedurl_label"/> - <Button - android:id="@+id/butBrowseGpoddernet" + <EditText + android:id="@+id/etxtFeedurl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/browse_gpoddernet_label"/> + android:layout_marginTop="4dp" + android:hint="@string/etxtFeedurlHint" + android:inputType="textUri" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <Button - android:id="@+id/butSearchItunes" + android:id="@+id/butConfirm" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/search_itunes_label"/> + android:text="@string/confirm_label"/> <View android:id="@+id/divider2" diff --git a/app/src/main/res/layout/authentication_dialog.xml b/app/src/main/res/layout/authentication_dialog.xml index 82260eb43..e18ab42eb 100644 --- a/app/src/main/res/layout/authentication_dialog.xml +++ b/app/src/main/res/layout/authentication_dialog.xml @@ -16,7 +16,10 @@ android:layout_height="0dp" android:layout_weight="1" android:layout_margin="16dp" - android:hint="@string/username_label"/> + android:hint="@string/username_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -25,7 +28,10 @@ android:layout_weight="1" android:layout_margin="16dp" android:inputType="textPassword" - android:hint="@string/password_label"/> + android:hint="@string/password_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <CheckBox android:id="@+id/chkSaveUsernamePassword" diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 18540aa1f..4bbdeae06 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -13,7 +13,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:adjustViewBounds="true" - android:scaleType="centerInside" + android:scaleType="fitCenter" tools:src="@android:drawable/sym_def_app_icon" /> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/app/src/main/res/layout/download_authentication_activity.xml b/app/src/main/res/layout/download_authentication_activity.xml index 69106c9b3..b035f2516 100644 --- a/app/src/main/res/layout/download_authentication_activity.xml +++ b/app/src/main/res/layout/download_authentication_activity.xml @@ -31,7 +31,10 @@ android:layout_margin="16dp" android:id="@+id/etxtUsername" android:hint="@string/username_label" - android:layout_below="@id/txtvDescription"/> + android:layout_below="@id/txtvDescription" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:layout_width="match_parent" @@ -40,7 +43,10 @@ android:id="@+id/etxtPassword" android:hint="@string/password_label" android:inputType="textPassword" - android:layout_below="@id/etxtUsername"/> + android:layout_below="@id/etxtUsername" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <LinearLayout android:id="@+id/footer" diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml new file mode 100644 index 000000000..d63088662 --- /dev/null +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -0,0 +1,120 @@ +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <LinearLayout + android:id="@+id/bottomBar" + android:layout_width="wrap_content" + android:layout_height="68dp" + android:layout_alignParentBottom="true" + android:orientation="horizontal" + android:gravity="center_vertical" + android:padding="4dp"> + + <Button + android:id="@+id/btnAddToQueue" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/content_new" + android:text="@string/add_to_queue_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnMarkAsPlayed" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/navigation_accept" + android:text="@string/mark_read_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnMarkAsUnplayed" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/navigation_cancel" + android:text="@string/mark_unread_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnDownload" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/av_download" + android:text="@string/download_label" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + <View xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_margin="4dp" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <Button + android:id="@+id/btnDelete" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:drawableTop="?attr/content_discard" + android:text="@string/remove_episode_lable" + android:textSize="10sp" + android:background="@android:color/transparent"/> + + </LinearLayout> + + <View + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?android:attr/listDivider" + android:paddingBottom="4dp" + android:layout_above="@id/bottomBar" + tools:background="@android:color/holo_red_dark" /> + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@id/divider"> + + </ListView> + + +</RelativeLayout> diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index db897865c..edae51847 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -20,8 +20,8 @@ <ImageView android:id="@+id/imgvCover" android:contentDescription="@string/cover_label" - android:layout_width="70dp" - android:layout_height="70dp" + android:layout_width="80dp" + android:layout_height="80dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" tools:src="@drawable/ic_stat_antenna_default" @@ -33,7 +33,9 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginLeft="8dp" + android:layout_alignTop="@id/imgvCover" android:layout_toRightOf="@id/imgvCover" + android:layout_alignBottom="@id/imgvCover" style="@style/AntennaPod.TextView.Heading" tools:text="Feed title" tools:background="@android:color/holo_green_dark"/> @@ -52,7 +54,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:scrollbarStyle="outsideInset" + android:scrollbarStyle="outsideOverlay" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingBottom="8dp"> @@ -119,7 +121,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="8dp" - android:layout_marginBottom="8dp" app:layout_row="2" app:layout_column="0" android:lines="1" @@ -129,10 +130,13 @@ <TextView android:id="@+id/txtvUrl" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" + android:paddingBottom="4dp" app:layout_row="2" app:layout_column="1" + app:layout_gravity="fill" + android:maxLines="4" tools:text="http://www.example.com/feed" tools:background="@android:color/holo_green_dark"/> @@ -155,7 +159,38 @@ android:enabled="false" android:textColor="?android:attr/textColorPrimary" tools:background="@android:color/holo_red_light" - android:checked="false"/> + android:checked="false" /> + + <android.support.v7.widget.GridLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="1"> + + <TextView + android:id="@+id/txtvFeedAutoDelete" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/auto_delete_label" + app:layout_row="0" + app:layout_column="0" + app:layout_gravity="center_vertical" + android:layout_marginRight="10dp" /> + + <Spinner + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/spnAutoDelete" + android:entries="@array/spnAutoDeleteItems" + android:layout_marginTop="8dp" + app:layout_row="0" + app:layout_column="1" + android:spinnerMode="dropdown" + app:layout_gravity="center" + android:dropDownWidth="wrap_content" + android:clickable="true" /> + </android.support.v7.widget.GridLayout> <TextView android:id="@+id/txtvAuthentication" @@ -200,7 +235,10 @@ android:layout_height="wrap_content" app:layout_row="0" app:layout_column="1" - android:hint="@string/username_label"/> + android:hint="@string/username_label" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <TextView android:id="@+id/txtvPassword" @@ -211,7 +249,10 @@ app:layout_row="1" app:layout_column="0" android:text="@string/password_label" - android:textColor="?android:attr/textColorPrimary"/> + android:textColor="?android:attr/textColorPrimary" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" diff --git a/app/src/main/res/layout/feeditem_fragment_header.xml b/app/src/main/res/layout/feeditem_fragment_header.xml index a21488306..2534dddbe 100644 --- a/app/src/main/res/layout/feeditem_fragment_header.xml +++ b/app/src/main/res/layout/feeditem_fragment_header.xml @@ -89,10 +89,9 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:visibility="gone" /> + android:visibility="invisible" /> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 17ffe349b..e57c59554 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -14,7 +14,7 @@ tools:context="de.danoeh.antennapod.activity.ITunesSearchActivity"> android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:columnWidth="200dp" + android:columnWidth="400dp" android:gravity="center" android:horizontalSpacing="8dp" android:numColumns="auto_fit" diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml index 05df70f31..d8b06e4f7 100644 --- a/app/src/main/res/layout/gpodnet_podcast_list.xml +++ b/app/src/main/res/layout/gpodnet_podcast_list.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:columnWidth="200dp" + android:columnWidth="400dp" android:gravity="center" android:horizontalSpacing="8dp" android:numColumns="auto_fit" diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index 8436570fc..13c5977f8 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -30,7 +30,10 @@ android:layout_height="wrap_content" android:hint="@string/username_label" android:layout_below="@id/txtvDescription" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <EditText android:id="@+id/etxtPassword" @@ -39,7 +42,10 @@ android:hint="@string/password_label" android:layout_below="@id/etxtUsername" android:inputType="textPassword" - android:layout_margin="8dp"/> + android:layout_margin="8dp" + android:focusable="true" + android:focusableInTouchMode="true" + android:cursorVisible="true"/> <Button android:id="@+id/butLogin" diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index ff1318fc8..ec5ab1e6a 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -7,18 +7,36 @@ android:orientation="horizontal" tools:background="@android:color/darker_gray"> - <ImageView - android:id="@+id/imgvImage" - android:layout_width="@dimen/thumbnail_length_itemlist" - android:layout_height="@dimen/thumbnail_length_itemlist" - android:layout_gravity="center_vertical" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:contentDescription="@string/cover_label" - android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/txtvPlaceholder" + android:layout_width="@dimen/thumbnail_length_itemlist" + android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_gravity="center_vertical" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:background="@color/light_gray" + android:ellipsize="end" + android:maxLines="3" + android:gravity="center"/> + + <ImageView + android:id="@+id/imgvCover" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_alignLeft="@id/txtvPlaceholder" + android:layout_alignTop="@id/txtvPlaceholder" + android:layout_alignRight="@id/txtvPlaceholder" + android:layout_alignBottom="@id/txtvPlaceholder" + android:contentDescription="@string/cover_label" + tools:src="@drawable/ic_stat_antenna_default" + tools:background="@android:color/holo_green_dark" /> + + </RelativeLayout> <RelativeLayout android:layout_width="0dp" diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 307d95a8d..339369971 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -1,18 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:dslv="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent"> + <TextView + android:id="@+id/info_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:gravity="center" + android:textSize="12sp" + android:text="42 episodes \u2022 5 hours 17 minutes"/> + + <View + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_below="@id/info_bar" + android:background="?android:attr/listDivider"/> + <com.mobeta.android.dslv.DragSortListView android:id="@android:id/list" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:clipToPadding="false" - android:paddingBottom="@dimen/list_vertical_padding" - android:paddingTop="@dimen/list_vertical_padding" android:scrollbarStyle="outsideOverlay" + android:layout_below="@+id/divider" dslv:collapsed_height="2dp" dslv:drag_enabled="true" dslv:drag_handle_id="@id/drag_handle" @@ -31,7 +46,7 @@ android:id="@id/android:empty" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" + android:layout_centerInParent="true" android:gravity="center" android:text="@string/no_items_label" /> @@ -39,12 +54,13 @@ android:id="@+id/progLoading" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_centerInParent="true" android:indeterminateOnly="true" android:visibility="gone" /> <LinearLayout android:id="@+id/undobar" + android:layout_alignParentBottom="true" style="@style/UndoBar"> <TextView @@ -57,4 +73,4 @@ </LinearLayout> -</FrameLayout> +</RelativeLayout> diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 39e9c72a5..38076ff51 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -21,17 +21,32 @@ tools:src="@drawable/ic_drag_handle" tools:background="@android:color/holo_green_dark" /> - <ImageView - android:id="@+id/imgvImage" - android:layout_width="@dimen/thumbnail_length_queue_item" - android:layout_height="@dimen/thumbnail_length_queue_item" - android:layout_gravity="center_vertical" - android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" - android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" - android:contentDescription="@string/cover_label" - android:scaleType="centerCrop" - tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark"/> + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <TextView + android:id="@+id/txtvPlaceholder" + android:layout_width="@dimen/thumbnail_length_queue_item" + android:layout_height="@dimen/thumbnail_length_queue_item" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_gravity="center_vertical" + android:gravity="center" + android:background="@color/light_gray" + android:maxLines="3" + android:ellipsize="end"/> + <ImageView + android:id="@+id/imgvCover" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignLeft="@id/txtvPlaceholder" + android:layout_alignTop="@id/txtvPlaceholder" + android:layout_alignRight="@id/txtvPlaceholder" + android:layout_alignBottom="@id/txtvPlaceholder" + android:contentDescription="@string/cover_label" + tools:src="@drawable/ic_stat_antenna_default" + tools:background="@android:color/holo_green_dark"/> + </RelativeLayout> <RelativeLayout android:layout_width="0dp" |