JamesDSPManager: Remove theming options.

Signed-off-by: Christos Papageorgiou <root.expert.xda@gmail.com>
Change-Id: I7f3bfeddcda1b42509432c66ecf4ad9e635a7145

7 files changed, 14 insertions, 181 deletions

diff --git a/app/src/main/java/james/dsp/activity/DSPManager.java b/app/src/main/java/james/dsp/activity/DSPManager.java
index f7ef4ae..04cc89b 100644
--- a/app/src/main/java/james/dsp/activity/DSPManager.java
+++ b/app/src/main/java/james/dsp/activity/DSPManager.java
@@ -111,27 +111,11 @@ public final class DSPManager extends Activity
     //==================================
     private SharedPreferences preferencesMode;
     private CharSequence mTitle;
-    public static int themeApp;
     public static int effectMode;
+
     //==================================
     // Overridden Methods
     //==================================
-    @Override
-    public Resources.Theme getTheme()
-    {
-        Resources.Theme theme = super.getTheme();
-        if(themeApp == 0)
-            theme.applyStyle(android.R.style.Theme_Material, true);
-        else if(themeApp == 1)
-            theme.applyStyle(android.R.style.Theme_Material_Light, true);
-        else if(themeApp == 2)
-            theme.applyStyle(R.style.AppTheme, true);
-        else if(themeApp == 3)
-            theme.applyStyle(R.style.AppThemeRed, true);
-        else if(themeApp == 4)
-            theme.applyStyle(R.style.AppThemeIdea, true);
-        return theme;
-    }
 	private final BroadcastReceiver updateReceiver = new BroadcastReceiver()
 	{
 		@Override
@@ -164,12 +148,9 @@ public final class DSPManager extends Activity
             preferences.edit().putString("dsp.ddc.files", getString(R.string.ddcdoesntexist)).commit();
         if (!preferencesMode.contains("dsp.app.showdevmsg"))
             preferencesMode.edit().putBoolean("dsp.app.showdevmsg", false).commit();
-        if (!preferencesMode.contains("dsp.app.theme"))
-            preferencesMode.edit().putInt("dsp.app.theme", 2).commit();
         if (!preferencesMode.contains("dsp.app.modeEffect"))
         	preferencesMode.edit().putInt("dsp.app.modeEffect", 0).commit();
         devMsgDisplay = preferencesMode.getBoolean("dsp.app.showdevmsg", false);
-        themeApp = preferencesMode.getInt("dsp.app.theme", 2);
         effectMode = preferencesMode.getInt("dsp.app.modeEffect", 0);
         mUserLearnedDrawer = preferencesMode.getBoolean(PREF_USER_LEARNED_DRAWER, false);
         mTitle = getTitle();
@@ -255,16 +236,7 @@ public final class DSPManager extends Activity
         if (!isDrawerOpen())
         {
             menu.findItem(R.id.mdisplaydevmsg).setTitle(getString(R.string.displaydevmsg, getString(devMsgDisplay ? R.string.removetext : R.string.displaytext)));
-            if (themeApp == 0)
-                menu.findItem(R.id.themeswitch).setTitle(getString(R.string.theme, getString(R.string.darktheme)));
-            else if (themeApp == 1)
-                menu.findItem(R.id.themeswitch).setTitle(getString(R.string.theme, getString(R.string.lighttheme)));
-            else if (themeApp == 2)
-                menu.findItem(R.id.themeswitch).setTitle(getString(R.string.theme, getString(R.string.defaulttheme)));
-            else if (themeApp == 3)
-                menu.findItem(R.id.themeswitch).setTitle(getString(R.string.theme, getString(R.string.redtheme)));
-            else if (themeApp == 4)
-                menu.findItem(R.id.themeswitch).setTitle(getString(R.string.theme, getString(R.string.ideatheme)));
+
             if (effectMode == 0)
                 menu.findItem(R.id.globaleffectitm).setTitle(getString(R.string.globaleffect_title, getString(R.string.globalreg)));
             else
@@ -296,14 +268,6 @@ public final class DSPManager extends Activity
             devMsgDisplay = !devMsgDisplay;
             preferencesMode.edit().putBoolean("dsp.app.showdevmsg", devMsgDisplay).commit();
             return true;
-        case R.id.themeswitch:
-            themeApp++;
-            if(themeApp > 4)
-                themeApp = 0;
-            preferencesMode.edit().putInt("dsp.app.theme", themeApp).commit();
-            startActivity(new Intent(this, DSPManager.class));
-            finish();
-            return true;
         case R.id.globaleffectitm:
         	effectMode++;
         	if(effectMode > 1)
@@ -346,16 +310,6 @@ public final class DSPManager extends Activity
         setUpNavigationDrawer(
             findViewById(R.id.dsp_navigation_drawer),
             findViewById(R.id.dsp_drawer_layout));
-        if (themeApp == 0)
-            mDrawerListView.setBackgroundColor(ResourcesCompat.getColor(getResources(), R.color.navigation_drawerdark, null));
-        else if (themeApp == 1)
-            mDrawerListView.setBackgroundColor(ResourcesCompat.getColor(getResources(), R.color.navigation_drawerlight, null));
-        else if (themeApp == 2)
-            mDrawerListView.setBackgroundColor(ResourcesCompat.getColor(getResources(), R.color.navigation_drawerdefault, null));
-        else if (themeApp == 3)
-            mDrawerListView.setBackgroundColor(ResourcesCompat.getColor(getResources(), R.color.navigation_drawerred, null));
-        else if (themeApp == 4)
-            mDrawerListView.setBackgroundColor(ResourcesCompat.getColor(getResources(), R.color.navigation_draweridea, null));
     }
     public void savePresetDialog()
     {
diff --git a/app/src/main/java/james/dsp/preference/EqualizerSurface.java b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
index 53b5f11..dc444d3 100644
--- a/app/src/main/java/james/dsp/preference/EqualizerSurface.java
+++ b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
@@ -107,7 +107,7 @@ public class EqualizerSurface extends SurfaceView
         mHeight = bottom - top;
         float barWidth = getResources().getDimension(R.dimen.bar_width);
         mControlBar.setStrokeWidth(barWidth);
-        mControlBarKnob.setShadowLayer(barWidth * 0.5f, 0, 0,ResourcesCompat.getColor(getResources(), R.color.off_white, null));
+        mControlBarKnob.setShadowLayer(barWidth * 0.5f, 0, 0, ResourcesCompat.getColor(getResources(), R.color.off_white, null));
         /**
          * red > +7
          * yellow > +3
@@ -115,62 +115,15 @@ public class EqualizerSurface extends SurfaceView
          * holo_blue < 0
          * holo_blue_dark < 3
          */
-        if (DSPManager.themeApp == 0)
-            mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
-                                           new int[] {ResourcesCompat.getColor(getResources(), R.color.eq_reddark, null),
-                                        		   ResourcesCompat.getColor(getResources(), R.color.eq_yellowdark, null),
-                                        		   ResourcesCompat.getColor(getResources(), R.color.eq_holo_brightdark, null),
-                                        		   ResourcesCompat.getColor(getResources(), R.color.eq_holo_bluedark, null),
-                                        		   ResourcesCompat.getColor(getResources(), R.color.eq_holo_darkdark, null)
-                                                     },
-                                           new float[] {0, 0.2f, 0.45f, 0.6f, 1f},
-                                           Shader.TileMode.CLAMP));
-        else if (DSPManager.themeApp == 1)
-            mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
-                                           new int[] {ResourcesCompat.getColor(getResources(), R.color.eq_redlight, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_yellowlight, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_brightlight, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_bluelight, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_darklight, null)
-                                                     },
-                                           new float[] {0, 0.2f, 0.45f, 0.6f, 1f},
-                                           Shader.TileMode.CLAMP));
-        else if (DSPManager.themeApp == 3)
-            mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
-                                           new int[] {ResourcesCompat.getColor(getResources(), R.color.eq_redred, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_yellowred, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_brightred, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_bluered, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_darkred, null)
-                                                     },
-                                           new float[] {0, 0.2f, 0.45f, 0.6f, 1f},
-                                           Shader.TileMode.CLAMP));
-        else if (DSPManager.themeApp == 4)
-            mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
-                                           new int[] {ResourcesCompat.getColor(getResources(), R.color.eq_redidea, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_yellowidea, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_brightidea, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_blueidea, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_darkidea, null)
-                                                     },
-                                           new float[] {0, 0.2f, 0.45f, 0.6f, 1f},
-                                           Shader.TileMode.CLAMP));
-        else
-            mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
-                                           new int[] {ResourcesCompat.getColor(getResources(), R.color.eq_red, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_yellow, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_bright, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_blue, null),
-                                                   ResourcesCompat.getColor(getResources(), R.color.eq_holo_dark, null)
-                                                     },
-                                           new float[] {0, 0.2f, 0.45f, 0.6f, 1f},
-                                           Shader.TileMode.CLAMP));
-        mControlBar.setShader(new LinearGradient(0, 0, 0, mHeight,
-                              new int[] {ResourcesCompat.getColor(getResources(), R.color.cb_shader, null),
-                                         ResourcesCompat.getColor(getResources(), R.color.cb_shader_alpha, null)
-                                        },
-                              new float[] {0, 1},
-                              Shader.TileMode.CLAMP));
+        mFrequencyResponseBg.setShader(new LinearGradient(0, 0, 0, mHeight,
+                new int[]{ResourcesCompat.getColor(getResources(), R.color.eq_reddark, null),
+                        ResourcesCompat.getColor(getResources(), R.color.eq_yellowdark, null),
+                        ResourcesCompat.getColor(getResources(), R.color.eq_holo_brightdark, null),
+                        ResourcesCompat.getColor(getResources(), R.color.eq_holo_bluedark, null),
+                        ResourcesCompat.getColor(getResources(), R.color.eq_holo_darkdark, null)
+                },
+                new float[]{0, 0.2f, 0.45f, 0.6f, 1f},
+                Shader.TileMode.CLAMP));
     }
 
     public void setBand(int i, float value)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fa367b6..b1b570d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
 
   <ListView
       android:id="@+id/dsp_navigation_drawer"
