Skip to content

Commit f2b2bb4

Browse files
author
Xabier I. Losada
committed
Update butterknife to version 7.0.1
InjectView annotations replaced by Bind ButterKnife.inject and ButterKnife.reset replaced by ButterKnife.bind and ButterKnife.unbind
1 parent 317dd33 commit f2b2bb4

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

buildsystem/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ext {
1313

1414
//Libraries
1515
daggerVersion = '2.0'
16-
butterKnifeVersion = '6.0.0'
16+
butterKnifeVersion = '7.0.1'
1717
recyclerViewVersion = '21.0.3'
1818
rxJavaVersion = '1.0.12'
1919
rxAndroidVersion = '0.24.0'

presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/activity/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.os.Bundle;
44
import android.widget.Button;
5+
import butterknife.Bind;
56
import butterknife.ButterKnife;
6-
import butterknife.InjectView;
77
import butterknife.OnClick;
88
import com.fernandocejas.android10.sample.presentation.R;
99

@@ -12,13 +12,13 @@
1212
*/
1313
public class MainActivity extends BaseActivity {
1414

15-
@InjectView(R.id.btn_LoadData) Button btn_LoadData;
15+
@Bind(R.id.btn_LoadData) Button btn_LoadData;
1616

1717
@Override
1818
protected void onCreate(Bundle savedInstanceState) {
1919
super.onCreate(savedInstanceState);
2020
setContentView(R.layout.activity_main);
21-
ButterKnife.inject(this);
21+
ButterKnife.bind(this);
2222
}
2323

2424
/**

presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/adapter/UsersAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import android.view.View;
1111
import android.view.ViewGroup;
1212
import android.widget.TextView;
13+
import butterknife.Bind;
1314
import butterknife.ButterKnife;
14-
import butterknife.InjectView;
1515
import com.fernandocejas.android10.sample.presentation.R;
1616
import com.fernandocejas.android10.sample.presentation.model.UserModel;
1717
import java.util.Collection;
@@ -82,11 +82,11 @@ private void validateUsersCollection(Collection<UserModel> usersCollection) {
8282
}
8383

8484
static class UserViewHolder extends RecyclerView.ViewHolder {
85-
@InjectView(R.id.title) TextView textViewTitle;
85+
@Bind(R.id.title) TextView textViewTitle;
8686

8787
public UserViewHolder(View itemView) {
8888
super(itemView);
89-
ButterKnife.inject(this, itemView);
89+
ButterKnife.bind(this, itemView);
9090
}
9191
}
9292
}

presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/fragment/UserDetailsFragment.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import android.widget.Button;
1313
import android.widget.RelativeLayout;
1414
import android.widget.TextView;
15+
import butterknife.Bind;
1516
import butterknife.ButterKnife;
16-
import butterknife.InjectView;
1717
import butterknife.OnClick;
1818
import com.fernandocejas.android10.sample.presentation.R;
1919
import com.fernandocejas.android10.sample.presentation.internal.di.components.UserComponent;
@@ -34,14 +34,14 @@ public class UserDetailsFragment extends BaseFragment implements UserDetailsView
3434

3535
@Inject UserDetailsPresenter userDetailsPresenter;
3636

37-
@InjectView(R.id.iv_cover) AutoLoadImageView iv_cover;
38-
@InjectView(R.id.tv_fullname) TextView tv_fullname;
39-
@InjectView(R.id.tv_email) TextView tv_email;
40-
@InjectView(R.id.tv_followers) TextView tv_followers;
41-
@InjectView(R.id.tv_description) TextView tv_description;
42-
@InjectView(R.id.rl_progress) RelativeLayout rl_progress;
43-
@InjectView(R.id.rl_retry) RelativeLayout rl_retry;
44-
@InjectView(R.id.bt_retry) Button bt_retry;
37+
@Bind(R.id.iv_cover) AutoLoadImageView iv_cover;
38+
@Bind(R.id.tv_fullname) TextView tv_fullname;
39+
@Bind(R.id.tv_email) TextView tv_email;
40+
@Bind(R.id.tv_followers) TextView tv_followers;
41+
@Bind(R.id.tv_description) TextView tv_description;
42+
@Bind(R.id.rl_progress) RelativeLayout rl_progress;
43+
@Bind(R.id.rl_retry) RelativeLayout rl_retry;
44+
@Bind(R.id.bt_retry) Button bt_retry;
4545

4646
public UserDetailsFragment() { super(); }
4747

@@ -59,7 +59,7 @@ public static UserDetailsFragment newInstance(int userId) {
5959
Bundle savedInstanceState) {
6060

6161
View fragmentView = inflater.inflate(R.layout.fragment_user_details, container, false);
62-
ButterKnife.inject(this, fragmentView);
62+
ButterKnife.bind(this, fragmentView);
6363

6464
return fragmentView;
6565
}
@@ -81,7 +81,7 @@ public static UserDetailsFragment newInstance(int userId) {
8181

8282
@Override public void onDestroyView() {
8383
super.onDestroyView();
84-
ButterKnife.reset(this);
84+
ButterKnife.unbind(this);
8585
}
8686

8787
@Override public void onDestroy() {

presentation/src/main/java/com/fernandocejas/android10/sample/presentation/view/fragment/UserListFragment.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import android.view.ViewGroup;
1414
import android.widget.Button;
1515
import android.widget.RelativeLayout;
16+
import butterknife.Bind;
1617
import butterknife.ButterKnife;
17-
import butterknife.InjectView;
1818
import butterknife.OnClick;
1919
import com.fernandocejas.android10.sample.presentation.R;
2020
import com.fernandocejas.android10.sample.presentation.internal.di.components.UserComponent;
@@ -41,10 +41,10 @@ public interface UserListListener {
4141

4242
@Inject UserListPresenter userListPresenter;
4343

44-
@InjectView(R.id.rv_users) RecyclerView rv_users;
45-
@InjectView(R.id.rl_progress) RelativeLayout rl_progress;
46-
@InjectView(R.id.rl_retry) RelativeLayout rl_retry;
47-
@InjectView(R.id.bt_retry) Button bt_retry;
44+
@Bind(R.id.rv_users) RecyclerView rv_users;
45+
@Bind(R.id.rl_progress) RelativeLayout rl_progress;
46+
@Bind(R.id.rl_retry) RelativeLayout rl_retry;
47+
@Bind(R.id.bt_retry) Button bt_retry;
4848

4949
private UsersAdapter usersAdapter;
5050
private UsersLayoutManager usersLayoutManager;
@@ -64,7 +64,7 @@ public interface UserListListener {
6464
Bundle savedInstanceState) {
6565

6666
View fragmentView = inflater.inflate(R.layout.fragment_user_list, container, true);
67-
ButterKnife.inject(this, fragmentView);
67+
ButterKnife.bind(this, fragmentView);
6868
setupUI();
6969

7070
return fragmentView;
@@ -93,7 +93,7 @@ public interface UserListListener {
9393

9494
@Override public void onDestroyView() {
9595
super.onDestroyView();
96-
ButterKnife.reset(this);
96+
ButterKnife.unbind(this);
9797
}
9898

9999
private void initialize() {

0 commit comments

Comments
 (0)