tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated methods

Browse source
This commit is contained in:
Eugene Cheung 2018-09-05 22:23:53 -04:00
commit 2b0280298c
No known key found for this signature in database
GPG key ID: E1FD745328866B0A
7 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/gramophone/dialogs/DonationsDialog.java
View file

@ -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);
}

10
app/src/main/java/com/kabouzeid/gramophone/preferences/NowPlayingScreenPreferenceDialog.java
View file

@ -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);
}
}
}
}

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

@ -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);
}
}
}
}

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

@ -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;
}

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

@ -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;

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

@ -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;
}

7
app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
View file

@ -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;
}
}
}