Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix

Browse source
This commit is contained in:
Victor Shcherb 2015-11-07 18:34:12 +01:00
parent ea88df9ab1
commit 294b91ce68
2 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
View file

@ -111,20 +111,20 @@ public class HelpActivity extends OsmandActionBarActivity {
private List<HelpMenuItem> createBeginWithOsmandItems() { private List<HelpMenuItem> createBeginWithOsmandItems() {
ArrayList<HelpMenuItem> arrayList = new ArrayList<>(); ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( 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() HelpMenuItem.Builder builder = new HelpMenuItem.Builder()
.setTitle(R.string.first_usage_item, getActivity()) .setTitle(R.string.first_usage_item, getActivity())
.setDescription(R.string.first_usage_item_description, getActivity()) .setDescription(R.string.first_usage_item_description, getActivity())
.setListener(listener); .setListener(listener);
arrayList.add(builder.create()); arrayList.add(builder.create());
listener = new ShowArticleOnTouchListener( listener = new ShowArticleOnTouchListener(
"feature_articles/navigation.html", getActivity()); "feature_articles/navigation.html", getActivity(), getString(R.string.shared_string_navigation));
builder = new HelpMenuItem.Builder() builder = new HelpMenuItem.Builder()
.setTitle(R.string.shared_string_navigation, getActivity()) .setTitle(R.string.shared_string_navigation, getActivity())
.setDescription(R.string.navigation_item_description, getActivity()) .setDescription(R.string.navigation_item_description, getActivity())
.setListener(listener); .setListener(listener);
arrayList.add(builder.create()); 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() builder = new HelpMenuItem.Builder()
.setTitle(R.string.faq_item, getActivity()) .setTitle(R.string.faq_item, getActivity())
.setDescription(R.string.faq_item_description, getActivity()) .setDescription(R.string.faq_item_description, getActivity())
@ -137,25 +137,25 @@ public class HelpActivity extends OsmandActionBarActivity {
ArrayList<HelpMenuItem> arrayList = new ArrayList<>(); ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
String name = getActivity().getString(R.string.map_viewing_item); String name = getActivity().getString(R.string.map_viewing_item);
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener(
"feature_articles/map-viewing.html", getActivity()); "feature_articles/map-viewing.html", getActivity(), name);
arrayList.add(new HelpMenuItem(name, listener)); arrayList.add(new HelpMenuItem(name, listener));
name = getActivity().getString(R.string.search_on_the_map_item); name = getActivity().getString(R.string.search_on_the_map_item);
listener = new ShowArticleOnTouchListener( 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)); arrayList.add(new HelpMenuItem(name, listener));
name = getActivity().getString(R.string.planning_trip_item); name = getActivity().getString(R.string.planning_trip_item);
listener = new ShowArticleOnTouchListener( listener = new ShowArticleOnTouchListener(
"feature_articles/trip-planning.html", getActivity()); "feature_articles/trip-planning.html", getActivity(), name);
arrayList.add(new HelpMenuItem(name, listener)); 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() { View.OnClickListener onClickListener = new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND) HelpArticleDialogFragment.instantiateWithUrl(OSMAND_MAP_LEGEND, legendName)
.show(getFragmentManager(), null); .show(getFragmentManager(), null);
} }
}; };
arrayList.add(new HelpMenuItem(name, onClickListener)); arrayList.add(new HelpMenuItem(legendName, onClickListener));
return arrayList; return arrayList;
} }
@ -168,7 +168,7 @@ public class HelpActivity extends OsmandActionBarActivity {
.setIcon(osmandPlugin.getLogoResourceId()); .setIcon(osmandPlugin.getLogoResourceId());
final String helpFileName = osmandPlugin.getHelpFileName(); final String helpFileName = osmandPlugin.getHelpFileName();
if (helpFileName != null) { if (helpFileName != null) {
builder.setListener(new ShowArticleOnTouchListener(helpFileName, getActivity())); builder.setListener(new ShowArticleOnTouchListener(helpFileName, getActivity(), osmandPlugin.getName()));
} }
arrayList.add(builder.create()); arrayList.add(builder.create());
} }
@ -179,16 +179,16 @@ public class HelpActivity extends OsmandActionBarActivity {
ArrayList<HelpMenuItem> arrayList = new ArrayList<>(); ArrayList<HelpMenuItem> arrayList = new ArrayList<>();
String name = getActivity().getString(R.string.instalation_troubleshooting_item); String name = getActivity().getString(R.string.instalation_troubleshooting_item);
ShowArticleOnTouchListener listener = new ShowArticleOnTouchListener( 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)); arrayList.add(new HelpMenuItem(name, listener));
name = getActivity().getString(R.string.techical_articles_item); name = getActivity().getString(R.string.techical_articles_item);
listener = new ShowArticleOnTouchListener( listener = new ShowArticleOnTouchListener(
"feature_articles/TechnicalArticles.html", getActivity()); "feature_articles/TechnicalArticles.html", getActivity(), name);
arrayList.add(new HelpMenuItem(name, listener)); arrayList.add(new HelpMenuItem(name, listener));
name = getActivity().getString(R.string.versions_item); name = getActivity().getString(R.string.versions_item);
listener = new ShowArticleOnTouchListener( listener = new ShowArticleOnTouchListener(
"feature_articles/changes.html", getActivity()); "feature_articles/changes.html", getActivity(), name);
arrayList.add(new HelpMenuItem(name, listener)); arrayList.add(new HelpMenuItem(name, listener));
String releasedate = ""; String releasedate = "";
@ -197,7 +197,7 @@ public class HelpActivity extends OsmandActionBarActivity {
} }
String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate; String version = Version.getFullVersion(getOsmandApplication()) + " " + releasedate;
listener = new ShowArticleOnTouchListener( listener = new ShowArticleOnTouchListener(
"feature_articles/about.html", getActivity()); "feature_articles/about.html", getActivity(), name);
HelpMenuItem.Builder builder = new HelpMenuItem.Builder() HelpMenuItem.Builder builder = new HelpMenuItem.Builder()
.setTitle(R.string.shared_string_about, getActivity()) .setTitle(R.string.shared_string_about, getActivity())
.setDescription(version) .setDescription(version)
@ -245,7 +245,7 @@ public class HelpActivity extends OsmandActionBarActivity {
feedbackButton.setOnClickListener(new View.OnClickListener() { feedbackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
HelpArticleDialogFragment.instantiateWithUrl(OSMAND_POLL_HTML) HelpArticleDialogFragment.instantiateWithUrl(OSMAND_POLL_HTML, ctx.getString(R.string.feedback))
.show(activity.getSupportFragmentManager(), null); .show(activity.getSupportFragmentManager(), null);
} }
}); });
@ -343,15 +343,17 @@ public class HelpActivity extends OsmandActionBarActivity {
private static class ShowArticleOnTouchListener implements View.OnClickListener { private static class ShowArticleOnTouchListener implements View.OnClickListener {
private final String filename; private final String filename;
private final FragmentActivity ctx; 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.filename = filename;
this.name = name;
this.ctx = ctx; this.ctx = ctx;
} }
@Override @Override
public void onClick(View v) { public void onClick(View v) {
HelpArticleDialogFragment.instantiateWithAsset(filename) HelpArticleDialogFragment.instantiateWithAsset(filename, name)
.show(ctx.getSupportFragmentManager(), null); .show(ctx.getSupportFragmentManager(), null);
} }
} }
@ -438,11 +440,6 @@ public class HelpActivity extends OsmandActionBarActivity {
this(title, null, -1, onClickListener); 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, private HelpMenuItem(String title, String desription, @DrawableRes int icon,
OnClickListener onClickListener) { OnClickListener onClickListener) {
this.title = title; this.title = title;

11
OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java
View file

@ -25,6 +25,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
private static final Log LOG = PlatformUtil.getLog(HelpArticleDialogFragment.class); private static final Log LOG = PlatformUtil.getLog(HelpArticleDialogFragment.class);
private static final String ASSET_NAME = "asset_name"; private static final String ASSET_NAME = "asset_name";
private static final String NAME = "name";
private static final String URL = "url"; private static final String URL = "url";
private WebView webView; private WebView webView;
private static String HEADER_INNER= "<html><head>\n"+ private static String HEADER_INNER= "<html><head>\n"+
@ -58,6 +59,10 @@ public class HelpArticleDialogFragment extends DialogFragment {
dismiss(); dismiss();
} }
}); });
String name = getArguments().getString(NAME);
if(name != null) {
toolbar.setTitle(name);
}
String assetName = getArguments().getString(ASSET_NAME); String assetName = getArguments().getString(ASSET_NAME);
String url = getArguments().getString(URL); String url = getArguments().getString(URL);
@ -108,17 +113,19 @@ public class HelpArticleDialogFragment extends DialogFragment {
return (OsmandApplication) getActivity().getApplication(); return (OsmandApplication) getActivity().getApplication();
} }
public static HelpArticleDialogFragment instantiateWithAsset(String assetName) { public static HelpArticleDialogFragment instantiateWithAsset(String assetName, String name) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ASSET_NAME, assetName); args.putString(ASSET_NAME, assetName);
args.putString(NAME, name);
final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment(); final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment();
helpArticleDialogFragment.setArguments(args); helpArticleDialogFragment.setArguments(args);
return helpArticleDialogFragment; return helpArticleDialogFragment;
} }
public static HelpArticleDialogFragment instantiateWithUrl(String url) { public static HelpArticleDialogFragment instantiateWithUrl(String url, String name) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(URL, url); args.putString(URL, url);
args.putString(NAME, name);
final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment(); final HelpArticleDialogFragment helpArticleDialogFragment = new HelpArticleDialogFragment();
helpArticleDialogFragment.setArguments(args); helpArticleDialogFragment.setArguments(args);
return helpArticleDialogFragment; return helpArticleDialogFragment;