diff options
| -rw-r--r-- | res/layout/external_itemlist_item.xml | 92 | ||||
| -rw-r--r-- | res/layout/feeditemlist_header.xml | 79 | ||||
| -rw-r--r-- | res/layout/feeditemlist_item.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java | 20 |
5 files changed, 111 insertions, 84 deletions
diff --git a/res/layout/external_itemlist_item.xml b/res/layout/external_itemlist_item.xml index 6f2405abc..2d0093641 100644 --- a/res/layout/external_itemlist_item.xml +++ b/res/layout/external_itemlist_item.xml @@ -33,63 +33,67 @@ android:layout_alignParentTop="true" android:layout_marginLeft="8dp" android:layout_marginRight="4dp" - android:layout_marginTop="8dp" + android:layout_marginTop="2dp" android:layout_toLeftOf="@id/butAction" android:layout_toRightOf="@id/imgvFeedimage" android:ellipsize="end" - android:maxLines="1" + android:lines="2" android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_small" /> - <TextView - android:id="@+id/txtvFeedname" + <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvTitle" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_alignParentBottom="true" android:layout_toLeftOf="@id/butAction" android:layout_toRightOf="@id/imgvFeedimage" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> + android:orientation="vertical" > - <TextView - android:id="@+id/txtvLenSize" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/txtvFeedname" - android:layout_marginBottom="8dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" - android:layout_toRightOf="@id/imgvFeedimage" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> + <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" /> - <ImageView - android:id="@+id/imgvDownloadStatus" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_below="@id/txtvFeedname" - android:layout_marginBottom="8dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" - android:layout_toLeftOf="@id/butAction" /> + <RelativeLayout + android:id="@+id/bottom_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" > - <ProgressBar - android:id="@+id/pbar_episode_progress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_below="@id/txtvFeedname" - android:layout_marginTop="4dp" - android:layout_toLeftOf="@id/imgvDownloadStatus" - android:layout_toRightOf="@id/txtvLenSize" /> + <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" /> + + <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" diff --git a/res/layout/feeditemlist_header.xml b/res/layout/feeditemlist_header.xml index 4dbeae28b..31ccb7e96 100644 --- a/res/layout/feeditemlist_header.xml +++ b/res/layout/feeditemlist_header.xml @@ -1,38 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/borderless_button" > + android:background="?attr/borderless_button" + android:orientation="vertical" > - <TextView - android:id="@+id/txtvHeaderTitle" + <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_marginBottom="24dp" - android:layout_marginLeft="@dimen/thumbnail_length_itemlist" - android:layout_marginRight="16dp" - android:layout_marginTop="24dp" - android:paddingLeft="8dp" - android:textColor="@color/dark_blue" - android:textSize="@dimen/text_size_large" - android:textStyle="bold" /> + android:layout_height="match_parent" > - <ImageButton - android:id="@+id/butAction" - 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/txtvHeaderTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_marginBottom="32dp" + android:layout_marginLeft="28dp" + android:layout_marginRight="16dp" + android:layout_marginTop="32dp" + android:paddingLeft="8dp" + android:textAllCaps="true" + android:textColor="@color/dark_blue" + android:textSize="@dimen/text_size_large" + android:typeface="sans" /> -</RelativeLayout>
\ No newline at end of file + <ImageButton + android:id="@+id/butAction" + 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/txtvNumItems" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_toLeftOf="@id/butAction" + android:textColor="@color/dark_blue" + android:textSize="@dimen/text_size_large" + android:textStyle="normal" /> + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml index 4fbddbbac..ed4b0d46d 100644 --- a/res/layout/feeditemlist_item.xml +++ b/res/layout/feeditemlist_item.xml @@ -14,7 +14,7 @@ android:layout_marginTop="4dp" android:layout_toLeftOf="@+id/butAction" android:ellipsize="end" - android:maxLines="2" + android:lines="2" android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/text_size_medium" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index a74ccf1a9..3b7e7475a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -11,5 +11,5 @@ <dimen name="text_size_medium">18sp</dimen> <dimen name="text_size_large">22sp</dimen> <dimen name="status_indicator_width">36dp</dimen> - <dimen name="thumbnail_length_itemlist">70dp</dimen> + <dimen name="thumbnail_length_itemlist">80dp</dimen> </resources>
\ No newline at end of file diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java index 9989fb283..916e13469 100644 --- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java +++ b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java @@ -231,20 +231,26 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter { TextView headerTitle = (TextView) convertView .findViewById(R.id.txtvHeaderTitle); ImageButton actionButton = (ImageButton) convertView - .findViewById(R.id.butAction); + .findViewById(R.id.butAction); + TextView numItems = (TextView) convertView.findViewById(R.id.txtvNumItems); + String headerString = null; + int childrenCount = 0; + if (groupPosition == 0) { headerString = context.getString(R.string.queue_label); - if (manager.getQueueSize(true) > 0) { - headerString += " (" + getChildrenCount(GROUP_POS_QUEUE) + ")"; - } + childrenCount = getChildrenCount(GROUP_POS_QUEUE); } else { headerString = context.getString(R.string.waiting_list_label); - if (manager.getUnreadItemsSize(true) > 0) { - headerString += " (" + getChildrenCount(GROUP_POS_UNREAD) + ")"; - } + childrenCount = getChildrenCount(GROUP_POS_UNREAD); } headerTitle.setText(headerString); + if (childrenCount <= 0) { + numItems.setVisibility(View.INVISIBLE); + } else { + numItems.setVisibility(View.VISIBLE); + numItems.setText(Integer.toString(childrenCount)); + } actionButton.setFocusable(false); actionButton.setOnClickListener(new OnClickListener() { |