From 2b0280298cf98b1bb03f69a647cfacb0ef85a591 Mon Sep 17 00:00:00 2001 From: Eugene Cheung Date: Wed, 5 Sep 2018 22:23:53 -0400 Subject: [PATCH] Replace deprecated methods --- .../kabouzeid/gramophone/dialogs/DonationsDialog.java | 4 ++-- .../preferences/NowPlayingScreenPreferenceDialog.java | 10 +++++----- .../gramophone/ui/activities/ArtistDetailActivity.java | 4 ++-- .../gramophone/ui/activities/MainActivity.java | 2 +- .../gramophone/ui/activities/SearchActivity.java | 7 +++---- .../activities/base/AbsSlidingMusicPanelActivity.java | 2 +- .../java/com/kabouzeid/gramophone/util/ViewUtil.java | 7 +++---- 7 files changed, 17 insertions(+), 19 deletions(-) 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 b879e647..5aafba0d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java @@ -61,7 +61,7 @@ public class DonationsDialog extends DialogFragment implements BillingProcessor. @SuppressLint("InflateParams") View customView = LayoutInflater.from(getContext()).inflate(R.layout.dialog_donation, null); - ProgressBar progressBar = ButterKnife.findById(customView, R.id.progress); + ProgressBar progressBar = customView.findViewById(R.id.progress); MDTintHelper.setTint(progressBar, ThemeSingleton.get().positiveColor.getDefaultColor()); return new MaterialDialog.Builder(getContext()) @@ -165,7 +165,7 @@ public class DonationsDialog extends DialogFragment implements BillingProcessor. View customView = ((MaterialDialog) dialog.getDialog()).getCustomView(); //noinspection ConstantConditions customView.findViewById(R.id.progress_container).setVisibility(View.GONE); - ListView listView = ButterKnife.findById(customView, R.id.list); + ListView listView = customView.findViewById(R.id.list); listView.setAdapter(new SkuDetailsAdapter(dialog, skuDetails)); listView.setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java index b2ef1e3c..2dd7e48a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java @@ -42,13 +42,13 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @SuppressLint("InflateParams") View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing_screen, null); - ViewPager viewPager = ButterKnife.findById(view, R.id.now_playing_screen_view_pager); + ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager); viewPager.setAdapter(new NowPlayingScreenAdapter(getContext())); viewPager.addOnPageChangeListener(this); viewPager.setPageMargin((int) ViewUtil.convertDpToPixel(32, getResources())); viewPager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getNowPlayingScreen().ordinal()); - InkPageIndicator pageIndicator = ButterKnife.findById(view, R.id.page_indicator); + InkPageIndicator pageIndicator = view.findViewById(R.id.page_indicator); pageIndicator.setViewPager(viewPager); pageIndicator.onPageSelected(viewPager.getCurrentItem()); @@ -105,8 +105,8 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false); collection.addView(layout); - ImageView image = ButterKnife.findById(layout, R.id.image); - TextView title = ButterKnife.findById(layout, R.id.title); + ImageView image = layout.findViewById(R.id.image); + TextView title = layout.findViewById(R.id.title); image.setImageResource(nowPlayingScreen.drawableResId); title.setText(nowPlayingScreen.titleRes); @@ -133,4 +133,4 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements return context.getString(NowPlayingScreen.values()[position].titleRes); } } -} \ No newline at end of file +} 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 7d44e7a4..e8de2b0a 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 @@ -161,7 +161,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement private void initViews() { songListHeader = LayoutInflater.from(this).inflate(R.layout.artist_detail_header, songListView, false); - albumRecyclerView = ButterKnife.findById(songListHeader, R.id.recycler_view); + albumRecyclerView = songListHeader.findViewById(R.id.recycler_view); } private void setUpViews() { @@ -486,4 +486,4 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement return ArtistLoader.getArtist(getContext(), artistId); } } -} \ No newline at end of file +} 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 adaef870..37992541 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 @@ -149,7 +149,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity { protected View createContentView() { @SuppressLint("InflateParams") View contentView = getLayoutInflater().inflate(R.layout.activity_main_drawer_layout, null); - ViewGroup drawerContent = ButterKnife.findById(contentView, R.id.drawer_content_container); + ViewGroup drawerContent = contentView.findViewById(R.id.drawer_content_container); drawerContent.addView(wrapSlidingMusicPanel(R.layout.activity_main_content)); return contentView; } 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 14427885..c045479c 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 @@ -5,7 +5,6 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; -import android.support.v4.view.MenuItemCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.SearchView; @@ -110,12 +109,12 @@ public class SearchActivity extends AbsMusicServiceActivity implements SearchVie getMenuInflater().inflate(R.menu.menu_search, menu); final MenuItem searchItem = menu.findItem(R.id.search); - searchView = (SearchView) MenuItemCompat.getActionView(searchItem); + searchView = (SearchView) searchItem.getActionView(); searchView.setQueryHint(getString(R.string.search_hint)); searchView.setMaxWidth(Integer.MAX_VALUE); - MenuItemCompat.expandActionView(searchItem); - MenuItemCompat.setOnActionExpandListener(searchItem, new MenuItemCompat.OnActionExpandListener() { + searchItem.expandActionView(); + searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { @Override public boolean onMenuItemActionExpand(MenuItem item) { return true; 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 5208201b..3fcc80dd 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 @@ -207,7 +207,7 @@ public abstract class AbsSlidingMusicPanelActivity extends AbsMusicServiceActivi protected View wrapSlidingMusicPanel(@LayoutRes int resId) { @SuppressLint("InflateParams") View slidingMusicPanelLayout = getLayoutInflater().inflate(R.layout.sliding_music_panel_layout, null); - ViewGroup contentContainer = ButterKnife.findById(slidingMusicPanelLayout, R.id.content_container); + ViewGroup contentContainer = slidingMusicPanelLayout.findViewById(R.id.content_container); getLayoutInflater().inflate(resId, contentContainer); return slidingMusicPanelLayout; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java index db92315a..ca5db109 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java @@ -13,7 +13,6 @@ import android.graphics.drawable.RippleDrawable; import android.graphics.drawable.StateListDrawable; import android.os.Build; import android.support.annotation.ColorInt; -import android.support.v4.view.ViewCompat; import android.util.DisplayMetrics; import android.view.View; import android.view.animation.PathInterpolator; @@ -70,8 +69,8 @@ public class ViewUtil { } public static boolean hitTest(View v, int x, int y) { - final int tx = (int) (ViewCompat.getTranslationX(v) + 0.5f); - final int ty = (int) (ViewCompat.getTranslationY(v) + 0.5f); + final int tx = (int) (v.getTranslationX() + 0.5f); + final int ty = (int) (v.getTranslationY() + 0.5f); final int left = v.getLeft() + tx; final int right = v.getRight() + tx; final int top = v.getTop() + ty; @@ -96,4 +95,4 @@ public class ViewUtil { DisplayMetrics metrics = resources.getDisplayMetrics(); return px / metrics.density; } -} \ No newline at end of file +}