pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix compatibility issues reported by lint

Browse source 
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2022-10-13 09:01:43 +03:00 • committed by Viktor Govako
parent f863559b50
commit c587560566
11 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/res/layout/item_search_clear_history.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MwmWidget.TextView.Search"
android:text="@string/clear_search"
android:drawableStart="@drawable/ic_cancel"/>
app:drawableStartCompat="@drawable/ic_cancel"/>

3
android/res/layout/item_search_my_position.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MwmWidget.TextView.Search"
android:text="@string/p2p_your_location"
android:drawableStart="@drawable/ic_search_my_position"/>
app:drawableStartCompat="@drawable/ic_search_my_position"/>

3
android/res/layout/item_search_recent.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.TextView.Search"
android:drawableStart="@drawable/ic_search_recent"
app:drawableStartCompat="@drawable/ic_search_recent"
tools:text="Some recent query"/>

3
android/res/layout/item_search_suggest.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/MwmWidget.TextView.Search"
android:textColor="?colorAccent"
android:drawableStart="@drawable/ic_search_suggest"
app:drawableStartCompat="@drawable/ic_search_suggest"
tools:text="Some suggest title"/>

2
android/src/com/mapswithme/maps/bookmarks/Holders.java
View file

@ -361,7 +361,7 @@ public class Holders
R.dimen.track_circle_size,
bookmark.getIcon().getResId(),
R.dimen.bookmark_icon_size,
mIcon.getContext().getResources());
mIcon.getContext());
mIcon.setImageDrawable(circle);
}
}

2
android/src/com/mapswithme/maps/bookmarks/IconsAdapter.java
View file

@ -46,7 +46,7 @@ public class IconsAdapter extends ArrayAdapter<Icon>
R.dimen.track_circle_size,
R.drawable.ic_bookmark_none,
R.dimen.bookmark_icon_size,
getContext().getResources());
getContext());
}
else

3
android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java
View file

@ -16,6 +16,7 @@ import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
@ -136,7 +137,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
// TODO @yunik add translations
tabView.setText("From");
final ColorStateList textColor = getResources().getColorStateList(
final ColorStateList textColor = AppCompatResources.getColorStateList(requireContext(),
ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
: R.color.accent_color_selector);
tabView.setTextColor(textColor);

5
android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java
View file

@ -9,11 +9,14 @@ import android.widget.ImageButton;
import android.widget.RelativeLayout;
import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat;
import com.mapswithme.maps.R;
import com.mapswithme.util.ThemeUtils;
import com.mapswithme.util.UiUtils;
import java.util.Objects;
public class TrafficButton
{
@NonNull
@ -36,7 +39,7 @@ public class TrafficButton
Context context = trafficBtn.getContext();
Resources res = context.getResources();
final int animResId = ThemeUtils.getResource(context, R.attr.trafficLoadingAnimation);
return (AnimationDrawable) res.getDrawable(animResId, context.getTheme());
return (AnimationDrawable) Objects.requireNonNull(ResourcesCompat.getDrawable(res, animResId, context.getTheme()));
}
void turnOff()

2
android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java
View file

@ -214,7 +214,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
R.dimen.track_circle_size,
R.drawable.ic_bookmark_none,
R.dimen.bookmark_icon_size,
requireContext().getResources());
requireContext());
mIvColor.setImageDrawable(circle);
}
}

3
android/src/com/mapswithme/maps/widget/recycler/DividerItemDecorationWithPadding.java
View file

@ -9,6 +9,7 @@ import androidx.annotation.DimenRes;
import androidx.annotation.Dimension;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.RecyclerView;
import com.mapswithme.maps.R;
@ -25,7 +26,7 @@ public class DividerItemDecorationWithPadding extends RecyclerView.ItemDecoratio
public DividerItemDecorationWithPadding(@NonNull Context context)
{
mDivider = Objects.requireNonNull(context.getDrawable(R.drawable.divider_base));
mDivider = Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.divider_base));
mStartMargin = context.getResources().getDimensionPixelSize(R.dimen.margin_quadruple_plus_half);
}

10
android/src/com/mapswithme/util/Graphics.java
View file

@ -17,10 +17,13 @@ import androidx.annotation.ColorInt;
import androidx.annotation.DimenRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.graphics.drawable.DrawableCompat;
import com.mapswithme.maps.R;
import java.util.Objects;
public final class Graphics
{
@NonNull
@ -43,8 +46,9 @@ public final class Graphics
@NonNull
public static Drawable drawCircleAndImage(int color, @DimenRes int sizeResId,
@DrawableRes int imageResId, @DimenRes int sizeImgResId,
@NonNull Resources res)
@NonNull Context context)
{
final Resources res = context.getResources();
final int size = res.getDimensionPixelSize(sizeResId);
final Bitmap bmp = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
@ -56,7 +60,7 @@ public final class Graphics
final float radius = size / 2.0f;
c.drawCircle(radius, radius, radius, paint);
Drawable imgD = res.getDrawable(imageResId);
Drawable imgD = Objects.requireNonNull(AppCompatResources.getDrawable(context, imageResId));
imgD.mutate();
final int sizeImg = res.getDimensionPixelSize(sizeImgResId);
int offset = (size - sizeImg) / 2;
@ -97,7 +101,7 @@ public final class Graphics
public static Drawable tint(Context context, @DrawableRes int resId, @AttrRes int tintAttr)
{
//noinspection deprecation
return tint(context, context.getResources().getDrawable(resId), tintAttr);
return tint(context, AppCompatResources.getDrawable(context, resId), tintAttr);
}
public static Drawable tint(Context context, Drawable drawable)