diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/feeditemlist_item.xml | 166 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
2 files changed, 92 insertions, 76 deletions
diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml index 37dbbcc17..1378540da 100644 --- a/res/layout/feeditemlist_item.xml +++ b/res/layout/feeditemlist_item.xml @@ -1,89 +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:paddingLeft="8dp" > + 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" /> + <View + android:id="@+id/vStatusLabel" + android:layout_width="5dip" + android:layout_height="match_parent" + android:background="@color/status_unread" + android:visibility="invisible" /> - <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" /> + <RelativeLayout + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:paddingLeft="4dp" > - <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" /> + <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" /> - <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" /> + <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" /> - <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" /> + <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" /> - <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/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/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/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" /> - <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" /> + <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" /> - <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="fitXY" - android:src="@drawable/navigation_expand" /> + <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" /> + + <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" /> + + <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> +</LinearLayout>
\ No newline at end of file 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 |