archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass ActivityPreferences to TaskAdapter

Browse Source
pull/189/head
Alex Baker 10 years ago
parent d213dd9b84
commit 6769981044
9 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File

3
astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -505,8 +505,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
}
private void constructWhenDialog(View whenDialogView) {
int theme = ThemeService.getEditDialogTheme();
whenDialog = new Dialog(getActivity(), theme);
whenDialog = new Dialog(getActivity(), preferences.getEditDialogTheme());
Button dismissDialogButton = (Button) whenDialogView.findViewById(R.id.when_dismiss);
dismissDialogButton.setOnClickListener(new View.OnClickListener() {

4
astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
Unescape Escape View File

@ -85,7 +85,7 @@ import org.tasks.injection.ForActivity;
import org.tasks.injection.InjectingListFragment;
import org.tasks.injection.Injector;
import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import java.util.List;
import java.util.Timer;
@ -142,7 +142,7 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
@Inject TaskDeleter taskDeleter;
@Inject TaskDuplicator taskDuplicator;
@Inject @ForActivity Context context;
@Inject Preferences preferences;
@Inject ActivityPreferences preferences;
@Inject NotificationManager notificationManager;
@Inject TaskAttachmentDao taskAttachmentDao;
@Inject Injector injector;

9
astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java
Unescape Escape View File

@ -61,13 +61,12 @@ import com.todoroo.astrid.files.FilesAction;
import com.todoroo.astrid.files.FilesControlSet;
import com.todoroo.astrid.notes.NotesAction;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.tags.TaskToTagMetadata;
import com.todoroo.astrid.ui.CheckableImageView;
import com.todoroo.astrid.utility.Constants;
import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import java.util.Collections;
import java.util.HashMap;
@ -174,7 +173,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
// --- instance variables
private final Preferences preferences;
private final ActivityPreferences preferences;
private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService;
@ -210,7 +209,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
* @param onCompletedTaskListener
* task listener. can be null
*/
public TaskAdapter(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, int resource,
public TaskAdapter(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, int resource,
Cursor c, AtomicReference<String> query, OnCompletedTaskListener onCompletedTaskListener) {
super(ContextManager.getContext(), c, false);
this.preferences = preferences;
@ -583,7 +582,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
return;
}
int theme = ThemeService.getEditDialogTheme();
int theme = preferences.getEditDialogTheme();
final Dialog dialog = new Dialog(fragment.getActivity(), theme);
dialog.setTitle(R.string.TEA_note_label);
View notesView = LayoutInflater.from(fragment.getActivity()).inflate(R.layout.notes_view_dialog, null);

4
astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java
Unescape Escape View File

@ -31,7 +31,7 @@ import com.todoroo.astrid.subtasks.SubtasksListFragment;
import org.tasks.R;
import org.tasks.injection.ForActivity;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import org.tasks.sync.IndeterminateProgressBarSyncResultCallback;
import javax.inject.Inject;
@ -48,7 +48,7 @@ public class GtasksListFragment extends SubtasksListFragment {
@Inject SyncV2Service syncService;
@Inject @ForActivity Context context;
@Inject TaskAttachmentDao taskAttachmentDao;
@Inject Preferences preferences;
@Inject ActivityPreferences preferences;
private StoreObject list;

8
astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
Unescape Escape View File

@ -29,7 +29,7 @@ import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.ui.DraggableListView;
import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import java.util.ArrayList;
import java.util.Collections;
@ -43,7 +43,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private final DisplayMetrics metrics = new DisplayMetrics();
private final AstridOrderedListUpdater<LIST> updater;
private final TaskListFragment fragment;
private final Preferences preferences;
private final ActivityPreferences preferences;
private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService;
@ -51,7 +51,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private LIST list;
public AstridOrderedListFragmentHelper(org.tasks.preferences.Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, AstridOrderedListUpdater<LIST> updater) {
public AstridOrderedListFragmentHelper(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, TaskListFragment fragment, AstridOrderedListUpdater<LIST> updater) {
this.preferences = preferences;
this.taskAttachmentDao = taskAttachmentDao;
this.taskService = taskService;
@ -186,7 +186,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
private final class DraggableTaskAdapter extends TaskAdapter {
private DraggableTaskAdapter(org.tasks.preferences.Preferences preferences, TaskListFragment activity, int resource,
private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, int resource,
Cursor c, AtomicReference<String> query) {
super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null);
}

8
astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
Unescape Escape View File

@ -34,7 +34,7 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVis
import com.todoroo.astrid.ui.DraggableListView;
import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import java.util.ArrayList;
import java.util.Arrays;
@ -49,7 +49,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private final OrderedMetadataListUpdater<LIST> updater;
private final TaskListFragment fragment;
private final Preferences preferences;
private final ActivityPreferences preferences;
private final TaskAttachmentDao taskAttachmentDao;
private final TaskService taskService;
private final MetadataService metadataService;
@ -58,7 +58,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private LIST list;
public OrderedMetadataListFragmentHelper(Preferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, MetadataService metadataService, TaskListFragment fragment, OrderedMetadataListUpdater<LIST> updater) {
public OrderedMetadataListFragmentHelper(ActivityPreferences preferences, TaskAttachmentDao taskAttachmentDao, TaskService taskService, MetadataService metadataService, TaskListFragment fragment, OrderedMetadataListUpdater<LIST> updater) {
this.preferences = preferences;
this.taskAttachmentDao = taskAttachmentDao;
this.taskService = taskService;
@ -198,7 +198,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
private final class DraggableTaskAdapter extends TaskAdapter {
private DraggableTaskAdapter(Preferences preferences, TaskListFragment activity, int resource,
private DraggableTaskAdapter(ActivityPreferences preferences, TaskListFragment activity, int resource,
Cursor c, AtomicReference<String> query) {
super(preferences, taskAttachmentDao, taskService, activity, resource, c, query, null);
}

4
astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.service.TaskService;
import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject;
@ -37,7 +37,7 @@ public class SubtasksListFragment extends TaskListFragment {
@Inject TaskService taskService;
@Inject SubtasksFilterUpdater subtasksFilterUpdater;
@Inject TaskAttachmentDao taskAttachmentDao;
@Inject Preferences preferences;
@Inject ActivityPreferences preferences;
@Override
public void onAttach(Activity activity) {

4
astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.todoroo.astrid.data.TaskListMetadata;
import com.todoroo.astrid.service.TaskService;
import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject;
@ -27,7 +27,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
@Inject TaskService taskService;
@Inject SubtasksFilterUpdater subtasksFilterUpdater;
@Inject TaskAttachmentDao taskAttachmentDao;
@Inject Preferences preferences;
@Inject ActivityPreferences preferences;
private AstridOrderedListFragmentHelper<TaskListMetadata> helper;

22
astrid/src/main/java/org/tasks/preferences/ActivityPreferences.java
Unescape Escape View File

@ -6,6 +6,8 @@ import android.content.res.Configuration;
import android.graphics.PixelFormat;
import android.util.DisplayMetrics;
import com.todoroo.andlib.utility.AndroidUtilities;
import org.tasks.R;
import javax.inject.Inject;
@ -42,6 +44,26 @@ public class ActivityPreferences extends Preferences {
activity.getWindow().setFormat(PixelFormat.RGBA_8888);
}
public int getEditDialogTheme() {
boolean ics = AndroidUtilities.getSdkVersion() >= 14;
int themeSetting = com.todoroo.andlib.utility.Preferences.getBoolean(R.string.p_use_dark_theme, false) ? R.style.Tasks : R.style.Tasks_Light;
int theme;
if (themeSetting == R.style.Tasks) {
if (ics) {
theme = R.style.TEA_Dialog_ICS;
} else {
theme = R.style.TEA_Dialog;
}
} else {
if (ics) {
theme = R.style.TEA_Dialog_Light_ICS;
} else {
theme = R.style.TEA_Dialog_Light;
}
}
return theme;
}
/**
* Returns true if the screen is large or xtra large
*/

Write Preview
Loading…
Cancel
Save