From f8cfdc4706764c7c8c2338a5e9c182d0f887a1be Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 18 Sep 2020 21:34:11 +0900 Subject: [PATCH] finish view binding migration and remove butterknife --- app/build.gradle | 3 -- .../adapter/base/MediaEntryViewHolder.java | 23 ++++---- .../AbsLibraryPagerRecyclerViewFragment.java | 54 ++++++------------- 3 files changed, 25 insertions(+), 55 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd23a6a7..4b5b5540 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,9 +77,6 @@ dependencies { implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0' implementation 'com.android.support:multidex:1.0.3' - implementation 'com.jakewharton:butterknife:10.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' - implementation 'com.squareup.retrofit2:retrofit:2.6.2' implementation 'com.squareup.retrofit2:converter-gson:2.5.0' diff --git a/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java index bbb8f878..19d218d9 100644 --- a/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java +++ b/app/src/main/java/com/dkanada/gramophone/adapter/base/MediaEntryViewHolder.java @@ -10,49 +10,46 @@ import android.widget.TextView; import com.dkanada.gramophone.R; -import butterknife.BindView; -import butterknife.ButterKnife; - public class MediaEntryViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { @Nullable - @BindView(R.id.image) public ImageView image; @Nullable - @BindView(R.id.image_text) public TextView imageText; @Nullable - @BindView(R.id.title) public TextView title; @Nullable - @BindView(R.id.text) public TextView text; @Nullable - @BindView(R.id.menu) public View menu; @Nullable - @BindView(R.id.separator) public View separator; @Nullable - @BindView(R.id.short_separator) public View shortSeparator; @Nullable - @BindView(R.id.drag_view) public View dragView; @Nullable - @BindView(R.id.palette_color_container) public View paletteColorContainer; public MediaEntryViewHolder(View itemView) { super(itemView); - ButterKnife.bind(this, itemView); + + image = itemView.findViewById(R.id.image); + imageText = itemView.findViewById(R.id.image_text); + title = itemView.findViewById(R.id.title); + text = itemView.findViewById(R.id.text); + menu = itemView.findViewById(R.id.menu); + separator = itemView.findViewById(R.id.separator); + shortSeparator = itemView.findViewById(R.id.short_separator); + dragView = itemView.findViewById(R.id.drag_view); + paletteColorContainer = itemView.findViewById(R.id.palette_color_container); itemView.setOnClickListener(this); itemView.setOnLongClickListener(this); diff --git a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java index 2f5e9662..4e9c30dd 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/fragments/mainactivity/library/pager/AbsLibraryPagerRecyclerViewFragment.java @@ -1,11 +1,11 @@ package com.dkanada.gramophone.ui.fragments.mainactivity.library.pager; import android.os.Bundle; -import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import com.dkanada.gramophone.App; +import com.dkanada.gramophone.databinding.FragmentMainActivityRecyclerViewBinding; import com.dkanada.gramophone.util.PreferenceUtil; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener; @@ -16,27 +16,13 @@ import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.TextView; import com.kabouzeid.appthemehelper.ThemeStore; import com.dkanada.gramophone.R; import com.dkanada.gramophone.util.ViewUtil; -import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; public abstract class AbsLibraryPagerRecyclerViewFragment extends AbsLibraryPagerFragment implements OnOffsetChangedListener { - - private Unbinder unbinder; - - @BindView(R.id.container) - View container; - @BindView(R.id.recycler_view) - RecyclerView recyclerView; - @BindView(android.R.id.empty) - TextView empty; + private FragmentMainActivityRecyclerViewBinding binding; private A adapter; private L layoutManager; @@ -47,13 +33,13 @@ public abstract class AbsLibraryPagerRecyclerViewFragment