From 2a06e4de302240b31059cbb880b708d5d7f3dab6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 1 Nov 2014 12:02:01 +0400 Subject: [PATCH] remove pill counters --- org.fox.ttrss/src/main/AndroidManifest.xml | 4 +- .../main/res/drawable/counter_background.xml | 12 ------ .../res/drawable/counter_background_dark.xml | 12 ------ .../counter_background_selected_light.xml | 12 ------ .../res/drawable/counter_background_sepia.xml | 12 ------ .../src/main/res/layout/cats_fragment.xml | 2 + .../src/main/res/layout/feeds_fragment.xml | 2 + .../src/main/res/layout/feeds_row.xml | 39 ++++++++--------- .../main/res/layout/feeds_row_selected.xml | 43 ++++++++----------- .../src/main/res/layout/headlines_footer.xml | 2 +- org.fox.ttrss/src/main/res/values/attrs.xml | 2 - org.fox.ttrss/src/main/res/values/style.xml | 17 +++----- 12 files changed, 48 insertions(+), 111 deletions(-) delete mode 100644 org.fox.ttrss/src/main/res/drawable/counter_background.xml delete mode 100644 org.fox.ttrss/src/main/res/drawable/counter_background_dark.xml delete mode 100644 org.fox.ttrss/src/main/res/drawable/counter_background_selected_light.xml delete mode 100644 org.fox.ttrss/src/main/res/drawable/counter_background_sepia.xml diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 66259bd9..ddca44c4 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="256" + android:versionName="1.53" > - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/counter_background_dark.xml b/org.fox.ttrss/src/main/res/drawable/counter_background_dark.xml deleted file mode 100644 index 3cc971c6..00000000 --- a/org.fox.ttrss/src/main/res/drawable/counter_background_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/counter_background_selected_light.xml b/org.fox.ttrss/src/main/res/drawable/counter_background_selected_light.xml deleted file mode 100644 index 7485ea00..00000000 --- a/org.fox.ttrss/src/main/res/drawable/counter_background_selected_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/drawable/counter_background_sepia.xml b/org.fox.ttrss/src/main/res/drawable/counter_background_sepia.xml deleted file mode 100644 index daebd494..00000000 --- a/org.fox.ttrss/src/main/res/drawable/counter_background_sepia.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml index 4a950933..1f0fc38b 100644 --- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml @@ -11,6 +11,8 @@ diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml index aa02ffff..4c5ad73a 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml @@ -13,6 +13,8 @@ diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index f2fc286c..38603144 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -4,17 +4,19 @@ android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" android:descendantFocusability="blocksDescendants" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="6dp" + android:paddingBottom="6dp" + android:baselineAligned="true" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingBottom="10dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:paddingTop="10dip" > + android:orientation="horizontal"> @@ -22,34 +24,27 @@ \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index 6cf43666..734fe637 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -3,54 +3,49 @@ android:id="@+id/feeds_row" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:background="?feedsSelectedBackground" android:descendantFocusability="blocksDescendants" + android:background="?feedsSelectedBackground" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="6dp" + android:paddingBottom="6dp" + android:baselineAligned="true" android:gravity="center_vertical" - android:orientation="horizontal" - android:paddingBottom="10dip" - android:paddingLeft="8dip" - android:paddingRight="8dip" - android:paddingTop="10dip" > + android:orientation="horizontal"> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml index 5877aae9..332c9882 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml @@ -10,6 +10,6 @@ android:layout_marginTop="10dp" android:layout_width="128dp" android:layout_height="1dp" - android:background="?unreadCounterBackground"/> + android:background="?feedsSelectedBackground"/> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 272c3dbd..31d5e33e 100644 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -23,8 +23,6 @@ - - diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index b1ac677c..1fc8b25d 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -5,14 +5,14 @@ #eeeeee @android:drawable/divider_horizontal_bright @drawable/shadow_feeds - #ffffff + #909090 @drawable/shadow_headlines #f0f0f0 @android:color/transparent #88b0f0 @android:color/white #f5f5f5 - #88b0f0 + #526a8e @android:color/primary_text_light #ffffff @android:color/secondary_text_light @@ -25,8 +25,6 @@ #008000 #4684ff @android:color/white - @drawable/counter_background - @drawable/counter_background_selected_light #9a8c59 #fff7d5 #dddddd @@ -46,10 +44,8 @@ @drawable/shadow_headlines_sepia @drawable/paper_sepia #E5B0A0 - #E5B0A0 + #7F3F3F @drawable/paper_sepia - @drawable/counter_background_sepia - @drawable/counter_background_sepia #35281C #C46262 @@ -66,7 +62,7 @@ @android:color/transparent @android:drawable/divider_horizontal_dark @android:color/transparent - #ffffff + #909090 @android:color/black @android:color/black @android:color/black @@ -86,8 +82,6 @@ #00FF00 @color/ics_cyan @android:color/black - @drawable/counter_background_dark - @drawable/counter_background_dark @android:color/secondary_text_dark #303030 #101010 @@ -106,11 +100,10 @@ @color/feeds_dark_gray #51698E #383c42 - #51698E + #445877 @android:color/primary_text_dark @android:color/secondary_text_dark @android:color/secondary_text_dark - #a0a0a0 #51698E