Updated to butterknife 8.

app/build.gradle

@@ -15,6 +15,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 apply plugin: 'com.jakewharton.hugo'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'android-apt'
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
@@ -136,7 +137,6 @@ dependencies {
     compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.3.0-kmod3'
     compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.jakewharton:butterknife:7.0.1'
     //noinspection GradleDynamicVersion
     compile 'com.anjlab.android.iab.v3:library:1.0.+'
     compile 'de.psdev.licensesdialog:licensesdialog:1.8.1'
@@ -146,4 +146,7 @@ dependencies {
     compile 'com.heinrichreimersoftware:material-intro:1.5.7'
     compile 'me.zhanghai.android.materialprogressbar:library:1.1.7'
     compile 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
+
+    compile 'com.jakewharton:butterknife:8.2.1'
+    apt 'com.jakewharton:butterknife-compiler:8.2.1'
 }

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

@@ -19,8 +19,9 @@ import com.kabouzeid.gramophone.util.PreferenceUtil;
 
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -75,7 +76,9 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
     public static class AlbumCoverFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener {
         private static final String SONG_ARG = "song";
 
-        @Bind(R.id.player_image)
+        private Unbinder unbinder;
+
+        @BindView(R.id.player_image)
         ImageView albumCover;
 
         private boolean isColorReady;
@@ -102,7 +105,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
             View view = inflater.inflate(R.layout.fragment_album_cover, container, false);
-            ButterKnife.bind(this, view);
+            unbinder = ButterKnife.bind(this, view);
             return view;
         }
 
@@ -120,7 +123,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter {
         public void onDestroyView() {
             super.onDestroyView();
             PreferenceUtil.getInstance(getActivity()).unregisterOnSharedPreferenceChangedListener(this);
-            ButterKnife.unbind(this);
+            unbinder.unbind();
             colorReceiver = null;
         }
 

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

@@ -10,7 +10,7 @@ import android.widget.TextView;
 
 import com.kabouzeid.gramophone.R;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -18,39 +18,39 @@ import butterknife.ButterKnife;
  */
 public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
     @Nullable
-    @Bind(R.id.image)
+    @BindView(R.id.image)
     public ImageView image;
 
     @Nullable
-    @Bind(R.id.image_text)
+    @BindView(R.id.image_text)
     public TextView imageText;
 
     @Nullable
-    @Bind(R.id.title)
+    @BindView(R.id.title)
     public TextView title;
 
     @Nullable
-    @Bind(R.id.text)
+    @BindView(R.id.text)
     public TextView text;
 
     @Nullable
-    @Bind(R.id.menu)
+    @BindView(R.id.menu)
     public View menu;
 
     @Nullable
-    @Bind(R.id.separator)
+    @BindView(R.id.separator)
     public View separator;
 
     @Nullable
-    @Bind(R.id.short_separator)
+    @BindView(R.id.short_separator)
     public View shortSeparator;
 
     @Nullable
-    @Bind(R.id.drag_view)
+    @BindView(R.id.drag_view)
     public View dragView;
 
     @Nullable
-    @Bind(R.id.palette_color_container)
+    @BindView(R.id.palette_color_container)
     public View paletteColorContainer;
 
     public MediaEntryViewHolder(View itemView) {

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

@@ -36,7 +36,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -234,11 +234,11 @@ public class DonationsDialog extends DialogFragment implements BillingProcessor.
         }
 
         static class ViewHolder {
-            @Bind(R.id.title)
+            @BindView(R.id.title)
             TextView title;
-            @Bind(R.id.text)
+            @BindView(R.id.text)
             TextView text;
-            @Bind(R.id.price)
+            @BindView(R.id.price)
             TextView price;
 
             public ViewHolder(View view) {

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

@@ -24,16 +24,16 @@ import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.triggertrap.seekarc.SeekArc;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class SleepTimerDialog extends DialogFragment {
-    @Bind(R.id.seek_arc)
+    @BindView(R.id.seek_arc)
     SeekArc seekArc;
-    @Bind(R.id.timer_display)
+    @BindView(R.id.timer_display)
     TextView timerDisplay;
 
     private int seekArcProgress;

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

@@ -22,7 +22,7 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.ui.activities.bugreport.BugReportActivity;
 import com.kabouzeid.gramophone.ui.activities.intro.AppIntroActivity;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import de.psdev.licensesdialog.LicensesDialog;
 
@@ -51,45 +51,45 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen
 
     private static String ALEKSANDAR_TESIC_GOOGLE_PLUS = "https://google.com/+aleksandartešić";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.app_version)
+    @BindView(R.id.app_version)
     TextView appVersion;
-    @Bind(R.id.changelog)
+    @BindView(R.id.changelog)
     LinearLayout changelog;
-    @Bind(R.id.intro)
+    @BindView(R.id.intro)
     LinearLayout intro;
-    @Bind(R.id.licenses)
+    @BindView(R.id.licenses)
     LinearLayout licenses;
-    @Bind(R.id.add_to_google_plus_circles)
+    @BindView(R.id.add_to_google_plus_circles)
     LinearLayout addToGooglePlusCircles;
-    @Bind(R.id.follow_on_twitter)
+    @BindView(R.id.follow_on_twitter)
     LinearLayout followOnTwitter;
-    @Bind(R.id.fork_on_git_hub)
+    @BindView(R.id.fork_on_git_hub)
     LinearLayout forkOnGitHub;
-    @Bind(R.id.visit_website)
+    @BindView(R.id.visit_website)
     LinearLayout visitWebsite;
-    @Bind(R.id.report_bugs)
+    @BindView(R.id.report_bugs)
     LinearLayout reportBugs;
-    @Bind(R.id.join_google_plus_community)
+    @BindView(R.id.join_google_plus_community)
     LinearLayout joinGooglePlusCommunity;
-    @Bind(R.id.translate)
+    @BindView(R.id.translate)
     LinearLayout translate;
-    @Bind(R.id.donate)
+    @BindView(R.id.donate)
     LinearLayout donate;
-    @Bind(R.id.rate_on_google_play)
+    @BindView(R.id.rate_on_google_play)
     LinearLayout rateOnGooglePlay;
-    @Bind(R.id.aidan_follestad_google_plus)
+    @BindView(R.id.aidan_follestad_google_plus)
     AppCompatButton aidanFollestadGooglePlus;
-    @Bind(R.id.aidan_follestad_git_hub)
+    @BindView(R.id.aidan_follestad_git_hub)
     AppCompatButton aidanFollestadGitHub;
-    @Bind(R.id.michael_cook_google_plus)
+    @BindView(R.id.michael_cook_google_plus)
     AppCompatButton michaelCookGooglePlus;
-    @Bind(R.id.michael_cook_website)
+    @BindView(R.id.michael_cook_website)
     AppCompatButton michaelCookWebsite;
-    @Bind(R.id.maarten_corpel_google_plus)
+    @BindView(R.id.maarten_corpel_google_plus)
     AppCompatButton maartenCorpelGooglePlus;
-    @Bind(R.id.aleksandar_tesic_google_plus)
+    @BindView(R.id.aleksandar_tesic_google_plus)
     AppCompatButton aleksandarTesicGooglePlus;
 
     @Override

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

@@ -32,9 +32,9 @@ import com.kabouzeid.gramophone.glide.SongGlideRequest;
 import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
+import com.kabouzeid.gramophone.interfaces.LoaderIds;
 import com.kabouzeid.gramophone.interfaces.PaletteColorHolder;
 import com.kabouzeid.gramophone.loader.AlbumLoader;
-import com.kabouzeid.gramophone.interfaces.LoaderIds;
 import com.kabouzeid.gramophone.misc.SimpleObservableScrollViewCallbacks;
 import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
 import com.kabouzeid.gramophone.model.Album;
@@ -45,7 +45,7 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.Util;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -61,15 +61,15 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
 
     private Album album;
 
-    @Bind(R.id.list)
+    @BindView(R.id.list)
     ObservableRecyclerView recyclerView;
-    @Bind(R.id.image)
+    @BindView(R.id.image)
     ImageView albumArtImageView;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.title)
+    @BindView(R.id.title)
     TextView albumTitleView;
-    @Bind(R.id.list_background)
+    @BindView(R.id.list_background)
     View songsBackgroundView;
 
     private AlbumSongAdapter adapter;

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

@@ -55,7 +55,7 @@ import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.Util;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -71,15 +71,15 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
 
     public static final String EXTRA_ARTIST_ID = "extra_artist_id";
 
-    @Bind(R.id.image)
+    @BindView(R.id.image)
     ImageView artistImage;
-    @Bind(R.id.list_background)
+    @BindView(R.id.list_background)
     View songListBackground;
-    @Bind(R.id.list)
+    @BindView(R.id.list)
     ObservableListView songListView;
-    @Bind(R.id.title)
+    @BindView(R.id.title)
     TextView artistName;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
 
     View songListHeader;

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

@@ -47,7 +47,7 @@ import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import java.io.File;
 import java.util.ArrayList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class MainActivity extends AbsSlidingMusicPanelActivity {
@@ -58,9 +58,9 @@ public class MainActivity extends AbsSlidingMusicPanelActivity {
     private static final int LIBRARY = 0;
     private static final int FOLDERS = 1;
 
-    @Bind(R.id.navigation_view)
+    @BindView(R.id.navigation_view)
     NavigationView navigationView;
-    @Bind(R.id.drawer_layout)
+    @BindView(R.id.drawer_layout)
     DrawerLayout drawerLayout;
 
     @Nullable

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

@@ -26,8 +26,8 @@ import com.kabouzeid.gramophone.adapter.song.SongAdapter;
 import com.kabouzeid.gramophone.dialogs.SleepTimerDialog;
 import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
-import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.loader.PlaylistSongLoader;
 import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
 import com.kabouzeid.gramophone.model.Playlist;
 import com.kabouzeid.gramophone.model.PlaylistSong;
@@ -41,7 +41,7 @@ import com.kabouzeid.gramophone.util.PlaylistsUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity implements CabHolder, LoaderManager.LoaderCallbacks<ArrayList<Song>> {
@@ -53,11 +53,11 @@ public class PlaylistDetailActivity extends AbsSlidingMusicPanelActivity impleme
     @NonNull
     public static String EXTRA_PLAYLIST = "extra_playlist";
 
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(android.R.id.empty)
+    @BindView(android.R.id.empty)
     TextView empty;
 
     private Playlist playlist;

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

@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class SearchActivity extends AbsMusicServiceActivity implements SearchView.OnQueryTextListener, LoaderManager.LoaderCallbacks<List<Object>> {
@@ -40,11 +40,11 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie
     public static final String QUERY = "query";
     private static final int LOADER_ID = LoaderIds.SEARCH_ACTIVITY;
 
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(android.R.id.empty)
+    @BindView(android.R.id.empty)
     TextView empty;
 
     SearchView searchView;

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

@@ -31,13 +31,13 @@ import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity;
 import com.kabouzeid.gramophone.util.NavigationUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class SettingsActivity extends AbsBaseActivity implements ColorChooserDialog.ColorCallback {
     public static final String TAG = SettingsActivity.class.getSimpleName();
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java

@@ -26,7 +26,7 @@ import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.ViewUtil;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -38,7 +38,7 @@ import butterknife.ButterKnife;
 public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivity implements SlidingUpPanelLayout.PanelSlideListener, CardPlayerFragment.Callbacks {
     public static final String TAG = AbsSlidingMusicPanelActivity.class.getSimpleName();
 
-    @Bind(R.id.sliding_layout)
+    @BindView(R.id.sliding_layout)
     SlidingUpPanelLayout slidingUpPanelLayout;
 
     private int navigationbarColor;

app/src/main/java/com/kabouzeid/gramophone/ui/activities/bugreport/BugReportActivity.java

@@ -47,7 +47,7 @@ import java.io.IOException;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class BugReportActivity extends AbsThemeActivity {
@@ -69,26 +69,26 @@ public class BugReportActivity extends AbsThemeActivity {
 
     private DeviceInfo deviceInfo;
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
 
-    @Bind(R.id.input_title)
+    @BindView(R.id.input_title)
     TextInputEditText inputTitle;
-    @Bind(R.id.input_description)
+    @BindView(R.id.input_description)
     TextInputEditText inputDescription;
-    @Bind(R.id.air_textDeviceInfo)
+    @BindView(R.id.air_textDeviceInfo)
     TextView textDeviceInfo;
 
-    @Bind(R.id.input_username)
+    @BindView(R.id.input_username)
     TextInputEditText inputUsername;
-    @Bind(R.id.input_password)
+    @BindView(R.id.input_password)
     TextInputEditText inputPassword;
-    @Bind(R.id.option_use_account)
+    @BindView(R.id.option_use_account)
     RadioButton optionUseAccount;
-    @Bind(R.id.option_anonymous)
+    @BindView(R.id.option_anonymous)
     RadioButton optionManual;
 
-    @Bind(R.id.button_send)
+    @BindView(R.id.button_send)
     FloatingActionButton sendFab;
 
     private static final String ISSUE_TRACKER_LINK = "https://github.com/kabouzeid/phonograph-issue-tracker";

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

@@ -53,7 +53,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -65,15 +65,15 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
     public static final String EXTRA_PALETTE = "extra_palette";
     private static final String TAG = AbsTagEditorActivity.class.getSimpleName();
     private static final int REQUEST_CODE_SELECT_IMAGE = 1337;
-    @Bind(R.id.play_pause_fab)
+    @BindView(R.id.play_pause_fab)
     FloatingActionButton fab;
-    @Bind(R.id.observableScrollView)
+    @BindView(R.id.observableScrollView)
     ObservableScrollView observableScrollView;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.image)
+    @BindView(R.id.image)
     ImageView image;
-    @Bind(R.id.header)
+    @BindView(R.id.header)
     LinearLayout header;
     private int id;
     private int headerVariableSpace;

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

@@ -36,7 +36,7 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -46,13 +46,13 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
 
     public static final String TAG = AlbumTagEditorActivity.class.getSimpleName();
 
-    @Bind(R.id.title)
+    @BindView(R.id.title)
     EditText albumTitle;
-    @Bind(R.id.album_artist)
+    @BindView(R.id.album_artist)
     EditText albumArtist;
-    @Bind(R.id.genre)
+    @BindView(R.id.genre)
     EditText genre;
-    @Bind(R.id.year)
+    @BindView(R.id.year)
     EditText year;
 
     private Bitmap albumArtBitmap;

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

@@ -18,24 +18,24 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class SongTagEditorActivity extends AbsTagEditorActivity implements TextWatcher {
 
     public static final String TAG = SongTagEditorActivity.class.getSimpleName();
 
-    @Bind(R.id.title1)
+    @BindView(R.id.title1)
     EditText songTitle;
-    @Bind(R.id.title2)
+    @BindView(R.id.title2)
     EditText albumTitle;
-    @Bind(R.id.artist)
+    @BindView(R.id.artist)
     EditText artist;
-    @Bind(R.id.genre)
+    @BindView(R.id.genre)
     EditText genre;
-    @Bind(R.id.year)
+    @BindView(R.id.year)
     EditText year;
-    @Bind(R.id.image_text)
+    @BindView(R.id.image_text)
     EditText trackNumber;
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java

@@ -40,8 +40,8 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote;
 import com.kabouzeid.gramophone.helper.menu.SongMenuHelper;
 import com.kabouzeid.gramophone.helper.menu.SongsMenuHelper;
 import com.kabouzeid.gramophone.interfaces.CabHolder;
-import com.kabouzeid.gramophone.misc.DialogAsyncTask;
 import com.kabouzeid.gramophone.interfaces.LoaderIds;
+import com.kabouzeid.gramophone.misc.DialogAsyncTask;
 import com.kabouzeid.gramophone.misc.UpdateToastMediaScannerCompletionListener;
 import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader;
 import com.kabouzeid.gramophone.model.Song;
@@ -64,8 +64,9 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 public class FoldersFragment extends AbsMainActivityFragment implements MainActivity.MainActivityFragmentCallbacks, CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks, AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks<List<File>> {
     public static final String TAG = FoldersFragment.class.getSimpleName();
@@ -75,19 +76,21 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
     protected static final String PATH = "path";
     protected static final String CRUMBS = "crumbs";
 
-    @Bind(R.id.coordinator_layout)
+    private Unbinder unbinder;
+
+    @BindView(R.id.coordinator_layout)
     CoordinatorLayout coordinatorLayout;
-    @Bind(R.id.container)
+    @BindView(R.id.container)
     View container;
-    @Bind(android.R.id.empty)
+    @BindView(android.R.id.empty)
     View empty;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.bread_crumbs)
+    @BindView(R.id.bread_crumbs)
     BreadCrumbLayout breadCrumbs;
-    @Bind(R.id.appbar)
+    @BindView(R.id.appbar)
     AppBarLayout appbar;
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     FastScrollRecyclerView recyclerView;
 
     private SongFileAdapter adapter;
@@ -150,7 +153,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_folder, container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -216,7 +219,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements MainActi
     @Override
     public void onDestroyView() {
         appbar.removeOnOffsetChangedListener(this);
-        ButterKnife.unbind(this);
+        unbinder.unbind();
         super.onDestroyView();
     }
 

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java

@@ -40,19 +40,22 @@ import com.kabouzeid.gramophone.util.PhonographColorUtil;
 import com.kabouzeid.gramophone.util.PreferenceUtil;
 import com.kabouzeid.gramophone.util.Util;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivity.MainActivityFragmentCallbacks, ViewPager.OnPageChangeListener {
     public static final String TAG = LibraryFragment.class.getSimpleName();
 
-    @Bind(R.id.toolbar)
+    private Unbinder unbinder;
+
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.tabs)
+    @BindView(R.id.tabs)
     TabLayout tabs;
-    @Bind(R.id.appbar)
+    @BindView(R.id.appbar)
     AppBarLayout appbar;
-    @Bind(R.id.pager)
+    @BindView(R.id.pager)
     ViewPager pager;
 
     private MusicLibraryPagerAdapter pagerAdapter;
@@ -68,7 +71,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_library, container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -76,7 +79,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
     public void onDestroyView() {
         super.onDestroyView();
         pager.removeOnPageChangeListener(this);
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java

@@ -18,8 +18,9 @@ import com.kabouzeid.gramophone.R;
 import com.kabouzeid.gramophone.util.ViewUtil;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -28,12 +29,14 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
 
     public static final String TAG = AbsLibraryPagerRecyclerViewFragment.class.getSimpleName();
 
-    @Bind(R.id.container)
+    private Unbinder unbinder;
+
+    @BindView(R.id.container)
     View container;
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView recyclerView;
     @Nullable
-    @Bind(android.R.id.empty)
+    @BindView(android.R.id.empty)
     TextView empty;
 
     private A adapter;
@@ -42,7 +45,7 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(getLayoutRes(), container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -134,6 +137,6 @@ public abstract class AbsLibraryPagerRecyclerViewFragment<A extends RecyclerView
     public void onDestroyView() {
         super.onDestroyView();
         getLibraryFragment().removeOnAppBarOffsetChangedListener(this);
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 }

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/MiniPlayerFragment.java

@@ -22,19 +22,23 @@ import com.kabouzeid.gramophone.helper.PlayPauseButtonOnClickHandler;
 import com.kabouzeid.gramophone.ui.fragments.AbsMusicServiceFragment;
 import com.kabouzeid.gramophone.views.PlayPauseDrawable;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class MiniPlayerFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
-    @Bind(R.id.mini_player_title)
+
+    private Unbinder unbinder;
+
+    @BindView(R.id.mini_player_title)
     TextView miniPlayerTitle;
-    @Bind(R.id.mini_player_play_pause_button)
+    @BindView(R.id.mini_player_play_pause_button)
     ImageView miniPlayerPlayPauseButton;
-    @Bind(R.id.progress_bar)
+    @BindView(R.id.progress_bar)
     MaterialProgressBar progressBar;
 
     private PlayPauseDrawable miniPlayerPlayPauseDrawable;
@@ -56,7 +60,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
 
         view.setOnTouchListener(new FlingPlayBackController(getActivity()));
         setUpMiniPlayer();
@@ -65,7 +69,7 @@ public class MiniPlayerFragment extends AbsMusicServiceFragment implements Music
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     private void setUpMiniPlayer() {

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/PlayerAlbumCoverFragment.java

@@ -19,8 +19,9 @@ import com.kabouzeid.gramophone.misc.SimpleAnimatorListener;
 import com.kabouzeid.gramophone.ui.fragments.AbsMusicServiceFragment;
 import com.kabouzeid.gramophone.util.ViewUtil;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
@@ -28,9 +29,11 @@ import butterknife.ButterKnife;
 public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements ViewPager.OnPageChangeListener {
     public static final String TAG = PlayerAlbumCoverFragment.class.getSimpleName();
 
-    @Bind(R.id.player_album_cover_viewpager)
+    private Unbinder unbinder;
+
+    @BindView(R.id.player_album_cover_viewpager)
     ViewPager viewPager;
-    @Bind(R.id.player_favorite_icon)
+    @BindView(R.id.player_favorite_icon)
     ImageView favoriteIcon;
 
     private Callbacks callbacks;
@@ -40,7 +43,7 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_player_album_cover, container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -71,7 +74,7 @@ public class PlayerAlbumCoverFragment extends AbsMusicServiceFragment implements
     public void onDestroyView() {
         super.onDestroyView();
         viewPager.removeOnPageChangeListener(this);
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerFragment.java

@@ -56,23 +56,26 @@ import org.jaudiotagger.tag.FieldKey;
 
 import java.io.File;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbumCoverFragment.Callbacks, SlidingUpPanelLayout.PanelSlideListener {
     public static final String TAG = CardPlayerFragment.class.getSimpleName();
 
-    @Bind(R.id.player_toolbar)
+    private Unbinder unbinder;
+
+    @BindView(R.id.player_toolbar)
     Toolbar toolbar;
-    @Bind(R.id.player_sliding_layout)
+    @BindView(R.id.player_sliding_layout)
     SlidingUpPanelLayout slidingUpPanelLayout;
-    @Bind(R.id.player_recycler_view)
+    @BindView(R.id.player_recycler_view)
     RecyclerView recyclerView;
-    @Bind(R.id.playing_queue_card)
+    @BindView(R.id.playing_queue_card)
     CardView playingQueueCard;
-    @Bind(R.id.color_background)
+    @BindView(R.id.color_background)
     View colorBackground;
-    @Bind(R.id.player_queue_sub_header)
+    @BindView(R.id.player_queue_sub_header)
     TextView playerQueueSubHeader;
 
     private int lastColor;
@@ -103,7 +106,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         }
 
         View view = inflater.inflate(R.layout.fragment_card_player, container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -156,7 +159,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         playingQueueAdapter = null;
         layoutManager = null;
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/card/CardPlayerPlaybackControlsFragment.java

@@ -25,30 +25,33 @@ import com.kabouzeid.gramophone.ui.fragments.AbsMusicServiceFragment;
 import com.kabouzeid.gramophone.util.MusicUtil;
 import com.kabouzeid.gramophone.views.PlayPauseDrawable;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
 
-    @Bind(R.id.player_play_pause_fab)
+    private Unbinder unbinder;
+
+    @BindView(R.id.player_play_pause_fab)
     FloatingActionButton playPauseFab;
-    @Bind(R.id.player_prev_button)
+    @BindView(R.id.player_prev_button)
     ImageButton prevButton;
-    @Bind(R.id.player_next_button)
+    @BindView(R.id.player_next_button)
     ImageButton nextButton;
-    @Bind(R.id.player_repeat_button)
+    @BindView(R.id.player_repeat_button)
     ImageButton repeatButton;
-    @Bind(R.id.player_shuffle_button)
+    @BindView(R.id.player_shuffle_button)
     ImageButton shuffleButton;
 
-    @Bind(R.id.player_progress_slider)
+    @BindView(R.id.player_progress_slider)
     SeekBar progressSlider;
-    @Bind(R.id.player_song_total_time)
+    @BindView(R.id.player_song_total_time)
     TextView songTotalTime;
-    @Bind(R.id.player_song_current_progress)
+    @BindView(R.id.player_song_current_progress)
     TextView songCurrentProgress;
 
     private PlayPauseDrawable playerFabPlayPauseDrawable;
@@ -73,7 +76,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         setUpMusicControllers();
         updateProgressTextColor();
     }
@@ -81,7 +84,7 @@ public class CardPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerFragment.java

@@ -54,22 +54,25 @@ import org.jaudiotagger.tag.FieldKey;
 
 import java.io.File;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbumCoverFragment.Callbacks, SlidingUpPanelLayout.PanelSlideListener {
     public static final String TAG = FlatPlayerFragment.class.getSimpleName();
 
-    @Bind(R.id.player_status_bar)
+    private Unbinder unbinder;
+
+    @BindView(R.id.player_status_bar)
     View playerStatusBar;
-    @Bind(R.id.player_toolbar)
+    @BindView(R.id.player_toolbar)
     Toolbar toolbar;
     @Nullable
-    @Bind(R.id.player_sliding_layout)
+    @BindView(R.id.player_sliding_layout)
     SlidingUpPanelLayout slidingUpPanelLayout;
-    @Bind(R.id.player_recycler_view)
+    @BindView(R.id.player_recycler_view)
     RecyclerView recyclerView;
-    @Bind(R.id.player_queue_sub_header)
+    @BindView(R.id.player_queue_sub_header)
     TextView playerQueueSubHeader;
 
     private int lastColor;
@@ -100,7 +103,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         }
 
         View view = inflater.inflate(R.layout.fragment_flat_player, container, false);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         return view;
     }
 
@@ -152,7 +155,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum
         playingQueueAdapter = null;
         layoutManager = null;
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/ui/fragments/player/flat/FlatPlayerPlaybackControlsFragment.java

@@ -29,30 +29,33 @@ import com.kabouzeid.gramophone.views.PlayPauseDrawable;
 import java.util.Collection;
 import java.util.LinkedList;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.Unbinder;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment implements MusicProgressViewUpdateHelper.Callback {
 
-    @Bind(R.id.player_play_pause__button)
+    private Unbinder unbinder;
+
+    @BindView(R.id.player_play_pause__button)
     ImageButton playPauseButton;
-    @Bind(R.id.player_prev_button)
+    @BindView(R.id.player_prev_button)
     ImageButton prevButton;
-    @Bind(R.id.player_next_button)
+    @BindView(R.id.player_next_button)
     ImageButton nextButton;
-    @Bind(R.id.player_repeat_button)
+    @BindView(R.id.player_repeat_button)
     ImageButton repeatButton;
-    @Bind(R.id.player_shuffle_button)
+    @BindView(R.id.player_shuffle_button)
     ImageButton shuffleButton;
 
-    @Bind(R.id.player_progress_slider)
+    @BindView(R.id.player_progress_slider)
     SeekBar progressSlider;
-    @Bind(R.id.player_song_total_time)
+    @BindView(R.id.player_song_total_time)
     TextView songTotalTime;
-    @Bind(R.id.player_song_current_progress)
+    @BindView(R.id.player_song_current_progress)
     TextView songCurrentProgress;
 
     private PlayPauseDrawable playPauseDrawable;
@@ -79,7 +82,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ButterKnife.bind(this, view);
+        unbinder = ButterKnife.bind(this, view);
         setUpMusicControllers();
         updateProgressTextColor();
     }
@@ -87,7 +90,7 @@ public class FlatPlayerPlaybackControlsFragment extends AbsMusicServiceFragment
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        ButterKnife.unbind(this);
+        unbinder.unbind();
     }
 
     @Override

build.gradle

@@ -5,6 +5,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.3'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }