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

change names and saved articles images

Browse source
This commit is contained in:
Chumva 2018-04-13 11:29:17 +03:00
parent c284287b8d
commit fc6aa1a404
7 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/res/values/strings.xml
View file

@ -9,12 +9,12 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="images_cache">Images cache:</string>
<string name="delete_search_history">Delete search history</string>
<string name="show_images">Show images</string>
<string name="download_maps_travel">Travel maps</string>
<string name="shared_string_wikivoyage">Wikivoyage</string>
<string name="article_removed">Article removed</string>
<string name="wikivoyage_images_cache">Images cache</string>
<string name="shared_string_delete_search_history">Delete search history</string>
<string name="wikivoyage_show_images">Show images</string>
<string name="wikivoyage_search_hint">Search: Country, City, Province</string>
<string name="shared_string_read">Read</string>
<string name="saved_articles">Saved articles</string>

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -717,7 +717,7 @@ public class OsmandSettings {
public final CommonPreference<Boolean> SHOW_LINES_TO_FIRST_MARKERS = new BooleanPreference("show_lines_to_first_markers", false).makeProfile();
public final CommonPreference<Boolean> SHOW_ARROWS_TO_FIRST_MARKERS = new BooleanPreference("show_arrows_to_first_markers", false).makeProfile();
public final CommonPreference<Boolean> SHOW_WEBVIEW_IMAGES = new BooleanPreference("show_webview_images", false);
public final CommonPreference<Boolean> SHOW_IMAGES = new BooleanPreference("show_images", false);
public final CommonPreference<Boolean> SELECT_MARKER_ON_SINGLE_TAP = new BooleanPreference("select_marker_on_single_tap", false).makeProfile();

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

@ -119,7 +119,7 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
contentWebView = (WebView) mainView.findViewById(R.id.content_web_view);
contentWebView.getSettings().setJavaScriptEnabled(true);
contentWebView.getSettings().setLoadsImagesAutomatically(getSettings().SHOW_WEBVIEW_IMAGES.get());
contentWebView.getSettings().setLoadsImagesAutomatically(getSettings().SHOW_IMAGES.get());
return mainView;
}
@ -230,9 +230,9 @@ public class WikivoyageArticleDialogFragment extends WikivoyageBaseDialogFragmen
private String createHtmlContent(@NonNull WikivoyageArticle article) {
StringBuilder sb = new StringBuilder(HEADER_INNER);
String articleTitle = article.getImageTitle();
if (!TextUtils.isEmpty(articleTitle)&&!getSettings().SHOW_WEBVIEW_IMAGES.get()) {
String url = WikivoyageArticle.getImageUrl(articleTitle, false);
String articleImageTitle = article.getImageTitle();
if (!TextUtils.isEmpty(articleImageTitle)&&!getSettings().SHOW_IMAGES.get()) {
String url = WikivoyageArticle.getImageUrl(articleImageTitle, false);
sb.append("<div class=\"title-image\" style=\"background-image: url(").append(url).append(")\"></div>");
}
sb.append("<div class=\"main\">\n");

14
OsmAnd/src/net/osmand/plus/wikivoyage/explore/OptionsImagesCasheBottomSheetDialogFragment.java → OsmAnd/src/net/osmand/plus/wikivoyage/explore/OptionsImagesCacheHistoryBottomSheetDialogFragment.java
View file

@ -15,7 +15,7 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerHalfItem;
import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
import net.osmand.plus.wikivoyage.data.WikivoyageLocalDataHelper;
public class OptionsImagesCasheBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
public class OptionsImagesCacheHistoryBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
public final static String TAG = "OptionsImagesCasheBottomSheetDialogFragment";
@ -24,18 +24,18 @@ public class OptionsImagesCasheBottomSheetDialogFragment extends MenuBottomSheet
items.add(new TitleItem(getString(R.string.shared_string_options)));
boolean showWebviewImages = getMyApplication().getSettings().SHOW_WEBVIEW_IMAGES.get();
boolean showImages = getMyApplication().getSettings().SHOW_IMAGES.get();
BaseBottomSheetItem showWebviewImagesItem = new BottomSheetItemWithCompoundButton.Builder()
.setChecked(showWebviewImages)
.setChecked(showImages)
.setIcon(getContentIcon(R.drawable.ic_type_img))
.setTitle(getString(R.string.wikivoyage_show_images))
.setTitle(getString(R.string.show_images))
.setLayoutId(R.layout.bottom_sheet_item_with_switch)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
OsmandSettings settings = getMyApplication().getSettings();
settings.SHOW_WEBVIEW_IMAGES.set(!settings.SHOW_WEBVIEW_IMAGES.get());
settings.SHOW_IMAGES.set(!settings.SHOW_IMAGES.get());
dismiss();
}
})
@ -44,7 +44,7 @@ public class OptionsImagesCasheBottomSheetDialogFragment extends MenuBottomSheet
BaseBottomSheetItem clearCacheItem = new BottomSheetItemWithDescription.Builder()
.setDescription(getString(R.string.shared_string_clear))
.setTitle(getString(R.string.wikivoyage_images_cache))
.setTitle(getString(R.string.images_cache))
.setLayoutId(R.layout.bottom_sheet_item_with_right_descr)
.setOnClickListener(new View.OnClickListener() {
@Override
@ -60,7 +60,7 @@ public class OptionsImagesCasheBottomSheetDialogFragment extends MenuBottomSheet
BaseBottomSheetItem clearHistoryItem = new SimpleBottomSheetItem.Builder()
.setIcon(getContentIcon(R.drawable.ic_action_history))
.setTitle(getString(R.string.shared_string_delete_search_history))
.setTitle(getString(R.string.delete_search_history))
.setLayoutId(R.layout.bottom_sheet_item_simple)
.setOnClickListener(new View.OnClickListener() {
@Override

8
OsmAnd/src/net/osmand/plus/wikivoyage/explore/SavedArticlesRvAdapter.java
View file

@ -76,10 +76,9 @@ public class SavedArticlesRvAdapter extends RecyclerView.Adapter<RecyclerView.Vi
final ItemVH holder = (ItemVH) viewHolder;
WikivoyageArticle article = (WikivoyageArticle) getItem(position);
boolean lastItem = position == getItemCount() - 1;
if (app.getSettings().SHOW_IMAGES.get()) {
Picasso.get()
.load(app.getSettings().SHOW_WEBVIEW_IMAGES.get() ?
WikivoyageArticle.getImageUrl(article.getImageTitle(), false) : null)
.load(WikivoyageArticle.getImageUrl(article.getImageTitle(), false))
.transform(USE_ALTERNATIVE_CARD ? new CropRectTransformation() : new CropCircleTransformation())
.into(holder.icon, new Callback() {
@Override
@ -92,6 +91,9 @@ public class SavedArticlesRvAdapter extends RecyclerView.Adapter<RecyclerView.Vi
holder.icon.setVisibility(View.GONE);
}
});
} else {
holder.icon.setVisibility(View.GONE);
}
holder.title.setText(article.getTitle());
holder.content.setText(article.getContent());
holder.partOf.setText(article.getGeoDescription());

5
OsmAnd/src/net/osmand/plus/wikivoyage/explore/WikivoyageExploreDialogFragment.java
View file

@ -20,7 +20,6 @@ import android.widget.TextView;
import net.osmand.AndroidUtils;
import net.osmand.plus.LockableViewPager;
import net.osmand.plus.R;
import net.osmand.plus.mapmarkers.OrderByBottomSheetDialogFragment;
import net.osmand.plus.wikivoyage.WikivoyageBaseDialogFragment;
import net.osmand.plus.wikivoyage.search.WikivoyageSearchDialogFragment;
@ -57,9 +56,9 @@ public class WikivoyageExploreDialogFragment extends WikivoyageBaseDialogFragmen
mainView.findViewById(R.id.options_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
OptionsImagesCasheBottomSheetDialogFragment fragment = new OptionsImagesCasheBottomSheetDialogFragment();
OptionsImagesCacheHistoryBottomSheetDialogFragment fragment = new OptionsImagesCacheHistoryBottomSheetDialogFragment();
fragment.setUsedOnMap(false);
fragment.show(getChildFragmentManager(), OptionsImagesCasheBottomSheetDialogFragment.TAG);
fragment.show(getChildFragmentManager(), OptionsImagesCacheHistoryBottomSheetDialogFragment.TAG);
}
});

2
OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
View file

@ -74,7 +74,7 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView
if (item instanceof WikivoyageSearchResult) {
WikivoyageSearchResult searchRes = (WikivoyageSearchResult) item;
Picasso.get()
.load(app.getSettings().SHOW_WEBVIEW_IMAGES.get() ?
.load(app.getSettings().SHOW_IMAGES.get() ?
WikivoyageArticle.getImageUrl(searchRes.getImageTitle(), true) : null)
.transform(new CropCircleTransformation())
.placeholder(placeholder)