Rename flip to toggle

pull/253/head
Alex Baker 9 years ago
parent 4a0ebd964f
commit f87b796c93

@ -9,7 +9,6 @@ import com.google.api.services.tasks.model.TaskList;
import com.google.api.services.tasks.model.TaskLists;
import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.StoreObject;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.test.DatabaseTestCase;

@ -19,7 +19,6 @@ import android.preference.PreferenceScreen;
import android.speech.tts.TextToSpeech;
import android.text.TextUtils;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.data.TaskAttachment;
import com.todoroo.astrid.files.FileExplore;

@ -12,7 +12,6 @@ import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.view.ViewPager;

@ -31,7 +31,6 @@ import org.tasks.filters.FilterCounter;
import org.tasks.filters.FilterProvider;
import static org.tasks.preferences.ResourceResolver.getData;
import static org.tasks.preferences.ResourceResolver.getResource;
public class FilterAdapter extends ArrayAdapter<Filter> {

@ -29,7 +29,6 @@ import org.tasks.R;
import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.Preferences;
import java.io.ByteArrayOutputStream;
import java.util.List;
import javax.inject.Inject;

@ -12,7 +12,6 @@ import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.TaskListMetadata;
import javax.inject.Inject;
import javax.inject.Singleton;
/**
* Data Access layer for {@link TagData}-related operations.

@ -15,7 +15,6 @@ import android.net.Uri;
import android.text.TextUtils;
import android.text.format.Time;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskService;

@ -27,7 +27,6 @@ import com.todoroo.astrid.data.Task;
import org.tasks.R;
import org.tasks.injection.ForApplication;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;

@ -27,7 +27,6 @@ import org.tasks.R;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingBroadcastReceiver;
import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.Preferences;
import javax.inject.Inject;
@ -59,7 +58,6 @@ public class Notifications extends InjectingBroadcastReceiver {
@Inject TaskDao taskDao;
@Inject @ForApplication Context context;
@Inject NotificationManager notificationManager;
@Inject Preferences preferences;
@Inject Broadcaster broadcaster;
@Override

@ -18,7 +18,6 @@ import com.todoroo.astrid.service.TaskService;
import org.tasks.R;
import org.tasks.injection.ForApplication;
import java.util.Collections;
import java.util.List;
import javax.inject.Inject;

@ -24,7 +24,6 @@ import android.widget.TextView;
import com.google.ical.values.Frequency;
import com.google.ical.values.RRule;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.data.Task;

@ -11,7 +11,6 @@ import android.view.View.OnClickListener;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
@ -26,7 +25,6 @@ import org.tasks.preferences.ActivityPreferences;
import java.util.Date;
import static org.tasks.date.DateTimeUtils.newDate;
import static org.tasks.preferences.ResourceResolver.getResource;
/**
* Control set for specifying when a task should be hidden

@ -12,7 +12,6 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
@ -27,8 +26,6 @@ import org.tasks.preferences.ActivityPreferences;
import java.util.ArrayList;
import java.util.List;
import static org.tasks.preferences.ResourceResolver.getResource;
/**
* Control set dealing with reminder settings
*

@ -49,7 +49,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
switch(intent.getAction()) {
case COMPLETE_TASK:
broadcaster.flipCompleteState(intent.getLongExtra(TaskEditFragment.TOKEN_ID, 0));
broadcaster.toggleCompletedState(intent.getLongExtra(TaskEditFragment.TOKEN_ID, 0));
break;
case EDIT_TASK:
if(ActivityPreferences.isTabletSized(context)) {

@ -27,7 +27,7 @@ public class Broadcaster {
this.context = context;
}
public void flipCompleteState(long taskId) {
public void toggleCompletedState(long taskId) {
completeTask(taskId, true);
}
@ -38,7 +38,7 @@ public class Broadcaster {
private void completeTask(final long taskId, final boolean flipState) {
sendOrderedBroadcast(new Intent(context, CompleteTaskReceiver.class) {{
putExtra(CompleteTaskReceiver.TASK_ID, taskId);
putExtra(CompleteTaskReceiver.FLIP_STATE, flipState);
putExtra(CompleteTaskReceiver.TOGGLE_STATE, flipState);
}});
}

@ -13,7 +13,6 @@ import org.tasks.R;
import javax.inject.Inject;
import javax.inject.Singleton;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastIceCreamSandwich;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
@Singleton

@ -17,7 +17,7 @@ public class CompleteTaskReceiver extends InjectingBroadcastReceiver {
private static final Logger log = LoggerFactory.getLogger(CompleteTaskReceiver.class);
public static final String TASK_ID = "id";
public static final String FLIP_STATE = "flip_state";
public static final String TOGGLE_STATE = "flip_state";
@Inject TaskService taskService;
@ -26,7 +26,7 @@ public class CompleteTaskReceiver extends InjectingBroadcastReceiver {
super.onReceive(context, intent);
long taskId = intent.getLongExtra(TASK_ID, 0);
boolean flipState = intent.getBooleanExtra(FLIP_STATE, false);
boolean flipState = intent.getBooleanExtra(TOGGLE_STATE, false);
log.info("Completing {}", taskId);
Task task = taskService.fetchById(taskId, Task.ID, Task.COMPLETION_DATE);
taskService.setComplete(task, !flipState || !task.isCompleted());

@ -10,11 +10,8 @@ import org.tasks.R;
import org.tasks.preferences.Preferences;
import org.tasks.sync.RecordSyncStatusCallback;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
public class GtasksBackgroundService extends RecurringIntervalIntentService {

@ -2,7 +2,6 @@ package org.tasks.widget;
import android.content.Context;
import android.content.res.Resources;
import android.opengl.Visibility;
import android.view.View;
import android.widget.RemoteViews;

@ -22,7 +22,6 @@ import com.todoroo.astrid.core.BuiltInFilterExposer;
import com.todoroo.astrid.dao.TagDataDao;
import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.tags.TagFilterExposer;
import com.todoroo.astrid.utility.Constants;
import com.todoroo.astrid.widget.TasksWidget;
import com.todoroo.astrid.widget.WidgetConfigActivity;

Loading…
Cancel
Save