Skip to content

Commit e42ee1e

Browse files
author
Kaushik Gopal
committed
chore: upgrade ButterKnife 5.1.1 -> 7.0.1
cause why not.
1 parent 46504fb commit e42ee1e

22 files changed

+145
-101
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
compile 'io.reactivex:rxjava-math:1.0.0'
1111
compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
1212

13-
compile 'com.jakewharton:butterknife:5.1.1'
13+
compile 'com.jakewharton:butterknife:7.0.1'
1414
compile 'com.jakewharton.timber:timber:2.4.2'
1515
compile 'com.squareup.retrofit:retrofit:2.0.0-beta1'
1616
compile 'com.squareup.retrofit:adapter-rxjava:2.0.0-beta1'

‎app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99
import android.view.ViewGroup;
1010
import android.widget.Button;
1111
import android.widget.ListView;
12-
import butterknife.ButterKnife;
13-
import butterknife.InjectView;
12+
1413
import com.jakewharton.rxbinding.view.RxView;
1514
import com.jakewharton.rxbinding.view.ViewClickEvent;
1615
import com.morihacky.android.rxjava.R;
1716
import com.morihacky.android.rxjava.wiring.LogAdapter;
17+
1818
import java.util.ArrayList;
1919
import java.util.List;
2020
import java.util.concurrent.TimeUnit;
21+
22+
import butterknife.Bind;
23+
import butterknife.ButterKnife;
2124
import rx.Observer;
2225
import rx.Subscription;
2326
import rx.android.schedulers.AndroidSchedulers;
@@ -41,8 +44,8 @@
4144
public class BufferDemoFragment
4245
extends BaseFragment {
4346

44-
@InjectView(R.id.list_threading_log) ListView _logsList;
45-
@InjectView(R.id.btn_start_operation) Button _tapBtn;
47+
@Bind(R.id.list_threading_log) ListView _logsList;
48+
@Bind(R.id.btn_start_operation) Button _tapBtn;
4649

4750
private LogAdapter _adapter;
4851
private List<String> _logs;
@@ -72,7 +75,7 @@ public View onCreateView(LayoutInflater inflater,
7275
@Nullable ViewGroup container,
7376
@Nullable Bundle savedInstanceState) {
7477
View layout = inflater.inflate(R.layout.fragment_buffer, container, false);
75-
ButterKnife.inject(this, layout);
78+
ButterKnife.bind(this, layout);
7679
return layout;
7780
}
7881

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
import android.widget.ArrayAdapter;
1212
import android.widget.ListView;
1313
import android.widget.ProgressBar;
14-
import butterknife.ButterKnife;
15-
import butterknife.InjectView;
16-
import butterknife.OnClick;
14+
1715
import com.morihacky.android.rxjava.R;
16+
1817
import java.util.ArrayList;
1918
import java.util.List;
19+
20+
import butterknife.Bind;
21+
import butterknife.ButterKnife;
22+
import butterknife.OnClick;
2023
import rx.Observable;
2124
import rx.Observer;
2225
import rx.Subscription;
@@ -28,8 +31,8 @@
2831
public class ConcurrencyWithSchedulersDemoFragment
2932
extends BaseFragment {
3033

31-
@InjectView(R.id.progress_operation_running) ProgressBar _progress;
32-
@InjectView(R.id.list_threading_log) ListView _logsList;
34+
@Bind(R.id.progress_operation_running) ProgressBar _progress;
35+
@Bind(R.id.list_threading_log) ListView _logsList;
3336

3437
private LogAdapter _adapter;
3538
private List<String> _logs;
@@ -54,7 +57,7 @@ public View onCreateView(LayoutInflater inflater,
5457
@Nullable ViewGroup container,
5558
@Nullable Bundle savedInstanceState) {
5659
View layout = inflater.inflate(R.layout.fragment_concurrency_schedulers, container, false);
57-
ButterKnife.inject(this, layout);
60+
ButterKnife.bind(this, layout);
5861
return layout;
5962
}
6063

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,18 @@
1111
import android.widget.ArrayAdapter;
1212
import android.widget.EditText;
1313
import android.widget.ListView;
14-
import butterknife.ButterKnife;
15-
import butterknife.InjectView;
16-
import butterknife.OnClick;
14+
1715
import com.jakewharton.rxbinding.widget.RxTextView;
1816
import com.jakewharton.rxbinding.widget.TextViewTextChangeEvent;
1917
import com.morihacky.android.rxjava.R;
18+
2019
import java.util.ArrayList;
2120
import java.util.List;
2221
import java.util.concurrent.TimeUnit;
22+
23+
import butterknife.Bind;
24+
import butterknife.ButterKnife;
25+
import butterknife.OnClick;
2326
import rx.Observer;
2427
import rx.Subscription;
2528
import rx.android.schedulers.AndroidSchedulers;
@@ -30,8 +33,8 @@
3033
public class DebounceSearchEmitterFragment
3134
extends BaseFragment {
3235

33-
@InjectView(R.id.list_threading_log) ListView _logsList;
34-
@InjectView(R.id.input_txt_debounce) EditText _inputSearchText;
36+
@Bind(R.id.list_threading_log) ListView _logsList;
37+
@Bind(R.id.input_txt_debounce) EditText _inputSearchText;
3538

3639
private LogAdapter _adapter;
3740
private List<String> _logs;
@@ -51,7 +54,7 @@ public View onCreateView(LayoutInflater inflater,
5154
@Nullable ViewGroup container,
5255
@Nullable Bundle savedInstanceState) {
5356
View layout = inflater.inflate(R.layout.fragment_debounce, container, false);
54-
ButterKnife.inject(this, layout);
57+
ButterKnife.bind(this, layout);
5558
return layout;
5659
}
5760

‎app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import android.view.ViewGroup;
88
import android.widget.EditText;
99
import android.widget.TextView;
10+
11+
import com.morihacky.android.rxjava.R;
12+
13+
import butterknife.Bind;
1014
import butterknife.ButterKnife;
11-
import butterknife.InjectView;
1215
import butterknife.OnTextChanged;
13-
import com.morihacky.android.rxjava.R;
1416
import rx.Subscription;
1517
import rx.functions.Action1;
1618
import rx.subjects.PublishSubject;
@@ -20,9 +22,9 @@
2022
public class DoubleBindingTextViewFragment
2123
extends BaseFragment {
2224

23-
@InjectView(R.id.double_binding_num1) EditText _number1;
24-
@InjectView(R.id.double_binding_num2) EditText _number2;
25-
@InjectView(R.id.double_binding_result) TextView _result;
25+
@Bind(R.id.double_binding_num1) EditText _number1;
26+
@Bind(R.id.double_binding_num2) EditText _number2;
27+
@Bind(R.id.double_binding_result) TextView _result;
2628

2729
Subscription _subscription;
2830
PublishSubject<Float> _resultEmitterSubject;
@@ -32,7 +34,7 @@ public View onCreateView(LayoutInflater inflater,
3234
@Nullable ViewGroup container,
3335
@Nullable Bundle savedInstanceState) {
3436
View layout = inflater.inflate(R.layout.fragment_double_binding_textview, container, false);
35-
ButterKnife.inject(this, layout);
37+
ButterKnife.bind(this, layout);
3638

3739
_resultEmitterSubject = PublishSubject.create();
3840
_subscription = _resultEmitterSubject.asObservable().subscribe(new Action1<Float>() {

‎app/src/main/java/com/morihacky/android/rxjava/fragments/ExponentialBackoffFragment.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
import android.view.View;
88
import android.view.ViewGroup;
99
import android.widget.ListView;
10-
import butterknife.ButterKnife;
11-
import butterknife.InjectView;
12-
import butterknife.OnClick;
10+
1311
import com.morihacky.android.rxjava.R;
1412
import com.morihacky.android.rxjava.RxUtils;
1513
import com.morihacky.android.rxjava.wiring.LogAdapter;
14+
1615
import java.util.ArrayList;
1716
import java.util.List;
1817
import java.util.concurrent.TimeUnit;
18+
19+
import butterknife.Bind;
20+
import butterknife.ButterKnife;
21+
import butterknife.OnClick;
1922
import rx.Observable;
2023
import rx.Observer;
2124
import rx.functions.Action0;
@@ -29,7 +32,7 @@
2932
public class ExponentialBackoffFragment
3033
extends BaseFragment {
3134

32-
@InjectView(R.id.list_threading_log) ListView _logList;
35+
@Bind(R.id.list_threading_log) ListView _logList;
3336
private LogAdapter _adapter;
3437
private List<String> _logs;
3538

@@ -52,7 +55,7 @@ public View onCreateView(LayoutInflater inflater,
5255
@Nullable ViewGroup container,
5356
@Nullable Bundle savedInstanceState) {
5457
View layout = inflater.inflate(R.layout.fragment_exponential_backoff, container, false);
55-
ButterKnife.inject(this, layout);
58+
ButterKnife.bind(this, layout);
5659
return layout;
5760
}
5861

‎app/src/main/java/com/morihacky/android/rxjava/fragments/FormValidationCombineLatestFragment.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
import android.view.ViewGroup;
88
import android.widget.EditText;
99
import android.widget.TextView;
10-
import butterknife.ButterKnife;
11-
import butterknife.InjectView;
10+
1211
import com.jakewharton.rxbinding.widget.RxTextView;
1312
import com.morihacky.android.rxjava.R;
13+
14+
import butterknife.Bind;
15+
import butterknife.ButterKnife;
1416
import rx.Observable;
1517
import rx.Observer;
1618
import rx.Subscription;
@@ -23,10 +25,10 @@
2325
public class FormValidationCombineLatestFragment
2426
extends BaseFragment {
2527

26-
@InjectView(R.id.btn_demo_form_valid) TextView _btnValidIndicator;
27-
@InjectView(R.id.demo_combl_email) EditText _email;
28-
@InjectView(R.id.demo_combl_password) EditText _password;
29-
@InjectView(R.id.demo_combl_num) EditText _number;
28+
@Bind(R.id.btn_demo_form_valid) TextView _btnValidIndicator;
29+
@Bind(R.id.demo_combl_email) EditText _email;
30+
@Bind(R.id.demo_combl_password) EditText _password;
31+
@Bind(R.id.demo_combl_num) EditText _number;
3032

3133
private Observable<CharSequence> _emailChangeObservable;
3234
private Observable<CharSequence> _passwordChangeObservable;
@@ -41,7 +43,7 @@ public View onCreateView(LayoutInflater inflater,
4143
View layout = inflater.inflate(R.layout.fragment_form_validation_comb_latest,
4244
container,
4345
false);
44-
ButterKnife.inject(this, layout);
46+
ButterKnife.bind(this, layout);
4547

4648
_emailChangeObservable = RxTextView.textChanges(_email).skip(1);
4749
_passwordChangeObservable = RxTextView.textChanges(_password).skip(1);

‎app/src/main/java/com/morihacky/android/rxjava/fragments/MainFragment.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
import android.view.LayoutInflater;
88
import android.view.View;
99
import android.view.ViewGroup;
10-
import butterknife.ButterKnife;
11-
import butterknife.OnClick;
10+
1211
import com.morihacky.android.rxjava.R;
1312
import com.morihacky.android.rxjava.rxbus.RxBusDemoFragment;
1413

14+
import butterknife.ButterKnife;
15+
import butterknife.OnClick;
16+
1517
public class MainFragment
1618
extends BaseFragment {
1719

@@ -20,7 +22,7 @@ public View onCreateView(LayoutInflater inflater,
2022
@Nullable ViewGroup container,
2123
@Nullable Bundle savedInstanceState) {
2224
View layout = inflater.inflate(R.layout.fragment_main, container, false);
23-
ButterKnife.inject(this, layout);
25+
ButterKnife.bind(this, layout);
2426
return layout;
2527
}
2628

‎app/src/main/java/com/morihacky/android/rxjava/fragments/PollingFragment.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010
import android.view.ViewGroup;
1111
import android.widget.ArrayAdapter;
1212
import android.widget.ListView;
13-
import butterknife.ButterKnife;
14-
import butterknife.InjectView;
15-
import butterknife.OnClick;
13+
1614
import com.morihacky.android.rxjava.R;
15+
1716
import java.util.ArrayList;
1817
import java.util.List;
1918
import java.util.concurrent.TimeUnit;
19+
20+
import butterknife.Bind;
21+
import butterknife.ButterKnife;
22+
import butterknife.OnClick;
2023
import rx.Observable;
2124
import rx.Subscriber;
2225
import rx.functions.Action0;
@@ -30,7 +33,7 @@ public class PollingFragment
3033

3134
public static final int INITIAL_DELAY = 0;
3235
public static final int POLLING_INTERVAL = 1000;
33-
@InjectView(R.id.list_threading_log) ListView _logsList;
36+
@Bind(R.id.list_threading_log) ListView _logsList;
3437

3538
private LogAdapter _adapter;
3639
private List<String> _logs;
@@ -55,7 +58,7 @@ public View onCreateView(LayoutInflater inflater,
5558
@Nullable ViewGroup container,
5659
@Nullable Bundle savedInstanceState) {
5760
View layout = inflater.inflate(R.layout.fragment_polling, container, false);
58-
ButterKnife.inject(this, layout);
61+
ButterKnife.bind(this, layout);
5962
return layout;
6063
}
6164

‎app/src/main/java/com/morihacky/android/rxjava/fragments/PseudoCacheConcatFragment.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import android.view.ViewGroup;
99
import android.widget.ArrayAdapter;
1010
import android.widget.ListView;
11-
import butterknife.ButterKnife;
12-
import butterknife.InjectView;
13-
import butterknife.OnClick;
11+
1412
import com.morihacky.android.rxjava.R;
1513
import com.morihacky.android.rxjava.retrofit.Contributor;
1614
import com.morihacky.android.rxjava.retrofit.GithubApi;
@@ -27,6 +25,9 @@
2725
import retrofit.GsonConverterFactory;
2826
import retrofit.Retrofit;
2927
import retrofit.RxJavaCallAdapterFactory;
28+
import butterknife.Bind;
29+
import butterknife.ButterKnife;
30+
import butterknife.OnClick;
3031
import rx.Observable;
3132
import rx.Subscriber;
3233
import rx.Subscription;
@@ -39,7 +40,7 @@
3940
public class PseudoCacheConcatFragment
4041
extends BaseFragment {
4142

42-
@InjectView(R.id.log_list) ListView _resultList;
43+
@Bind(R.id.log_list) ListView _resultList;
4344

4445
private Subscription _subscription = null;
4546
private HashMap<String, Long> _contributionMap = null;
@@ -50,7 +51,7 @@ public View onCreateView(LayoutInflater inflater,
5051
@Nullable ViewGroup container,
5152
@Nullable Bundle savedInstanceState) {
5253
View layout = inflater.inflate(R.layout.fragment_pseudo_cache_concat, container, false);
53-
ButterKnife.inject(this, layout);
54+
ButterKnife.bind(this, layout);
5455
_initializeCache();
5556
return layout;
5657
}

0 commit comments

Comments
 (0)