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

Update to ButterKnife 7.0.1

Browse Source
pull/324/merge
Alex Baker 10 years ago
parent 32b11d2bfd
commit 2969214b37
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
build.gradle
Unescape Escape View File

@ -87,7 +87,7 @@ dependencies {
provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2' provided group: 'com.squareup.dagger', name: 'dagger-compiler', version: '1.2.2'
compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2' compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.2'
compile group: 'com.jakewharton', name: 'butterknife', version: '6.0.0' compile group: 'com.jakewharton', name: 'butterknife', version: '7.0.1'
compile group: 'com.android.support', name: 'design', version: '22.2.1' compile group: 'com.android.support', name: 'design', version: '22.2.1'

8
src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java
Unescape Escape View File

@ -31,8 +31,8 @@ import org.tasks.ui.MenuColorizer;
import javax.inject.Inject; import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
@ -46,15 +46,15 @@ public class FilterSettingsActivity extends InjectingAppCompatActivity {
@Inject StoreObjectDao storeObjectDao; @Inject StoreObjectDao storeObjectDao;
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@InjectView(R.id.tag_name) EditText filterName; @Bind(R.id.tag_name) EditText filterName;
@InjectView(R.id.toolbar) Toolbar toolbar; @Bind(R.id.toolbar) Toolbar toolbar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
preferences.applyThemeAndStatusBarColor(); preferences.applyThemeAndStatusBarColor();
setContentView(R.layout.filter_settings_activity); setContentView(R.layout.filter_settings_activity);
ButterKnife.inject(this); ButterKnife.bind(this);
filter = getIntent().getParcelableExtra(TOKEN_FILTER); filter = getIntent().getParcelableExtra(TOKEN_FILTER);

8
src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java
Unescape Escape View File

@ -37,8 +37,8 @@ import org.tasks.ui.MenuColorizer;
import javax.inject.Inject; import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
@ -56,15 +56,15 @@ public class TagSettingsActivity extends InjectingAppCompatActivity {
@Inject MetadataDao metadataDao; @Inject MetadataDao metadataDao;
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@InjectView(R.id.tag_name) EditText tagName; @Bind(R.id.tag_name) EditText tagName;
@InjectView(R.id.toolbar) Toolbar toolbar; @Bind(R.id.toolbar) Toolbar toolbar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
preferences.applyThemeAndStatusBarColor(); preferences.applyThemeAndStatusBarColor();
setContentView(R.layout.tag_settings_activity); setContentView(R.layout.tag_settings_activity);
ButterKnife.inject(this); ButterKnife.bind(this);
tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA); tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA);
if (tagData == null) { if (tagData == null) {

6
src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -20,14 +20,14 @@ import org.tasks.preferences.ActivityPreferences;
import javax.inject.Inject; import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView;
public class TaskEditActivity extends AstridActivity { public class TaskEditActivity extends AstridActivity {
@Inject ActivityPreferences preferences; @Inject ActivityPreferences preferences;
@InjectView(R.id.toolbar) Toolbar toolbar; @Bind(R.id.toolbar) Toolbar toolbar;
/** /**
* @see android.app.Activity#onCreate(Bundle) * @see android.app.Activity#onCreate(Bundle)
@ -38,7 +38,7 @@ public class TaskEditActivity extends AstridActivity {
preferences.applyThemeAndStatusBarColor(); preferences.applyThemeAndStatusBarColor();
setContentView(R.layout.task_edit_wrapper_activity); setContentView(R.layout.task_edit_wrapper_activity);
ButterKnife.inject(this); ButterKnife.bind(this);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
ActionBar supportActionBar = getSupportActionBar(); ActionBar supportActionBar = getSupportActionBar();

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

@ -75,7 +75,6 @@ import com.todoroo.astrid.utility.Flags;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.tasks.R; import org.tasks.R;
import org.tasks.activities.CalendarSelectionDialog;
import org.tasks.activities.LocationPickerActivity; import org.tasks.activities.LocationPickerActivity;
import org.tasks.activities.TimePickerActivity; import org.tasks.activities.TimePickerActivity;
import org.tasks.dialogs.DialogBuilder; import org.tasks.dialogs.DialogBuilder;
@ -96,8 +95,8 @@ import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView;
import static com.todoroo.andlib.utility.AndroidUtilities.preGingerbreadMR1; import static com.todoroo.andlib.utility.AndroidUtilities.preGingerbreadMR1;
import static org.tasks.files.FileHelper.getPathFromUri; import static org.tasks.files.FileHelper.getPathFromUri;
@ -188,14 +187,14 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
private ReminderControlSet reminderControlSet; private ReminderControlSet reminderControlSet;
private GCalControlSet gcalControl; private GCalControlSet gcalControl;
@InjectView(R.id.title) EditText title; @Bind(R.id.title) EditText title;
@InjectView(R.id.pager) ViewPager mPager; @Bind(R.id.pager) ViewPager mPager;
@InjectView(R.id.updatesFooter) View commentsBar; @Bind(R.id.updatesFooter) View commentsBar;
@InjectView(R.id.completeBox) CheckableImageView checkbox; @Bind(R.id.completeBox) CheckableImageView checkbox;
@InjectView(R.id.timer_container) LinearLayout timerShortcut; @Bind(R.id.timer_container) LinearLayout timerShortcut;
@InjectView(R.id.basic_controls) LinearLayout basicControls; @Bind(R.id.basic_controls) LinearLayout basicControls;
@InjectView(R.id.edit_scroll) ScrollView scrollView; @Bind(R.id.edit_scroll) ScrollView scrollView;
@InjectView(R.id.commentField) EditText commentField; @Bind(R.id.commentField) EditText commentField;
private final List<TaskEditControlSet> controls = Collections.synchronizedList(new ArrayList<TaskEditControlSet>()); private final List<TaskEditControlSet> controls = Collections.synchronizedList(new ArrayList<TaskEditControlSet>());
@ -255,7 +254,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.task_edit_activity, container, false); View view = inflater.inflate(R.layout.task_edit_activity, container, false);
ButterKnife.inject(this, view); ButterKnife.bind(this, view);
return view; return view;
} }

8
src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
Unescape Escape View File

@ -55,8 +55,8 @@ import java.util.Map.Entry;
import javax.inject.Inject; import javax.inject.Inject;
import butterknife.Bind;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.InjectView;
import static android.text.TextUtils.isEmpty; import static android.text.TextUtils.isEmpty;
@ -143,8 +143,8 @@ public class CustomFilterActivity extends InjectingAppCompatActivity {
@Inject DialogBuilder dialogBuilder; @Inject DialogBuilder dialogBuilder;
@Inject FilterCriteriaProvider filterCriteriaProvider; @Inject FilterCriteriaProvider filterCriteriaProvider;
@InjectView(R.id.tag_name) EditText filterName; @Bind(R.id.tag_name) EditText filterName;
@InjectView(R.id.toolbar) Toolbar toolbar; @Bind(R.id.toolbar) Toolbar toolbar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -153,7 +153,7 @@ public class CustomFilterActivity extends InjectingAppCompatActivity {
preferences.applyThemeAndStatusBarColor(); preferences.applyThemeAndStatusBarColor();
setContentView(R.layout.custom_filter_activity); setContentView(R.layout.custom_filter_activity);
ButterKnife.inject(this); ButterKnife.bind(this);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
ActionBar supportActionBar = getSupportActionBar(); ActionBar supportActionBar = getSupportActionBar();

Write Preview
Loading…
Cancel
Save