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 2018-04-09 19:38:17 +02:00
commit f66ba66e6d
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,11 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
if (savedInstanceState != null) {
selectedLang = savedInstanceState.getString(SELECTED_LANG_KEY);
} else {
Bundle args = getArguments();
if (args != null) {
selectedLang = args.getString(SELECTED_LANG_KEY);
}
}
final View mainView = inflate(R.layout.fragment_wikivoyage_article_dialog, container);
@ -190,10 +195,17 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
}
public static boolean showInstance(FragmentManager fm, long cityId, ArrayList<String> langs) {
return showInstance(fm, cityId, langs, null);
}
public static boolean showInstance(FragmentManager fm, long cityId, ArrayList<String> langs, @Nullable String selectedLang) {
try {
Bundle args = new Bundle();
args.putLong(CITY_ID_KEY, cityId);
args.putStringArrayList(LANGS_KEY, langs);
if (langs.contains(selectedLang)) {
args.putString(SELECTED_LANG_KEY, selectedLang);
}
WikivoyageArticleDialogFragment fragment = new WikivoyageArticleDialogFragment();
fragment.setArguments(args);
fragment.show(fm, TAG);

6
OsmAnd/src/net/osmand/plus/wikivoyage/search/WikivoyageSearchDialogFragment.java
View file

@ -111,12 +111,8 @@ public class WikivoyageSearchDialogFragment extends WikivoyageBaseDialogFragment
WikivoyageSearchHistoryItem historyItem = (WikivoyageSearchHistoryItem) item;
ArrayList<String> langs = getMyApplication().getWikivoyageDbHelper()
.getArticleLangs(historyItem.getCityId());
boolean selectedLangExists = langs.remove(historyItem.getLang());
if (selectedLangExists) {
langs.add(0, historyItem.getLang());
}
WikivoyageArticleDialogFragment.showInstance(getFragmentManager(),
historyItem.getCityId(), langs);
historyItem.getCityId(), langs, historyItem.getLang());
}
}
}