diff options
Diffstat (limited to 'app/src/main/res/layout')
27 files changed, 463 insertions, 654 deletions
diff --git a/app/src/main/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml index a879aad55..770ced350 100644 --- a/app/src/main/res/layout/audioplayer_activity.xml +++ b/app/src/main/res/layout/audioplayer_activity.xml @@ -24,7 +24,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <ImageButton @@ -33,7 +33,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <TextView @@ -76,7 +76,7 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_centerHorizontal="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_pause"/> <ImageButton @@ -85,8 +85,8 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toLeftOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_rewind"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_rew_big"/> <ImageButton android:id="@+id/butFF" @@ -94,8 +94,8 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_ff_big"/> <Button android:id="@+id/butPlaybackSpeed" @@ -103,7 +103,7 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butFF" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_fast_forward" android:textColor="@color/gray" android:textSize="@dimen/text_size_medium" @@ -168,15 +168,6 @@ </RelativeLayout> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:background="?attr/nav_drawer_background" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="8dp" - android:paddingRight="8dp"/> + <include layout="@layout/nav_list"/> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml index 738c00842..7511c164a 100644 --- a/app/src/main/res/layout/directory_chooser.xml +++ b/app/src/main/res/layout/directory_chooser.xml @@ -39,7 +39,7 @@ android:layout_height="60dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/navigation_up" /> <TextView diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml index 97003ce65..18db746b2 100644 --- a/app/src/main/res/layout/downloaded_episodeslist_item.xml +++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml @@ -1,82 +1,69 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/imgvImage" + android:layout_width="@dimen/thumbnail_length_downloaded_item" + android:layout_height="@dimen/thumbnail_length_downloaded_item" + 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" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_marginRight="8dp"> - - <ImageView - android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/thumbnail_length_downloaded_item" - android:layout_height="@dimen/thumbnail_length_downloaded_item" - android:layout_alignParentLeft="true" - android:scaleType="centerCrop"/> - - <TextView - android:id="@+id/txtvPublished" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/imgvImage" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" - android:layout_marginLeft="8dp" - android:layout_marginRight="4dp" - android:layout_marginTop="2dp" - android:layout_toRightOf="@id/imgvImage" - android:layout_centerVertical="true" + android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_alignParentTop="true" + android:layout_centerVertical="true" + android:layout_marginBottom="4dp" /> <TextView android:id="@+id/txtvSize" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/txtvTitle" /> + + <TextView + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_below="@id/txtvTitle" /> + </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> <ImageButton android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" android:contentDescription="@string/remove_episode_lable" android:focusable="false" - android:clickable="false" android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - android:src="?attr/content_discard" - /> + android:src="?attr/content_discard" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/downloadlist_item.xml b/app/src/main/res/layout/downloadlist_item.xml index 49e0ea471..df6ebf762 100644 --- a/app/src/main/res/layout/downloadlist_item.xml +++ b/app/src/main/res/layout/downloadlist_item.xml @@ -1,89 +1,76 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <LinearLayout - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginTop="8dp" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary"/> - - <TextView - android:id="@+id/txtvMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" android:lines="1" - android:ellipsize="end"/> + android:textColor="?android:attr/textColorPrimary" + android:textSize="16sp" /> <ProgressBar android:id="@+id/progProgress" style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="16dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp"/> + android:layout_marginBottom="4dp" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="4dp" /> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"> <TextView android:id="@+id/txtvDownloaded" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_alignParentLeft="true" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorPrimary" - android:layout_alignParentLeft="true"/> + android:textSize="@dimen/text_size_small" /> <TextView android:id="@+id/txtvPercent" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_alignParentRight="true" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorPrimary" - android:layout_alignParentRight="true"/> + android:textSize="@dimen/text_size_small" /> </RelativeLayout> </LinearLayout> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> <ImageButton android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" android:contentDescription="@string/cancel_download_label" android:focusable="false" - android:clickable="false" android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - android:src="?attr/navigation_cancel" - /> + android:src="?attr/navigation_cancel" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml index 22d669097..c2ef93c71 100644 --- a/app/src/main/res/layout/downloadlog_item.xml +++ b/app/src/main/res/layout/downloadlog_item.xml @@ -1,61 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:orientation="vertical"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" > + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"> <TextView android:id="@+id/txtvType" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginRight="8dp" - android:textSize="@dimen/text_size_small" - android:textColor="?android:attr/textColorTertiary" /> + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_toLeftOf="@id/txtvType" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_medium" - android:ellipsize="end" - android:maxLines="2" /> + android:layout_toLeftOf="@id/txtvType" /> </RelativeLayout> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - > - <TextView - android:id="@+id/txtvDate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:lines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small" - android:layout_alignParentLeft="true"/> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"> - <TextView - android:id="@+id/txtvStatus" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:lines="1" - android:textSize="@dimen/text_size_small" - android:layout_alignParentRight="true"/> + <TextView + android:id="@+id/txtvDate" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_marginRight="8dp" /> + + <TextView + android:id="@+id/txtvStatus" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" /> </RelativeLayout> @@ -63,9 +57,10 @@ android:id="@+id/txtvReason" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" - android:layout_marginBottom="4dp" - android:layout_marginLeft="8dp" /> + android:textSize="@dimen/text_size_micro" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/external_itemlist_item.xml b/app/src/main/res/layout/external_itemlist_item.xml deleted file mode 100644 index 20c63c2cf..000000000 --- a/app/src/main/res/layout/external_itemlist_item.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?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="match_parent" > - - <ImageView - android:id="@+id/imgvFeedimage" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/thumbnail_length_itemlist" - android:layout_height="@dimen/thumbnail_length_itemlist" - android:layout_alignParentLeft="true" - android:scaleType="centerCrop" /> - - <ImageButton - android:id="@+id/butAction" - android:contentDescription="@string/butAction_label" - android:layout_width="48dp" - android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:clickable="false" - android:focusable="false" - android:focusableInTouchMode="false" - android:paddingLeft="24dp" - android:paddingRight="8dp" - android:paddingTop="16dp" - android:scaleType="fitEnd" - android:src="?attr/spinner_button" /> - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="4dp" - android:layout_marginTop="2dp" - android:layout_toLeftOf="@id/butAction" - android:layout_toRightOf="@id/imgvFeedimage" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_toLeftOf="@id/butAction" - android:layout_toRightOf="@id/imgvFeedimage" - android:orientation="vertical" > - - <TextView - android:id="@+id/txtvFeedname" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> - - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <TextView - android:id="@+id/txtvLenSize" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> - - <ImageView - android:id="@+id/imgvDownloadStatus" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentRight="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - tools:ignore="ContentDescription"/> - - <ProgressBar - android:id="@+id/pbar_episode_progress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvDownloadStatus" - android:layout_toRightOf="@id/txtvLenSize" /> - </RelativeLayout> - </LinearLayout> - - <ImageView - android:id="@+id/statusPlaying" - android:contentDescription="@string/status_playing_label" - android:layout_width="@dimen/status_indicator_width" - android:layout_height="18dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="8dp" - android:background="@color/status_playing" - android:gravity="center" - android:padding="2dp" - android:src="@drawable/av_play_dark" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml index f084ccac1..2b5c90847 100644 --- a/app/src/main/res/layout/external_player_fragment.xml +++ b/app/src/main/res/layout/external_player_fragment.xml @@ -4,7 +4,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="gone"> + android:visibility="gone" + android:background="?attr/colorPrimary"> <View android:layout_width="match_parent" @@ -20,7 +21,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="?attr/borderless_button"> + android:background="?attr/selectableItemBackground"> <ImageView android:id="@+id/imgvCover" @@ -53,7 +54,7 @@ android:contentDescription="@string/pause_label" android:layout_width="@dimen/external_player_height" android:layout_height="@dimen/external_player_height" - android:background="?attr/borderless_button"/> + android:background="?attr/selectableItemBackground"/> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditem_dialog.xml b/app/src/main/res/layout/feeditem_dialog.xml index e4a37d685..24abae762 100644 --- a/app/src/main/res/layout/feeditem_dialog.xml +++ b/app/src/main/res/layout/feeditem_dialog.xml @@ -34,7 +34,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butAction1" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription"/> <ImageButton @@ -42,7 +42,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butAction2" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription"/> <ImageButton @@ -50,7 +50,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butMoreActions" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/ic_action_overflow" android:contentDescription="@string/butAction_label"/> </LinearLayout> diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 83c189bb5..fc38c6797 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -1,65 +1,63 @@ <?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="match_parent" - tools:context="de.danoeh.antennapod.activity.MainActivity"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/feeditemlist_header_height" + tools:context="de.danoeh.antennapod.activity.MainActivity"> <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_onlinefeedview" android:layout_height="@dimen/thumbnail_length_onlinefeedview" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp"/> + android:layout_centerVertical="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:contentDescription="@string/cover_label" /> <ImageButton - android:layout_width="48dp" - android:layout_height="48dp" android:id="@+id/butShowInfo" - android:contentDescription="@string/show_info_label" - android:src="?attr/action_about" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:background="?attr/borderless_button"/> - - <ImageButton android:layout_width="48dp" android:layout_height="48dp" - android:layout_marginRight="8dp" - android:id="@+id/butVisitWebsite" - android:contentDescription="@string/visit_website_label" - android:src="?attr/location_web_site" - android:layout_toLeftOf="@id/butShowInfo" - android:layout_alignParentBottom="true" - android:background="?attr/borderless_button"/> + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="8dp" + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/show_info_label" + android:src="?attr/action_about" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.Heading" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" - android:gravity="center_vertical" - android:layout_alignTop="@id/imgvCover" + android:layout_alignParentTop="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_toLeftOf="@id/butShowInfo" android:layout_toRightOf="@id/imgvCover" - android:layout_alignParentRight="true" - android:lines="1" - style="@style/AntennaPod.TextView.Heading" - android:layout_margin="4dp"/> + android:ellipsize="end" + android:maxLines="2" /> <TextView android:id="@+id/txtvAuthor" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="4dp" android:layout_below="@id/txtvTitle" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:layout_toRightOf="@id/imgvCover" - android:layout_toLeftOf="@id/butShowInfo" - android:lines="1" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_small" /> + </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index f3701de2c..4d9f79394 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -1,64 +1,66 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <RelativeLayout - android:layout_margin="8dp" + android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:paddingLeft="4dp"> + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_weight="1"> <TextView - android:id="@+id/txtvPublished" - android:layout_width="fill_parent" + android:id="@+id/statusUnread" + style="@style/AntennaPod.TextView.UnreadIndicator" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_margin="16dp" /> <TextView android:id="@+id/txtvItemname" - android:layout_width="fill_parent" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" android:layout_marginBottom="8dp" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/> + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_toLeftOf="@id/statusUnread" /> <ImageView android:id="@+id/imgvInPlaylist" - android:contentDescription="@string/in_queue_label" android:layout_width="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:padding="2dp" + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" + android:contentDescription="@string/in_queue_label" android:src="?attr/stat_playlist" - android:visibility="visible"/> + android:visibility="visible" /> <ImageView android:id="@+id/imgvType" android:layout_width="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentBottom="true" + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" android:layout_toLeftOf="@+id/imgvInPlaylist" - android:padding="2dp" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> <TextView android:id="@+id/txtvLenSize" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@id/txtvItemname" - android:maxLines="2" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_below="@id/txtvItemname" /> <ProgressBar android:id="@+id/pbar_episode_progress" @@ -68,34 +70,22 @@ android:layout_below="@id/txtvItemname" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" - android:layout_marginTop="2dp" android:layout_toLeftOf="@id/imgvType" - android:layout_toRightOf="@id/txtvLenSize"/> + android:layout_toRightOf="@id/txtvLenSize" /> + <TextView - android:id="@+id/statusUnread" + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.UnreadIndicator" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true"/> + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" + android:layout_toLeftOf="@id/imgvType" /> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml index 0112754ee..be9da61e2 100644 --- a/app/src/main/res/layout/gpodnet_podcast_list.xml +++ b/app/src/main/res/layout/gpodnet_podcast_list.xml @@ -1,45 +1,49 @@ <?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="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView + android:id="@+id/gridView" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/gridView" - android:stretchMode="columnWidth" + 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" - android:horizontalSpacing="8dp" - android:gravity="center" - android:columnWidth="200dp" - tools:listitem="@layout/gpodnet_podcast_listitem"/> + tools:listitem="@layout/gpodnet_podcast_listitem" /> <ProgressBar + android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/progressBar" android:layout_centerInParent="true" - android:indeterminateOnly="true"/> + android:indeterminateOnly="true" /> <TextView + android:id="@+id/txtvError" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/txtvError" android:layout_centerInParent="true" - android:visibility="gone" - android:textAlignment="center" android:layout_margin="16dp" - android:textSize="@dimen/text_size_small"/> + android:textAlignment="center" + android:textSize="@dimen/text_size_small" + android:visibility="gone" /> + <Button + android:id="@+id/butRetry" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/butRetry" - android:text="@string/retry_label" - android:layout_margin="16dp" - android:visibility="gone" + android:layout_below="@id/txtvError" android:layout_centerHorizontal="true" - android:layout_below="@id/txtvError"/> + android:layout_margin="16dp" + android:text="@string/retry_label" + android:visibility="gone" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 1f6cdd1d0..94a77dd7f 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -1,45 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height"> + <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_marginRight="4dip" + 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" /> - <LinearLayout + <TextView + android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" - android:layout_height="@dimen/thumbnail_length_itemlist" + 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:layout_marginRight="8dp" - android:orientation="vertical" > - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - - <TextView - android:id="@+id/txtvDescription" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:maxLines="2" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> - - </LinearLayout> + android:maxLines="1" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml index d6a3f6a16..418271aad 100644 --- a/app/src/main/res/layout/itemdescription_listitem.xml +++ b/app/src/main/res/layout/itemdescription_listitem.xml @@ -1,27 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" - android:layout_margin="8dp" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:lines="1" - android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_margin="16dp" /> <TextView android:id="@+id/txtvDescription" - android:layout_margin="8dp" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:lines="3" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:lines="3" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index cfd59b87c..0a7b7ef74 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -26,15 +26,6 @@ </RelativeLayout> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:background="?attr/nav_drawer_background" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="8dp" - android:paddingRight="8dp"/> + <include layout="@layout/nav_list"/> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index d94c9ada1..4a7cb17de 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -3,7 +3,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="@dimen/listitem_iconwithtext_height"> <ImageView @@ -16,8 +16,9 @@ android:adjustViewBounds="true" android:cropToPadding="true" android:scaleType="fitXY" - android:layout_marginTop="6dp" - android:layout_marginBottom="6dp"/> + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginLeft="@dimen/listitem_icon_leftpadding"/> <TextView @@ -30,10 +31,10 @@ android:textSize="@dimen/text_size_navdrawer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" - android:layout_marginRight="48dp" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_toRightOf="@id/imgvCover" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml new file mode 100644 index 000000000..536946ca1 --- /dev/null +++ b/app/src/main/res/layout/nav_list.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="?attr/nav_drawer_background" + android:choiceMode="singleChoice" + android:clipToPadding="false" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:scrollbarStyle="outsideOverlay" />
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml index 9d70e7d7c..2559c1cd6 100644 --- a/app/src/main/res/layout/nav_listitem.xml +++ b/app/src/main/res/layout/nav_listitem.xml @@ -3,7 +3,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="@dimen/listitem_iconwithtext_height"> <ImageView android:id="@+id/imgvCover" @@ -16,8 +16,9 @@ android:cropToPadding="true" android:scaleType="centerCrop" android:padding="8dp" - android:layout_marginTop="6dp" - android:layout_marginBottom="6dp"/> + android:layout_marginLeft="@dimen/listitem_icon_leftpadding" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> <TextView @@ -30,9 +31,9 @@ android:textSize="@dimen/text_size_navdrawer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding" android:layout_marginRight="48dp" android:layout_toRightOf="@id/imgvCover" /> @@ -47,7 +48,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="14dp" android:layout_marginBottom="14dp" - android:layout_marginRight="16dp" + android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_alignParentRight="true" android:layout_centerVertical="true"/> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml index 1f2fc7e3e..6eb26291e 100644 --- a/app/src/main/res/layout/nav_section_item.xml +++ b/app/src/main/res/layout/nav_section_item.xml @@ -1,26 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/transparent"> - - <TextView - android:id="@+id/txtvTitle" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small" - android:typeface="sans" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_marginTop="16dp" - android:paddingBottom="4dp"/> + android:layout_width="match_parent" + android:layout_height="24dp" + android:background="@android:color/transparent" + android:orientation="vertical"> <View android:layout_width="match_parent" - android:layout_height="2dp" - android:layout_alignParentBottom="true" - android:background="@color/gray"/> + android:layout_height="1dp" + android:layout_centerVertical="true" + android:background="@color/gray" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml index 63c712f57..c09a1cdf3 100644 --- a/app/src/main/res/layout/new_episodes_fragment.xml +++ b/app/src/main/res/layout/new_episodes_fragment.xml @@ -11,6 +11,9 @@ android:scrollbarStyle="outsideOverlay" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="@dimen/list_vertical_padding" + android:paddingBottom="@dimen/list_vertical_padding" + android:clipToPadding="false" dslv:collapsed_height="2dp" dslv:drag_enabled="false" dslv:drag_scroll_start="0.33" diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index dcef1f8fc..7312f18a2 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -1,111 +1,99 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <ImageView android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" - android:scaleType="centerCrop"/> + 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" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_margin="4dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> + <TextView - android:id="@+id/txtvPublished" - android:layout_width="0dp" + android:id="@+id/statusUnread" + style="@style/AntennaPod.TextView.UnreadIndicator" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_alignParentTop="true" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/> - - <TextView - android:id="@+id/statusUnread" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" - style="@style/AntennaPod.TextView.UnreadIndicator"/> + android:layout_toLeftOf="@id/statusUnread" /> - <LinearLayout + <RelativeLayout + android:id="@+id/bottom_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:orientation="vertical"> + android:layout_alignParentRight="true" + android:layout_marginTop="16dp"> + + <ImageView + android:id="@id/imgvInPlaylist" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" + android:contentDescription="@string/in_queue_label" + android:src="?attr/stat_playlist" /> - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:max="100" /> - <ImageView - android:id="@id/imgvInPlaylist" - android:contentDescription="@string/in_queue_label" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentRight="true" - android:src="?attr/stat_playlist"/> + <TextView + android:id="@+id/txtvDuration" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/imgvInPlaylist" /> - <ProgressBar - android:id="@+id/pbar_download_progress" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvInPlaylist" - android:layout_marginRight="8dp" - android:layout_alignParentLeft="true"/> + <TextView + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:ellipsize="end" /> - <TextView - android:id="@+id/txtvDuration" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvInPlaylist" - android:layout_alignParentLeft="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> - </RelativeLayout> - </LinearLayout> + </RelativeLayout> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml index 11ae1f644..66d3039e4 100644 --- a/app/src/main/res/layout/onlinefeedview_header.xml +++ b/app/src/main/res/layout/onlinefeedview_header.xml @@ -1,83 +1,81 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_onlinefeedview" android:layout_height="@dimen/thumbnail_length_onlinefeedview" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp"/> + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:contentDescription="@string/cover_label" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.Heading" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_marginBottom="8dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:layout_toRightOf="@id/imgvCover" android:ellipsize="end" android:gravity="center_vertical" - android:layout_alignTop="@id/imgvCover" - android:layout_toRightOf="@id/imgvCover" - android:layout_alignParentRight="true" - android:lines="1" - style="@style/AntennaPod.TextView.Heading" - android:layout_margin="4dp"/> + android:maxLines="2" /> <TextView android:id="@+id/txtvAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="4dp" android:layout_below="@id/txtvTitle" + android:layout_marginBottom="8dp" + android:layout_marginRight="16dp" android:layout_toRightOf="@id/imgvCover" - android:lines="1" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small"/> - - <Button - android:id="@+id/butSubscribe" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/subscribe_label" - android:layout_below="@id/txtvAuthor" - android:layout_alignParentRight="true" - android:focusable="false" - /> + android:textSize="@dimen/text_size_small" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butSubscribe" + android:layout_below="@id/imgvCover" android:orientation="vertical"> <Spinner + android:id="@+id/spinnerAlternateUrls" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/spinnerAlternateUrls" - android:layout_margin="4dp" - android:textSize="@dimen/text_size_micro" - android:textColor="?android:attr/textColorPrimary"/> + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_micro" /> + <Button + android:id="@+id/butSubscribe" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:focusable="false" + android:text="@string/subscribe_label" /> <TextView android:id="@+id/txtvDescription" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLines="3" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_margin="4dp"/> + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/player_widget.xml b/app/src/main/res/layout/player_widget.xml index b6946f7a8..47f9ec258 100644 --- a/app/src/main/res/layout/player_widget.xml +++ b/app/src/main/res/layout/player_widget.xml @@ -16,8 +16,8 @@ android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_margin="12dp" - android:background="@drawable/borderless_button_dark" - android:src="@drawable/av_play_dark" /> + android:background="?attr/selectableItemBackground" + android:src="@drawable/ic_play_arrow_white_24dp" /> <LinearLayout android:id="@+id/layout_left" @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_toLeftOf="@id/butPlay" - android:background="@drawable/borderless_button_dark" + android:background="?attr/selectableItemBackground" android:gravity="center_vertical" android:orientation="vertical" > diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 742411761..d184eb28d 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -1,27 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout 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"> + xmlns:dslv="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> <com.mobeta.android.dslv.DragSortListView android:id="@android:id/list" - android:scrollbarStyle="outsideOverlay" android:layout_width="match_parent" android:layout_height="match_parent" + android:clipToPadding="false" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:scrollbarStyle="outsideOverlay" dslv:collapsed_height="2dp" dslv:drag_enabled="true" dslv:drag_handle_id="@id/drag_handle" dslv:drag_scroll_start="0.33" dslv:float_alpha="0.6" + dslv:float_background_color="?attr/dragview_float_background" dslv:max_drag_scroll_speed="0.5" dslv:remove_enabled="false" dslv:slide_shuffle_speed="0.3" dslv:sort_enabled="true" dslv:track_drag_sort="true" - dslv:float_background_color="?attr/dragview_float_background" - dslv:use_default_controller="true"/> + dslv:use_default_controller="true" /> <TextView android:id="@id/android:empty" @@ -29,7 +32,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" - android:text="@string/no_items_label"/> + android:text="@string/no_items_label" /> <ProgressBar android:id="@+id/progLoading" @@ -37,6 +40,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:indeterminateOnly="true" - android:visibility="gone"/> + android:visibility="gone" /> </FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 4a55cd466..68fb53c2c 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -1,96 +1,79 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <ImageView + android:id="@+id/drag_handle" android:layout_width="24dp" android:layout_height="match_parent" - android:id="@+id/drag_handle" - android:src="?attr/dragview_background" - android:scaleType="center" android:layout_margin="8dp" - android:contentDescription="@string/drag_handle_content_description"/> + android:contentDescription="@string/drag_handle_content_description" + android:scaleType="center" + android:src="?attr/dragview_background" /> <ImageView android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_queue_item" android:layout_height="@dimen/thumbnail_length_queue_item" - android:scaleType="centerCrop"/> + 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" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_margin="8dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/queue_title_text_size"/> + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" /> - <LinearLayout + <RelativeLayout + android:id="@+id/bottom_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:orientation="vertical"> - - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_alignParentRight="true" + android:layout_marginTop="16dp"> - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + <TextView + android:id="@+id/txtvPosition" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" /> - <ProgressBar - android:id="@+id/pbar_download_progress" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginLeft="8dp" - android:layout_toRightOf="@id/txtvPosition"/> + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_toRightOf="@id/txtvPosition" + android:max="100" /> - </RelativeLayout> - </LinearLayout> + </RelativeLayout> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml index b057a966d..ff4d490e9 100644 --- a/app/src/main/res/layout/searchlist_item.xml +++ b/app/src/main/res/layout/searchlist_item.xml @@ -1,43 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height"> <ImageView android:id="@+id/imgvFeedimage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:scaleType="centerCrop"/> + 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" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_centerVertical="true" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_verticalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:layout_toRightOf="@id/imgvFeedimage" android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp" - android:lines="2" - android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_marginBottom="8dp" /> <TextView android:id="@+id/txtvSubtitle" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp" - android:lines="1" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small"/> + android:lines="1" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/secondary_action.xml b/app/src/main/res/layout/secondary_action.xml new file mode 100644 index 000000000..eb1871abc --- /dev/null +++ b/app/src/main/res/layout/secondary_action.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" + android:focusable="false" + android:focusableInTouchMode="false" + tools:ignore="ContentDescription" />
\ No newline at end of file diff --git a/app/src/main/res/layout/vertical_list_divider.xml b/app/src/main/res/layout/vertical_list_divider.xml new file mode 100644 index 000000000..00b1752f6 --- /dev/null +++ b/app/src/main/res/layout/vertical_list_divider.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<View xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" + android:background="?android:attr/listDivider"/>
\ No newline at end of file |