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

Add HTML support

Browse source
This commit is contained in:
cepprice 2021-02-03 21:28:22 +05:00
parent 27b47907f1
commit ff0d6a535c
3 changed files with 73 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/FavouritePointMenuBuilder.java
View file

@ -22,7 +22,9 @@ import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.MenuBuilder; import net.osmand.plus.mapcontextmenu.MenuBuilder;
import net.osmand.plus.mapcontextmenu.CollapsableView; import net.osmand.plus.mapcontextmenu.CollapsableView;
import net.osmand.plus.myplaces.FavoritesActivity; import net.osmand.plus.myplaces.FavoritesActivity;
import net.osmand.plus.views.layers.POIMapLayer;
import net.osmand.plus.widgets.TextViewEx; import net.osmand.plus.widgets.TextViewEx;
import net.osmand.plus.wikipedia.WikiArticleHelper;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
@ -82,11 +84,23 @@ public class FavouritePointMenuBuilder extends MenuBuilder {
} }
@Override @Override
protected void buildDescription(View view) { protected void buildDescription(final View view) {
String desc = fav.getDescription(); final String desc = fav.getDescription();
if (!Algorithms.isEmpty(desc)) { if (Algorithms.isEmpty(desc)) {
buildDescriptionRow(view, app.getString(R.string.shared_string_description), desc, 0, 10, true); return;
} }
final String textPrefix = app.getString(R.string.shared_string_description);
View.OnClickListener clickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
POIMapLayer.showHtmlDescriptionDialog(view.getContext(), app, desc, textPrefix);
}
};
buildRow(view, null, null, textPrefix, WikiArticleHelper.getPartialContent(desc), 0,
null, false, null, true, 10,
false, false, false, clickListener, true);
} }
private void buildGroupFavouritesView(View view) { private void buildGroupFavouritesView(View view) {

53
OsmAnd/src/net/osmand/plus/views/layers/POIMapLayer.java
View file

@ -3,9 +3,11 @@ package net.osmand.plus.views.layers;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.util.Linkify; import android.text.util.Linkify;
import android.util.Base64;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -41,6 +43,7 @@ import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.views.OsmandMapLayer; import net.osmand.plus.views.OsmandMapLayer;
import net.osmand.plus.views.OsmandMapTileView; import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.layers.MapTextLayer.MapTextProvider; import net.osmand.plus.views.layers.MapTextLayer.MapTextProvider;
import net.osmand.plus.widgets.WebViewEx;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import java.util.ArrayList; import java.util.ArrayList;
@ -272,7 +275,39 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
} }
public static void showDescriptionDialog(Context ctx, OsmandApplication app, String text, String title) { public static void showDescriptionDialog(Context ctx, OsmandApplication app, String text, String title) {
showText(ctx, app, text, title); final TextView textView = new TextView(ctx);
LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
int textMargin = dpToPx(app, 10f);
boolean light = app.getSettings().isLightContent();
textView.setLayoutParams(llTextParams);
textView.setPadding(textMargin, textMargin, textMargin, textMargin);
textView.setTextSize(16);
textView.setTextColor(ContextCompat.getColor(app, light ? R.color.text_color_primary_light : R.color.text_color_primary_dark));
textView.setAutoLinkMask(Linkify.ALL);
textView.setLinksClickable(true);
textView.setText(text);
showText(ctx, app, textView, title);
}
public static void showHtmlDescriptionDialog(Context ctx, OsmandApplication app, String html, String title) {
final WebViewEx webView = new WebViewEx(ctx);
LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
webView.setLayoutParams(llTextParams);
int margin = dpToPx(app, 10f);
webView.setPadding(margin, margin, margin, margin);
webView.setScrollbarFadingEnabled(true);
webView.setVerticalScrollBarEnabled(false);
webView.setBackgroundColor(Color.TRANSPARENT);
webView.getSettings().setTextZoom((int) (app.getResources().getConfiguration().fontScale * 100f));
boolean light = app.getSettings().isLightContent();
int textColor = ContextCompat.getColor(app, light ? R.color.text_color_primary_light : R.color.text_color_primary_dark);
String rgbHex = Integer.toHexString(textColor).substring(2, 8);
html = "<body style=\"color:#" + rgbHex + ";\">" + html + "</body>";
String encoded = Base64.encodeToString(html.getBytes(), Base64.NO_PADDING);
webView.loadData(encoded, "text/html", "base64");
showText(ctx, app, webView, title);
} }
static int getResIdFromAttribute(final Context ctx, final int attr) { static int getResIdFromAttribute(final Context ctx, final int attr) {
@ -284,7 +319,7 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
return typedvalueattr.resourceId; return typedvalueattr.resourceId;
} }
private static void showText(final Context ctx, final OsmandApplication app, final String text, String title) { private static void showText(final Context ctx, final OsmandApplication app, final View view, String title) {
final Dialog dialog = new Dialog(ctx, final Dialog dialog = new Dialog(ctx,
app.getSettings().isLightContent() ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme); app.getSettings().isLightContent() ? R.style.OsmandLightTheme : R.style.OsmandDarkTheme);
@ -306,24 +341,12 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
} }
}); });
final TextView textView = new TextView(ctx);
LinearLayout.LayoutParams llTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
int textMargin = dpToPx(app, 10f);
boolean light = app.getSettings().isLightContent();
textView.setLayoutParams(llTextParams);
textView.setPadding(textMargin, textMargin, textMargin, textMargin);
textView.setTextSize(16);
textView.setTextColor(ContextCompat.getColor(app, light ? R.color.text_color_primary_light : R.color.text_color_primary_dark));
textView.setAutoLinkMask(Linkify.ALL);
textView.setLinksClickable(true);
textView.setText(text);
ScrollView scrollView = new ScrollView(ctx); ScrollView scrollView = new ScrollView(ctx);
ll.addView(topBar); ll.addView(topBar);
LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, 0); LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, 0);
lp.weight = 1; lp.weight = 1;
ll.addView(scrollView, lp); ll.addView(scrollView, lp);
scrollView.addView(textView); scrollView.addView(view);
dialog.setContentView(ll); dialog.setContentView(ll);
dialog.setCancelable(true); dialog.setCancelable(true);

