diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/feeditemlist_header.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/layout/feeditemlist_item.xml | 56 | ||||
| -rw-r--r-- | app/src/main/res/layout/nav_feedlistitem.xml | 36 | ||||
| -rw-r--r-- | app/src/main/res/layout/new_episodes_listitem.xml | 46 |
4 files changed, 101 insertions, 52 deletions
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 943f4fc92..667f777af 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -78,6 +78,21 @@ 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" 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 38f4f21aa..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" @@ -24,7 +23,6 @@ tools:src="@drawable/ic_stat_antenna_default" tools:background="@android:color/holo_green_dark"/> - <TextView android:id="@+id/txtvTitle" android:lines="1" @@ -39,6 +37,34 @@ 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/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> |