Skip to content

Commit 5d475b7

Browse files
committed
Migrate to ButterKnife 7
1 parent 4a92fda commit 5d475b7

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityBackpressureSamples.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3636
super.onCreate(savedInstanceState);
3737
setContentView(R.layout.activity_samples_backpressure);
3838

39-
ButterKnife.inject(this);
39+
ButterKnife.bind(this);
4040
initialize();
4141
}
4242

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityObservableCompositionSamples.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static Intent getCallingIntent(Context context) {
3333
protected void onCreate(Bundle savedInstanceState) {
3434
super.onCreate(savedInstanceState);
3535
setContentView(R.layout.activity_samples_observable_composition);
36-
ButterKnife.inject(this);
36+
ButterKnife.bind(this);
3737
this.initialize();
3838
}
3939

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivityObservableConcatVsFlatMapSample.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import android.util.Log;
2222
import android.widget.TextView;
2323
import android.widget.Toast;
24+
import butterknife.Bind;
2425
import butterknife.ButterKnife;
25-
import butterknife.InjectView;
2626
import butterknife.OnClick;
2727
import com.fernandocejas.android10.rx.sample.R;
2828
import com.fernandocejas.android10.rx.sample.data.LocalDataManager;
@@ -49,9 +49,9 @@ public class ActivityObservableConcatVsFlatMapSample extends BaseActivity {
4949
}
5050
};
5151

52-
@InjectView(R.id.tv_streamOriginalOrder) TextView tv_streamOriginalOrder;
53-
@InjectView(R.id.tv_flatMapResult) TextView tv_flatMapResult;
54-
@InjectView(R.id.tv_concatMapResult) TextView tv_concatMapResult;
52+
@Bind(R.id.tv_streamOriginalOrder) TextView tv_streamOriginalOrder;
53+
@Bind(R.id.tv_flatMapResult) TextView tv_flatMapResult;
54+
@Bind(R.id.tv_concatMapResult) TextView tv_concatMapResult;
5555

5656
private LocalDataManager dataManager;
5757
private Subscription subscription;
@@ -65,7 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
6565
super.onCreate(savedInstanceState);
6666
setContentView(R.layout.activity_sample_observervable_composition_flat_vs_concat);
6767

68-
ButterKnife.inject(this);
68+
ButterKnife.bind(this);
6969
initialize();
7070
populateData();
7171
}

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/ActivitySubscriberSample.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import android.support.v7.widget.LinearLayoutManager;
2222
import android.support.v7.widget.RecyclerView;
2323
import android.widget.Toast;
24+
import butterknife.Bind;
2425
import butterknife.ButterKnife;
25-
import butterknife.InjectView;
2626
import butterknife.OnClick;
2727
import com.fernandocejas.android10.rx.sample.R;
2828
import com.fernandocejas.android10.rx.sample.adapter.ElementsAdapter;
@@ -35,7 +35,7 @@
3535

3636
public class ActivitySubscriberSample extends BaseActivity {
3737

38-
@InjectView(android.R.id.list) RecyclerView rv_elements;
38+
@Bind(android.R.id.list) RecyclerView rv_elements;
3939

4040
private LocalDataManager dataManager;
4141
private ElementsAdapter adapter;
@@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
5151
super.onCreate(savedInstanceState);
5252
setContentView(R.layout.activity_sample_subscriber);
5353

54-
ButterKnife.inject(this);
54+
ButterKnife.bind(this);
5555
initialize();
5656
fillData();
5757
}

app/src/main/java/com/fernandocejas/android10/rx/sample/activity/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class MainActivity extends BaseActivity {
2727
protected void onCreate(Bundle savedInstanceState) {
2828
super.onCreate(savedInstanceState);
2929
setContentView(R.layout.activity_main);
30-
ButterKnife.inject(this);
30+
ButterKnife.bind(this);
3131
this.initialize();
3232
}
3333

app/src/main/java/com/fernandocejas/android10/rx/sample/adapter/ElementsAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import android.view.View;
2323
import android.view.ViewGroup;
2424
import android.widget.TextView;
25+
import butterknife.Bind;
2526
import butterknife.ButterKnife;
26-
import butterknife.InjectView;
2727
import com.fernandocejas.android10.rx.sample.R;
2828
import java.util.ArrayList;
2929
import java.util.List;
@@ -72,11 +72,11 @@ public ElementsAdapter(Context context) {
7272
}
7373

7474
static class ElementViewHolder extends RecyclerView.ViewHolder {
75-
@InjectView(R.id.title) TextView textViewText;
75+
@Bind(R.id.title) TextView textViewText;
7676

7777
public ElementViewHolder(View itemView) {
7878
super(itemView);
79-
ButterKnife.inject(this, itemView);
79+
ButterKnife.bind(this, itemView);
8080
}
8181
}
8282
}

0 commit comments

Comments
 (0)