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

Merge conflicts

Browse source
This commit is contained in:
Victor Shcherb 2018-04-15 17:41:43 +02:00
parent d2dc413af0
commit 87cf5a067d
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml
View file

@ -23,8 +23,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<View
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/article_toolbar_text"
android:layout_width="0dp"
android:gravity="center_vertical"
android:textSize="@dimen/dialog_header_text_size"
android:ellipsize="end"
osmand:typeface="@string/font_roboto_medium"
android:layout_height="match_parent"
android:layout_weight="1"/>

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

@ -105,6 +105,8 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
private TextView saveBtn;
private WebView contentWebView;
private TextView articleToolbarText;
@SuppressLint("SetJavaScriptEnabled")
@Nullable
@ -122,7 +124,8 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
final View mainView = inflate(R.layout.fragment_wikivoyage_article_dialog, container);
setupToolbar((Toolbar) mainView.findViewById(R.id.toolbar));
articleToolbarText = (TextView) mainView.findViewById(R.id.article_toolbar_text);
ColorStateList selectedLangColorStateList = AndroidUtils.createPressedColorStateList(
getContext(), nightMode,
R.color.icon_color, R.color.wikivoyage_active_light,
@ -233,7 +236,7 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
if (activity != null) {
WikivoyageShowPicturesDialogFragment fragment = new WikivoyageShowPicturesDialogFragment();
fragment.setTargetFragment(this, WikivoyageShowPicturesDialogFragment.SHOW_PICTURES_CHANGED);
fragment.show(activity.getSupportFragmentManager(), WikivoyageShowPicturesDialogFragment.TAG);
fragment.show(getFragmentManager(), WikivoyageShowPicturesDialogFragment.TAG);
settings.WIKIVOYAGE_SHOW_IMAGES_ASKED.set(true);
}
}
@ -321,11 +324,12 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
if (selectedLang == null) {
selectedLang = langs.get(0);
}
articleToolbarText.setText("");
article = getMyApplication().getWikivoyageDbHelper().getArticle(cityId, selectedLang);
if (article == null) {
return;
}
articleToolbarText.setText(article.getTitle());
if(article.getGpxFile() != null) {
trackButton.setText(getString(R.string.points) + " (" + article.getGpxFile().getPointsSize() +")");
}