From 8bc0dc83364822a4a61218a7672db5a6ce74c840 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 10 Dec 2018 08:01:02 +0300
Subject: add amber theme

---
 org.fox.ttrss/src/main/AndroidManifest.xml                       | 4 ++--
 org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java   | 3 ++-
 org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java    | 6 ++++--
 .../main/java/org/fox/ttrss/offline/OfflineArticleFragment.java  | 4 +++-
 org.fox.ttrss/src/main/res/values/arrays.xml                     | 6 ++----
 org.fox.ttrss/src/main/res/values/strings.xml                    | 3 +--
 org.fox.ttrss/src/main/res/values/style.xml                      | 9 +++++----
 7 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'org.fox.ttrss/src/main')

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 2bcfa651..61a2a626 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="487"
-    android:versionName="1.253">
+    android:versionCode="488"
+    android:versionName="1.254">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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);
 				}
 
diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml
index 64c59890..47cac770 100644
--- a/org.fox.ttrss/src/main/res/values/arrays.xml
+++ b/org.fox.ttrss/src/main/res/values/arrays.xml
@@ -2,14 +2,12 @@
     <string-array name="pref_theme_names">
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
-        <!-- <item>@string/theme_sepia</item>
-        <item>@string/theme_amber</item> -->
+        <item>@string/theme_amber</item>
     </string-array>
     <string-array name="pref_theme_values" translatable="false">
         <item>THEME_LIGHT</item>
         <item>THEME_DARK</item>
-        <!-- <item>THEME_SEPIA</item>
-        <item>THEME_AMBER</item> -->
+        <item>THEME_AMBER</item>
     </string-array>
     <string-array name="headline_mode_names">
         <item>@string/headline_display_mode_default</item>
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index c1f235c8..c7544266 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -134,8 +134,7 @@
     <string name="trial_purchase">Unlock full version</string>
     <string name="trial_expired">Trial expired</string>
     <string name="trial_expired_message">To continue using Tiny Tiny RSS please unlock the full version by purchasing the key.</string>
-    <!-- <string name="theme_sepia">Sepia</string>
-    <string name="theme_amber">Amber</string> -->
+    <string name="theme_amber">Amber</string>
     <string name="reading">Reading</string>
     <string name="offline_articles_to_download">Amount of articles to download</string>
     <string name="offline_articles_to_download_long">How many articles to download for offline mode (newest first)</string>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 98e8ddca..e16ee854 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -67,6 +67,11 @@
 
     </style>
 
+    <style name="AmberTheme" parent="DarkTheme">
+        <item name="colorPrimary">#b87d2c</item>
+        <item name="colorPrimaryDark">#6e4b1a</item>
+    </style>
+
     <style name="DarkTheme" parent="DarkTheme.Base">
         <item name="windowActionModeOverlay">true</item>
 
@@ -101,10 +106,6 @@
         <item name="headlineFooterColor">?colorPrimary</item>
         <item name="articleHeaderSeparator">#303030</item>
 
-        <!-- <item name="colorPrimary">#b87d2c</item>
-        <item name="colorPrimaryDark">#6e4b1a</item>
-        <item name="colorAccent">#607D8B</item> -->
-
         <item name="colorPrimary">#1e6286</item>
         <item name="colorPrimaryDark">#18506e</item>
         <item name="colorAccent">#D84315</item>
-- 
cgit v1.2.3