diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2012-11-16 19:17:13 +0100 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2012-11-16 19:17:13 +0100 |
commit | a7831abf77a75b15681c3a4364d04950394dddab (patch) | |
tree | 3c87ebd327ded4441d424b64203ef3b9c234a7f1 /res | |
parent | 5c55b0922bbae266163f4c8557d8010753d94a51 (diff) | |
parent | b154865d60b6474b537437ae40ca99fd63d9562a (diff) | |
download | AntennaPod-a7831abf77a75b15681c3a4364d04950394dddab.zip |
Merge branch 'feed-item-labels' of git://github.com/patheticpat/AntennaPod into patheticpat-feed-item-labels
Conflicts:
src/de/danoeh/antennapod/feed/FeedItem.java
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/feeditemlist_item.xml | 135 | ||||
-rw-r--r-- | res/layout/feedlist_item.xml | 56 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 119 insertions, 74 deletions
diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml index 725891071..1378540da 100644 --- a/res/layout/feeditemlist_item.xml +++ b/res/layout/feeditemlist_item.xml @@ -1,102 +1,103 @@ <?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:layout_margin="8dp" > + android:paddingLeft="4dp" > - <ImageButton - android:id="@+id/butAction" - android:layout_width="wrap_content" + <View + android:id="@+id/vStatusLabel" + android:layout_width="5dip" android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="@drawable/borderless_button" - android:clickable="false" - android:focusable="false" - android:focusableInTouchMode="false" - android:padding="8dp" - android:scaleType="fitXY" - android:src="@drawable/navigation_expand" /> + android:background="@color/status_unread" + android:visibility="invisible" /> - <LinearLayout - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="0dip" android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_marginBottom="4dp" - android:layout_marginLeft="8dp" - android:layout_marginTop="4dp" - android:layout_toLeftOf="@id/butAction" - android:orientation="vertical" > + android:layout_weight="1" + android:paddingLeft="4dp" > <TextView android:id="@+id/txtvItemname" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginBottom="4dp" + android:layout_toLeftOf="@+id/butAction" android:textSize="16dp" /> <TextView android:id="@+id/txtvFeedname" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_below="@id/txtvItemname" android:layout_marginBottom="4dp" + android:layout_toLeftOf="@id/butAction" android:visibility="gone" /> <TextView android:id="@+id/txtvPublished" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_below="@id/txtvFeedname" android:layout_marginBottom="4dp" + android:layout_toLeftOf="@id/butAction" android:textColor="@color/gray" /> - <RelativeLayout - android:id="@+id/enc_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:id="@+id/enc_icons" - android:layout_width="wrap_content" - android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:orientation="horizontal" > + <ImageView + android:id="@+id/imgvType" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_below="@id/txtvPublished" + android:layout_toLeftOf="@+id/imgvInPlaylist" /> - <ImageView - android:id="@+id/imgvType" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="match_parent" /> + <ImageView + android:id="@id/imgvInPlaylist" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_below="@id/txtvPublished" + android:layout_toLeftOf="@+id/imgvDownloaded" + android:src="@drawable/stat_playlist" + android:visibility="visible" /> - <ImageView - android:id="@+id/imgvInPlaylist" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="match_parent" - android:src="@drawable/stat_playlist" - android:visibility="gone" /> + <ImageView + android:id="@id/imgvDownloaded" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_below="@id/txtvPublished" + android:layout_toLeftOf="@+id/imgvDownloading" + android:src="@drawable/av_download" + android:visibility="visible" /> - <ImageView - android:id="@+id/imgvDownloaded" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="match_parent" - android:src="@drawable/av_download" - android:visibility="gone" /> + <ImageView + android:id="@id/imgvDownloading" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_below="@id/txtvPublished" + android:layout_toLeftOf="@id/butAction" + android:src="@drawable/navigation_refresh" + android:visibility="visible" /> - <ImageView - android:id="@+id/imgvDownloading" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="match_parent" - android:src="@drawable/navigation_refresh" - android:visibility="gone" /> - </LinearLayout> + <TextView + android:id="@+id/txtvLenSize" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/txtvPublished" + android:maxLines="2" /> - <TextView - android:id="@+id/txtvLenSize" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@id/enc_icons" - android:maxLines="2" /> - </RelativeLayout> - </LinearLayout> + <ImageButton + android:id="@id/butAction" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="@drawable/borderless_button" + android:clickable="false" + android:focusable="false" + android:focusableInTouchMode="false" + android:padding="8dp" + android:scaleType="center" + android:src="@drawable/navigation_expand" /> + </RelativeLayout> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/feedlist_item.xml b/res/layout/feedlist_item.xml index 4677cae84..87f18f64e 100644 --- a/res/layout/feedlist_item.xml +++ b/res/layout/feedlist_item.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingBottom="4dp" - android:paddingRight="16dp" + android:paddingRight="8dp" android:paddingTop="4dp" > <ImageView @@ -18,19 +18,61 @@ android:cropToPadding="true" android:scaleType="fitXY" /> - <TextView - android:id="@+id/txtvNewEps" + <LinearLayout + android:id="@+id/lEpisodeCounts" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="fill_parent" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:textSize="20dp" - android:textStyle="bold" /> + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/lNewStatusLabel" + android:layout_width="wrap_content" + android:layout_height="0dip" + android:layout_weight="1" > + + <TextView + android:id="@+id/txtvNewEps" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_marginRight="4dip" + android:textSize="20dp" + android:textStyle="bold" /> + + <View + android:layout_width="5dip" + android:layout_height="match_parent" + android:background="@color/status_unread" + android:visibility="visible" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/lProgressStatusLabel" + android:layout_width="wrap_content" + android:layout_height="0dip" + android:layout_weight="1" > + + <TextView + android:id="@+id/txtvProgressEps" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_marginRight="4dip" + android:textSize="20dp" + android:textStyle="bold" /> + + <View + android:layout_width="5dip" + android:layout_height="match_parent" + android:background="@color/status_progress" + android:visibility="visible" /> + </LinearLayout> + </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_toLeftOf="@id/txtvNewEps" + android:layout_toLeftOf="@id/lEpisodeCounts" android:layout_toRightOf="@id/imgvFeedimage" android:orientation="vertical" > diff --git a/res/values/colors.xml b/res/values/colors.xml index e7463852f..e87f90420 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,5 +23,7 @@ <color name="actionbar_gray">#DDDDDD</color> <color name="download_success_green">#669900</color> <color name="download_failed_red">#CC0000</color> + <color name="status_unread">#99CC00</color> + <color name="status_progress">#FFBB33</color> </resources>
\ No newline at end of file |