diff options
| author | Andrew Dolgov <[email protected]> | 2013-02-09 20:25:56 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-02-09 20:25:56 +0400 |
| commit | 535b04dbe116c1df56bf1e1249a88fa9687c58f3 (patch) | |
| tree | f480ec587f9f3aa3c0a17af9d11312fcaa8cdbf8 /src | |
| parent | a608e8cee82ea6f5947edcbe4fcfd049eb7b074f (diff) | |
implement dark gray theme, bump version
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/OnlineActivity.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineActivity.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 8 | ||||
| -rw-r--r-- | src/org/fox/ttrss/util/HeadlinesRequest.java | 7 |
5 files changed, 14 insertions, 7 deletions
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;
}
|