Move isDarkThemeWidget to preferences

astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java

@@ -39,10 +39,6 @@ public class ThemeService {
         return getStyleForSetting(preference);
     }
 
-    public static boolean isDarkWidgetTheme() {
-        return Preferences.getBoolean(R.string.p_use_dark_theme_widget, false);
-    }
-
     private static int getStyleForSetting(String setting) {
         if(THEME_BLACK.equals(setting)) {
             return R.style.Tasks;

astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java

@@ -22,7 +22,6 @@ import com.todoroo.astrid.dao.TaskListMetadataDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.TaskService;
-import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.subtasks.SubtasksHelper;
 import com.todoroo.astrid.utility.Constants;
 
@@ -124,7 +123,7 @@ public class WidgetUpdateService extends InjectingService {
                 String textContent;
                 Resources r = context.getResources();
                 int textColor = r
-                        .getColor(ThemeService.isDarkWidgetTheme() ? R.color.widget_text_color_dark : R.color.widget_text_color_light);
+                        .getColor(preferences.isDarkWidgetTheme() ? R.color.widget_text_color_dark : R.color.widget_text_color_light);
 
                 textContent = task.getTitle();
 
@@ -191,7 +190,7 @@ public class WidgetUpdateService extends InjectingService {
         int titleColor;
         int buttonDrawable;
 
-        if (ThemeService.isDarkWidgetTheme()) {
+        if (preferences.isDarkWidgetTheme()) {
             layout = R.layout.widget_initialized_dark;
             titleColor = r.getColor(R.color.widget_text_color_dark);
             buttonDrawable = R.drawable.ic_action_new_light;

astrid/src/main/java/org/tasks/preferences/Preferences.java

@@ -9,6 +9,7 @@ import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec;
 
+import org.tasks.R;
 import org.tasks.injection.ForApplication;
 
 import javax.inject.Inject;
@@ -210,4 +211,8 @@ public class Preferences {
             }
         }
     }
+
+    public boolean isDarkWidgetTheme() {
+        return getBoolean(R.string.p_use_dark_theme_widget, false);
+    }
 }

astrid/src/main/java/org/tasks/widget/WidgetHelper.java

@@ -24,7 +24,6 @@ import com.todoroo.astrid.api.PermaSql;
 import com.todoroo.astrid.core.CoreFilterExposer;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.service.TagDataService;
-import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagFilterExposer;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.widget.TasksWidget;
@@ -88,10 +87,10 @@ public class WidgetHelper {
         Bundle filterBundle = new Bundle(com.todoroo.astrid.api.Filter.class.getClassLoader());
         filterBundle.putParcelable(ScrollableWidgetUpdateService.FILTER, filter);
         rvIntent.putExtra(ScrollableWidgetUpdateService.FILTER, filterBundle);
-        rvIntent.putExtra(ScrollableWidgetUpdateService.IS_DARK_THEME, ThemeService.isDarkWidgetTheme());
+        rvIntent.putExtra(ScrollableWidgetUpdateService.IS_DARK_THEME, preferences.isDarkWidgetTheme());
         rvIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, id);
         rvIntent.setData(Uri.parse(rvIntent.toUri(Intent.URI_INTENT_SCHEME)));
-        RemoteViews remoteViews = new RemoteViews(context.getPackageName(), ThemeService.isDarkWidgetTheme() ? R.layout.scrollable_widget_dark : R.layout.scrollable_widget_light);
+        RemoteViews remoteViews = new RemoteViews(context.getPackageName(), preferences.isDarkWidgetTheme() ? R.layout.scrollable_widget_dark : R.layout.scrollable_widget_light);
         remoteViews.setTextViewText(R.id.widget_title, filter.title);
         remoteViews.setRemoteAdapter(R.id.list_view, rvIntent);
         remoteViews.setEmptyView(R.id.list_view, R.id.empty_view);