Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ContextCompat.getDrawable().

Browse Source
This commit is contained in:
Isira Seneviratne 2020-07-16 06:32:19 +05:30
parent 07f3e778d3
commit 6a0cd0a14a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
View File

@ -23,6 +23,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.cursoradapter.widget.CursorAdapter; import androidx.cursoradapter.widget.CursorAdapter;
import androidx.loader.app.LoaderManager; import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader; import androidx.loader.content.CursorLoader;
@ -147,7 +148,7 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall
private Drawable getDefaultAppIcon(Context context) { private Drawable getDefaultAppIcon(Context context) {
if (defaultAppIcon == null) { if (defaultAppIcon == null) {
defaultAppIcon = context.getResources().getDrawable(android.R.drawable.sym_def_app_icon); defaultAppIcon = ContextCompat.getDrawable(context, android.R.drawable.sym_def_app_icon);
} }
return defaultAppIcon; return defaultAppIcon;
} }
@ -225,7 +226,7 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall
resource = R.drawable.ic_add_circle_outline; resource = R.drawable.ic_add_circle_outline;
colour = 0xFFD0D0D4; colour = 0xFFD0D0D4;
} }
imageView.setImageDrawable(getResources().getDrawable(resource)); imageView.setImageDrawable(ContextCompat.getDrawable(getContext(), resource));
imageView.setColorFilter(colour, PorterDuff.Mode.MULTIPLY); imageView.setColorFilter(colour, PorterDuff.Mode.MULTIPLY);
} }
} }

11
app/src/main/java/org/fdroid/fdroid/views/SeekBarForegroundThumb.java
View File

@ -4,9 +4,11 @@ import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import androidx.appcompat.widget.AppCompatSeekBar;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.appcompat.widget.AppCompatSeekBar;
import androidx.core.content.ContextCompat;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
/** /**
@ -34,12 +36,7 @@ public class SeekBarForegroundThumb extends AppCompatSeekBar {
private void init(Context context) { private void init(Context context) {
this.context = context; this.context = context;
tickMark = ContextCompat.getDrawable(context, R.drawable.seekbar_tickmark);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
tickMark = context.getDrawable(R.drawable.seekbar_tickmark);
} else {
tickMark = context.getResources().getDrawable(R.drawable.seekbar_tickmark);
}
} }
private Drawable getThumbCompat() { private Drawable getThumbCompat() {