From e73feb48af406563ef9446346f6396f4be674af2 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Thu, 18 Aug 2016 18:21:09 +0200 Subject: [PATCH] Updated to butterknife 8. --- app/build.gradle | 5 ++- .../adapter/AlbumCoverPagerAdapter.java | 11 +++-- .../adapter/base/MediaEntryViewHolder.java | 20 ++++----- .../gramophone/dialogs/DonationsDialog.java | 8 ++-- .../gramophone/dialogs/SleepTimerDialog.java | 6 +-- .../ui/activities/AboutActivity.java | 42 +++++++++---------- .../ui/activities/AlbumDetailActivity.java | 14 +++---- .../ui/activities/ArtistDetailActivity.java | 12 +++--- .../ui/activities/MainActivity.java | 6 +-- .../ui/activities/PlaylistDetailActivity.java | 10 ++--- .../ui/activities/SearchActivity.java | 8 ++-- .../ui/activities/SettingsActivity.java | 4 +- .../base/AbsSlidingMusicPanelActivity.java | 4 +- .../bugreport/BugReportActivity.java | 20 ++++----- .../tageditor/AbsTagEditorActivity.java | 12 +++--- .../tageditor/AlbumTagEditorActivity.java | 10 ++--- .../tageditor/SongTagEditorActivity.java | 14 +++---- .../mainactivity/folders/FoldersFragment.java | 25 ++++++----- .../mainactivity/library/LibraryFragment.java | 17 ++++---- .../AbsLibraryPagerRecyclerViewFragment.java | 15 ++++--- .../fragments/player/MiniPlayerFragment.java | 16 ++++--- .../player/PlayerAlbumCoverFragment.java | 13 +++--- .../player/card/CardPlayerFragment.java | 21 ++++++---- .../CardPlayerPlaybackControlsFragment.java | 25 ++++++----- .../player/flat/FlatPlayerFragment.java | 19 +++++---- .../FlatPlayerPlaybackControlsFragment.java | 25 ++++++----- build.gradle | 1 + 27 files changed, 209 insertions(+), 174 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 15f859ca..e2a74995 100644 --- a/app/build.gradle +++ b/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' } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java index e459f0a2..bcac0e45 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java +++ b/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; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java index dceb1c74..8ad2a3f1 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/base/MediaEntryViewHolder.java +++ b/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) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java index e7392ceb..d9652f60 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java +++ b/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) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java index 174cc74b..aef5d685 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/SleepTimerDialog.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java index 70929381..71ddbe33 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java +++ b/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 diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index 0c74e618..20de7ebf 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 4f51b775..ccf973a5 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 3bc551e9..d4d2245f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/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 diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index f1a32d2d..ad403225 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/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> { @@ -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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java index 34fac5c1..2947c15c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SearchActivity.java +++ b/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> { @@ -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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index 0237f0a7..d71a7701 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/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 diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java index e317fb72..0f481a18 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsSlidingMusicPanelActivity.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/bugreport/BugReportActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/bugreport/BugReportActivity.java index 7cc9d56f..cf1332e4 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/bugreport/BugReportActivity.java +++ b/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"; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java index c1108364..f0e89573 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java index 57af10a8..7a6fd6ce 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java +++ b/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; diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java index 74a7f522..40134c87 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java +++ b/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 diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java index 56379578..4a646e6c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/folders/FoldersFragment.java +++ b/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> { 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(); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java index ae199bf0..840c25f3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/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 diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java index 6c1b21ff..2b441d59 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java +++ b/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