diff --git a/build.gradle b/build.gradle
index 8ef0b529c..05679034f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'com.getkeepsafe.dexcount'
+apply plugin: 'com.neenbedankt.android-apt'
task wrapper(type: Wrapper) {
gradleVersion = '2.10'
@@ -13,6 +14,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2'
+ classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
}
}
@@ -81,12 +83,14 @@ configurations {
dependencies {
provided 'com.google.dagger:dagger-compiler:2.1'
+ apt 'com.jakewharton:butterknife-compiler:8.0.1'
+
compile 'com.google.dagger:dagger:2.1'
compile 'com.nononsenseapps:filepicker:2.5.2'
compile 'com.android.support:design:23.4.0'
compile 'com.android.support:support-v13:23.4.0'
- compile 'com.jakewharton:butterknife:7.0.1'
+ compile 'com.jakewharton:butterknife:8.0.1'
compile 'com.jakewharton.timber:timber:4.1.1'
compile 'com.google.guava:guava:19.0'
compile ('com.rubiconproject.oss:jchronic:0.2.6') {
diff --git a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java
index fcfa7bbd5..d5418c269 100755
--- a/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java
+++ b/src/googleplay/java/org/tasks/locale/ui/activity/TaskerSettingsActivity.java
@@ -28,7 +28,7 @@ import java.util.Set;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
@@ -39,8 +39,8 @@ public final class TaskerSettingsActivity extends AbstractFragmentPluginAppCompa
private static final String EXTRA_FILTER = "extra_filter";
private static final String EXTRA_PURCHASE_INITIATED = "extra_purchase_initiated";
- @Bind(R.id.toolbar) Toolbar toolbar;
- @Bind(R.id.text_view) TextView filterTitle;
+ @BindView(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.text_view) TextView filterTitle;
@Inject Preferences preferences;
@Inject DefaultFilterProvider defaultFilterProvider;
diff --git a/src/googleplay/res/values/keys.xml b/src/googleplay/res/values/keys.xml
index 6578f0322..1c1ea9acf 100644
--- a/src/googleplay/res/values/keys.xml
+++ b/src/googleplay/res/values/keys.xml
@@ -7,5 +7,4 @@
themes
dashclock_filter
If you purchased the stand-alone Tasker plugin please send your Google Play Store transaction ID to support@tasks.org and you will receive a promo code for this in-app purchase. You can find the transaction ID in your Google Play Store order confirmation e-mail or by visiting wallet.google.com
- default_gtasks_list
\ No newline at end of file
diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
index 1cb17c878..4c4ef3350 100644
--- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
@@ -31,7 +31,7 @@ import org.tasks.ui.MenuColorizer;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import static android.text.TextUtils.isEmpty;
@@ -45,8 +45,8 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity {
@Inject StoreObjectDao storeObjectDao;
@Inject DialogBuilder dialogBuilder;
- @Bind(R.id.tag_name) EditText filterName;
- @Bind(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.tag_name) EditText filterName;
+ @BindView(R.id.toolbar) Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
index cbeb9466f..0ea2cf1aa 100644
--- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -41,7 +41,7 @@ import org.tasks.ui.MenuColorizer;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import static android.text.TextUtils.isEmpty;
@@ -61,9 +61,9 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity {
@Inject MetadataDao metadataDao;
@Inject DialogBuilder dialogBuilder;
- @Bind(R.id.tag_name) EditText tagName;
- @Bind(R.id.toolbar) Toolbar toolbar;
- @Bind(R.id.tag_error) TextView tagError;
+ @BindView(R.id.tag_name) EditText tagName;
+ @BindView(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.tag_error) TextView tagError;
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
index 34f8abeaa..e32af03da 100644
--- a/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -36,13 +36,13 @@ import java.util.HashMap;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
public class BeastModePreferences extends ThemedInjectingAppCompatActivity {
- @Bind(R.id.toolbar) Toolbar toolbar;
- @Bind(android.R.id.list) TouchListView touchList;
+ @BindView(R.id.toolbar) Toolbar toolbar;
+ @BindView(android.R.id.list) TouchListView touchList;
private ArrayAdapter adapter;
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index ebe6f84cb..3c4163e10 100755
--- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -50,7 +50,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import timber.log.Timber;
@@ -86,8 +86,8 @@ public final class TaskEditFragment extends InjectingFragment implements Toolbar
@Inject Preferences preferences;
@Inject Tracker tracker;
- @Bind(R.id.toolbar) Toolbar toolbar;
- @Bind(R.id.comments) LinearLayout comments;
+ @BindView(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.comments) LinearLayout comments;
// --- other instance variables
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 56943395b..a3befc53b 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -86,7 +86,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import timber.log.Timber;
@@ -147,9 +147,9 @@ public class TaskListFragment extends InjectingListFragment implements
@Inject TaskCreator taskCreator;
@Inject Broadcaster broadcaster;
- @Bind(R.id.swipe_layout) SwipeRefreshLayout swipeRefreshLayout;
- @Bind(R.id.swipe_layout_empty) SwipeRefreshLayout emptyView;
- @Bind(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.swipe_layout) SwipeRefreshLayout swipeRefreshLayout;
+ @BindView(R.id.swipe_layout_empty) SwipeRefreshLayout emptyView;
+ @BindView(R.id.toolbar) Toolbar toolbar;
private TaskAdapter taskAdapter = null;
private RefreshReceiver refreshReceiver = new RefreshReceiver();
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 2141ce40d..6a1264fe5 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -55,7 +55,7 @@ import java.util.Map.Entry;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import static android.text.TextUtils.isEmpty;
@@ -142,8 +142,8 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity {
@Inject DialogBuilder dialogBuilder;
@Inject FilterCriteriaProvider filterCriteriaProvider;
- @Bind(R.id.tag_name) EditText filterName;
- @Bind(R.id.toolbar) Toolbar toolbar;
+ @BindView(R.id.tag_name) EditText filterName;
+ @BindView(R.id.toolbar) Toolbar toolbar;
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java b/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java
index a4eee35a1..2c460702d 100644
--- a/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java
+++ b/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
@@ -39,7 +39,7 @@ public class AACRecordingActivity extends InjectingAppCompatActivity implements
@Inject Preferences preferences;
@Inject ActivityPermissionRequestor permissionRequestor;
- @Bind(R.id.timer) Chronometer timer;
+ @BindView(R.id.timer) Chronometer timer;
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
index 9a648f7b9..97c012f42 100644
--- a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@@ -45,7 +45,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import timber.log.Timber;
@@ -62,8 +62,8 @@ public class FilesControlSet extends TaskEditControlFragment {
@Inject DialogBuilder dialogBuilder;
@Inject @ForActivity Context context;
- @Bind(R.id.attachment_container) LinearLayout attachmentContainer;
- @Bind(R.id.add_attachment) TextView addAttachment;
+ @BindView(R.id.attachment_container) LinearLayout attachmentContainer;
+ @BindView(R.id.add_attachment) TextView addAttachment;
private String taskUuid;
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 2d64d071b..0ebc9710b 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -55,7 +55,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import timber.log.Timber;
@@ -102,8 +102,8 @@ public class RepeatControlSet extends TaskEditControlFragment {
@Inject @ForActivity Context context;
@Inject ThemeManager themeManager;
- @Bind(R.id.clear) ImageView clear;
- @Bind(R.id.display_row_edit) TextView displayView;
+ @BindView(R.id.clear) ImageView clear;
+ @BindView(R.id.display_row_edit) TextView displayView;
private ArrayAdapter repeatUntilAdapter;
private final List repeatUntilOptions = new ArrayList<>();
diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index c07f6dcd8..a347623c4 100644
--- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -53,7 +53,7 @@ import java.util.Set;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import static com.google.common.base.Predicates.notNull;
@@ -80,7 +80,7 @@ public final class TagsControlSet extends TaskEditControlFragment {
@Inject TagService tagService;
@Inject DialogBuilder dialogBuilder;
- @Bind(R.id.display_row_edit) TextView tagsDisplay;
+ @BindView(R.id.display_row_edit) TextView tagsDisplay;
private long taskId;
private ArrayList allTagNames;
diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
index f1b75b4a5..21129f5b1 100644
--- a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
+++ b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java
@@ -36,7 +36,7 @@ import org.tasks.ui.TaskEditControlFragment;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
/**
@@ -62,9 +62,9 @@ public class TimerControlSet extends TaskEditControlFragment {
@Inject @ForActivity Context context;
@Inject ThemeManager themeManager;
- @Bind(R.id.display_row_edit) TextView displayEdit;
- @Bind(R.id.timer) Chronometer chronometer;
- @Bind(R.id.timer_button) ImageView timerButton;
+ @BindView(R.id.display_row_edit) TextView displayEdit;
+ @BindView(R.id.timer) Chronometer chronometer;
+ @BindView(R.id.timer_button) ImageView timerButton;
private TimeDurationControlSet estimated;
private TimeDurationControlSet elapsed;
diff --git a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 28d4264b1..1a075bc31 100644
--- a/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -28,7 +28,7 @@ import org.tasks.ui.TaskEditControlFragment;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnTextChanged;
@@ -49,8 +49,8 @@ public class EditTitleControlSet extends TaskEditControlFragment {
@Inject TaskService taskService;
- @Bind(R.id.title) EditText editText;
- @Bind(R.id.completeBox) CheckableImageView completeBox;
+ @BindView(R.id.title) EditText editText;
+ @BindView(R.id.completeBox) CheckableImageView completeBox;
private CheckBoxes checkBoxes;
private boolean isComplete;
diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
index 656926416..e18bc2942 100644
--- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -37,7 +37,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import static java.util.Arrays.asList;
@@ -63,8 +63,8 @@ public class HideUntilControlSet extends TaskEditControlFragment implements OnIt
@Inject @ForActivity Context context;
//private final CheckBox enabled;
- @Bind(R.id.hideUntil) Spinner spinner;
- @Bind(R.id.clear) ImageView clearButton;
+ @BindView(R.id.hideUntil) Spinner spinner;
+ @BindView(R.id.clear) ImageView clearButton;
private ArrayAdapter adapter;
private long initialHideUntil;
diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
index e3d851900..148857cbd 100644
--- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnItemSelected;
@@ -87,9 +87,9 @@ public class ReminderControlSet extends TaskEditControlFragment {
@Inject Preferences preferences;
@Inject @ForActivity Context context;
- @Bind(R.id.alert_container) LinearLayout alertContainer;
- @Bind(R.id.reminder_alarm) Spinner mode;
- @Bind(R.id.alarms_add_spinner) Spinner addSpinner;
+ @BindView(R.id.alert_container) LinearLayout alertContainer;
+ @BindView(R.id.reminder_alarm) Spinner mode;
+ @BindView(R.id.alarms_add_spinner) Spinner addSpinner;
private long taskId;
private int flags;
diff --git a/src/main/java/org/tasks/activities/CalendarSelectionDialog.java b/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
index 51a36bcfa..13520702c 100644
--- a/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
+++ b/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
@@ -5,7 +5,6 @@ import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
-import android.widget.ArrayAdapter;
import com.google.common.base.Function;
diff --git a/src/main/java/org/tasks/fragments/CommentBarFragment.java b/src/main/java/org/tasks/fragments/CommentBarFragment.java
index 628fc357e..add3bc313 100644
--- a/src/main/java/org/tasks/fragments/CommentBarFragment.java
+++ b/src/main/java/org/tasks/fragments/CommentBarFragment.java
@@ -38,7 +38,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnEditorAction;
@@ -71,10 +71,10 @@ public class CommentBarFragment extends TaskEditControlFragment {
@Inject Device device;
@Inject Preferences preferences;
- @Bind(R.id.commentButton) View commentButton;
- @Bind(R.id.commentField) EditText commentField;
- @Bind(R.id.picture) ImageView pictureButton;
- @Bind(R.id.updatesFooter) LinearLayout commentBar;
+ @BindView(R.id.commentButton) View commentButton;
+ @BindView(R.id.commentField) EditText commentField;
+ @BindView(R.id.picture) ImageView pictureButton;
+ @BindView(R.id.updatesFooter) LinearLayout commentBar;
private CommentBarFragmentCallback callback;
private Uri pendingCommentPicture = null;
diff --git a/src/main/java/org/tasks/ui/CalendarControlSet.java b/src/main/java/org/tasks/ui/CalendarControlSet.java
index b507857b0..3c5d06105 100644
--- a/src/main/java/org/tasks/ui/CalendarControlSet.java
+++ b/src/main/java/org/tasks/ui/CalendarControlSet.java
@@ -36,7 +36,7 @@ import org.tasks.preferences.Preferences;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import timber.log.Timber;
@@ -54,8 +54,8 @@ public class CalendarControlSet extends TaskEditControlFragment {
private static final String EXTRA_ID = "extra_id";
private static final String EXTRA_NAME = "extra_name";
- @Bind(R.id.clear) View cancelButton;
- @Bind(R.id.calendar_display_which) TextView calendar;
+ @BindView(R.id.clear) View cancelButton;
+ @BindView(R.id.calendar_display_which) TextView calendar;
@Inject GCalHelper gcalHelper;
@Inject CalendarProvider calendarProvider;
diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java
index dab78e8ff..21ad9d5f1 100644
--- a/src/main/java/org/tasks/ui/DeadlineControlSet.java
+++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java
@@ -31,7 +31,7 @@ import java.util.List;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnItemSelected;
@@ -67,9 +67,9 @@ public class DeadlineControlSet extends TaskEditControlFragment {
@Inject Preferences preferences;
@Inject @ForActivity Context context;
- @Bind(R.id.due_date) Spinner dueDateSpinner;
- @Bind(R.id.due_time) Spinner dueTimeSpinner;
- @Bind(R.id.clear) View clearButton;
+ @BindView(R.id.due_date) Spinner dueDateSpinner;
+ @BindView(R.id.due_time) Spinner dueTimeSpinner;
+ @BindView(R.id.clear) View clearButton;
private ArrayAdapter dueDateAdapter;
private ArrayAdapter dueTimeAdapter;
diff --git a/src/main/java/org/tasks/ui/DescriptionControlSet.java b/src/main/java/org/tasks/ui/DescriptionControlSet.java
index 5aa34534b..5078cd0e8 100644
--- a/src/main/java/org/tasks/ui/DescriptionControlSet.java
+++ b/src/main/java/org/tasks/ui/DescriptionControlSet.java
@@ -13,7 +13,7 @@ import com.todoroo.astrid.data.Task;
import org.tasks.R;
import org.tasks.injection.FragmentComponent;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnTextChanged;
public class DescriptionControlSet extends TaskEditControlFragment {
@@ -21,7 +21,7 @@ public class DescriptionControlSet extends TaskEditControlFragment {
public static final int TAG = R.string.TEA_ctrl_notes_pref;
private static final String EXTRA_DESCRIPTION = "extra_description";
- @Bind(R.id.notes) EditText editText;
+ @BindView(R.id.notes) EditText editText;
private String description;
diff --git a/src/main/java/org/tasks/ui/PriorityControlSet.java b/src/main/java/org/tasks/ui/PriorityControlSet.java
index dd79fef19..e8b8a9458 100644
--- a/src/main/java/org/tasks/ui/PriorityControlSet.java
+++ b/src/main/java/org/tasks/ui/PriorityControlSet.java
@@ -17,7 +17,7 @@ import org.tasks.injection.FragmentComponent;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.OnClick;
import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
@@ -34,10 +34,10 @@ public class PriorityControlSet extends TaskEditControlFragment {
@Inject CheckBoxes checkBoxes;
- @Bind(R.id.priority_high) AppCompatRadioButton priorityHigh;
- @Bind(R.id.priority_medium) AppCompatRadioButton priorityMedium;
- @Bind(R.id.priority_low) AppCompatRadioButton priorityLow;
- @Bind(R.id.priority_none) AppCompatRadioButton priorityNone;
+ @BindView(R.id.priority_high) AppCompatRadioButton priorityHigh;
+ @BindView(R.id.priority_medium) AppCompatRadioButton priorityMedium;
+ @BindView(R.id.priority_low) AppCompatRadioButton priorityLow;
+ @BindView(R.id.priority_none) AppCompatRadioButton priorityNone;
private OnPriorityChanged callback;
private int priority;
diff --git a/src/main/java/org/tasks/widget/WidgetConfigDialog.java b/src/main/java/org/tasks/widget/WidgetConfigDialog.java
index 5d5573fa4..b858951a3 100644
--- a/src/main/java/org/tasks/widget/WidgetConfigDialog.java
+++ b/src/main/java/org/tasks/widget/WidgetConfigDialog.java
@@ -31,7 +31,7 @@ import java.text.NumberFormat;
import javax.inject.Inject;
-import butterknife.Bind;
+import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
@@ -76,13 +76,13 @@ public class WidgetConfigDialog extends InjectingDialogFragment implements SeekB
private static final int REQUEST_FILTER = 1005;
- @Bind(R.id.opacity_value) TextView opacityValue;
- @Bind(R.id.selected_filter) TextView selectedFilter;
- @Bind(R.id.selected_theme) TextView selectedTheme;
- @Bind(R.id.hideDueDate) CheckBox hideDueDate;
- @Bind(R.id.hideCheckboxes) CheckBox hideCheckBoxes;
- @Bind(R.id.hideHeader) CheckBox hideHeader;
- @Bind(R.id.opacity_seekbar) SeekBar opacitySeekbar;
+ @BindView(R.id.opacity_value) TextView opacityValue;
+ @BindView(R.id.selected_filter) TextView selectedFilter;
+ @BindView(R.id.selected_theme) TextView selectedTheme;
+ @BindView(R.id.hideDueDate) CheckBox hideDueDate;
+ @BindView(R.id.hideCheckboxes) CheckBox hideCheckBoxes;
+ @BindView(R.id.hideHeader) CheckBox hideHeader;
+ @BindView(R.id.opacity_seekbar) SeekBar opacitySeekbar;
@Inject DialogBuilder dialogBuilder;
@Inject DefaultFilterProvider defaultFilterProvider;
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 3c181ee3e..a34aa8c48 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -294,5 +294,6 @@
Tasker/Locale
DashClock extension
selected_theme
+ default_gtasks_list