diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/all_episodes_fragment.xml | 52 | ||||
| -rw-r--r-- | app/src/main/res/layout/audioplayer_activity.xml | 24 | ||||
| -rw-r--r-- | app/src/main/res/layout/downloadlog_item.xml | 120 | ||||
| -rw-r--r-- | app/src/main/res/layout/feedinfo.xml | 162 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditemlist_header.xml | 30 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditemlist_item.xml | 56 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_feedlistitem.xml | 42 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_list.xml | 64 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_listitem.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_section_item.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/new_episodes_listitem.xml | 46 | ||||
| -rw-r--r-- | app/src/main/res/layout/queue_listitem.xml | 6 |
12 files changed, 394 insertions, 222 deletions
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml new file mode 100644 index 000000000..19db02f1d --- /dev/null +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -0,0 +1,52 @@ +<?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" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + 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: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" + dslv:float_alpha="0.6" + dslv:max_drag_scroll_speed="0.5" + dslv:remove_enabled="true" + dslv:remove_mode="flingRemove" + dslv:slide_shuffle_speed="0.3" + dslv:sort_enabled="false" + dslv:track_drag_sort="false" + dslv:float_background_color="?attr/dragview_float_background" + dslv:use_default_controller="true" + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@id/android:empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:text="@string/no_items_label"/> + + <ProgressBar + android:id="@+id/progLoading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:indeterminateOnly="true" + android:visibility="gone" + tools:visibility="visible" + tools:layout_width="match_parent" + tools:layout_height="64dp" + tools:background="@android:color/holo_red_light"/> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml index 644d8fe90..827e06e00 100644 --- a/app/src/main/res/layout/audioplayer_activity.xml +++ b/app/src/main/res/layout/audioplayer_activity.xml @@ -95,6 +95,18 @@ tools:src="@drawable/ic_fast_rewind_white_36dp" tools:background="@android:color/holo_blue_dark" /> + <TextView + android:id="@+id/txtvRev" + android:layout_width="wrap_content" + android:layout_height="32dp" + android:layout_alignTop="@id/butRev" + android:layout_alignLeft="@id/butRev" + android:layout_alignRight="@id/butRev" + android:gravity="center" + android:text="30" + android:textSize="8dp" + android:clickable="false"/> + <ImageButton android:id="@+id/butFF" android:layout_width="@dimen/audioplayer_playercontrols_length" @@ -106,6 +118,18 @@ tools:src="@drawable/ic_fast_forward_white_36dp" tools:background="@android:color/holo_blue_dark" /> + <TextView + android:id="@+id/txtvFF" + android:layout_width="wrap_content" + android:layout_height="32dp" + android:layout_alignTop="@id/butFF" + android:layout_alignLeft="@id/butFF" + android:layout_alignRight="@id/butFF" + android:gravity="center" + android:text="30" + android:textSize="8dp" + android:clickable="false"/> + <Button android:id="@+id/butPlaybackSpeed" android:layout_width="@dimen/audioplayer_playercontrols_length" diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml index df1501222..c6a34a517 100644 --- a/app/src/main/res/layout/downloadlog_item.xml +++ b/app/src/main/res/layout/downloadlog_item.xml @@ -1,78 +1,84 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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="wrap_content" - android:orientation="vertical" + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp" tools:background="@android:color/darker_gray"> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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_marginLeft="@dimen/listitem_threeline_textleftpadding" - tools:text="Media file" - tools:background="@android:color/holo_green_dark" /> - - <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" - tools:text="Download item title" - tools:background="@android:color/holo_blue_light" /> - </RelativeLayout> + <TextView + android:id="@+id/txtvIcon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:textSize="48sp" + tools:text="[Icon]" + android:gravity="center" /> - <RelativeLayout - android:layout_width="match_parent" + <Button + android:id="@+id/btnRetry" + 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:layout_below="@id/txtvIcon" + android:layout_alignLeft="@id/txtvIcon" + android:layout_alignRight="@id/txtvIcon" + android:layout_marginTop="8dp" + tools:text="↻" /> - <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" - tools:text="January 23" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvType" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + tools:text="Media file" + tools:background="@android:color/holo_green_dark" /> - <TextView - android:id="@+id/txtvStatus" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - tools:text="successful" - tools:background="@android:color/holo_green_dark" /> + <TextView + android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/txtvIcon" + android:layout_toLeftOf="@id/txtvType" + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + android:minLines="1" + android:maxLines="2" + tools:text="Download item title" + tools:background="@android:color/holo_blue_light" /> - </RelativeLayout> + <TextView + android:id="@+id/txtvDate" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/txtvIcon" + android:layout_below="@id/txtvTitle" + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + tools:text="January 23" + tools:background="@android:color/holo_green_dark" /> <TextView 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:layout_below="@id/txtvDate" + android:layout_toRightOf="@id/txtvIcon" + android:layout_marginLeft="8dp" android:textColor="?android:attr/textColorTertiary" android:textSize="@dimen/text_size_micro" tools:text="@string/design_time_downloaded_log_failure_reason" tools:background="@android:color/holo_green_dark" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml index a52104afa..db897865c 100644 --- a/app/src/main/res/layout/feedinfo.xml +++ b/app/src/main/res/layout/feedinfo.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -11,7 +12,10 @@ android:focusableInTouchMode="true" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp"> <ImageView android:id="@+id/imgvCover" @@ -20,26 +24,26 @@ android:layout_height="70dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp" tools:src="@drawable/ic_stat_antenna_default" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <TextView android:id="@+id/txtvTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_margin="4dp" + android:layout_marginLeft="8dp" android:layout_toRightOf="@id/imgvCover" style="@style/AntennaPod.TextView.Heading" tools:text="Feed title" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <View android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" android:layout_below="@id/imgvCover" + android:layout_marginTop="8dp" android:background="@color/bright_blue"/> </RelativeLayout> @@ -47,99 +51,120 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"> + android:layout_weight="1" + android:scrollbarStyle="outsideInset" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="8dp"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - <RelativeLayout + <android.support.v7.widget.GridLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp"> - - <View - android:id="@+id/center_divider" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_centerHorizontal="true"/> + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="3"> <TextView android:id="@+id/lblAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="0" + app:layout_column="0" + android:lines="1" android:text="@string/author_label" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light"/> <TextView android:id="@+id/txtvAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_margin="8dp" - android:layout_toRightOf="@id/center_divider" + app:layout_row="0" + app:layout_column="1" tools:text="Daniel Oeh" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> <TextView android:id="@+id/lblLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_below="@id/txtvAuthor" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="1" + app:layout_column="0" + android:lines="1" android:text="@string/language_label" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light"/> <TextView android:id="@+id/txtvLanguage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_below="@id/txtvAuthor" - android:layout_margin="8dp" - android:layout_toRightOf="@id/center_divider" + app:layout_row="1" + app:layout_column="1" tools:text="English" - tools:background="@android:color/holo_green_dark" /> - </RelativeLayout> + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@+id/lblUrl" + 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" + android:text="@string/url_label" + android:textColor="?android:attr/textColorPrimary" + tools:background="@android:color/holo_red_light"/> + + <TextView + android:id="@+id/txtvUrl" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:layout_row="2" + app:layout_column="1" + tools:text="http://www.example.com/feed" + tools:background="@android:color/holo_green_dark"/> + + </android.support.v7.widget.GridLayout> <TextView android:id="@+id/txtvSettings" style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" android:text="@string/podcast_settings_label" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp"/> + android:layout_marginTop="8dp"/> <CheckBox android:id="@+id/cbxAutoDownload" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/auto_download_label" android:enabled="false" android:textColor="?android:attr/textColorPrimary" - tools:background="@android:color/holo_red_light" /> + tools:background="@android:color/holo_red_light" + android:checked="false"/> <TextView android:id="@+id/txtvAuthentication" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/authentication_label" android:textSize="@dimen/text_size_medium" - android:textColor="?android:attr/textColorPrimary" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp"/> + android:textColor="?android:attr/textColorPrimary"/> <TextView android:id="@+id/txtvAuthenticationDescr" @@ -148,71 +173,74 @@ android:textColor="?android:attr/textColorPrimary" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp"/> + android:layout_marginTop="8dp"/> - <LinearLayout - android:layout_width="match_parent" + <android.support.v7.widget.GridLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_marginTop="8dp" + app:columnCount="2" + app:rowCount="3" + android:layout_gravity="center_horizontal"> <TextView android:id="@+id/txtvUsername" - android:layout_width="0dp" - android:layout_weight="1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="0" + app:layout_column="0" android:text="@string/username_label" android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtUsername" - android:layout_width="0dp" - android:layout_weight="2" + android:layout_width="140sp" android:layout_height="wrap_content" + app:layout_row="0" + app:layout_column="1" android:hint="@string/username_label"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp"> <TextView android:id="@+id/txtvPassword" - android:layout_width="0dp" - android:layout_weight="1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" + app:layout_row="1" + app:layout_column="0" android:text="@string/password_label" android:textColor="?android:attr/textColorPrimary"/> <EditText android:id="@+id/etxtPassword" - android:layout_width="0dp" - android:layout_weight="2" + android:layout_width="140sp" android:layout_height="wrap_content" + app:layout_row="1" + app:layout_column="1" android:hint="@string/password_label" android:inputType="textPassword"/> - </LinearLayout> + + </android.support.v7.widget.GridLayout> <TextView style="@style/AntennaPod.TextView.Heading" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginBottom="8dp" - android:layout_marginTop="24dp" + android:layout_marginTop="8dp" android:text="@string/description_label"/> <TextView android:id="@+id/txtvDescription" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginTop="8dp" android:text="@string/design_time_lorem_ipsum" - tools:background="@android:color/holo_green_dark" /> + tools:background="@android:color/holo_green_dark"/> </LinearLayout> + </ScrollView> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 4619580e3..667f777af 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -3,7 +3,7 @@ <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/feeditemlist_header_height" + android:layout_height="wrap_content" tools:context="de.danoeh.antennapod.activity.MainActivity" tools:background="@android:color/darker_gray"> @@ -11,7 +11,7 @@ android:id="@+id/imgvBackground" style="@style/BigBlurryBackground" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="@dimen/feeditemlist_header_height" /> <ImageView android:id="@+id/imgvCover" @@ -78,5 +78,31 @@ tools:text="Podcast author" tools:background="@android:color/holo_green_dark" /> + <IconTextView + android:id="@+id/txtvFailure" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/imgvBackground" + android:paddingTop="2dp" + android:paddingBottom="2dp" + android:background="@color/download_failed_red" + android:gravity="center" + android:textColor="@color/white" + android:visibility="gone" + android:text="@string/refresh_failed_msg" + tools:text="(!) Last refresh failed" + /> + + <TextView + android:id="@+id/txtvInformation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/imgvBackground" + android:paddingTop="2dp" + android:paddingBottom="2dp" + android:gravity="center" + android:visibility="gone" + tools:text="(i) Information" + /> </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 03595990e..6b7c45978 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -22,8 +22,10 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:layout_margin="16dp" - tools:text="Status unread" + android:layout_marginTop="16dp" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + tools:text="NEW" tools:background="@android:color/white" /> <TextView @@ -36,9 +38,18 @@ android:layout_marginBottom="8dp" android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:layout_toLeftOf="@id/statusUnread" - tools:text="Feed item name" + tools:text="Episode title" tools:background="@android:color/holo_green_dark" /> + <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" + tools:text="00:42:23" + tools:background="@android:color/holo_green_dark" /> <ImageView android:id="@+id/imgvInPlaylist" @@ -46,7 +57,7 @@ android:layout_height="@dimen/enc_icons_size" android:layout_alignParentRight="true" android:layout_below="@id/txtvItemname" - android:layout_marginRight="4dp" + android:layout_marginRight="8dp" android:contentDescription="@string/in_queue_label" android:src="?attr/stat_playlist" android:visibility="visible" @@ -58,20 +69,21 @@ android:layout_width="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size" android:layout_below="@id/txtvItemname" - android:layout_marginRight="4dp" - android:layout_toLeftOf="@+id/imgvInPlaylist" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/imgvInPlaylist" tools:ignore="ContentDescription" tools:src="@drawable/ic_hearing_white_18dp" tools:background="@android:color/holo_red_light" /> <TextView - android:id="@+id/txtvLenSize" + android:id="@+id/txtvPublished" style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_below="@id/txtvItemname" - tools:text="00:42:23" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/imgvType" + tools:text="Jan 23" tools:background="@android:color/holo_green_dark" /> <ProgressBar @@ -79,24 +91,20 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvItemname" - android:layout_marginLeft="4dp" - android:layout_marginRight="4dp" - android:layout_toLeftOf="@id/imgvType" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/txtvPublished" android:layout_toRightOf="@id/txtvLenSize" - tools:background="@android:color/holo_blue_light" /> + android:layout_alignTop="@id/txtvPublished" + android:layout_alignBottom="@id/txtvPublished" + tools:background="@android:color/holo_blue_light" + android:max="100" + android:progress="42" + android:indeterminate="false" + /> + - <TextView - android:id="@+id/txtvPublished" - style="@style/AntennaPod.TextView.ListItemSecondaryTitle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/txtvItemname" - android:layout_marginRight="4dp" - android:layout_toLeftOf="@id/imgvType" - tools:text="Jan 23" - tools:background="@android:color/holo_green_dark" /> </RelativeLayout> <include layout="@layout/vertical_list_divider"/> diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index e942d1b08..238beff88 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -7,7 +7,6 @@ android:layout_height="@dimen/listitem_iconwithtext_height" tools:background="@android:color/darker_gray"> - <ImageView android:id="@+id/imgvCover" android:contentDescription="@string/cover_label" @@ -18,13 +17,12 @@ android:adjustViewBounds="true" android:cropToPadding="true" android:scaleType="fitXY" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" tools:src="@drawable/ic_stat_antenna_default" tools:background="@android:color/holo_green_dark"/> - <TextView android:id="@+id/txtvTitle" android:lines="1" @@ -36,11 +34,37 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" 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" tools:text="Navigation feed item title" - tools:background="@android:color/holo_green_dark" - /> -</RelativeLayout>
\ No newline at end of file + tools:background="@android:color/holo_green_dark"/> + + <TextView + android:id="@+id/txtvCount" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:lines="1" + android:textColor="?android:attr/textColorTertiary" + android:textSize="@dimen/text_size_navdrawer" + android:layout_marginLeft="8dp" + android:layout_marginRight="@dimen/listitem_icon_rightpadding" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + tools:text="23" + tools:background="@android:color/holo_green_dark"/> + + <IconTextView + android:id="@+id/itxtvFailure" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toLeftOf="@id/txtvCount" + android:lines="1" + android:text="{fa-exclamation-circle}" + android:textColor="@color/download_failed_red" + android:textSize="@dimen/text_size_navdrawer" + android:layout_marginLeft="8dp" + android:layout_centerVertical="true" + tools:text="!" + tools:background="@android:color/holo_green_dark"/> + +</RelativeLayout> diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index 8c46e456d..9fcf9d9fc 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/nav_layout" android:layout_width="@dimen/drawer_width" @@ -9,32 +10,11 @@ android:background="?attr/nav_drawer_background" android:orientation="vertical"> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="0dp" - android:layout_weight="1" - 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" - tools:listitem="@layout/nav_listitem" - tools:background="@android:color/holo_purple" /> - - <View - android:layout_width="@dimen/drawer_width" - android:layout_height="1dp" - android:layout_centerVertical="true" - android:background="?android:attr/listDivider" - tools:background="@android:color/holo_red_dark" /> - <LinearLayout android:id="@+id/nav_settings" android:layout_width="@dimen/drawer_width" android:layout_height="@dimen/listitem_iconwithtext_height" + android:layout_alignParentBottom="true" android:background="?attr/selectableItemBackground" android:contentDescription="@string/settings_label" android:orientation="horizontal"> @@ -45,9 +25,9 @@ android:layout_height="@dimen/thumbnail_length_navlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_marginBottom="8dp" + android:layout_marginBottom="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" - android:layout_marginTop="8dp" + android:layout_marginTop="4dp" android:adjustViewBounds="true" android:contentDescription="@string/cover_label" android:cropToPadding="true" @@ -58,10 +38,10 @@ tools:background="@android:color/holo_orange_dark" /> <TextView - android:layout_width="0dp" - android:layout_height="match_parent" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_margin="16dp" + android:layout_marginLeft="16dp" android:layout_weight="1" android:gravity="center_vertical" android:text="@string/settings_label" @@ -71,4 +51,30 @@ </LinearLayout> -</LinearLayout>
\ No newline at end of file + <View + android:id="@+id/divider" + android:layout_width="@dimen/drawer_width" + android:layout_height="1dp" + android:layout_centerVertical="true" + android:layout_above="@id/nav_settings" + android:background="?android:attr/listDivider" + tools:background="@android:color/holo_red_dark" /> + + <ListView + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_above="@id/divider" + android:layout_alignParentTop="true" + 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" + tools:listitem="@layout/nav_listitem" + tools:background="@android:color/holo_purple" /> + +</RelativeLayout> diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml index bb5865ee6..d62672c34 100644 --- a/app/src/main/res/layout/nav_listitem.xml +++ b/app/src/main/res/layout/nav_listitem.xml @@ -16,11 +16,11 @@ android:layout_centerVertical="true" android:adjustViewBounds="true" android:cropToPadding="true" - android:scaleType="centerCrop" - android:padding="8dp" + android:scaleType="centerInside" + android:padding="4dp" android:layout_marginLeft="@dimen/listitem_icon_leftpadding" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" tools:src="@drawable/ic_new_releases_white_24dp" tools:background="@android:color/holo_green_dark"/> @@ -36,8 +36,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" 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" tools:text="Navigation item title" @@ -52,8 +50,6 @@ android:textColor="?android:attr/textColorTertiary" android:textSize="@dimen/text_size_navdrawer" android:layout_marginLeft="12dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_alignParentRight="true" android:layout_centerVertical="true" diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml index 77b2ff253..fa1db865d 100644 --- a/app/src/main/res/layout/nav_section_item.xml +++ b/app/src/main/res/layout/nav_section_item.xml @@ -3,7 +3,7 @@ <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="24dp" + android:layout_height="16dp" android:background="@android:color/transparent" android:orientation="vertical"> diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index 43ada14b0..b738cf836 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -37,7 +37,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" /> + android:layout_alignParentTop="true" + android:layout_marginLeft="8dp"/> <TextView android:id="@+id/txtvTitle" @@ -60,38 +61,26 @@ android:layout_marginTop="16dp" tools:background="@android:color/holo_red_light" > + <TextView + android:id="@+id/txtvDuration" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + tools:text="00:42:23" + tools:background="@android:color/holo_blue_dark" /> + <ImageView - android:id="@id/imgvInPlaylist" + 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" tools:src="@drawable/ic_list_grey600_24dp" tools:background="@android:color/black" /> - <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" /> - - <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" - tools:text="00:42:23" - tools:background="@android:color/holo_blue_dark" /> - <TextView android:id="@+id/txtvPublished" style="@style/AntennaPod.TextView.ListItemSecondaryTitle" @@ -103,6 +92,17 @@ tools:text="Jan 23" tools:background="@android:color/holo_green_dark" /> + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/txtvPublished" + android:layout_toRightOf="@id/txtvDuration" + android:max="100" /> + </RelativeLayout> </RelativeLayout> diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index bc5b951a2..39e9c72a5 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout + 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" android:orientation="horizontal" + android:paddingLeft="16dp" tools:background="@android:color/darker_gray" > <ImageView android:id="@+id/drag_handle" android:layout_width="100dp" android:layout_height="match_parent" - android:layout_marginLeft="8dp" + android:layout_marginLeft="-8dp" android:layout_marginRight="-64dp" android:contentDescription="@string/drag_handle_content_description" android:scaleType="fitXY" |