diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index c586caaa1..7bba2cf6b 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -323,8 +323,8 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co searchView.findViewById(R.id.search_edit_frame).setPadding(0, 0, 48, 0); SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text); - searchAutoComplete.setHintTextColor(getResources().getColor(android.R.color.white)); - searchAutoComplete.setTextColor(getResources().getColor(android.R.color.white)); + searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white)); + searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white)); searchView.setOnCloseListener(() -> { searchView.clearFocus(); diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java index 61dd92f8c..e459b6811 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java @@ -135,7 +135,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc viewBinding.trackRecordingFabAction.setImageResource(R.drawable.ic_baseline_stop_24); viewBinding.trackRecordingFabAction.setBackgroundTintList(ContextCompat.getColorStateList(this, R.color.opentracks_secondary_color)); - viewBinding.trackRecordingFabAction.setBackgroundColor(getResources().getColor(R.color.opentracks_secondary_color)); + viewBinding.trackRecordingFabAction.setBackgroundColor(ContextCompat.getColor(this, R.color.opentracks_secondary_color)); viewBinding.trackRecordingFabAction.setOnLongClickListener((view) -> { ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(1000); trackRecordingServiceConnection.stopRecording(TrackRecordingActivity.this); diff --git a/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java index 07bdc50d4..35f87596f 100644 --- a/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java +++ b/src/main/java/de/dennisguse/opentracks/chart/ChartValueSeries.java @@ -24,6 +24,7 @@ import android.graphics.Paint.Style; import android.graphics.Path; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import java.text.NumberFormat; @@ -68,12 +69,12 @@ abstract class ChartValueSeries { fillPaint = new Paint(); fillPaint.setStyle(Style.FILL); - fillPaint.setColor(context.getResources().getColor(fillColor)); + fillPaint.setColor(ContextCompat.getColor(context, fillColor)); fillPaint.setAntiAlias(true); strokePaint = new Paint(); strokePaint.setStyle(Style.STROKE); - strokePaint.setColor(context.getResources().getColor(strokeColor)); + strokePaint.setColor(ContextCompat.getColor(context, strokeColor)); strokePaint.setAntiAlias(true); // Make copies of the stroke paint with the default thickness diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java index 32ee8da54..b662ee158 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ListItemUtils.java @@ -22,6 +22,8 @@ import android.view.ViewGroup.LayoutParams; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -169,7 +171,7 @@ public class ListItemUtils { textView.setVisibility(View.VISIBLE); textView.setText(value); if (addShadow) { - textView.setShadowLayer(5, 0, 2, context.getResources().getColor(android.R.color.black)); + textView.setShadowLayer(5, 0, 2, ContextCompat.getColor(context, android.R.color.black)); } else { textView.setShadowLayer(0, 0, 0, 0); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java b/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java index 2b4ad348b..b5b3dc0ad 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/RecyclerViewSwipeDeleteCallback.java @@ -27,11 +27,11 @@ abstract public class RecyclerViewSwipeDeleteCallback extends ItemTouchHelper.Ca public RecyclerViewSwipeDeleteCallback(Context context) { background = new ColorDrawable(); - backgroundColor = context.getResources().getColor(R.color.colorBackgroundDelete); + backgroundColor = ContextCompat.getColor(context, R.color.colorBackgroundDelete); clearPaint = new Paint(); clearPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR)); deleteDrawable = ContextCompat.getDrawable(context, R.drawable.ic_delete_forever_24dp); - deleteDrawable.setTint(context.getResources().getColor(R.color.colorForegroundDelete)); + deleteDrawable.setTint(ContextCompat.getColor(context, R.color.colorForegroundDelete)); intrinsicWidth = deleteDrawable.getIntrinsicWidth(); intrinsicHeight = deleteDrawable.getIntrinsicHeight(); }