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

Merge pull request #5296 from osmandapp/PaulsBranch

Browse source 
Pauls branch
This commit is contained in:
vshcherb 2018-04-28 15:20:23 +03:00 committed by GitHub
commit 237471b41a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
View file

@ -17,6 +17,7 @@ import android.widget.ExpandableListView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import net.osmand.plus.R;
import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
@ -77,7 +78,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
}
parentsList = new ArrayList<>(Arrays.asList(article.getAggregatedPartOf().split(",")));
LinkedHashMap<String, List<WikivoyageSearchResult>> navigationMap = getMyApplication().getTravelDbHelper().getNavigationMap(article);
LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> navigationMap = getMyApplication().getTravelDbHelper().getNavigationMap(article);
items.add(new TitleItem(getString(R.string.shared_string_navigation)));
@ -107,10 +108,12 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
expListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
@Override
public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
if (!expListView.isGroupExpanded(groupPosition)) {
expListView.expandGroup(groupPosition);
WikivoyageSearchResult articleItem = (WikivoyageSearchResult) listAdapter.getGroup(groupPosition);
if (articleItem.getCityId() == -1) {
Toast.makeText(getContext(), R.string.wiki_article_not_found, Toast.LENGTH_LONG).show();
} else {
expListView.collapseGroup(groupPosition);
sendResults(articleItem.getCityId());
dismiss();
}
return true;
}
@ -177,13 +180,13 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
private Context context;
private LinkedHashMap<String, List<WikivoyageSearchResult>> navigationMap;
private List<String> headers;
private LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> navigationMap;
private List<WikivoyageSearchResult> headers;
private Drawable itemGroupIcon;
private Drawable itemChildIcon;
ExpandableListAdapter(Context context, LinkedHashMap<String, List<WikivoyageSearchResult>> navigationMap) {
ExpandableListAdapter(Context context, LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> navigationMap) {
this.context = context;
this.navigationMap = navigationMap;
headers = new ArrayList<>(navigationMap.keySet());
@ -264,7 +267,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
@Override
public View getGroupView(final int groupPosition, final boolean isExpanded,
View convertView, ViewGroup parent) {
String groupTitle = (String) getGroup(groupPosition);
String groupTitle = ((WikivoyageSearchResult) getGroup(groupPosition)).getArticleTitles().get(0);
boolean selected = parentsList.contains(groupTitle) || article.getTitle().equals(groupTitle);
if (convertView == null) {
convertView = LayoutInflater.from(context)

35
OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelDbHelper.java
View file

@ -32,9 +32,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import gnu.trove.map.hash.TLongObjectHashMap;
@ -295,7 +297,7 @@ public class TravelDbHelper {
}
@NonNull
public LinkedHashMap<String, List<WikivoyageSearchResult>> getNavigationMap(final TravelArticle article) {
public LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> getNavigationMap(final TravelArticle article) {
String lang = article.getLang();
String title = article.getTitle();
if (TextUtils.isEmpty(lang) || TextUtils.isEmpty(title)) {
@ -315,6 +317,8 @@ public class TravelDbHelper {
}
Map<String, List<WikivoyageSearchResult>> navMap = new HashMap<>();
SQLiteConnection conn = openConnection();
Set<String> headers = null;
Map<String, WikivoyageSearchResult> headerObjs = new HashMap<>();
if (conn != null) {
List<String> params = new ArrayList<>();
StringBuilder query = new StringBuilder("SELECT a.city_id, a.title, a.lang, a.is_part_of " +
@ -322,6 +326,12 @@ public class TravelDbHelper {
params.add(title);
params.add(lang);
if (parts != null && parts.length > 0) {
headers = new HashSet<>(Arrays.asList(parts));
headers.add(title);
query.append("UNION SELECT a.city_id, a.title, a.lang, a.is_part_of " +
"FROM wikivoyage_articles a WHERE title = ? and lang = ? ");
params.add(parts[0]);
params.add(lang);
for (String part : parts) {
query.append("UNION SELECT a.city_id, a.title, a.lang, a.is_part_of " +
"FROM wikivoyage_articles a WHERE is_part_of = ? and lang = ? ");
@ -329,7 +339,6 @@ public class TravelDbHelper {
params.add(lang);
}
}
SQLiteCursor cursor = conn.rawQuery(query.toString(), params.toArray(new String[params.size()]));
if (cursor.moveToFirst()) {
do {
@ -344,18 +353,18 @@ public class TravelDbHelper {
navMap.put(rs.isPartOf.get(0), l);
}
l.add(rs);
String key = rs.getArticleTitles().get(0);
if (headers != null && headers.contains(key)) {
headerObjs.put(key, rs);
}
} while (cursor.moveToNext());
}
cursor.close();
}
LinkedHashMap<String, List<WikivoyageSearchResult>> res = new LinkedHashMap<>();
List<String> partsList = new ArrayList<>();
if (parts != null) {
partsList.addAll(Arrays.asList(parts));
}
partsList.add(title);
for (String part : partsList) {
List<WikivoyageSearchResult> results = navMap.get(part);
LinkedHashMap<WikivoyageSearchResult, List<WikivoyageSearchResult>> res = new LinkedHashMap<>();
for (String header : navMap.keySet()) {
WikivoyageSearchResult searchResult = headerObjs.get(header);
List<WikivoyageSearchResult> results = navMap.get(header);
if (results != null) {
Collections.sort(results, new Comparator<WikivoyageSearchResult>() {
@Override
@ -363,7 +372,11 @@ public class TravelDbHelper {
return collator.compare(o1.articleTitles.get(0), o2.articleTitles.get(0));
}
});
res.put(part, results);
WikivoyageSearchResult emptyResult = new WikivoyageSearchResult();
emptyResult.articleTitles.add(header);
emptyResult.cityId = -1;
searchResult = searchResult != null ? searchResult : emptyResult;
res.put(searchResult, results);
}
}
return res;