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

Updated header view layout

This commit is contained in:
daniel oeh 2013-04-09 12:47:39 +02:00
parent a6d68205a5
commit 1ab5a09429
4 changed files with 77 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/episodes_fragment.xml
View File

@ -6,11 +6,7 @@
<ExpandableListView <ExpandableListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" >
android:childDivider="@android:color/transparent"
android:divider="@android:color/transparent"
android:dividerHeight="3dp"
android:paddingLeft="8dp" >
</ExpandableListView> </ExpandableListView>
</LinearLayout> </LinearLayout>

101
res/layout/external_itemlist_item.xml
View File

@ -33,7 +33,7 @@
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"
@ -41,42 +41,59 @@
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/txtvLenSize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="16dp"
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" />
<ImageView
android:id="@+id/imgvDownloadStatus"
android:layout_width="@dimen/enc_icons_size"
android:layout_height="@dimen/enc_icons_size"
android:layout_alignParentBottom="true"
android:layout_marginBottom="16dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="4dp"
android:layout_toLeftOf="@id/butAction" />
<ProgressBar
android:id="@+id/pbar_episode_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginBottom="8dp" android:layout_toLeftOf="@id/butAction"
android:layout_marginTop="4dp" android:layout_toRightOf="@id/imgvFeedimage"
android:layout_toLeftOf="@id/imgvDownloadStatus" android:orientation="vertical" >
android:layout_toRightOf="@id/txtvLenSize" />
<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" />
<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 <ImageView
android:id="@+id/statusPlaying" android:id="@+id/statusPlaying"
@ -90,20 +107,4 @@
android:padding="2dp" android:padding="2dp"
android:src="@drawable/av_play_dark" /> android:src="@drawable/av_play_dark" />
<TextView
android:id="@+id/txtvFeedname"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@id/txtvTitle"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
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" />
</RelativeLayout> </RelativeLayout>

14
res/layout/feeditemlist_header.xml
View File

@ -15,10 +15,10 @@
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="28dp" 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:textAllCaps="true"
android:textColor="@color/dark_blue" android:textColor="@color/dark_blue"
@ -40,6 +40,16 @@
android:paddingTop="16dp" android:paddingTop="16dp"
android:scaleType="fitEnd" android:scaleType="fitEnd"
android:src="?attr/spinner_button" /> 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> </RelativeLayout>
</LinearLayout> </LinearLayout>

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

@ -231,20 +231,26 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
TextView headerTitle = (TextView) convertView TextView headerTitle = (TextView) convertView
.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() {