-      android:background="@color/navigation_drawerdark"
+      android:background="?android:attr/colorBackground"
       android:layout_width="260dp"
       android:layout_height="match_parent"
       android:layout_gravity="start"
diff --git a/app/src/main/res/layout/drawer_item.xml b/app/src/main/res/layout/drawer_item.xml
index dd1caab..382345b 100644
--- a/app/src/main/res/layout/drawer_item.xml
+++ b/app/src/main/res/layout/drawer_item.xml
@@ -36,7 +36,6 @@
       android:id="@+id/drawer_title"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:textColor="#111"
       android:textSize="15sp"
       android:background="?android:attr/activatedBackgroundIndicator"
       android:textAppearance="?android:attr/textAppearanceListItemSmall"
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index ecc5278..0cabf4d 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -10,9 +10,6 @@
       android:id="@+id/mdisplaydevmsg"
       android:title="@string/displaydevmsg"/>
   <item
-      android:id="@+id/themeswitch"
-      android:title="@string/theme"/>
-  <item
       android:id="@+id/globaleffectitm"
       android:title="@string/globaleffect_title"/>
   <item
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a1236bd..8769a78 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,11 +22,6 @@
   <color name="cb">#88bbffff</color>
   <color name="freq_hl">#2000ddff</color>
   <color name="freq_hl2">#4033b5e5</color>
