change accentcolor to better conform with material design guidelines; remove amber and sepia themes

3 files changed, 11 insertions, 11 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
index 05572272..7598cef7 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
@@ -255,7 +255,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         m_prefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
 
-        setDarkAppTheme(m_prefs);
+        setTheme(R.style.DarkTheme);
 
         super.onCreate(savedInstanceState);
 
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 aad5adbc..347c739b 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
@@ -25,8 +25,8 @@ public class CommonActivity extends ActionBarActivity {
 
 	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_SEPIA = "THEME_SEPIA";
+    //public final static String THEME_AMBER = "THEME_AMBER";
 	public final static String THEME_DEFAULT = CommonActivity.THEME_LIGHT;
 
     public static final int EXCERPT_MAX_LENGTH = 256;
@@ -186,27 +186,27 @@ public class CommonActivity extends ActionBarActivity {
 		toast.show();
 	}
 
-	public boolean isDarkTheme() {
+	/* public boolean isDarkTheme() {
 		String theme = m_prefs.getString("theme", THEME_DEFAULT);
 		
-		return theme.equals(THEME_DARK) || theme.equals(THEME_AMBER);
-	}
+		return theme.equals(THEME_DARK); || theme.equals(THEME_AMBER);
+	} */
 	
 	protected void setAppTheme(SharedPreferences prefs) {
 		String theme = prefs.getString("theme", CommonActivity.THEME_DEFAULT);
 		
 		if (theme.equals(THEME_DARK)) {
             setTheme(R.style.DarkTheme);
-        } else if (theme.equals(THEME_AMBER)) {
+        /* } else if (theme.equals(THEME_AMBER)) {
             setTheme(R.style.AmberTheme);
 		} else if (theme.equals(THEME_SEPIA)) {
-			setTheme(R.style.SepiaTheme);
+			setTheme(R.style.SepiaTheme); */
 		} else {
 			setTheme(R.style.LightTheme);
 		}
 	}
 
-    protected void setDarkAppTheme(SharedPreferences prefs) {
+    /* protected void setDarkAppTheme(SharedPreferences prefs) {
         String theme = prefs.getString("theme", CommonActivity.THEME_DEFAULT);
 
         if (theme.equals(THEME_AMBER)) {
@@ -214,7 +214,7 @@ public class CommonActivity extends ActionBarActivity {
         } else {
             setTheme(R.style.DarkTheme);
         }
-    }
+    } */
 
 	@SuppressWarnings("deprecation")
 	@SuppressLint("NewApi")
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
index deab88d8..5a741e27 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java
@@ -16,7 +16,7 @@ public class PreferencesActivity extends PreferenceActivity {
 	@Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         addPreferencesFromResource(R.xml.preferences);
 
         /* if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {