From e5a852f6808ee5ede40bfd660fbf03415d1dc18e Mon Sep 17 00:00:00 2001 From: Harry Bond Date: Sat, 10 Feb 2024 00:19:27 +0000 Subject: [PATCH] [android] poi name in wikipedia page header Signed-off-by: Harry Bond --- .../widget/placepage/PlaceDescriptionActivity.java | 14 ++++++++++++-- .../sections/PlacePageWikipediaFragment.java | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java index ab0027341a..d042868c45 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlaceDescriptionActivity.java @@ -10,16 +10,26 @@ import app.organicmaps.base.BaseToolbarActivity; public class PlaceDescriptionActivity extends BaseToolbarActivity { + private static final String EXTRA_TITLE = "title"; + @Override protected Class getFragmentClass() { return PlaceDescriptionFragment.class; } - public static void start(@NonNull Context context, @NonNull String description) + public static void start(@NonNull Context context, @NonNull String title, @NonNull String description) { Intent intent = new Intent(context, PlaceDescriptionActivity.class) - .putExtra(PlaceDescriptionFragment.EXTRA_DESCRIPTION, description); + .putExtra(PlaceDescriptionFragment.EXTRA_DESCRIPTION, description) + .putExtra(EXTRA_TITLE, title); context.startActivity(intent); } + + @Override + protected void onStart() { + super.onStart(); + String toolbarTitle = getIntent().getStringExtra(EXTRA_TITLE); + this.getToolbar().setTitle(toolbarTitle); + } } diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java index 2be30fcae8..558568c099 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java @@ -63,7 +63,7 @@ public class PlacePageWikipediaFragment extends Fragment implements Observer