drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-06 12:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android]Use ContextCompat API instead Resources API

Browse Source 
Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-08-16 17:35:54 +02:00
committed by Konstantin Pastbin
parent e786dbe5f5
commit 62de63eda0
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
View File

@@ -16,6 +16,7 @@ import android.view.ViewTreeObserver;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.OptIn; import androidx.annotation.OptIn;
import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -295,7 +296,7 @@ public class MapButtonsController extends Fragment
mBadgeDrawable.setMaxCharacterCount(0); mBadgeDrawable.setMaxCharacterCount(0);
mBadgeDrawable.setHorizontalOffset(verticalOffset); mBadgeDrawable.setHorizontalOffset(verticalOffset);
mBadgeDrawable.setVerticalOffset(dpToPx(9, context)); 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); mBadgeDrawable.setVisible(enable);
BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton); BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
} }

4
android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
View File

@@ -11,6 +11,8 @@ import android.widget.ExpandableListAdapter;
import android.widget.ExpandableListView; import android.widget.ExpandableListView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import app.organicmaps.R; import app.organicmaps.R;
import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter; import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.base.BaseMwmDialogFragment;
@@ -122,7 +124,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
} }
listView.setAdapter(buildAdapter()); 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, () -> { UiUtils.waitLayout(listView, () -> {
final int width = listView.getWidth(); final int width = listView.getWidth();

2
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
View File

@@ -481,7 +481,7 @@ public class PlacePageView extends Fragment
? ContextCompat.getColor( ? ContextCompat.getColor(
getContext(), getContext(),
UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)) 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); mTvEditPlace.setTextColor(editPlaceButtonColor);
mTvAddBusiness.setTextColor(editPlaceButtonColor); mTvAddBusiness.setTextColor(editPlaceButtonColor);
mTvAddPlace.setTextColor(editPlaceButtonColor); mTvAddPlace.setTextColor(editPlaceButtonColor);