-  <color name="eq_red">#80ff0000</color>
-  <color name="eq_yellow">#80f0ff00</color>
-  <color name="eq_holo_bright">#8000ddff</color>
-  <color name="eq_holo_blue">#8033b5e5</color>
-  <color name="eq_holo_dark">#800099cc</color>
 
   <color name="eq_reddark">#80ffffff</color>
   <color name="eq_yellowdark">#80ffff00</color>
@@ -34,45 +29,4 @@
   <color name="eq_holo_bluedark">#80ff00ff</color>
   <color name="eq_holo_darkdark">#80000080</color>
 
-  <color name="eq_redlight">#80ffffff</color>
-  <color name="eq_yellowlight">#80cccccc</color>
-  <color name="eq_holo_brightlight">#80999999</color>
-  <color name="eq_holo_bluelight">#80666666</color>
-  <color name="eq_holo_darklight">#80444444</color>
-
-  <color name="eq_redred">#80ef0000</color>
-  <color name="eq_yellowred">#80ef8000</color>
-  <color name="eq_holo_brightred">#80f7c785</color>
-  <color name="eq_holo_bluered">#802e8d32</color>
-  <color name="eq_holo_darkred">#802e4d32</color>
-
-  <color name="eq_redidea">#80ea322a</color>
-  <color name="eq_yellowidea">#80ff847c</color>
-  <color name="eq_holo_brightidea">#80fecea8</color>
-  <color name="eq_holo_blueidea">#8099b898</color>
-  <color name="eq_holo_darkidea">#802a363b</color>
-
-  <color name="cb_shader">#ffccffff</color>
-  <color name="cb_shader_alpha">#44ccffff</color>
-  <color name="action_bar_color">#ff0d0d0d</color>
-
-  <!-- Material -->
-  <color name="primary">#009688</color>
-  <color name="primaryred">#ef0000</color>
-  <color name="backgroundred">#2e7d32</color>
-  <color name="primary_dark">#00796b</color>
-  <color name="primaryred_dark">#9f0000</color>
-  <color name="accent">#009688</color>
-  <color name="accentred">#99ef0000</color>
-
-  <color name="primaryidea">#f67280</color>
-  <color name="backgroundidea">#355c7d</color>
-  <color name="primaryidea_dark">#c06c84</color>
-  <color name="accentidea">#99f8b195</color>
-
-  <color name="navigation_drawerdark">#80ffffff</color>
-  <color name="navigation_drawerlight">#80666666</color>
-  <color name="navigation_drawerdefault">#8003a9f4</color>
-  <color name="navigation_drawerred">#80f4ff81</color>
-  <color name="navigation_draweridea">#806c5b7b</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3378a52..ca40c7c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,33 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <style name="AppTheme" parent="@android:style/Theme.Material">
-    <item name="android:colorPrimary">@color/primary</item>
-    <item name="android:colorPrimaryDark">@color/primary_dark</item>
-    <item name="android:colorAccent">@color/accent</item>
-    <item name="android:navigationBarColor">@color/primary_dark</item>
     <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
   </style>
