diff --git a/clients/android/NewsBlur/lint.xml b/clients/android/NewsBlur/lint.xml index 1bf48cc01..7a5c72c0d 100644 --- a/clients/android/NewsBlur/lint.xml +++ b/clients/android/NewsBlur/lint.xml @@ -3,4 +3,5 @@ + diff --git a/clients/android/NewsBlur/res/drawable-hdpi/clock.png b/clients/android/NewsBlur/res/drawable-hdpi/clock.png deleted file mode 100644 index 3dbcdfd3a..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/clock.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/fullscreen.png b/clients/android/NewsBlur/res/drawable-hdpi/fullscreen.png deleted file mode 100644 index 817c16394..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/fullscreen.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/newsblur_share.png b/clients/android/NewsBlur/res/drawable-hdpi/newsblur_share.png deleted file mode 100644 index 8e491ae8e..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/newsblur_share.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/share_icon.png b/clients/android/NewsBlur/res/drawable-hdpi/share_icon.png deleted file mode 100644 index 17738db3e..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/share_icon.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/tag_negative_already.png b/clients/android/NewsBlur/res/drawable-hdpi/tag_negative_already.png deleted file mode 100644 index 8a4c064f4..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/tag_negative_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/tag_positive_already.png b/clients/android/NewsBlur/res/drawable-hdpi/tag_positive_already.png deleted file mode 100644 index 99f6c9255..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/tag_positive_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-hdpi/website.png b/clients/android/NewsBlur/res/drawable-hdpi/website.png deleted file mode 100644 index e154afdbc..000000000 Binary files a/clients/android/NewsBlur/res/drawable-hdpi/website.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-ldpi/fullscreen.png b/clients/android/NewsBlur/res/drawable-ldpi/fullscreen.png deleted file mode 100644 index 28e1b668d..000000000 Binary files a/clients/android/NewsBlur/res/drawable-ldpi/fullscreen.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-ldpi/newsblur_share.png b/clients/android/NewsBlur/res/drawable-ldpi/newsblur_share.png deleted file mode 100644 index 5f6b10094..000000000 Binary files a/clients/android/NewsBlur/res/drawable-ldpi/newsblur_share.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-mdpi/fullscreen.png b/clients/android/NewsBlur/res/drawable-mdpi/fullscreen.png deleted file mode 100644 index 766971c17..000000000 Binary files a/clients/android/NewsBlur/res/drawable-mdpi/fullscreen.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-mdpi/newsblur_share.png b/clients/android/NewsBlur/res/drawable-mdpi/newsblur_share.png deleted file mode 100644 index 854fc81b1..000000000 Binary files a/clients/android/NewsBlur/res/drawable-mdpi/newsblur_share.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-mdpi/tag_negative_already.png b/clients/android/NewsBlur/res/drawable-mdpi/tag_negative_already.png deleted file mode 100644 index 54d621e86..000000000 Binary files a/clients/android/NewsBlur/res/drawable-mdpi/tag_negative_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-mdpi/tag_positive_already.png b/clients/android/NewsBlur/res/drawable-mdpi/tag_positive_already.png deleted file mode 100644 index 8ce2ebe79..000000000 Binary files a/clients/android/NewsBlur/res/drawable-mdpi/tag_positive_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-mdpi/website.png b/clients/android/NewsBlur/res/drawable-mdpi/website.png deleted file mode 100644 index 41b56ec92..000000000 Binary files a/clients/android/NewsBlur/res/drawable-mdpi/website.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/markread.png b/clients/android/NewsBlur/res/drawable-xhdpi/markread.png deleted file mode 100644 index f032cd391..000000000 Binary files a/clients/android/NewsBlur/res/drawable-xhdpi/markread.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/newsblur_share.png b/clients/android/NewsBlur/res/drawable-xhdpi/newsblur_share.png deleted file mode 100644 index 557147c3f..000000000 Binary files a/clients/android/NewsBlur/res/drawable-xhdpi/newsblur_share.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/tag_negative_already.png b/clients/android/NewsBlur/res/drawable-xhdpi/tag_negative_already.png deleted file mode 100644 index 037623d8e..000000000 Binary files a/clients/android/NewsBlur/res/drawable-xhdpi/tag_negative_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/tag_positive_already.png b/clients/android/NewsBlur/res/drawable-xhdpi/tag_positive_already.png deleted file mode 100644 index a72e2e6a4..000000000 Binary files a/clients/android/NewsBlur/res/drawable-xhdpi/tag_positive_already.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/website.png b/clients/android/NewsBlur/res/drawable-xhdpi/website.png deleted file mode 100644 index 9b77be967..000000000 Binary files a/clients/android/NewsBlur/res/drawable-xhdpi/website.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable/barbutton_refresh.png b/clients/android/NewsBlur/res/drawable/barbutton_refresh.png deleted file mode 100644 index 51978518d..000000000 Binary files a/clients/android/NewsBlur/res/drawable/barbutton_refresh.png and /dev/null differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/classify_negative.png b/clients/android/NewsBlur/res/drawable/classify_negative.png old mode 100644 new mode 100755 similarity index 100% rename from clients/android/NewsBlur/res/drawable-xhdpi/classify_negative.png rename to clients/android/NewsBlur/res/drawable/classify_negative.png diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/classify_positive.png b/clients/android/NewsBlur/res/drawable/classify_positive.png old mode 100644 new mode 100755 similarity index 100% rename from clients/android/NewsBlur/res/drawable-xhdpi/classify_positive.png rename to clients/android/NewsBlur/res/drawable/classify_positive.png diff --git a/clients/android/NewsBlur/res/drawable/clock.png b/clients/android/NewsBlur/res/drawable/clock.png old mode 100644 new mode 100755 index 06793f656..3dbcdfd3a Binary files a/clients/android/NewsBlur/res/drawable/clock.png and b/clients/android/NewsBlur/res/drawable/clock.png differ diff --git a/clients/android/NewsBlur/res/drawable-xhdpi/fullscreen.png b/clients/android/NewsBlur/res/drawable/fullscreen.png old mode 100644 new mode 100755 similarity index 100% rename from clients/android/NewsBlur/res/drawable-xhdpi/fullscreen.png rename to clients/android/NewsBlur/res/drawable/fullscreen.png diff --git a/clients/android/NewsBlur/res/drawable-hdpi/markread.png b/clients/android/NewsBlur/res/drawable/markread.png old mode 100644 new mode 100755 similarity index 100% rename from clients/android/NewsBlur/res/drawable-hdpi/markread.png rename to clients/android/NewsBlur/res/drawable/markread.png diff --git a/clients/android/NewsBlur/res/drawable/share_icon.png b/clients/android/NewsBlur/res/drawable/share_icon.png old mode 100644 new mode 100755 index a1a394671..17738db3e Binary files a/clients/android/NewsBlur/res/drawable/share_icon.png and b/clients/android/NewsBlur/res/drawable/share_icon.png differ diff --git a/clients/android/NewsBlur/res/drawable/tag_negative_already.png b/clients/android/NewsBlur/res/drawable/tag_negative_already.png new file mode 100755 index 000000000..1e0d32487 Binary files /dev/null and b/clients/android/NewsBlur/res/drawable/tag_negative_already.png differ diff --git a/clients/android/NewsBlur/res/drawable/tag_positive_already.png b/clients/android/NewsBlur/res/drawable/tag_positive_already.png new file mode 100755 index 000000000..c26f6ac9d Binary files /dev/null and b/clients/android/NewsBlur/res/drawable/tag_positive_already.png differ diff --git a/clients/android/NewsBlur/res/layout/row_folderitem.xml b/clients/android/NewsBlur/res/layout/row_folderitem.xml index 253afea64..9c1b812ab 100644 --- a/clients/android/NewsBlur/res/layout/row_folderitem.xml +++ b/clients/android/NewsBlur/res/layout/row_folderitem.xml @@ -1,115 +1,108 @@ - + style="?selectorStoryBackground" > + + + + + + + + + android:id="@+id/row_item_title_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/row_item_favicon_borderbar_2" + android:layout_marginTop="4dp" + android:layout_below="@id/row_item_feedicon"> - - - - - - - - - - - - - - - - + android:id="@+id/row_item_sidebar" + android:layout_width="9dp" + android:layout_height="9dp" + android:layout_marginTop="8dp" + android:layout_marginLeft="7dp" + android:layout_marginRight="7dp" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true"/> + android:maxLines="2" + android:ellipsize="end" + android:textSize="14sp"/> + android:textSize="14sp"/> + - + + + + diff --git a/clients/android/NewsBlur/res/layout/row_item.xml b/clients/android/NewsBlur/res/layout/row_item.xml index 2ce544914..0c75e1301 100644 --- a/clients/android/NewsBlur/res/layout/row_item.xml +++ b/clients/android/NewsBlur/res/layout/row_item.xml @@ -1,93 +1,87 @@ - + style="?selectorStoryBackground" > + + + + - - - - - - - - - - - - - - + android:id="@+id/row_item_title_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/row_item_favicon_borderbar_2" + android:layout_marginTop="4dp"> + android:id="@+id/row_item_sidebar" + android:layout_width="9dp" + android:layout_height="9dp" + android:layout_marginLeft="7dp" + android:layout_marginRight="7dp" + android:layout_centerVertical="true"/> + android:gravity="left" + android:paddingBottom="4dp" + android:paddingTop="4dp" + android:textSize="14sp"/> + + + - + + + + + diff --git a/clients/android/NewsBlur/res/menu/main.xml b/clients/android/NewsBlur/res/menu/main.xml index 2dce6cdd4..7c309d453 100644 --- a/clients/android/NewsBlur/res/menu/main.xml +++ b/clients/android/NewsBlur/res/menu/main.xml @@ -2,7 +2,6 @@ @@ -11,7 +10,6 @@ android:showAsAction="never" /> diff --git a/clients/android/NewsBlur/res/menu/reading.xml b/clients/android/NewsBlur/res/menu/reading.xml index b93e805a8..a0e43be89 100644 --- a/clients/android/NewsBlur/res/menu/reading.xml +++ b/clients/android/NewsBlur/res/menu/reading.xml @@ -9,12 +9,10 @@ android:visible="false"/>