From 535b04dbe116c1df56bf1e1249a88fa9687c58f3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 9 Feb 2013 20:25:56 +0400 Subject: [PATCH] implement dark gray theme, bump version --- AndroidManifest.xml | 4 ++-- res/values-v11/style.xml | 23 +++++++++++++++++++ res/values-v15/style.xml | 23 +++++++++++++++++++ res/values/arrays.xml | 4 +++- res/values/resources.xml | 4 +++- res/values/strings.xml | 1 + res/values/style.xml | 20 ++++++++++++++++ src/org/fox/ttrss/ArticleFragment.java | 2 ++ src/org/fox/ttrss/OnlineActivity.java | 2 ++ .../fox/ttrss/offline/OfflineActivity.java | 2 ++ .../ttrss/offline/OfflineArticleFragment.java | 8 +++---- src/org/fox/ttrss/util/HeadlinesRequest.java | 7 +++--- 12 files changed, 89 insertions(+), 11 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 394bf4b4..c778bed6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="133" + android:versionName="1.11" > @android:color/black + + + + \ No newline at end of file diff --git a/res/values-v15/style.xml b/res/values-v15/style.xml index 4f1d54fd..7012f3c4 100644 --- a/res/values-v15/style.xml +++ b/res/values-v15/style.xml @@ -64,4 +64,27 @@ @android:color/black + + + + \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0ee7ef8d..d4217384 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,11 +1,13 @@ @string/theme_dark + @string/theme_dark_gray @string/theme_light - @string/theme_sepia + @string/theme_sepia THEME_DARK + THEME_DARK_GRAY THEME_LIGHT THEME_SEPIA diff --git a/res/values/resources.xml b/res/values/resources.xml index f3c3cda3..a87b671b 100644 --- a/res/values/resources.xml +++ b/res/values/resources.xml @@ -8,5 +8,7 @@ #33b5e5 #E5B0A0 #33b5e5 - + #1c1d1e + #22667f + #383c42 \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index b49a9f01..5def8571 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -155,4 +155,5 @@ Full version, thank you for support! Fullscreen mode Reading + Dark gray \ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index 09963fc4..a817f33b 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -65,4 +65,24 @@ @android:color/black + + + \ No newline at end of file diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 1c8a21d4..479463b0 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -213,6 +213,8 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { cssOverride = "body { background : transparent; color : #e0e0e0}"; + } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) { + cssOverride = "body { background : transparent; color : #e0e0e0}"; } else { cssOverride = "body { background : transparent; }"; } diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 098d5717..e7a9dac5 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -137,6 +137,8 @@ public class OnlineActivity extends CommonActivity { setTheme(R.style.DarkTheme); } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_SEPIA")) { setTheme(R.style.SepiaTheme); + } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) { + setTheme(R.style.DarkGrayTheme); } else { setTheme(R.style.LightTheme); } diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 608b9bcf..41122e0f 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -78,6 +78,8 @@ public class OfflineActivity extends CommonActivity { setTheme(R.style.DarkTheme); } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_SEPIA")) { setTheme(R.style.SepiaTheme); + } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) { + setTheme(R.style.DarkGrayTheme); } else { setTheme(R.style.LightTheme); } diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index 2eda1efb..bc378b40 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -188,12 +188,12 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. web.setLayerType(View.LAYER_TYPE_SOFTWARE, null); } - if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { + if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { + cssOverride = "body { background : transparent; color : #e0e0e0}"; + } else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) { cssOverride = "body { background : transparent; color : #e0e0e0}"; - //view.setBackgroundColor(android.R.color.black); - web.setBackgroundColor(getResources().getColor(android.R.color.transparent)); } else { - cssOverride = ""; + cssOverride = "body { background : transparent; }"; } String hexColor = String.format("#%06X", (0xFFFFFF & tv.data)); diff --git a/src/org/fox/ttrss/util/HeadlinesRequest.java b/src/org/fox/ttrss/util/HeadlinesRequest.java index 768abc7c..fe323d25 100644 --- a/src/org/fox/ttrss/util/HeadlinesRequest.java +++ b/src/org/fox/ttrss/util/HeadlinesRequest.java @@ -56,10 +56,11 @@ public class HeadlinesRequest extends ApiRequest { m_articles.add(placeholder); } - if (m_articles.size() == 0) + /* if (m_articles.size() == 0) m_activity.setLoadingStatus(R.string.no_headlines_to_display, false); - else - m_activity.setLoadingStatus(R.string.blank, false); + else */ + + m_activity.setLoadingStatus(R.string.blank, false); return; }