From 62de63eda0f387983558569d1d33fe8651025133 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Sat, 16 Aug 2025 17:35:54 +0200 Subject: [PATCH] [android]Use ContextCompat API instead Resources API Signed-off-by: Jean-Baptiste Charron --- .../java/app/organicmaps/maplayer/MapButtonsController.java | 3 ++- .../organicmaps/routing/BaseRoutingErrorDialogFragment.java | 4 +++- .../java/app/organicmaps/widget/placepage/PlacePageView.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index 200ac7082..7f4e8ba34 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -16,6 +16,7 @@ import android.view.ViewTreeObserver; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.OptIn; +import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import androidx.fragment.app.Fragment; @@ -295,7 +296,7 @@ public class MapButtonsController extends Fragment mBadgeDrawable.setMaxCharacterCount(0); mBadgeDrawable.setHorizontalOffset(verticalOffset); mBadgeDrawable.setVerticalOffset(dpToPx(9, context)); - mBadgeDrawable.setBackgroundColor(getResources().getColor(R.color.base_accent)); + mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent)); mBadgeDrawable.setVisible(enable); BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton); } diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java index f05f24d27..a97de9aa6 100644 --- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java @@ -11,6 +11,8 @@ import android.widget.ExpandableListAdapter; import android.widget.ExpandableListView; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; + import app.organicmaps.R; import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter; import app.organicmaps.base.BaseMwmDialogFragment; @@ -122,7 +124,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment } listView.setAdapter(buildAdapter()); - listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent))); + listView.setChildDivider(new ColorDrawable(ContextCompat.getColor(requireContext(), android.R.color.transparent))); UiUtils.waitLayout(listView, () -> { final int width = listView.getWidth(); diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index 7187c253d..6d0091334 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -481,7 +481,7 @@ public class PlacePageView extends Fragment ? ContextCompat.getColor( getContext(), UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)) - : getResources().getColor(R.color.button_accent_text_disabled); + : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled); mTvEditPlace.setTextColor(editPlaceButtonColor); mTvAddBusiness.setTextColor(editPlaceButtonColor); mTvAddPlace.setTextColor(editPlaceButtonColor);