From f87b796c934e2f2a7ea6d37d547209391bb584dc Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 12 Mar 2015 11:33:44 -0500 Subject: [PATCH] Rename flip to toggle --- .../com/todoroo/astrid/gtasks/GtasksIndentActionTest.java | 1 - .../java/com/todoroo/astrid/activity/EditPreferences.java | 1 - .../java/com/todoroo/astrid/activity/TaskEditFragment.java | 1 - src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java | 1 - src/main/java/com/todoroo/astrid/dao/TaskDao.java | 1 - src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java | 1 - src/main/java/com/todoroo/astrid/gcal/GCalHelper.java | 1 - .../java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java | 1 - src/main/java/com/todoroo/astrid/reminders/Notifications.java | 2 -- .../java/com/todoroo/astrid/timers/TimerFilterExposer.java | 1 - src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java | 1 - src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java | 2 -- src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java | 3 --- src/main/java/com/todoroo/astrid/widget/TasksWidget.java | 2 +- src/main/java/org/tasks/Broadcaster.java | 4 ++-- src/main/java/org/tasks/preferences/ActivityPreferences.java | 1 - src/main/java/org/tasks/receivers/CompleteTaskReceiver.java | 4 ++-- .../java/org/tasks/scheduling/GtasksBackgroundService.java | 3 --- src/main/java/org/tasks/widget/DueDateFormatter.java | 1 - src/main/java/org/tasks/widget/WidgetHelper.java | 1 - 20 files changed, 5 insertions(+), 28 deletions(-) diff --git a/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java index b7df85ff9..9b5526d67 100644 --- a/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java +++ b/src/androidTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java index d30c036c6..cca79e1da 100644 --- a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 7826d6869..10343e17a 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index fdfd916ee..709e3bc95 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -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 { diff --git a/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/src/main/java/com/todoroo/astrid/dao/TaskDao.java index 41db3e0ed..d08421f7c 100644 --- a/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java b/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java index 4956ad055..579693d76 100644 --- a/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java +++ b/src/main/java/com/todoroo/astrid/dao/TaskListMetadataDao.java @@ -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. diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java index 37330d09c..0529084d0 100644 --- a/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java +++ b/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 7d1fcb863..0043726f8 100644 --- a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/src/main/java/com/todoroo/astrid/reminders/Notifications.java index cf1c2624d..d669e2f92 100644 --- a/src/main/java/com/todoroo/astrid/reminders/Notifications.java +++ b/src/main/java/com/todoroo/astrid/reminders/Notifications.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java index 6d7ab83f5..ff3dab8cc 100644 --- a/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java index 1573b2a06..d9a1085ef 100644 --- a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java +++ b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java @@ -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; diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 36c4402af..de0338049 100644 --- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 25dda6bb1..d6cd1587c 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -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 * diff --git a/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/src/main/java/com/todoroo/astrid/widget/TasksWidget.java index bb840d1d8..f6775f3c8 100644 --- a/src/main/java/com/todoroo/astrid/widget/TasksWidget.java +++ b/src/main/java/com/todoroo/astrid/widget/TasksWidget.java @@ -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)) { diff --git a/src/main/java/org/tasks/Broadcaster.java b/src/main/java/org/tasks/Broadcaster.java index 00eb916ab..a3b4fc528 100644 --- a/src/main/java/org/tasks/Broadcaster.java +++ b/src/main/java/org/tasks/Broadcaster.java @@ -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); }}); } diff --git a/src/main/java/org/tasks/preferences/ActivityPreferences.java b/src/main/java/org/tasks/preferences/ActivityPreferences.java index 9eec1b1a3..6e6d86acf 100644 --- a/src/main/java/org/tasks/preferences/ActivityPreferences.java +++ b/src/main/java/org/tasks/preferences/ActivityPreferences.java @@ -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 diff --git a/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java b/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java index eedb509cc..5f90fe3b8 100644 --- a/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java +++ b/src/main/java/org/tasks/receivers/CompleteTaskReceiver.java @@ -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()); diff --git a/src/main/java/org/tasks/scheduling/GtasksBackgroundService.java b/src/main/java/org/tasks/scheduling/GtasksBackgroundService.java index a2a0a9d19..276a015ae 100644 --- a/src/main/java/org/tasks/scheduling/GtasksBackgroundService.java +++ b/src/main/java/org/tasks/scheduling/GtasksBackgroundService.java @@ -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 { diff --git a/src/main/java/org/tasks/widget/DueDateFormatter.java b/src/main/java/org/tasks/widget/DueDateFormatter.java index ac86ae01e..552edd69a 100644 --- a/src/main/java/org/tasks/widget/DueDateFormatter.java +++ b/src/main/java/org/tasks/widget/DueDateFormatter.java @@ -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; diff --git a/src/main/java/org/tasks/widget/WidgetHelper.java b/src/main/java/org/tasks/widget/WidgetHelper.java index e33d4324d..c735dbdf0 100644 --- a/src/main/java/org/tasks/widget/WidgetHelper.java +++ b/src/main/java/org/tasks/widget/WidgetHelper.java @@ -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;