AndroidX lib refactor
This commit is contained in:
parent
b3eb12aebd
commit
08f0b5e76e
581 changed files with 5470 additions and 6070 deletions
|
@ -1,6 +1,6 @@
|
|||
package code.name.monkey.retromusic.misc;
|
||||
|
||||
import android.support.design.widget.AppBarLayout;
|
||||
import com.google.android.material.appbar.AppBarLayout;
|
||||
|
||||
/**
|
||||
* @author Hemanth S (h4h13).
|
||||
|
|
|
@ -18,11 +18,13 @@ package code.name.monkey.retromusic.misc;
|
|||
|
||||
import android.os.Bundle;
|
||||
import android.os.Parcelable;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import android.support.v4.app.FragmentTransaction;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
import androidx.fragment.app.FragmentPagerAdapter;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
import androidx.viewpager.widget.PagerAdapter;
|
||||
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
@ -30,7 +32,7 @@ import android.view.ViewGroup;
|
|||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Implementation of {@link android.support.v4.view.PagerAdapter} that
|
||||
* Implementation of {@link PagerAdapter} that
|
||||
* uses a {@link Fragment} to manage each page. This class also handles
|
||||
* saving and restoring of fragment's state.
|
||||
* <p/>
|
||||
|
@ -65,7 +67,7 @@ import java.util.ArrayList;
|
|||
* {@sample development/samples/Support13Demos/res/layout/fragment_pager_list.xml
|
||||
* complete}
|
||||
*/
|
||||
public abstract class CustomFragmentStatePagerAdapter extends android.support.v4.view.PagerAdapter {
|
||||
public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter {
|
||||
public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
|
||||
private static final boolean DEBUG = false;
|
||||
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
package code.name.monkey.retromusic.misc;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v7.app.MediaRouteActionProvider;
|
||||
import android.support.v7.app.MediaRouteButton;
|
||||
import android.support.v7.media.MediaRouteSelector;
|
||||
import android.util.Log;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import code.name.monkey.retromusic.RetroApplication;
|
||||
import code.name.monkey.retromusic.views.CustomMediaRouteButton;
|
||||
|
||||
public class CustomMediaRouteActionProvider extends MediaRouteActionProvider {
|
||||
private static final String TAG = "MediaRteActProvider";
|
||||
|
||||
private Activity activity;
|
||||
|
||||
private MediaRouteSelector selector = MediaRouteSelector.EMPTY;
|
||||
private CustomMediaRouteButton customMediaRouteButton;
|
||||
|
||||
public CustomMediaRouteActionProvider(Context context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
public void setActivity(@NonNull Activity activity) {
|
||||
this.activity = activity;
|
||||
if (customMediaRouteButton != null) {
|
||||
customMediaRouteButton.setActivity(activity);
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public MediaRouteButton getMediaRouteButton() {
|
||||
return customMediaRouteButton;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the media route button is being created.
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public CustomMediaRouteButton onCreateMediaRouteButton() {
|
||||
if (customMediaRouteButton != null) {
|
||||
Log.e(TAG, "onCreateMediaRouteButton: This ActionProvider is already associated "
|
||||
+ "with a menu item. Don't reuse MediaRouteActionProvider instances! "
|
||||
+ "Abandoning the old button...");
|
||||
}
|
||||
|
||||
customMediaRouteButton = new CustomMediaRouteButton(getContext());
|
||||
customMediaRouteButton.setActivity(activity);
|
||||
customMediaRouteButton.setAlpha(RetroApplication.isProVersion() ? 1.0f : 0.5f);
|
||||
customMediaRouteButton.setRouteSelector(selector);
|
||||
customMediaRouteButton.setLayoutParams(new ViewGroup.LayoutParams(
|
||||
ViewGroup.LayoutParams.WRAP_CONTENT,
|
||||
ViewGroup.LayoutParams.FILL_PARENT));
|
||||
return customMediaRouteButton;
|
||||
}
|
||||
}
|
|
@ -3,8 +3,8 @@ package code.name.monkey.retromusic.misc;
|
|||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
|
||||
|
|
|
@ -5,13 +5,14 @@ import android.animation.ObjectAnimator;
|
|||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.res.ColorStateList;
|
||||
import android.content.res.Resources;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.util.DisplayMetrics;
|
||||
import android.view.View;
|
||||
import android.view.animation.Interpolator;
|
||||
import android.widget.ImageView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import butterknife.BindInt;
|
||||
import code.name.monkey.appthemehelper.util.ATHUtil;
|
||||
import code.name.monkey.retromusic.R;
|
||||
|
@ -65,7 +66,7 @@ public class NavigationIconClickListener implements View.OnClickListener {
|
|||
throw new IllegalArgumentException("updateIcon() must be called on an ImageView");
|
||||
}
|
||||
updateIcon((ImageView) view);
|
||||
final int translateY = (int) RetroUtil.convertDpToPixel(RetroUtil.isLandscape(view.getResources()) ? 3 * 48 : 5 * 48, view.getContext());
|
||||
final int translateY = (int) RetroUtil.convertDpToPixel(getHeight(view.getContext()), view.getContext());
|
||||
|
||||
ObjectAnimator animator = ObjectAnimator.ofFloat(sheet, "translationY", backdropShown ? translateY : 0);
|
||||
animator.setDuration(500);
|
||||
|
@ -76,6 +77,20 @@ public class NavigationIconClickListener implements View.OnClickListener {
|
|||
animator.start();
|
||||
}
|
||||
|
||||
private int getHeight(Context context) {
|
||||
Resources resources = context.getResources();
|
||||
if (RetroUtil.isLandscape(resources)) {
|
||||
return 3 * 48;
|
||||
} else if (RetroUtil.isTablet(resources)) {
|
||||
if (RetroUtil.isLandscape(resources)) {
|
||||
return 48;
|
||||
} else {
|
||||
return 2 * 48;
|
||||
}
|
||||
} else
|
||||
return 5 * 48;
|
||||
}
|
||||
|
||||
private void updateIcon(ImageView view) {
|
||||
if (openIcon != null && closeIcon != null) {
|
||||
view.setImageTintList(ColorStateList.valueOf(ATHUtil.resolveColor(context, R.attr.iconColor)));
|
||||
|
|
|
@ -2,10 +2,10 @@ package code.name.monkey.retromusic.misc;
|
|||
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.design.widget.CoordinatorLayout;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.v4.view.ViewCompat;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.coordinatorlayout.widget.CoordinatorLayout;
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import android.util.AttributeSet;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
|
|
@ -1 +1 @@
|
|||
package code.name.monkey.retromusic.misc;
import android.content.Context;
import android.os.AsyncTask;
import android.support.annotation.Nullable;
import java.lang.ref.WeakReference;
public abstract class WeakContextAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
private WeakReference<Context> contextWeakReference;
public WeakContextAsyncTask(Context context) {
contextWeakReference = new WeakReference<>(context);
}
@Nullable
protected Context getContext() {
return contextWeakReference.get();
}
}
|
||||
package code.name.monkey.retromusic.misc;
import android.content.Context;
import android.os.AsyncTask;
import androidx.annotation.Nullable;
import java.lang.ref.WeakReference;
public abstract class WeakContextAsyncTask<Params, Progress, Result> extends AsyncTask<Params, Progress, Result> {
private WeakReference<Context> contextWeakReference;
public WeakContextAsyncTask(Context context) {
contextWeakReference = new WeakReference<>(context);
}
@Nullable
protected Context getContext() {
return contextWeakReference.get();
}
}
|
|
@ -2,7 +2,7 @@
|
|||
package code.name.monkey.retromusic.misc;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v4.content.AsyncTaskLoader;
|
||||
import androidx.loader.content.AsyncTaskLoader;
|
||||
|
||||
/**
|
||||
* <a href="http://code.google.com/p/android/issues/detail?id=14944">Issue
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue