From 8bc0dc83364822a4a61218a7672db5a6ce74c840 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 10 Dec 2018 08:01:02 +0300 Subject: add amber theme --- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 3 ++- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 6 ++++-- .../src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'org.fox.ttrss/src/main/java') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index c7d65742..fe494a1e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -469,7 +469,8 @@ public class ArticleFragment extends StateSavedFragment { ws.setMediaPlaybackRequiresUserGesture(false); } - if (CommonActivity.THEME_DARK.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) { + String theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); + if (CommonActivity.THEME_DARK.equals(theme) || CommonActivity.THEME_AMBER.equals(theme)) { m_web.setBackgroundColor(Color.BLACK); } 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 b21e6981..416e3f28 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -67,7 +67,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc public final static String THEME_DARK = "THEME_DARK"; public final static String THEME_LIGHT = "THEME_LIGHT"; //public final static String THEME_SEPIA = "THEME_SEPIA"; - //public final static String THEME_AMBER = "THEME_AMBER"; + public final static String THEME_AMBER = "THEME_AMBER"; public final static String THEME_DEFAULT = CommonActivity.THEME_LIGHT; public final static String NOTIFICATION_CHANNEL_NORMAL = "channel_normal"; @@ -315,7 +315,9 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc String theme = prefs.getString("theme", CommonActivity.THEME_DEFAULT); if (theme.equals(THEME_DARK)) { - setTheme(R.style.DarkTheme); + setTheme(R.style.DarkTheme); + } else if (theme.equals(THEME_AMBER)) { + setTheme(R.style.AmberTheme); } else { setTheme(R.style.LightTheme); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 1b4ff72e..46f3a98d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -320,7 +320,9 @@ public class OfflineArticleFragment extends Fragment { m_web = view.findViewById(R.id.article_content); if (m_web != null) { - if (CommonActivity.THEME_DARK.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) { + + String theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); + if (CommonActivity.THEME_DARK.equals(theme) || CommonActivity.THEME_AMBER.equals(theme)) { m_web.setBackgroundColor(Color.BLACK); } -- cgit v1.2.3