diff options
author | Andrew Dolgov <[email protected]> | 2015-07-10 23:37:18 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-07-10 23:37:18 +0300 |
commit | 7c8919cb79a2e4fd9f03ca8058ae000a60dc5537 (patch) | |
tree | 0641028c1f4b55856b0975c3f695d8a7eaa66c86 /org.fox.ttrss/src/main/res | |
parent | d9e3c77419989897c26f0156720058a54a61c2f5 (diff) |
new album icon, various headline tweaks
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png | bin | 0 -> 613 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png | bin | 0 -> 829 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png | bin | 0 -> 1146 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png | bin | 0 -> 1587 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml | 15 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml | 15 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines_row.xml | 54 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml | 54 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 2 |
9 files changed, 55 insertions, 85 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png Binary files differnew file mode 100644 index 00000000..9bbc5bd1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png Binary files differnew file mode 100644 index 00000000..e96c2bdf --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png Binary files differnew file mode 100644 index 00000000..f99b1536 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png Binary files differnew file mode 100644 index 00000000..a48a95cd --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml deleted file mode 100644 index bbc3c1e2..00000000 --- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list - xmlns:android="http://schemas.android.com/apk/res/android" > - - <item> - <shape android:shape="rectangle"> - <solid android:color="#90000000" /> - </shape> - </item> - - <item> - <bitmap android:src="@drawable/ic_play_circle" - android:gravity="center" /> - </item> -</layer-list>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml deleted file mode 100644 index 6f57ff0f..00000000 --- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<layer-list - xmlns:android="http://schemas.android.com/apk/res/android" > - - <item> - <shape android:shape="rectangle"> - <solid android:color="#90000000" /> - </shape> - </item> - - <item> - <bitmap android:src="@drawable/ic_youtube_play" - android:gravity="center" /> - </item> -</layer-list>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index b5764477..e54731e4 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -24,22 +24,6 @@ android:layout_height="wrap_content" android:layout_span="2"> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" /> - - <ImageView - android:id="@+id/flavor_video_play" - android:layout_width="match_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:scaleType="fitXY" - android:src="@drawable/flavor_video_play" - android:visibility="visible" /> - <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -64,6 +48,17 @@ android:background="?headlineHeaderBackground" android:padding="16dp"> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="visible" + android:layout_alignParentTop="false" + android:layout_alignParentRight="false" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" /> + <TextView android:id="@+id/title" android:layout_width="match_parent" @@ -81,7 +76,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/title" - android:orientation="horizontal"> + android:orientation="horizontal" + android:id="@+id/linearLayout2"> <TextView android:id="@+id/feed_title" @@ -110,20 +106,24 @@ android:textSize="12sp" /> </LinearLayout> + </RelativeLayout> + </RelativeLayout> - <TextView - android:id="@+id/flavor_image_prompt" - android:layout_width="match_parent" + <ImageView + android:id="@+id/flavor_video_play" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:background="?headlineHeaderBackground" - android:gravity="center" - android:text="@string/flavor_image_prompt" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?headlineSecondaryTextColor" - android:visibility="visible" /> + android:layout_gravity="bottom|right" + android:scaleType="fitXY" + android:src="@drawable/ic_play_circle" + android:visibility="visible" + android:layout_below="@+id/headline_header" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" /> </FrameLayout> </TableRow> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index fba42d4f..58691aeb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -25,22 +25,6 @@ android:layout_height="wrap_content" android:layout_span="2"> - <ProgressBar - android:id="@+id/flavorImageLoadingBar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="visible" /> - - <ImageView - android:id="@+id/flavor_video_play" - android:layout_width="match_parent" - android:layout_height="fill_parent" - android:layout_gravity="center" - android:scaleType="fitXY" - android:src="@drawable/flavor_video_play" - android:visibility="visible" /> - <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -65,6 +49,17 @@ android:background="?headlineHeaderBackground" android:padding="16dp"> + <ProgressBar + android:id="@+id/flavorImageLoadingBar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="visible" + android:layout_alignParentTop="false" + android:layout_alignParentRight="false" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" /> + <TextView android:id="@+id/title" android:layout_width="match_parent" @@ -82,7 +77,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/title" - android:orientation="horizontal"> + android:orientation="horizontal" + android:id="@+id/linearLayout2"> <TextView android:id="@+id/feed_title" @@ -111,20 +107,24 @@ android:textSize="12sp" /> </LinearLayout> + </RelativeLayout> + </RelativeLayout> - <TextView - android:id="@+id/flavor_image_prompt" - android:layout_width="match_parent" + <ImageView + android:id="@+id/flavor_video_play" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:background="?headlineHeaderBackground" - android:gravity="center" - android:text="@string/flavor_image_prompt" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?headlineSecondaryTextColor" - android:visibility="visible" /> + android:layout_gravity="bottom|right" + android:scaleType="fitXY" + android:src="@drawable/ic_play_circle" + android:visibility="visible" + android:layout_below="@+id/headline_header" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="8dp" + android:layout_marginBottom="8dp" /> </FrameLayout> </TableRow> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index f36d9c2f..74aad95a 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -80,7 +80,7 @@ <item name="headlineSelectedExcerptTextColor">@android:color/secondary_text_dark</item> <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item> <item name="headlineSelectedBackground">#1c1c1c</item> - <item name="headlineHeaderBackground">#cc000000</item> + <item name="headlineHeaderBackground">#99000000</item> <item name="headlineUnreadBackground">#101010</item> <item name="linkColor">?colorPrimary</item> <item name="loadingBackground">@android:color/black</item> |