20
OsmAnd/src/net/osmand/plus/wikivoyage/menu/WikivoyageWptPtMenuBuilder.java
View file

@ -8,6 +8,8 @@ import net.osmand.GPXUtilities.WptPt;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.mapcontextmenu.builders.WptPtMenuBuilder; import net.osmand.plus.mapcontextmenu.builders.WptPtMenuBuilder;
import net.osmand.plus.views.layers.POIMapLayer;
import net.osmand.plus.wikipedia.WikiArticleHelper;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import java.util.HashMap; import java.util.HashMap;
@ -29,11 +31,23 @@ public class WikivoyageWptPtMenuBuilder extends WptPtMenuBuilder {
} }
@Override @Override
protected void buildDescription(View view) { protected void buildDescription(final View view) {
final String desc = descTokens.get(KEY_DESCRIPTION); final String desc = descTokens.get(KEY_DESCRIPTION);
if (!Algorithms.isEmpty(desc)) { if (Algorithms.isEmpty(desc)) {
buildDescriptionRow(view, app.getString(R.string.shared_string_description), desc, 0, 10, true); return;
} }
final String textPrefix = app.getString(R.string.shared_string_description);
View.OnClickListener clickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
POIMapLayer.showHtmlDescriptionDialog(view.getContext(), app, desc, textPrefix);
}
};
buildRow(view, null, null, textPrefix, WikiArticleHelper.getPartialContent(desc), 0,
null, false, null, true, 10,
false, false, false, clickListener, true);
} }
@Override @Override