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

[android] Enable nonTransitiveRClass

Browse source 
Signed-off-by: Jean-BaptisteC <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste 2024-01-15 19:17:36 +01:00 • committed by Alexander Borsuk
parent 09dc445835
commit 0c0314579b
13 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/java/app/organicmaps/ChartController.java
View file

@ -126,7 +126,7 @@ public class ChartController implements OnChartValueSelectedListener,
x.setGranularityEnabled(true);
x.setTextColor(ThemeUtils.getColor(mContext, R.attr.elevationProfileAxisLabelColor));
x.setPosition(XAxis.XAxisPosition.BOTTOM);
x.setAxisLineColor(ThemeUtils.getColor(mContext, R.attr.dividerHorizontal));
x.setAxisLineColor(ThemeUtils.getColor(mContext, androidx.appcompat.R.attr.dividerHorizontal));
x.setAxisLineWidth(mContext.getResources().getDimensionPixelSize(R.dimen.divider_height));
ValueFormatter xAxisFormatter = new AxisValueFormatter(mChart);
x.setValueFormatter(xAxisFormatter);

4
android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
View file

@ -88,8 +88,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
{
mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(Graphics.tint(requireActivity(), left, R.attr.colorAccent), null,
Graphics.tint(requireActivity(), right, R.attr.colorAccent), null);
mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), null);
}
@Override

2
android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
View file

@ -222,7 +222,7 @@ public class SearchWheel implements View.OnClickListener
searchOption == null ?
R.drawable.ic_routing_search_off :
searchOption.mDrawableOff,
R.attr.colorAccent));
androidx.appcompat.R.attr.colorAccent));
}
@Override

2
android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
View file

@ -255,7 +255,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
UiUtils.show(mActionButton);
Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_my_location);
int colorAccent = ContextCompat.getColor(mContext,
UiUtils.getStyledResourceId(mContext, R.attr.colorAccent));
UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
}
else

2
android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
View file

@ -110,7 +110,7 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
case RULER:
return ThemeUtils.getColor(context, R.attr.transitRulerBackground);
case INTERMEDIATE_POINT:
return ThemeUtils.getColor(context, R.attr.colorPrimary);
return ThemeUtils.getColor(context, androidx.appcompat.R.attr.colorPrimary);
default:
return info.getColor();
}

2
android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
View file

@ -64,7 +64,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
@AttrRes int getTintAttr()
{
return R.attr.colorAccent;
return androidx.appcompat.R.attr.colorAccent;
}
abstract TextView getTitleView();

2
android/app/src/main/java/app/organicmaps/search/TabAdapter.java
View file

@ -92,7 +92,7 @@ class TabAdapter extends FragmentPagerAdapter
public void onTabSelected(TabLayout.Tab tab)
{
super.onTabSelected(tab);
Graphics.tint(mContext, tab.getIcon(), R.attr.colorAccent);
Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
}
@Override

2
android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
View file

@ -382,7 +382,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
final Spannable link = new SpannableString(ttsLinkText + "↗");
// Set link color.
link.setSpan(new ForegroundColorSpan(ContextCompat.getColor(requireContext(),
UiUtils.getStyledResourceId(requireContext(), R.attr.colorAccent))),
UiUtils.getStyledResourceId(requireContext(), androidx.appcompat.R.attr.colorAccent))),
0, ttsLinkText.length(), 0);
ttsLangInfoLink.setSummary(link);

2
android/app/src/main/java/app/organicmaps/util/UiUtils.java
View file

@ -195,7 +195,7 @@ public final class UiUtils
public static void showHomeUpButton(Toolbar toolbar)
{
toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), R.attr.homeAsUpIndicator));
toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
}
public static boolean isTablet(@NonNull Context context)

2
android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
View file

@ -49,7 +49,7 @@ public class MyPositionButton
@DimenRes int sizeDimen = R.dimen.map_button_icon_size;
if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE || mode == LocationState.PENDING_POSITION)
{
colorAttr = R.attr.colorAccent;
colorAttr = androidx.appcompat.R.attr.colorAccent;
if (mode == LocationState.PENDING_POSITION)
sizeDimen = R.dimen.map_button_size;
else

2
android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
View file

@ -169,7 +169,7 @@ public class NavMenu
public void refreshTts()
{
mTts.setImageDrawable(TtsPlayer.isEnabled() ? Graphics.tint(mActivity, R.drawable.ic_voice_on,
R.attr.colorAccent)
androidx.appcompat.R.attr.colorAccent)
: Graphics.tint(mActivity, R.drawable.ic_voice_off));
}

2
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
View file

@ -120,7 +120,7 @@ public class PlacePageController extends Fragment implements
mViewportMinHeight = res.getDimensionPixelSize(R.dimen.viewport_min_height);
mButtonsHeight = (int) res.getDimension(R.dimen.place_page_buttons_height);
mMaxButtons = res.getInteger(R.integer.pp_buttons_max);
mRoutingHeaderHeight = (int) res.getDimension(ThemeUtils.getResource(requireContext(), R.attr.actionBarSize));
mRoutingHeaderHeight = (int) res.getDimension(ThemeUtils.getResource(requireContext(), androidx.appcompat.R.attr.actionBarSize));
mCoordinator = activity.findViewById(R.id.coordinator);
mPlacePage = view.findViewById(R.id.placepage);

2
android/gradle.properties
View file

@ -6,7 +6,7 @@ org.gradle.caching=true
org.gradle.jvmargs=-Xmx1024m -Xms256m
android.useAndroidX=true
android.native.buildOutput=verbose
android.nonTransitiveRClass=false
android.nonTransitiveRClass=true
android.nonFinalResIds=false
# Autogenerated by tools/unix/generate_localizations.sh