Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'external_itemlist_update' into develop

This commit is contained in:
daniel oeh 2013-04-11 10:56:09 +02:00
parent 0a350c5c9e 7a33b7f96e
commit 7e4827e253
5 changed files with 111 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
res/layout/external_itemlist_item.xml
View File

@ -33,38 +33,45 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="4dp" android:layout_marginRight="4dp"
android:layout_marginTop="8dp" android:layout_marginTop="2dp"
android:layout_toLeftOf="@id/butAction" android:layout_toLeftOf="@id/butAction"
android:layout_toRightOf="@id/imgvFeedimage" android:layout_toRightOf="@id/imgvFeedimage"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:lines="2"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_small" /> android:textSize="@dimen/text_size_small" />
<TextView <LinearLayout
android:id="@+id/txtvFeedname"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/txtvTitle" android:layout_alignParentBottom="true"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_toLeftOf="@id/butAction" android:layout_toLeftOf="@id/butAction"
android:layout_toRightOf="@id/imgvFeedimage" 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:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_micro" /> android:textSize="@dimen/text_size_micro" />
<RelativeLayout
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView <TextView
android:id="@+id/txtvLenSize" android:id="@+id/txtvLenSize"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/txtvFeedname" android:layout_alignParentLeft="true"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginTop="4dp"
android:layout_toRightOf="@id/imgvFeedimage"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
@ -74,22 +81,19 @@
android:id="@+id/imgvDownloadStatus" android:id="@+id/imgvDownloadStatus"
android:layout_width="@dimen/enc_icons_size" android:layout_width="@dimen/enc_icons_size"
android:layout_height="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size"
android:layout_below="@id/txtvFeedname" android:layout_alignParentRight="true"
android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp" />
android:layout_marginTop="4dp"
android:layout_toLeftOf="@id/butAction" />
<ProgressBar <ProgressBar
android:id="@+id/pbar_episode_progress" android:id="@+id/pbar_episode_progress"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/txtvFeedname"
android:layout_marginTop="4dp"
android:layout_toLeftOf="@id/imgvDownloadStatus" android:layout_toLeftOf="@id/imgvDownloadStatus"
android:layout_toRightOf="@id/txtvLenSize" /> android:layout_toRightOf="@id/txtvLenSize" />
</RelativeLayout>
</LinearLayout>
<ImageView <ImageView
android:id="@+id/statusPlaying" android:id="@+id/statusPlaying"

31
res/layout/feeditemlist_header.xml
View File

@ -1,8 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/borderless_button" > android:background="?attr/borderless_button"
android:orientation="vertical" >
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent" >
<TextView <TextView
android:id="@+id/txtvHeaderTitle" android:id="@+id/txtvHeaderTitle"
@ -10,14 +15,15 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginBottom="24dp" android:layout_marginBottom="32dp"
android:layout_marginLeft="@dimen/thumbnail_length_itemlist" android:layout_marginLeft="28dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="24dp" android:layout_marginTop="32dp"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:textAllCaps="true"
android:textColor="@color/dark_blue" android:textColor="@color/dark_blue"
android:textSize="@dimen/text_size_large" android:textSize="@dimen/text_size_large"
android:textStyle="bold" /> android:typeface="sans" />
<ImageButton <ImageButton
android:id="@+id/butAction" android:id="@+id/butAction"
@ -35,4 +41,15 @@
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="?attr/spinner_button" /> android:src="?attr/spinner_button" />
</RelativeLayout> <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>

2
res/layout/feeditemlist_item.xml
View File

@ -14,7 +14,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_toLeftOf="@+id/butAction" android:layout_toLeftOf="@+id/butAction"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:lines="2"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textSize="@dimen/text_size_medium" /> android:textSize="@dimen/text_size_medium" />

2
res/values/dimens.xml
View File

@ -11,5 +11,5 @@
<dimen name="text_size_medium">18sp</dimen> <dimen name="text_size_medium">18sp</dimen>
<dimen name="text_size_large">22sp</dimen> <dimen name="text_size_large">22sp</dimen>
<dimen name="status_indicator_width">36dp</dimen> <dimen name="status_indicator_width">36dp</dimen>
<dimen name="thumbnail_length_itemlist">70dp</dimen> <dimen name="thumbnail_length_itemlist">80dp</dimen>
</resources> </resources>

18
src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
View File

@ -232,19 +232,25 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
.findViewById(R.id.txtvHeaderTitle); .findViewById(R.id.txtvHeaderTitle);
ImageButton actionButton = (ImageButton) convertView ImageButton actionButton = (ImageButton) convertView
.findViewById(R.id.butAction); .findViewById(R.id.butAction);
TextView numItems = (TextView) convertView.findViewById(R.id.txtvNumItems);
String headerString = null; String headerString = null;
int childrenCount = 0;
if (groupPosition == 0) { if (groupPosition == 0) {
headerString = context.getString(R.string.queue_label); headerString = context.getString(R.string.queue_label);
if (manager.getQueueSize(true) > 0) { childrenCount = getChildrenCount(GROUP_POS_QUEUE);
headerString += " (" + getChildrenCount(GROUP_POS_QUEUE) + ")";
}
} else { } else {
headerString = context.getString(R.string.waiting_list_label); headerString = context.getString(R.string.waiting_list_label);
if (manager.getUnreadItemsSize(true) > 0) { childrenCount = getChildrenCount(GROUP_POS_UNREAD);
headerString += " (" + getChildrenCount(GROUP_POS_UNREAD) + ")";
}
} }
headerTitle.setText(headerString); headerTitle.setText(headerString);
if (childrenCount <= 0) {
numItems.setVisibility(View.INVISIBLE);
} else {
numItems.setVisibility(View.VISIBLE);
numItems.setText(Integer.toString(childrenCount));
}
actionButton.setFocusable(false); actionButton.setFocusable(false);
actionButton.setOnClickListener(new OnClickListener() { actionButton.setOnClickListener(new OnClickListener() {