diff options
Diffstat (limited to 'org.fox.ttrss/src')
14 files changed, 15 insertions, 21 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index b94e404d..b2765dc0 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -141,6 +141,11 @@ public class CommonActivity extends ActionBarActivity { super.onCreate(savedInstanceState); } + public int dpToPx(int dp) { + float density = getResources().getDisplayMetrics().density; + return Math.round((float)dp * density); + } + public void setStatusBarTint() { if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.KITKAT && !m_prefs.getBoolean("full_screen_mode", false)) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index ae174922..a5168aab 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -332,6 +332,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, // thanks google if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) { list.setDividerHeight(0); + + int px = m_activity.dpToPx(4); + list.setPadding(px, px, px, px); } if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index ce2f1170..a49bef60 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -310,6 +310,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis // thanks google if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) { list.setDividerHeight(0); + + int px = m_activity.dpToPx(4); + list.setPadding(px, px, px, px); } if (m_prefs.getBoolean("headlines_mark_read_scroll", false)) { diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml index d61097a6..ad4bd653 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml @@ -29,6 +29,7 @@ </FrameLayout> <FrameLayout + android:elevation="4dp" android:id="@+id/headlines_fragment" android:layout_width="0dp" android:layout_height="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml index 86040461..7995d491 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml @@ -32,6 +32,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.6" + android:elevation="4dp" android:background="?articleBackground" > </FrameLayout> </LinearLayout> 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 19959c51..362dffa9 100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -13,7 +13,6 @@ android:orientation="horizontal"> <ImageView - android:tint="?iconTintColor" android:id="@+id/icon" android:layout_gravity="center_vertical" android:layout_width="16dp" 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 132ec566..77c3f59e 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 @@ -14,7 +14,6 @@ android:orientation="horizontal"> <ImageView - android:tint="?iconTintColor" android:id="@+id/icon" android:layout_gravity="center_vertical" android:layout_width="16dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml index 0a759398..575707bb 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml @@ -10,6 +10,7 @@ android:layout_height="match_parent" > <ListView + android:padding="8dp" android:id="@+id/headlines_list" android:layout_width="match_parent" android:layoutAnimation="@anim/layout_headline" 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 2c6317bb..408a2251 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -153,7 +153,6 @@ android:textStyle="italic" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="16dp" @@ -164,7 +163,6 @@ android:src="@drawable/ic_star_empty" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/published" android:layout_width="wrap_content" android:layout_height="16dp" @@ -175,7 +173,6 @@ android:src="@drawable/ic_unpublished" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/article_menu_button" android:layout_width="wrap_content" android:layout_height="16dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml index 9b411a97..36224ba0 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml @@ -154,7 +154,6 @@ android:textStyle="italic" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="16dp" @@ -165,7 +164,6 @@ android:src="@drawable/ic_star_empty" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/published" android:layout_width="wrap_content" android:layout_height="16dp" @@ -176,7 +174,6 @@ android:src="@drawable/ic_unpublished" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/article_menu_button" android:layout_width="wrap_content" android:layout_height="16dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml index 91aeddee..ad144313 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml @@ -155,7 +155,6 @@ android:textStyle="italic" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="16dp" @@ -166,7 +165,6 @@ android:src="@drawable/ic_star_empty" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/published" android:layout_width="wrap_content" android:layout_height="16dp" @@ -177,7 +175,6 @@ android:src="@drawable/ic_unpublished" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/article_menu_button" android:layout_width="wrap_content" android:layout_height="16dp" 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 849cfb86..5931b26c 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -154,7 +154,6 @@ android:textStyle="italic" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/marked" android:layout_width="wrap_content" android:layout_height="16dp" @@ -165,7 +164,6 @@ android:src="@drawable/ic_star_empty" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/published" android:layout_width="wrap_content" android:layout_height="16dp" @@ -176,7 +174,6 @@ android:src="@drawable/ic_unpublished" /> <ImageView - android:tint="?iconTintColor" android:id="@+id/article_menu_button" android:layout_width="wrap_content" android:layout_height="16dp" diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index a926e83f..2aeb90a8 100644 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -28,5 +28,4 @@ <attr name="articleHeader" format="reference|color" /> <attr name="articleHeaderTextColor" format="reference|color" /> <attr name="articleTextColor" format="reference|color" /> - <attr name="iconTintColor" format="reference|color" /> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 8eb6229e..719d7958 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -29,7 +29,6 @@ <item name="articleHeaderTextColor">@android:color/white</item> <item name="articleTextColor">@android:color/black</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> - <item name="iconTintColor">@android:color/transparent</item> <item name="colorPrimary">#6482af</item> <item name="colorPrimaryDark">#526A8E</item> @@ -62,7 +61,6 @@ <item name="articleTextColor">#D2B944</item> <item name="linkColor">?colorAccent</item> - <item name="feedlistTextColor">?linkColor</item> <item name="unreadCounterColor">?colorPrimaryDark</item> <item name="headlineUnreadTextColor">?linkColor</item> @@ -75,10 +73,8 @@ <item name="headlineUnreadBackground">@android:color/black</item> <item name="headlineSelectedBackground">#635200</item> - <item name="iconTintColor">?linkColor</item> - <item name="colorPrimary">@android:color/black</item> - <item name="colorPrimaryDark">#A57100</item> + <item name="colorPrimaryDark">@android:color/black</item> <item name="colorAccent">#EACF4C</item> </style> @@ -111,7 +107,6 @@ <item name="articleHeaderTextColor">@android:color/white</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> <item name="articleTextColor">#e0e0e0</item> - <item name="iconTintColor">@android:color/transparent</item> <item name="colorPrimary">#51698E</item> <item name="colorPrimaryDark">#445877</item> |