diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 367fa84d4..abe4a7471 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -838,7 +838,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public String getPrefsName() { - return getString(R.string.help); + return getString(R.string.about_help); } @Override @@ -2604,7 +2604,7 @@ public class MwmActivity extends BaseMwmFragmentActivity items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected)); if (!BUTTON_HELP_CODE.equals(activeLeftButton)) - items.add(new MenuBottomSheetItem(R.string.about_menu_title, R.drawable.ic_question_mark, this::showHelp)); + items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_question_mark, this::showHelp)); return items; } diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java index aed9e2acc..2079f3e03 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java @@ -41,7 +41,7 @@ public class HelpScreen extends BaseMapScreen { final Header.Builder builder = new Header.Builder(); builder.setStartHeaderAction(Action.BACK); - builder.setTitle(getCarContext().getString(R.string.help)); + builder.setTitle(getCarContext().getString(R.string.about_help)); return builder.build(); } diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java index 3c493b2ac..2749d1ce9 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java @@ -109,7 +109,7 @@ public class SettingsScreen extends BaseMapScreen private Item createHelpItem() { final Row.Builder builder = new Row.Builder(); - builder.setTitle(getCarContext().getString(R.string.help)); + builder.setTitle(getCarContext().getString(R.string.about_help)); builder.setOnClickListener(() -> getScreenManager().push(new HelpScreen(getCarContext(), getSurfaceRenderer()))); builder.setBrowsable(true); return builder.build(); diff --git a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java index 5c12c2f6d..38f3d0737 100644 --- a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java @@ -43,7 +43,7 @@ public class CopyrightFragment extends BaseMwmFragment { if (!mDelegate.onBackPressed()) { - ((HelpActivity) requireActivity()).stackFragment(HelpFragment.class, getString(R.string.help), null); + ((HelpActivity) requireActivity()).stackFragment(HelpFragment.class, getString(R.string.about_help), null); } return true; 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 806be8a9e..57efc27cf 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -213,7 +213,7 @@ public class MapButtonsController extends Fragment ) { leftButtonView.setImageResource(R.drawable.ic_christmas_tree); - leftButtonView.setContentDescription(getString(R.string.help)); + leftButtonView.setContentDescription(getString(R.string.about_help)); leftButtonView.setOnClickListener((v) -> mMapButtonClickListener.onMapButtonClick(MapButtons.help)); } else diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index d86752031..3e112533e 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -941,4 +941,5 @@ Bicycle Ruler Bookmark color + About & Help