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

Close all sections when selecting from contents

Browse source
This commit is contained in:
PaulStets 2018-04-15 14:41:00 +03:00
parent 6dffedfa3d
commit aeacbf6cfc
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
View file

@ -27,7 +27,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.OsmandSettings; import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.wikivoyage.WikivoyageBaseDialogFragment; import net.osmand.plus.wikivoyage.WikivoyageBaseDialogFragment;
import net.osmand.plus.wikivoyage.data.CustomWebViewClient; import net.osmand.plus.wikivoyage.data.WikivoyageWebViewClient;
import net.osmand.plus.wikivoyage.data.WikivoyageArticle; import net.osmand.plus.wikivoyage.data.WikivoyageArticle;
import net.osmand.plus.wikivoyage.data.WikivoyageLocalDataHelper; import net.osmand.plus.wikivoyage.data.WikivoyageLocalDataHelper;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
@ -66,10 +66,25 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
"openContent(title);" + "openContent(title);" +
"window.location.hash = id;}\n" + "window.location.hash = id;}\n" +
"function openContent(id) {\n" + "function openContent(id) {\n" +
"var doc = document.getElementById(id).parentElement;\n" + " var doc = document.getElementById(id).parentElement;\n" +
" doc.classList.toggle(\"active\");\n" + " doc.classList.toggle(\"active\");\n" +
" var content = doc.nextElementSibling;\n" + " var content = doc.nextElementSibling;\n" +
"content.style.display = \"block\";\n" + " content.style.display = \"block\";\n" +
" collapseActive(doc);" +
"}" +
"function collapseActive(doc) {" +
" var coll = document.getElementsByTagName(\"H2\");" +
" var i;" +
" for (i = 0; i < coll.length; i++) {" +
" var item = coll[i];" +
" if (item != doc && item.classList.contains(\"active\")) {" +
" item.classList.toggle(\"active\");" +
" var content = item.nextElementSibling;" +
" if (content.style.display === \"block\") {" +
" content.style.display = \"none\";" +
" }" +
" }" +
" }" +
"}</script>" "}</script>"
+ "</body></html>"; + "</body></html>";
@ -156,7 +171,7 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ONLY); WebSettings.LOAD_DEFAULT : WebSettings.LOAD_CACHE_ONLY);
break; break;
} }
contentWebView.setWebViewClient(new CustomWebViewClient(getActivity(), getFragmentManager())); contentWebView.setWebViewClient(new WikivoyageWebViewClient(getActivity(), getFragmentManager()));
return mainView; return mainView;
} }