From c18ed97aa4b10d844e008c9dd610f775b5aaff8e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 23 Nov 2011 23:18:18 +0300 Subject: add misc drawables update layouts --- res/drawable-hdpi/mark_set.png | Bin 0 -> 1530 bytes res/drawable-hdpi/mark_unset.png | Bin 0 -> 1433 bytes res/drawable/mark_set.svg | 77 ++++++++++++++++++++++++++++++ res/drawable/mark_unset.svg | 79 +++++++++++++++++++++++++++++++ res/layout/article_fragment.xml | 18 +++++-- res/layout/feeds_fragment.xml | 2 +- res/layout/feeds_row.xml | 7 ++- res/layout/headlines_fragment.xml | 2 +- res/layout/headlines_row.xml | 3 +- res/layout/main.xml | 15 +++--- res/values/attrs.xml | 2 + res/values/style.xml | 4 ++ src/org/fox/ttrss/HeadlinesFragment.java | 2 +- src/org/fox/ttrss/MainActivity.java | 14 +++++- 14 files changed, 203 insertions(+), 22 deletions(-) create mode 100644 res/drawable-hdpi/mark_set.png create mode 100644 res/drawable-hdpi/mark_unset.png create mode 100644 res/drawable/mark_set.svg create mode 100644 res/drawable/mark_unset.svg diff --git a/res/drawable-hdpi/mark_set.png b/res/drawable-hdpi/mark_set.png new file mode 100644 index 00000000..bd7c3755 Binary files /dev/null and b/res/drawable-hdpi/mark_set.png differ diff --git a/res/drawable-hdpi/mark_unset.png b/res/drawable-hdpi/mark_unset.png new file mode 100644 index 00000000..cb29576c Binary files /dev/null and b/res/drawable-hdpi/mark_unset.png differ diff --git a/res/drawable/mark_set.svg b/res/drawable/mark_set.svg new file mode 100644 index 00000000..5f55e61a --- /dev/null +++ b/res/drawable/mark_set.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/drawable/mark_unset.svg b/res/drawable/mark_unset.svg new file mode 100644 index 00000000..0d46aeb0 --- /dev/null +++ b/res/drawable/mark_unset.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 31a105e4..4610d207 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,8 +1,16 @@ - - - - + + + + + + + + + - diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml index 32f2d229..0dcbc1c4 100644 --- a/res/layout/feeds_fragment.xml +++ b/res/layout/feeds_fragment.xml @@ -6,6 +6,6 @@ - + diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index 4eb22e22..08eafd32 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -3,24 +3,23 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:gravity="center_vertical" - android:padding="3dip" android:id="@+id/feeds_row" android:layout_width="match_parent"> + android:id="@+id/feeds_row" android:layout_width="match_parent" android:paddingBottom="4dip" android:paddingLeft="8dip" android:paddingRight="8dip" android:paddingTop="4dip"> + android:text="{FEED}" android:layout_width="wrap_content" android:textSize="21dp"/> + android:text="{123}" android:textSize="16dp"/> \ No newline at end of file diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index 1828adb2..c5536c5c 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -3,7 +3,7 @@ - + diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 1cb583f6..656ff80a 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -4,7 +4,8 @@ android:gravity="center_vertical" android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content"> + android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"> + diff --git a/res/layout/main.xml b/res/layout/main.xml index 9593924a..fcac33d5 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,16 +1,17 @@ - - - - + + + + - - - + + + + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 2e1278de..76647f0e 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index a52af801..84a40558 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -4,6 +4,8 @@ #fafafa #0000ff #ffffff + #f0f0f0 + #ffffff