-  <style name="AppThemeRed" parent="@android:style/Theme.Material">
-    <item name="android:windowBackground">@color/backgroundred</item>
-    <item name="android:itemBackground">@color/backgroundred</item>
-    <item name="android:textColorAlertDialogListItem">@color/primaryred</item>
-    <item name="android:colorPrimary">@color/primaryred</item>
-    <item name="android:colorPrimaryDark">@color/primaryred_dark</item>
-    <item name="android:colorAccent">@color/accentred</item>
-    <item name="android:navigationBarColor">@color/primaryred_dark</item>
-    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-  </style>
-  <style name="AppThemeIdea" parent="@android:style/Theme.Material">
-    <item name="android:windowBackground">@color/backgroundidea</item>
-    <item name="android:itemBackground">@color/backgroundidea</item>
-    <item name="android:textColorAlertDialogListItem">@color/primaryidea</item>
-    <item name="android:colorPrimary">@color/primaryidea</item>
-    <item name="android:colorPrimaryDark">@color/primaryidea_dark</item>
-    <item name="android:colorAccent">@color/accentidea</item>
-    <item name="android:navigationBarColor">@color/primaryidea_dark</item>
-    <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-  </style>
-
+  
   <style name="DrawerArrowStyle" parent="@style/Widget.AppCompat.DrawerArrowToggle">
     <item name="spinBars">true</item>
     <item name="color">@android:color/white</item>