drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android][sdk] Move required strings to sdk

Browse Source 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-08-15 17:31:33 +02:00
committed by Konstantin Pastbin
parent 4dca45f74a
commit 80b616daf2
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
View File

@@ -94,7 +94,7 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
if (mRoutePoints.get(position).mIsMyPosition) if (mRoutePoints.get(position).mIsMyPosition)
{ {
// My position point. // My position point.
title = mContext.getString(R.string.core_my_position); title = mContext.getString(app.organicmaps.sdk.R.string.core_my_position);
if (mRoutePoints.get(position).mPointType != RouteMarkType.Start) if (mRoutePoints.get(position).mPointType != RouteMarkType.Start)
subtitle = mRoutePoints.get(position).mTitle; subtitle = mRoutePoints.get(position).mTitle;

5
android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
View File

@@ -355,8 +355,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
{ {
mAltitudeChart.setImageBitmap(bm); mAltitudeChart.setImageBitmap(bm);
UiUtils.show(mAltitudeChart); UiUtils.show(mAltitudeChart);
final String unit = limits.isMetricUnits ? mAltitudeDifference.getResources().getString(R.string.m) final String unit = limits.isMetricUnits
: mAltitudeDifference.getResources().getString(R.string.ft); ? mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.m)
: mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.ft);
mAltitudeDifference.setText("↗ " + limits.totalAscentString + " " + unit + " ↘ " + limits.totalDescentString + " " mAltitudeDifference.setText("↗ " + limits.totalAscentString + " " + unit + " ↘ " + limits.totalDescentString + " "
+ unit); + unit);
UiUtils.show(mAltitudeDifference); UiUtils.show(mAltitudeDifference);

3
android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
View File

@@ -183,7 +183,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
super.onStart(); super.onStart();
// Focus name and show keyboard for "Unknown Place" bookmarks // Focus name and show keyboard for "Unknown Place" bookmarks
if (mBookmark != null && mBookmark.getName().equals(getString(R.string.core_placepage_unknown_place))) if (mBookmark != null
&& mBookmark.getName().equals(getString(app.organicmaps.sdk.R.string.core_placepage_unknown_place)))
{ {
mEtName.requestFocus(); mEtName.requestFocus();
mEtName.selectAll(); mEtName.selectAll();

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

@@ -643,7 +643,8 @@ public class PlacePageView extends Fragment
final String cap = mMapObject.getMetadata(Metadata.MetadataType.FMD_CAPACITY); final String cap = mMapObject.getMetadata(Metadata.MetadataType.FMD_CAPACITY);
refreshMetadataOrHide(!TextUtils.isEmpty(cap) ? getString(R.string.capacity, cap) : "", mCapacity, mTvCapacity); refreshMetadataOrHide(!TextUtils.isEmpty(cap) ? getString(R.string.capacity, cap) : "", mCapacity, mTvCapacity);
refreshMetadataOrHide(mMapObject.hasAtm() ? getString(R.string.type_amenity_atm) : "", mAtm, mTvAtm); refreshMetadataOrHide(mMapObject.hasAtm() ? getString(app.organicmaps.sdk.R.string.type_amenity_atm) : "", mAtm,
mTvAtm);
final String wheelchair = final String wheelchair =
getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR)); getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR));