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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-08-16 00:38:24 +02:00
commit a764009725
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/assets/help/style.css
View file

@ -33,6 +33,7 @@
.imgcontainer{margin:20px 30px;} .imgcontainer{margin:20px 30px;}
.legendcontainer{margin:0;} .legendcontainer{margin:0;}
.legend{width:100%;} .legend{width:100%;}
.contributorsbanner {width:100%;}
/*div {border-width: 1px; padding: 10px; /*div {border-width: 1px; padding: 10px;
border: groove; margin-left:auto;margin-right:auto; width:480pt} border: groove; margin-left:auto;margin-right:auto; width:480pt}
h3.help { text-align: center} h3.help { text-align: center}

1
OsmAnd/assets/style.css
View file

@ -60,3 +60,4 @@
/***********help about****************************************************/ /***********help about****************************************************/
.about .surname{font-weight:bold;} .about .surname{font-weight:bold;}
.about h3{margin-top:30px;} .about h3{margin-top:30px;}
.contributorsbanner {width:100%;}

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

@ -31,7 +31,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
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"+
"<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, maximum-scale=1\" />\n" + "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />\n" +
"<meta http-equiv=\"cleartype\" content=\"on\" />\n" + "<meta http-equiv=\"cleartype\" content=\"on\" />\n" +
"<link href=\"file:///android_asset/style.css\" type=\"text/css\" rel=\"stylesheet\"/>\n" + "<link href=\"file:///android_asset/style.css\" type=\"text/css\" rel=\"stylesheet\"/>\n" +
"</head><body>\n" + "</head><body>\n" +
@ -71,6 +71,10 @@ public class HelpArticleDialogFragment extends DialogFragment {
String url = getArguments().getString(URL); String url = getArguments().getString(URL);
webView = (WebView) view.findViewById(R.id.webView); webView = (WebView) view.findViewById(R.id.webView);
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
webView.getSettings().setBuiltInZoomControls(true);
webView.getSettings().setDisplayZoomControls(false);
webView.getSettings().setSupportZoom(true);
if (assetName != null) { if (assetName != null) {
String fileContents = getAssetAsString(assetName, getActivity()); String fileContents = getAssetAsString(assetName, getActivity());