Update to Butterknife 7

app/build.gradle

@@ -66,6 +66,7 @@ android {
     }
     lintOptions {
         disable 'MissingTranslation'
+        disable 'InvalidPackage'
     }
 }
 
@@ -96,5 +97,5 @@ dependencies {
     compile 'com.afollestad:material-dialogs:0.7.6.0'
     compile 'com.afollestad:material-cab:0.1.4'
 
-    compile 'com.jakewharton:butterknife:6.1.0'
+    compile 'com.jakewharton:butterknife:7.0.1'
 }

app/proguard-rules.pro

@@ -24,5 +24,17 @@
 
 -keep class !android.support.v7.internal.view.menu.**,** {*;}
 
+-keep class butterknife.** { *; }
+-dontwarn butterknife.internal.**
+-keep class **$$ViewBinder { *; }
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <fields>;
+}
+
+-keepclasseswithmembernames class * {
+    @butterknife.* <methods>;
+}
+
 -dontwarn
 -ignorewarnings

app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java

@@ -143,7 +143,7 @@ public class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.ViewHolder
     public class ViewHolder extends MediaEntryViewHolder {
         public ViewHolder(@NonNull View itemView, int itemViewType) {
             super(itemView);
-            ButterKnife.inject(this, itemView);
+            ButterKnife.bind(this, itemView);
             itemView.setOnLongClickListener(null);
 
             if (itemViewType != HEADER) {

app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java

@@ -10,60 +10,53 @@ import android.widget.TextView;
 
 import com.kabouzeid.gramophone.R;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
-import butterknife.Optional;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public abstract class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
     @Nullable
-    @Optional
+    @Bind(R.id.image)
-    @InjectView(R.id.image)
     public ImageView image;
+
     @Nullable
-    @Optional
+    @Bind(R.id.image_text)
-    @InjectView(R.id.image_text)
     public TextView imageText;
 
     @Nullable
-    @Optional
+    @Bind(R.id.title)
-    @InjectView(R.id.title)
     public TextView title;
+
     @Nullable
-    @Optional
+    @Bind(R.id.text)
-    @InjectView(R.id.text)
     public TextView text;
 
     @Nullable
-    @Optional
+    @Bind(R.id.menu)
-    @InjectView(R.id.menu)
     public View menu;
 
     @Nullable
-    @Optional
+    @Bind(R.id.separator)
-    @InjectView(R.id.separator)
     public View separator;
+
     @Nullable
-    @Optional
+    @Bind(R.id.short_separator)
-    @InjectView(R.id.short_separator)
     public View shortSeparator;
 
     @Nullable
-    @Optional
+    @Bind(R.id.selected_indicator)
-    @InjectView(R.id.selected_indicator)
     public View selectedIndicator;
 
     @Nullable
-    @Optional
+    @Bind(R.id.palette_color_container)
-    @InjectView(R.id.palette_color_container)
     public View paletteColorContainer;
     public int paletteColor;
 
     public MediaEntryViewHolder(View itemView) {
         super(itemView);
-        ButterKnife.inject(this, itemView);
+        ButterKnife.bind(this, itemView);
 
         itemView.setOnClickListener(this);
         itemView.setOnLongClickListener(this);

app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java

@@ -29,16 +29,16 @@ import com.triggertrap.seekarc.SeekArc;
 
 import java.lang.reflect.Field;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class SleepTimerDialog extends DialogFragment {
-    @InjectView(R.id.seek_arc)
+    @Bind(R.id.seek_arc)
     SeekArc seekArc;
-    @InjectView(R.id.timer_display)
+    @Bind(R.id.timer_display)
     TextView timerDisplay;
 
     private int seekArcProgress;
@@ -106,7 +106,7 @@ public class SleepTimerDialog extends DialogFragment {
             return materialDialog;
         }
 
-        ButterKnife.inject(this, materialDialog.getCustomView());
+        ButterKnife.bind(this, materialDialog.getCustomView());
 
         seekArc.post(new Runnable() {
             @Override

app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java

@@ -50,12 +50,12 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 import com.nostra13.universalimageloader.core.process.BitmapProcessor;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 /**
  * A lot of hackery is done in this activity. Changing things may will brake the whole activity.
- * <p>
+ * <p/>
  * Should be kinda stable ONLY AS IT IS!!!
  */
 public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder {
@@ -67,17 +67,17 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
     private Album album;
 
-    @InjectView(R.id.list)
+    @Bind(R.id.list)
     ObservableRecyclerView recyclerView;
-    @InjectView(R.id.image)
+    @Bind(R.id.image)
     ImageView albumArtImageView;
-    @InjectView(R.id.album_art_background)
+    @Bind(R.id.album_art_background)
     ImageView albumArtBackground;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
-    @InjectView(R.id.title)
+    @Bind(R.id.title)
     TextView albumTitleView;
-    @InjectView(R.id.list_background)
+    @Bind(R.id.list_background)
     View songsBackgroundView;
 
     private AlbumSongAdapter adapter;
@@ -95,7 +95,7 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
         setStatusBarTransparent();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_album_detail);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             postponeEnterTransition();

app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java

@@ -58,15 +58,15 @@ import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 import com.nostra13.universalimageloader.core.process.BitmapProcessor;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
 
 /**
  * A lot of hackery is done in this activity. Changing things may will brake the whole activity.
- * <p>
+ * <p/>
  * Should be kinda stable ONLY AS IT IS!!!
  */
 public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implements PaletteColorHolder, CabHolder {
@@ -75,17 +75,17 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     public static final String EXTRA_ARTIST_ID = "extra_artist_id";
 
-    @InjectView(R.id.artist_image_background)
+    @Bind(R.id.artist_image_background)
     ImageView artistImageBackground;
-    @InjectView(R.id.image)
+    @Bind(R.id.image)
     SquareIfPlaceImageView artistImage;
-    @InjectView(R.id.list_background)
+    @Bind(R.id.list_background)
     View songListBackground;
-    @InjectView(R.id.list)
+    @Bind(R.id.list)
     ObservableListView songListView;
-    @InjectView(R.id.title)
+    @Bind(R.id.title)
     TextView artistName;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
 
     View songListHeader;
@@ -112,7 +112,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
         setStatusBarTransparent();
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_artist_detail);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             postponeEnterTransition();

app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java

@@ -67,25 +67,25 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 public class MainActivity extends AbsSlidingMusicPanelActivity
         implements KabViewsDisableAble, CabHolder {
 
     public static final String TAG = MainActivity.class.getSimpleName();
 
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
-    @InjectView(R.id.tabs)
+    @Bind(R.id.tabs)
     TabLayout tabs;
-    @InjectView(R.id.appbar)
+    @Bind(R.id.appbar)
     AppBarLayout appbar;
-    @InjectView(R.id.pager)
+    @Bind(R.id.pager)
     ViewPager pager;
-    @InjectView(R.id.navigation_view)
+    @Bind(R.id.navigation_view)
     NavigationView navigationView;
-    @InjectView(R.id.drawer_layout)
+    @Bind(R.id.drawer_layout)
     DrawerLayout drawerLayout;
 
     private ActionBarDrawerToggle drawerToggle;
@@ -98,7 +98,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         setUpDrawerLayout();
         setUpToolbar();

app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java

@@ -65,8 +65,8 @@ import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListene
 import java.io.File;
 import java.lang.ref.WeakReference;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import hugo.weaving.DebugLog;
 
 public class MusicControllerActivity extends AbsSlidingMusicPanelActivity {
@@ -77,31 +77,31 @@ public class MusicControllerActivity extends AbsSlidingMusicPanelActivity {
 
     private static final int CMD_UPDATE_PROGRESS_VIEWS = 1;
 
-    @InjectView(R.id.title)
+    @Bind(R.id.title)
     TextView songTitle;
-    @InjectView(R.id.text)
+    @Bind(R.id.text)
     TextView songArtist;
-    @InjectView(R.id.footer)
+    @Bind(R.id.footer)
     LinearLayout footer;
-    @InjectView(R.id.playback_controller_card)
+    @Bind(R.id.playback_controller_card)
     CardView playbackControllerCard;
-    @InjectView(R.id.prev_button)
+    @Bind(R.id.prev_button)
     ImageButton prevButton;
-    @InjectView(R.id.next_button)
+    @Bind(R.id.next_button)
     ImageButton nextButton;
-    @InjectView(R.id.repeat_button)
+    @Bind(R.id.repeat_button)
     ImageButton repeatButton;
-    @InjectView(R.id.shuffle_button)
+    @Bind(R.id.shuffle_button)
     ImageButton shuffleButton;
-    @InjectView(R.id.media_controller_container)
+    @Bind(R.id.media_controller_container)
     RelativeLayout mediaControllerContainer;
-    @InjectView(R.id.album_art_background)
+    @Bind(R.id.album_art_background)
     ImageView albumArtBackground;
-    @InjectView(R.id.image)
+    @Bind(R.id.image)
     SquareIfPlaceImageView albumArt;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
-    @InjectView(R.id.favorite_icon)
+    @Bind(R.id.favorite_icon)
     ImageView favoriteIcon;
 
     TextView songCurrentProgress;
@@ -129,7 +129,7 @@ public class MusicControllerActivity extends AbsSlidingMusicPanelActivity {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_music_controller);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         initAppearanceVarsFromSharedPrefs();
         initProgressSliderDependentViews();

app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java

@@ -28,8 +28,8 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PlaylistsUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder {
 
@@ -38,11 +38,11 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     @NonNull
     public static String EXTRA_PLAYLIST = "extra_playlist";
 
-    @InjectView(R.id.recycler_view)
+    @Bind(R.id.recycler_view)
     RecyclerView recyclerView;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
-    @InjectView(android.R.id.empty)
+    @Bind(android.R.id.empty)
     TextView empty;
 
     private Playlist playlist;
@@ -53,7 +53,7 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_playlist_detail);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         getIntentExtras();
 

app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java

@@ -24,18 +24,18 @@ import com.kabouzeid.gramophone.adapter.SearchAdapter;
 import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.util.Util;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 public class SearchActivity extends AbsBaseActivity {
 
     public static final String TAG = SearchActivity.class.getSimpleName();
-    @InjectView(R.id.recycler_view)
+    @Bind(R.id.recycler_view)
     RecyclerView recyclerView;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
     @SuppressWarnings("ButterKnifeNoViewWithId")
-    @InjectView(android.R.id.empty)
+    @Bind(android.R.id.empty)
     TextView empty;
 
 
@@ -48,7 +48,7 @@ public class SearchActivity extends AbsBaseActivity {
         setTitle(null);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
         searchAdapter = new SearchAdapter(this);

app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java

@@ -50,8 +50,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -70,15 +70,15 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     private int paletteColorPrimary;
     private boolean isInNoImageMode;
 
-    @InjectView(R.id.play_pause_fab)
+    @Bind(R.id.play_pause_fab)
     FloatingActionButton fab;
-    @InjectView(R.id.observableScrollView)
+    @Bind(R.id.observableScrollView)
     ObservableScrollView observableScrollView;
-    @InjectView(R.id.toolbar)
+    @Bind(R.id.toolbar)
     Toolbar toolbar;
-    @InjectView(R.id.image)
+    @Bind(R.id.image)
     ImageView image;
-    @InjectView(R.id.header)
+    @Bind(R.id.header)
     LinearLayout header;
 
     private List<String> songPaths;
@@ -87,7 +87,7 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(getContentViewLayout());
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         getIntentExtras();
 

app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java

@@ -35,8 +35,8 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import retrofit.client.Response;
@@ -45,13 +45,13 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
 
     public static final String TAG = AlbumTagEditorActivity.class.getSimpleName();
 
-    @InjectView(R.id.title)
+    @Bind(R.id.title)
     EditText albumTitle;
-    @InjectView(R.id.album_artist)
+    @Bind(R.id.album_artist)
     EditText albumArtist;
-    @InjectView(R.id.genre)
+    @Bind(R.id.genre)
     EditText genre;
-    @InjectView(R.id.year)
+    @Bind(R.id.year)
     EditText year;
 
     private Bitmap albumArtBitmap;
@@ -61,7 +61,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         lastFMRestClient = new LastFMRestClient(this);
 

app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java

@@ -17,30 +17,30 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
 
 public class SongTagEditorActivity extends AbsTagEditorActivity implements TextWatcher {
 
     public static final String TAG = SongTagEditorActivity.class.getSimpleName();
 
-    @InjectView(R.id.title1)
+    @Bind(R.id.title1)
     EditText songTitle;
-    @InjectView(R.id.title2)
+    @Bind(R.id.title2)
     EditText albumTitle;
-    @InjectView(R.id.artist)
+    @Bind(R.id.artist)
     EditText artist;
-    @InjectView(R.id.genre)
+    @Bind(R.id.genre)
     EditText genre;
-    @InjectView(R.id.year)
+    @Bind(R.id.year)
     EditText year;
-    @InjectView(R.id.image_text)
+    @Bind(R.id.image_text)
     EditText trackNumber;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         setNoImageMode();
         setUpViews();

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java

@@ -17,9 +17,8 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.interfaces.MusicStateListener;
 import com.kabouzeid.gramophone.views.FastScroller;
 
+import butterknife.Bind;
 import butterknife.ButterKnife;
-import butterknife.InjectView;
-import butterknife.Optional;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -28,15 +27,13 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
 
     public static final String TAG = AbsMainActivityRecyclerViewFragment.class.getSimpleName();
 
-    @InjectView(R.id.recycler_view)
+    @Bind(R.id.recycler_view)
     RecyclerView recyclerView;
     @Nullable
-    @Optional
+    @Bind(android.R.id.empty)
-    @InjectView(android.R.id.empty)
     TextView empty;
     @Nullable
-    @Optional
+    @Bind(R.id.fast_scroller)
-    @InjectView(R.id.fast_scroller)
     FastScroller fastScroller;
 
     private A adapter;
@@ -45,7 +42,7 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(getLayoutRes(), container, false);
-        ButterKnife.inject(this, view);
+        ButterKnife.bind(this, view);
         return view;
     }
 
@@ -163,7 +160,7 @@ public abstract class AbsMainActivityRecyclerViewFragment<A extends RecyclerView
         super.onDestroyView();
         getMainActivity().removeOnAppBarOffsetChangedListener(this);
         getMainActivity().removeMusicStateListenerListener(this);
-        ButterKnife.reset(this);
+        ButterKnife.unbind(this);
     }
 
     protected int getDefaultGridColumnNumber() {