diff options
48 files changed, 25 insertions, 30 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5f319d72..939dfb2e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -34,6 +34,7 @@ </activity> <activity android:name=".FeedsActivity" + android:uiOptions="splitActionBarWhenNarrow" android:label="@string/app_name" > </activity> <activity diff --git a/res/drawable-hdpi/ic_accept_dark.png b/res/drawable-hdpi/ic_accept_dark.png Binary files differnew file mode 100644 index 00000000..58bf9721 --- /dev/null +++ b/res/drawable-hdpi/ic_accept_dark.png diff --git a/res/drawable-hdpi/ic_accept_light.png b/res/drawable-hdpi/ic_accept_light.png Binary files differnew file mode 100644 index 00000000..53cf6877 --- /dev/null +++ b/res/drawable-hdpi/ic_accept_light.png diff --git a/res/drawable-hdpi/ic_cloud_dark.png b/res/drawable-hdpi/ic_cloud_dark.png Binary files differnew file mode 100644 index 00000000..e3d06333 --- /dev/null +++ b/res/drawable-hdpi/ic_cloud_dark.png diff --git a/res/drawable-hdpi/ic_cloud_light.png b/res/drawable-hdpi/ic_cloud_light.png Binary files differnew file mode 100644 index 00000000..a1d27cec --- /dev/null +++ b/res/drawable-hdpi/ic_cloud_light.png diff --git a/res/drawable-hdpi/ic_important_dark.png b/res/drawable-hdpi/ic_important_dark.png Binary files differnew file mode 100644 index 00000000..7c25f351 --- /dev/null +++ b/res/drawable-hdpi/ic_important_dark.png diff --git a/res/drawable-hdpi/ic_important_light.png b/res/drawable-hdpi/ic_important_light.png Binary files differnew file mode 100644 index 00000000..11f86414 --- /dev/null +++ b/res/drawable-hdpi/ic_important_light.png diff --git a/res/drawable-hdpi/ic_labels_dark.png b/res/drawable-hdpi/ic_labels_dark.png Binary files differnew file mode 100644 index 00000000..9b093a67 --- /dev/null +++ b/res/drawable-hdpi/ic_labels_dark.png diff --git a/res/drawable-hdpi/ic_labels_light.png b/res/drawable-hdpi/ic_labels_light.png Binary files differnew file mode 100644 index 00000000..432e7c00 --- /dev/null +++ b/res/drawable-hdpi/ic_labels_light.png diff --git a/res/drawable-hdpi/ic_list_dark.png b/res/drawable-hdpi/ic_list_dark.png Binary files differnew file mode 100644 index 00000000..c5f6c97b --- /dev/null +++ b/res/drawable-hdpi/ic_list_dark.png diff --git a/res/drawable-hdpi/ic_list_light.png b/res/drawable-hdpi/ic_list_light.png Binary files differnew file mode 100644 index 00000000..e45ea1fd --- /dev/null +++ b/res/drawable-hdpi/ic_list_light.png diff --git a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png b/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png Binary files differdeleted file mode 100644 index 2c395b80..00000000 --- a/res/drawable-hdpi/ic_mailbox_collapsed_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_clock.png b/res/drawable-hdpi/ic_menu_clock.png Binary files differdeleted file mode 100644 index 824f688e..00000000 --- a/res/drawable-hdpi/ic_menu_clock.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_cloud.png b/res/drawable-hdpi/ic_menu_cloud.png Binary files differdeleted file mode 100644 index 9f866719..00000000 --- a/res/drawable-hdpi/ic_menu_cloud.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_database.png b/res/drawable-hdpi/ic_menu_database.png Binary files differdeleted file mode 100644 index 8f89ade5..00000000 --- a/res/drawable-hdpi/ic_menu_database.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png Binary files differdeleted file mode 100644 index 8e5fab5f..00000000 --- a/res/drawable-hdpi/ic_menu_exit.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_tick.png b/res/drawable-hdpi/ic_menu_tick.png Binary files differdeleted file mode 100644 index 9691a11d..00000000 --- a/res/drawable-hdpi/ic_menu_tick.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_new_dark.png b/res/drawable-hdpi/ic_new_dark.png Binary files differnew file mode 100644 index 00000000..5741995c --- /dev/null +++ b/res/drawable-hdpi/ic_new_dark.png diff --git a/res/drawable-hdpi/ic_new_light.png b/res/drawable-hdpi/ic_new_light.png Binary files differnew file mode 100644 index 00000000..ad8ada6b --- /dev/null +++ b/res/drawable-hdpi/ic_new_light.png diff --git a/res/drawable-hdpi/ic_refresh_dark.png b/res/drawable-hdpi/ic_refresh_dark.png Binary files differnew file mode 100644 index 00000000..479aca46 --- /dev/null +++ b/res/drawable-hdpi/ic_refresh_dark.png diff --git a/res/drawable-hdpi/ic_refresh_light.png b/res/drawable-hdpi/ic_refresh_light.png Binary files differnew file mode 100644 index 00000000..bb9d855f --- /dev/null +++ b/res/drawable-hdpi/ic_refresh_light.png diff --git a/res/drawable-hdpi/ic_rotate_left_dark.png b/res/drawable-hdpi/ic_rotate_left_dark.png Binary files differnew file mode 100644 index 00000000..d353d831 --- /dev/null +++ b/res/drawable-hdpi/ic_rotate_left_dark.png diff --git a/res/drawable-hdpi/ic_rotate_left_light.png b/res/drawable-hdpi/ic_rotate_left_light.png Binary files differnew file mode 100644 index 00000000..97ab27f0 --- /dev/null +++ b/res/drawable-hdpi/ic_rotate_left_light.png diff --git a/res/drawable-hdpi/ic_search_dark.png b/res/drawable-hdpi/ic_search_dark.png Binary files differnew file mode 100644 index 00000000..e6b70451 --- /dev/null +++ b/res/drawable-hdpi/ic_search_dark.png diff --git a/res/drawable-hdpi/ic_search_light.png b/res/drawable-hdpi/ic_search_light.png Binary files differnew file mode 100644 index 00000000..f12e005e --- /dev/null +++ b/res/drawable-hdpi/ic_search_light.png diff --git a/res/drawable-hdpi/ic_select_all_dark.png b/res/drawable-hdpi/ic_select_all_dark.png Binary files differnew file mode 100644 index 00000000..7053d7ac --- /dev/null +++ b/res/drawable-hdpi/ic_select_all_dark.png diff --git a/res/drawable-hdpi/ic_select_all_light.png b/res/drawable-hdpi/ic_select_all_light.png Binary files differnew file mode 100644 index 00000000..26a270b3 --- /dev/null +++ b/res/drawable-hdpi/ic_select_all_light.png diff --git a/res/drawable-hdpi/ic_undo_dark.png b/res/drawable-hdpi/ic_undo_dark.png Binary files differnew file mode 100644 index 00000000..8c1b4512 --- /dev/null +++ b/res/drawable-hdpi/ic_undo_dark.png diff --git a/res/drawable-hdpi/ic_undo_light.png b/res/drawable-hdpi/ic_undo_light.png Binary files differnew file mode 100644 index 00000000..9e719c9c --- /dev/null +++ b/res/drawable-hdpi/ic_undo_light.png diff --git a/res/drawable-hdpi/ic_unimportant_dark.png b/res/drawable-hdpi/ic_unimportant_dark.png Binary files differnew file mode 100644 index 00000000..c10325fe --- /dev/null +++ b/res/drawable-hdpi/ic_unimportant_dark.png diff --git a/res/drawable-hdpi/ic_unimportant_light.png b/res/drawable-hdpi/ic_unimportant_light.png Binary files differnew file mode 100644 index 00000000..7259b06b --- /dev/null +++ b/res/drawable-hdpi/ic_unimportant_light.png diff --git a/res/drawable-xhdpi/ic_accept_light.png b/res/drawable-xhdpi/ic_accept_light.png Binary files differnew file mode 100644 index 00000000..b52dc370 --- /dev/null +++ b/res/drawable-xhdpi/ic_accept_light.png diff --git a/res/drawable-xhdpi/ic_cloud_light.png b/res/drawable-xhdpi/ic_cloud_light.png Binary files differnew file mode 100644 index 00000000..37d98e5d --- /dev/null +++ b/res/drawable-xhdpi/ic_cloud_light.png diff --git a/res/drawable-xhdpi/ic_important_light.png b/res/drawable-xhdpi/ic_important_light.png Binary files differnew file mode 100644 index 00000000..7576cc1e --- /dev/null +++ b/res/drawable-xhdpi/ic_important_light.png diff --git a/res/drawable-xhdpi/ic_labels_light.png b/res/drawable-xhdpi/ic_labels_light.png Binary files differnew file mode 100644 index 00000000..8fdcd1a2 --- /dev/null +++ b/res/drawable-xhdpi/ic_labels_light.png diff --git a/res/drawable-xhdpi/ic_list_light.png b/res/drawable-xhdpi/ic_list_light.png Binary files differnew file mode 100644 index 00000000..95708234 --- /dev/null +++ b/res/drawable-xhdpi/ic_list_light.png diff --git a/res/drawable-xhdpi/ic_new_light.png b/res/drawable-xhdpi/ic_new_light.png Binary files differnew file mode 100644 index 00000000..23b9a1c1 --- /dev/null +++ b/res/drawable-xhdpi/ic_new_light.png diff --git a/res/drawable-xhdpi/ic_refresh_light.png b/res/drawable-xhdpi/ic_refresh_light.png Binary files differnew file mode 100644 index 00000000..a7fdc0df --- /dev/null +++ b/res/drawable-xhdpi/ic_refresh_light.png diff --git a/res/drawable-xhdpi/ic_rotate_left_light.png b/res/drawable-xhdpi/ic_rotate_left_light.png Binary files differnew file mode 100644 index 00000000..46d04a53 --- /dev/null +++ b/res/drawable-xhdpi/ic_rotate_left_light.png diff --git a/res/drawable-xhdpi/ic_search_light.png b/res/drawable-xhdpi/ic_search_light.png Binary files differnew file mode 100644 index 00000000..3549f84d --- /dev/null +++ b/res/drawable-xhdpi/ic_search_light.png diff --git a/res/drawable-xhdpi/ic_select_all_light.png b/res/drawable-xhdpi/ic_select_all_light.png Binary files differnew file mode 100644 index 00000000..52d1155d --- /dev/null +++ b/res/drawable-xhdpi/ic_select_all_light.png diff --git a/res/drawable-xhdpi/ic_undo_light.png b/res/drawable-xhdpi/ic_undo_light.png Binary files differnew file mode 100644 index 00000000..99967f2f --- /dev/null +++ b/res/drawable-xhdpi/ic_undo_light.png diff --git a/res/drawable-xhdpi/ic_unimportant_light.png b/res/drawable-xhdpi/ic_unimportant_light.png Binary files differnew file mode 100644 index 00000000..3c618a12 --- /dev/null +++ b/res/drawable-xhdpi/ic_unimportant_light.png diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml index 77a9e745..58cd900b 100644 --- a/res/menu/headlines_action_menu.xml +++ b/res/menu/headlines_action_menu.xml @@ -2,7 +2,6 @@ <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 483ff37e..16047b33 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -13,52 +13,50 @@ <item android:id="@+id/subscribe_to_feed" - android:icon="@android:drawable/ic_menu_add" - android:showAsAction="" + android:icon="@drawable/ic_new_light" + android:showAsAction="ifRoom" android:title="@string/subscribe_to_feed"/> <item android:id="@+id/show_feeds" - android:icon="@android:drawable/ic_menu_agenda" - android:showAsAction="" + android:icon="@drawable/ic_list_light" + android:showAsAction="ifRoom" android:title="@string/menu_all_feeds"/> <item android:id="@+id/update_feeds" - android:icon="@android:drawable/ic_menu_rotate" + android:icon="@drawable/ic_refresh_light" android:showAsAction="ifRoom" android:title="@string/update_feeds"/> <item android:id="@+id/go_offline" - android:icon="@drawable/ic_menu_cloud" android:showAsAction="" android:title="@string/go_offline"/> <item android:id="@+id/logout" - android:icon="@drawable/ic_menu_exit" android:showAsAction="" android:title="@string/logout"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/update_headlines" - android:icon="@android:drawable/ic_menu_rotate" + android:icon="@drawable/ic_refresh_light" android:showAsAction="ifRoom" android:title="@string/update_headlines"/> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" - android:icon="@android:drawable/ic_menu_search" + android:icon="@drawable/ic_search_light" android:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_menu_tick" - android:showAsAction="" + android:icon="@drawable/ic_accept_light" + android:showAsAction="ifRoom" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_menu_database" - android:showAsAction="" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_select_all_light" android:title="@string/headlines_select"/> <item @@ -79,7 +77,6 @@ <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item @@ -118,20 +115,20 @@ android:id="@+id/share_article" android:actionProviderClass="android.widget.ShareActionProvider" android:icon="@android:drawable/ic_menu_share" - android:showAsAction="" + android:showAsAction="ifRoom" android:title="@string/share_article"/> <item android:id="@+id/set_unread" - android:icon="@android:drawable/ic_menu_recent_history" - android:showAsAction="" + android:icon="@drawable/ic_undo_light" + android:showAsAction="ifRoom" android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" - android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> <item android:id="@+id/set_labels" - android:icon="@drawable/ic_menu_marked" + android:showAsAction="ifRoom" + android:icon="@drawable/ic_labels_light" android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index 8a30a8e4..93eb5d1a 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -3,7 +3,6 @@ <group android:id="@+id/menu_group_feeds" > <item android:id="@+id/go_online" - android:icon="@drawable/ic_menu_cloud" android:showAsAction="ifRoom|withText" android:title="@string/go_online" android:visible="false"/> @@ -23,11 +22,6 @@ android:title="@string/menu_all_feeds"/> </group> <group android:id="@+id/menu_group_headlines" > - <!-- <item - android:id="@+id/go_online" - android:icon="@drawable/ic_menu_cloud" - android:title="@string/go_online" - android:visible="false"/> --> <item android:id="@+id/search" android:actionViewClass="android.widget.SearchView" @@ -36,11 +30,9 @@ android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" - android:icon="@drawable/ic_menu_tick" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:icon="@drawable/ic_menu_database" android:showAsAction="" android:title="@string/headlines_select"/> <!-- <item @@ -52,7 +44,6 @@ <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:icon="@drawable/ic_menu_tick" android:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item @@ -95,7 +86,6 @@ android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" - android:icon="@drawable/ic_menu_tick" android:title="@string/article_mark_read_above"/> <!-- <item android:id="@+id/close_article" diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 79f07224..e84d712d 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -16,6 +16,7 @@ import android.annotation.SuppressLint; import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -113,6 +114,8 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl else
titleStr = m_article.title;
+
+ title.setTypeface(null, m_article.unread ? Typeface.BOLD : Typeface.NORMAL);
title.setText(Html.fromHtml(titleStr));
//title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
title.setOnClickListener(new OnClickListener() {
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java index a01c7966..0566aaf8 100644 --- a/src/org/fox/ttrss/CommonActivity.java +++ b/src/org/fox/ttrss/CommonActivity.java @@ -30,6 +30,11 @@ public class CommonActivity extends FragmentActivity { protected SharedPreferences m_prefs;
+ protected boolean isDarkTheme() {
+ return m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK") ||
+ m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY");
+ }
+
protected void setSmallScreen(boolean smallScreen) {
Log.d(TAG, "m_smallScreenMode=" + smallScreen);
m_smallScreenMode = smallScreen;
|