From 294b91ce6801a382951a3e2081abf626e204b0ee Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 7 Nov 2015 18:34:12 +0100 Subject: [PATCH] Fix --- .../osmand/plus/activities/HelpActivity.java | 41 +++++++++---------- .../dialogs/HelpArticleDialogFragment.java | 11 ++++- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java index bd991aafbc..c9fd6c6fad 100644 --- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java @@ -111,20 +111,20 @@ public class HelpActivity extends OsmandActionBarActivity { private List createBeginWithOsmandItems() { ArrayList arrayList = new ArrayList<>(); ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( - "feature_articles/start.html", getActivity()); + "feature_articles/start.html", getActivity(), getString(R.string.first_usage_item)); HelpMenuItem.Builder builder = new HelpMenuItem.Builder() .setTitle(R.string.first_usage_item, getActivity()) .setDescription(R.string.first_usage_item_description, getActivity()) .setListener(listener); arrayList.add(builder.create()); listener = new ShowArticleOnTouchListener( - "feature_articles/navigation.html", getActivity()); + "feature_articles/navigation.html", getActivity(), getString(R.string.shared_string_navigation)); builder = new HelpMenuItem.Builder() .setTitle(R.string.shared_string_navigation, getActivity()) .setDescription(R.string.navigation_item_description, getActivity()) .setListener(listener); arrayList.add(builder.create()); - listener = new ShowArticleOnTouchListener("feature_articles/faq.html", getActivity()); + listener = new ShowArticleOnTouchListener("feature_articles/faq.html", getActivity(), getString(R.string.faq_item)); builder = new HelpMenuItem.Builder() .setTitle(R.string.faq_item, getActivity()) .setDescription(R.string.faq_item_description, getActivity()) @@ -137,25 +137,25 @@ public class HelpActivity extends OsmandActionBarActivity { ArrayList arrayList = new ArrayList<>(); String name = getActivity().getString(R.string.map_viewing_item); ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( - "feature_articles/map-viewing.html", getActivity()); + "feature_articles/map-viewing.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); name = getActivity().getString(R.string.search_on_the_map_item); listener = new ShowArticleOnTouchListener( - "feature_articles/find-something-on-map.html", getActivity()); + "feature_articles/find-something-on-map.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); name = getActivity().getString(R.string.planning_trip_item); listener = new ShowArticleOnTouchListener( - "feature_articles/trip-planning.html", getActivity()); + "feature_articles/trip-planning.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); - name = getActivity().getString(R.string.map_legend); + final String legendName = getActivity().getString(R.string.map_legend); View.OnClickListener onClickListener = new View.OnClickListener() { @Override public void onClick(View v) { - HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND) + HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND, legendName) .show(getFragmentManager(), null); } }; - arrayList.add(new HelpMenuItem(name, onClickListener)); + arrayList.add(new HelpMenuItem(legendName, onClickListener)); return arrayList; } @@ -168,7 +168,7 @@ public class HelpActivity extends OsmandActionBarActivity { .setIcon(osmandPlugin.getLogoResourceId()); final String helpFileName = osmandPlugin.getHelpFileName(); if (helpFileName != null) { - builder.setListener(new ShowArticleOnTouchListener(helpFileName, getActivity())); + builder.setListener(new ShowArticleOnTouchListener(helpFileName, getActivity(), osmandPlugin.getName())); } arrayList.add(builder.create()); } @@ -179,16 +179,16 @@ public class HelpActivity extends OsmandActionBarActivity { ArrayList arrayList = new ArrayList<>(); String name = getActivity().getString(R.string.instalation_troubleshooting_item); ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( - "feature_articles/installation-and-troubleshooting.html", getActivity()); + "feature_articles/installation-and-troubleshooting.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); name = getActivity().getString(R.string.techical_articles_item); listener = new ShowArticleOnTouchListener( - "feature_articles/TechnicalArticles.html", getActivity()); + "feature_articles/TechnicalArticles.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); name = getActivity().getString(R.string.versions_item); listener = new ShowArticleOnTouchListener( - "feature_articles/changes.html", getActivity()); + "feature_articles/changes.html", getActivity(), name); arrayList.add(new HelpMenuItem(name, listener)); String releasedate = ""; @@ -197,7 +197,7 @@ public class HelpActivity extends OsmandActionBarActivity { } String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate; listener = new ShowArticleOnTouchListener( - "feature_articles/about.html", getActivity()); + "feature_articles/about.html", getActivity(), name); HelpMenuItem.Builder builder = new HelpMenuItem.Builder() .setTitle(R.string.shared_string_about, getActivity()) .setDescription(version) @@ -245,7 +245,7 @@ public class HelpActivity extends OsmandActionBarActivity { feedbackButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - HelpArticleDialogFragment.instantiateWithUrl(OSMAND_POLL_HTML) + HelpArticleDialogFragment.instantiateWithUrl(OSMAND_POLL_HTML, ctx.getString(R.string.feedback)) .show(activity.getSupportFragmentManager(), null); } }); @@ -343,15 +343,17 @@ public class HelpActivity extends OsmandActionBarActivity { private static class ShowArticleOnTouchListener implements View.OnClickListener { private final String filename; private final FragmentActivity ctx; + private String name; - private ShowArticleOnTouchListener(String filename, FragmentActivity ctx) { + private ShowArticleOnTouchListener(String filename, FragmentActivity ctx, String name) { this.filename = filename; + this.name = name; this.ctx = ctx; } @Override public void onClick(View v) { - HelpArticleDialogFragment.instantiateWithAsset(filename) + HelpArticleDialogFragment.instantiateWithAsset(filename, name) .show(ctx.getSupportFragmentManager(), null); } } @@ -438,11 +440,6 @@ public class HelpActivity extends OsmandActionBarActivity { this(title, null, -1, onClickListener); } - private HelpMenuItem(String title, @StringRes int desription, @DrawableRes int icon, - Context context, OnClickListener onClickListener) { - this(title, context.getString(desription), icon, onClickListener); - } - private HelpMenuItem(String title, String desription, @DrawableRes int icon, OnClickListener onClickListener) { this.title = title; diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java index efef8e2548..f2b1cbbc04 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java @@ -25,6 +25,7 @@ public class HelpArticleDialogFragment extends DialogFragment { private static final Log LOG = PlatformUtil.getLog(HelpArticleDialogFragment.class); private static final String ASSET_NAME = "asset_name"; + private static final String NAME = "name"; private static final String URL = "url"; private WebView webView; private static String HEADER_INNER= "\n"+ @@ -58,6 +59,10 @@ public class HelpArticleDialogFragment extends DialogFragment { dismiss(); } }); + String name = getArguments().getString(NAME); + if(name != null) { + toolbar.setTitle(name); + } String assetName = getArguments().getString(ASSET_NAME); String url = getArguments().getString(URL); @@ -108,17 +113,19 @@ public class HelpArticleDialogFragment extends DialogFragment { return (OsmandApplication) getActivity().getApplication(); } - public static HelpArticleDialogFragment instantiateWithAsset(String assetName) { + public static HelpArticleDialogFragment instantiateWithAsset(String assetName, String name) { Bundle args = new Bundle(); args.putString(ASSET_NAME, assetName); + args.putString(NAME, name); final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment(); helpArticleDialogFragment.setArguments(args); return helpArticleDialogFragment; } - public static HelpArticleDialogFragment instantiateWithUrl(String url) { + public static HelpArticleDialogFragment instantiateWithUrl(String url, String name) { Bundle args = new Bundle(); args.putString(URL, url); + args.putString(NAME, name); final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment(); helpArticleDialogFragment.setArguments(args); return helpArticleDialogFragment;