Remove name from theme

src/main/java/org/tasks/preferences/BaseBasicPreferences.java

@@ -42,7 +42,7 @@ public abstract class BaseBasicPreferences extends InjectingPreferenceActivity i
         addPreferencesFromResource(R.xml.preferences_privacy);
 
         Preference themePreference = findPreference(getString(R.string.p_theme));
-        themePreference.setSummary(themeManager.getBaseTheme().getName());
+        themePreference.setSummary(themeManager.getBaseThemeName());
         themePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
@@ -55,7 +55,7 @@ public abstract class BaseBasicPreferences extends InjectingPreferenceActivity i
             }
         });
         Preference colorPreference = findPreference(getString(R.string.p_theme_color));
-        colorPreference.setSummary(themeManager.getColorTheme().getName());
+        colorPreference.setSummary(themeManager.getColorName());
         colorPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
@@ -68,7 +68,7 @@ public abstract class BaseBasicPreferences extends InjectingPreferenceActivity i
             }
         });
         Preference accentPreference = findPreference(getString(R.string.p_theme_accent));
-        accentPreference.setSummary(themeManager.getAccentTheme().getName());
+        accentPreference.setSummary(themeManager.getAccentName());
         accentPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {

src/main/java/org/tasks/preferences/Theme.java

@@ -3,7 +3,6 @@ package org.tasks.preferences;
 import android.content.Context;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
-import android.view.LayoutInflater;
 
 import org.tasks.R;
 
@@ -11,19 +10,13 @@ public class Theme {
     private final Context context;
     private final int themeRes;
     private final int themeIndex;
-    private final String name;
 
-    public Theme(Context context, int themeIndex, int themeRes, String name) {
+    public Theme(Context context, int themeIndex, int themeRes) {
         this.themeIndex = themeIndex;
-        this.name = name;
         this.context = new ContextThemeWrapper(context, themeRes);
         this.themeRes = themeRes;
     }
 
-    public String getName() {
-        return name;
-    }
-
     @Deprecated
     public int getThemeIndex() {
         return themeIndex;

src/main/java/org/tasks/preferences/ThemeManager.java

@@ -109,15 +109,15 @@ public class ThemeManager {
     }
 
     public Theme getBaseTheme(int themeIndex) {
-        return new Theme(context, themeIndex, THEMES[themeIndex], themeNames[themeIndex]);
+        return new Theme(context, themeIndex, THEMES[themeIndex]);
     }
 
     public Theme getColor(int themeIndex) {
-        return new Theme(context, themeIndex, COLORS[themeIndex], colorNames[themeIndex]);
+        return new Theme(context, themeIndex, COLORS[themeIndex]);
     }
 
     public Theme getAccent(int accentIndex) {
-        return new Theme(context, accentIndex, ACCENTS[accentIndex], accentNames[accentIndex]);
+        return new Theme(context, accentIndex, ACCENTS[accentIndex]);
     }
 
     public Theme getWidgetTheme(int widgetId) {
@@ -131,4 +131,28 @@ public class ThemeManager {
     public int getDialogThemeResId() {
         return getBaseTheme().getDialogThemeResId();
     }
+
+    public String getBaseThemeName() {
+        return getBaseThemeName(preferences.getInt(R.string.p_theme, 0));
+    }
+
+    public String getColorName() {
+        return getColorName(preferences.getInt(R.string.p_theme_color, 0));
+    }
+
+    public String getAccentName() {
+        return getAccentName(preferences.getInt(R.string.p_theme_accent, 1));
+    }
+
+    public String getBaseThemeName(int theme) {
+        return themeNames[theme];
+    }
+
+    public String getColorName(int color) {
+        return colorNames[color];
+    }
+
+    public String getAccentName(int accent) {
+        return accentNames[accent];
+    }
 }

src/main/java/org/tasks/widget/WidgetConfigDialog.java

@@ -173,11 +173,11 @@ public class WidgetConfigDialog extends InjectingDialogFragment implements SeekB
     }
 
     private void updateTheme() {
-        selectedTheme.setText(themeManager.getBaseTheme(theme).getName());
+        selectedTheme.setText(themeManager.getBaseThemeName(theme));
     }
 
     private void updateColor() {
-        selectedColor.setText(themeManager.getColor(color).getName());
+        selectedColor.setText(themeManager.getColorName(color));
     }
 
     @OnClick(R.id.filter_selection)