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

Fix web image viewer

Browse source
This commit is contained in:
Alexey Kulish 2017-05-08 09:57:06 +03:00
parent 2253b27da7
commit 263a16d60e
8 changed files with 533 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
OsmAnd/res/layout-land/map_image_view.xml Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="@dimen/dashboard_land_width"
android:layout_height="match_parent"
android:background="@android:color/transparent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/left_menu_view_bg"
android:orientation="vertical">
<LinearLayout
android:id="@+id/image_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/dashboard_map_toolbar"
android:background="@color/osmand_orange"
android:gravity="center_vertical"
android:orientation="horizontal">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image_close_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/shared_string_close"
android:tint="@color/color_white"
android:src="@drawable/ic_action_remove_dark"/>
<LinearLayout
android:id="@+id/image_title_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp">
<TextView
android:id="@+id/image_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:ellipsize="end"
android:gravity="center_vertical"
android:lines="1"
android:singleLine="true"
android:textColor="@color/color_white"
android:textSize="@dimen/abc_text_size_medium_material"
tools:text="Title"/>
<TextView
android:id="@+id/image_description"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:ellipsize="end"
android:gravity="center_vertical"
android:textColor="@color/color_white"
android:textSize="@dimen/default_sub_text_size"
android:visibility="gone"
tools:text="Description"/>
</LinearLayout>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image_refresh_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="48dp"
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/shared_string_refresh"
android:src="@drawable/ic_action_refresh_dark"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout
android:id="@+id/image_viewer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/map_widget_dark"
android:orientation="vertical"/>
</LinearLayout>
</LinearLayout>

5
OsmAnd/res/layout/main.xml
View file

@ -72,6 +72,11 @@
</FrameLayout>
<FrameLayout
android:id="@+id/topFragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<FrameLayout
android:id="@+id/routeMenuContainer"
android:layout_width="match_parent"

91
OsmAnd/res/layout/map_image_view.xml Normal file
View file

@ -0,0 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent">
<LinearLayout
android:id="@+id/image_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/dashboard_map_toolbar"
android:background="@color/osmand_orange"
android:gravity="center_vertical"
android:orientation="horizontal">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image_close_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/shared_string_close"
android:tint="@color/color_white"
android:src="@drawable/ic_action_remove_dark"/>
<LinearLayout
android:id="@+id/image_title_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp">
<TextView
android:id="@+id/image_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:ellipsize="end"
android:gravity="center_vertical"
android:lines="1"
android:singleLine="true"
android:textColor="@color/color_white"
android:textSize="@dimen/abc_text_size_medium_material"
tools:text="Title"/>
<TextView
android:id="@+id/image_description"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:ellipsize="end"
android:gravity="center_vertical"
android:textColor="@color/color_white"
android:textSize="@dimen/default_sub_text_size"
android:visibility="gone"
tools:text="Description"/>
</LinearLayout>
<android.support.v7.widget.AppCompatImageView
android:id="@+id/image_refresh_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="48dp"
android:layout_height="56dp"
android:layout_gravity="top"
android:contentDescription="@string/shared_string_refresh"
android:src="@drawable/ic_action_refresh_dark"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout
android:id="@+id/image_viewer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/map_widget_dark"
android:orientation="vertical"/>
<FrameLayout
android:id="@+id/image_shadow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="@drawable/bg_contextmenu_shadow"
android:foregroundGravity="top|fill_horizontal"/>
</LinearLayout>

230
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/WebImageMenu.java Normal file
View file

@ -0,0 +1,230 @@
package net.osmand.plus.mapcontextmenu.other;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
import android.widget.LinearLayout;
import net.osmand.AndroidUtils;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.mapillary.MapillaryLayer;
import net.osmand.plus.views.OsmandMapTileView;
public class WebImageMenu {
private MapActivity mapActivity;
private static final String KEY_WEB_IMAGE_MENU_TYPE = "key_web_image_menu_type";
private static final String KEY_WEB_IMAGE_MENU_VIEWER_URL = "key_web_image_menu_viewer_url";
private static final String KEY_WEB_IMAGE_MENU_LATLON = "key_web_image_menu_latlon";
private static final String KEY_WEB_IMAGE_MENU_CA = "key_web_image_menu_ca";
private static final String KEY_WEB_IMAGE_MENU_TITLE = "key_web_image_menu_title";
private static final String KEY_WEB_IMAGE_MENU_DESCRIPTION = "key_web_image_menu_description";
private WebImageType type;
private String viewerUrl;
private LatLon latLon;
private double ca = Double.NaN;
private String title;
private String description;
private int prevMapPosition = OsmandSettings.CENTER_CONSTANT;
public enum WebImageType {
MAPILLARY
}
private WebImageMenu(MapActivity mapActivity, @NonNull WebImageType type, @NonNull String viewerUrl,
LatLon latLon, double ca, String title, String description) {
this.mapActivity = mapActivity;
this.type = type;
this.viewerUrl = viewerUrl;
this.latLon = latLon;
this.ca = ca;
this.title = title;
this.description = description;
}
public MapActivity getMapActivity() {
return mapActivity;
}
public WebImageType getType() {
return type;
}
public String getViewerUrl() {
return viewerUrl;
}
public LatLon getLatLon() {
return latLon;
}
public double getCa() {
return ca;
}
public String getTitle() {
return title;
}
public String getDescription() {
return description;
}
public void saveMenu(Bundle bundle) {
bundle.putString(KEY_WEB_IMAGE_MENU_TYPE, type.name());
bundle.putSerializable(KEY_WEB_IMAGE_MENU_VIEWER_URL, viewerUrl);
bundle.putSerializable(KEY_WEB_IMAGE_MENU_LATLON, latLon);
bundle.putString(KEY_WEB_IMAGE_MENU_TITLE, title);
bundle.putDouble(KEY_WEB_IMAGE_MENU_CA, ca);
if (description != null) {
bundle.putString(KEY_WEB_IMAGE_MENU_DESCRIPTION, description);
}
}
public static WebImageMenu restoreMenu(Bundle bundle, MapActivity mapActivity) {
try {
WebImageType type = WebImageType.valueOf(bundle.getString(KEY_WEB_IMAGE_MENU_TYPE));
String viewerUrl = bundle.getString(KEY_WEB_IMAGE_MENU_VIEWER_URL);
LatLon latLon = null;
String title = bundle.getString(KEY_WEB_IMAGE_MENU_TITLE);
Object latLonObj = bundle.getSerializable(KEY_WEB_IMAGE_MENU_LATLON);
if (latLonObj != null) {
latLon = (LatLon) latLonObj;
}
Double ca = bundle.getDouble(KEY_WEB_IMAGE_MENU_CA, Double.NaN);
String description = bundle.getString(KEY_WEB_IMAGE_MENU_TITLE);
if (viewerUrl != null) {
return new WebImageMenu(mapActivity, type, viewerUrl, latLon, ca, title, description);
} else {
return null;
}
} catch (IllegalArgumentException e) {
return null;
}
}
public void onResume() {
setImageLocation(latLon, ca, true);
}
public void onPause() {
restoreMapPosition();
setImageLocation(null, Double.NaN, false);
}
public void setImageLocation(LatLon latLon, double ca, boolean animated) {
switch (type) {
case MAPILLARY:
MapillaryLayer layer = mapActivity.getMapView().getLayerByClass(MapillaryLayer.class);
if (layer != null) {
layer.setSelectedImageLocation(latLon);
if (!Double.isNaN(ca)) {
layer.setSelectedImageCameraAngle((float) ca);
} else {
layer.setSelectedImageCameraAngle(null);
}
}
break;
}
if (latLon != null) {
shiftMapPosition();
if (animated) {
mapActivity.getMapView().getAnimatedDraggingThread().startMoving(
latLon.getLatitude(), latLon.getLongitude(), mapActivity.getMapView().getZoom(), true);
} else {
mapActivity.setMapLocation(latLon.getLatitude(), latLon.getLongitude());
}
} else {
mapActivity.refreshMap();
}
}
private void shiftMapPosition() {
OsmandMapTileView mapView = mapActivity.getMapView();
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
if (mapView.getMapPosition() != OsmandSettings.MIDDLE_CONSTANT) {
prevMapPosition = mapView.getMapPosition();
mapView.setMapPosition(OsmandSettings.MIDDLE_CONSTANT);
}
} else {
mapView.setMapPositionX(1);
}
}
private void restoreMapPosition() {
if (AndroidUiHelper.isOrientationPortrait(mapActivity)) {
mapActivity.getMapView().setMapPosition(prevMapPosition);
} else {
mapActivity.getMapView().setMapPositionX(0);
}
}
public View getContentView() {
switch (type) {
case MAPILLARY:
return getWebView(viewerUrl);
default:
return null;
}
}
@SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"})
private WebView getWebView(String url) {
final WebView webView = new WebView(mapActivity);
webView.setBackgroundColor(Color.argb(1, 0, 0, 0));
//webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
webView.setScrollContainer(false);
webView.getSettings().setJavaScriptEnabled(true);
if (type == WebImageType.MAPILLARY) {
webView.addJavascriptInterface(new MapillaryWebAppInterface(mapActivity), "Android");
}
boolean portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
portrait ? ViewGroup.LayoutParams.MATCH_PARENT : AndroidUtils.dpToPx(mapActivity, 360f),
portrait ? AndroidUtils.dpToPx(mapActivity, 270f) : ViewGroup.LayoutParams.MATCH_PARENT);
webView.setLayoutParams(lp);
webView.loadUrl(url);
return webView;
}
private class MapillaryWebAppInterface {
Context mContext;
MapillaryWebAppInterface(Context c) {
mContext = c;
}
@JavascriptInterface
public void onNodeChanged(double latitude, double longitude, double ca) {
LatLon latLon = null;
if (!Double.isNaN(latitude) && !Double.isNaN(longitude)) {
latLon = new LatLon(latitude, longitude);
}
setImageLocation(latLon, ca, false);
}
}
public static WebImageMenu show(MapActivity mapActivity, WebImageType type, String viewerUrl, LatLon latLon, double ca,
String title, String description) {
WebImageMenu menu = new WebImageMenu(mapActivity, type, viewerUrl, latLon, ca, title, description);
WebImageMenuFragment.showInstance(menu);
return menu;
}
}

109
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/WebImageMenuFragment.java Normal file
View file

@ -0,0 +1,109 @@
package net.osmand.plus.mapcontextmenu.other;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.util.Algorithms;
public class WebImageMenuFragment extends Fragment {
public static final String TAG = "WebImageMenuFragment";
private WebImageMenu menu;
private View view;
private LinearLayout viewerLayout;
private View contentView;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null && getActivity() instanceof MapActivity) {
menu = WebImageMenu.restoreMenu(savedInstanceState, (MapActivity) getActivity());
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.map_image_view, container, false);
viewerLayout = (LinearLayout) view.findViewById(R.id.image_viewer);
contentView = menu.getContentView();
if (contentView != null) {
viewerLayout.addView(contentView);
}
view.findViewById(R.id.image_close_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dismiss();
}
});
if (!Algorithms.isEmpty(menu.getTitle())) {
((TextView) view.findViewById(R.id.image_title)).setText(menu.getTitle());
}
if (!Algorithms.isEmpty(menu.getDescription())) {
((TextView) view.findViewById(R.id.image_description)).setText(menu.getDescription());
}
return view;
}
@Override
public void onResume() {
super.onResume();
if (menu != null) {
menu.onResume();
}
}
@Override
public void onPause() {
super.onPause();
if (menu != null) {
menu.onPause();
}
}
@Override
public void onDestroyView() {
super.onDestroyView();
if (viewerLayout != null && contentView != null) {
viewerLayout.removeView(contentView);
if (contentView instanceof WebView) {
((WebView) contentView).loadUrl("about:blank");
}
}
}
@Override
public void onSaveInstanceState(Bundle outState) {
menu.saveMenu(outState);
}
public static void showInstance(WebImageMenu menu) {
WebImageMenuFragment fragment = new WebImageMenuFragment();
fragment.menu = menu;
menu.getMapActivity().getSupportFragmentManager().beginTransaction()
.replace(R.id.topFragmentContainer, fragment, TAG)
.addToBackStack(TAG).commit();
}
public void dismiss() {
MapActivity activity = menu.getMapActivity();
if (activity != null) {
try {
activity.getSupportFragmentManager().popBackStack(TAG,
FragmentManager.POP_BACK_STACK_INCLUSIVE);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

125
OsmAnd/src/net/osmand/plus/mapillary/MapillaryImageCard.java
View file

@ -1,144 +1,27 @@
package net.osmand.plus.mapillary;
import android.annotation.SuppressLint;
import android.content.Context;
import android.graphics.Color;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.JavascriptInterface;
import android.webkit.WebView;
import android.widget.LinearLayout;
import net.osmand.AndroidUtils;
import net.osmand.data.LatLon;
import net.osmand.plus.OsmandSettings;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.mapcontextmenu.builders.cards.ImageCard;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
import net.osmand.plus.mapcontextmenu.other.WebImageMenu;
import net.osmand.plus.mapcontextmenu.other.WebImageMenu.WebImageType;
import org.json.JSONObject;
public class MapillaryImageCard extends ImageCard {
private int prevMapPosition = OsmandSettings.CENTER_CONSTANT;
public MapillaryImageCard(final MapActivity mapActivity, final JSONObject imageObject) {
super(mapActivity, imageObject);
this.icon = getMyApplication().getIconsCache().getIcon(R.drawable.ic_logo_mapillary);
this.onClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
final MapillaryImageViewerController toolbarController = new MapillaryImageViewerController();
toolbarController.setTitle(getMyApplication().getString(R.string.mapillary));
toolbarController.setCloseBtnVisible(false);
toolbarController.setBottomView(getWebView(getUrl()));
toolbarController.setOnBackButtonClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
getMapActivity().hideTopToolbar(toolbarController);
}
});
toolbarController.setOnCloseToolbarListener(new Runnable() {
@Override
public void run() {
restoreMapPosition();
setSelectedImageLocation(null, Double.NaN);
}
});
getMapActivity().getContextMenu().hideMenues();
getMapActivity().showTopToolbar(toolbarController);
setSelectedImageLocation(getLocation(), getCa());
WebImageMenu.show(getMapActivity(), WebImageType.MAPILLARY, getUrl(), getLocation(),
getCa(), getMyApplication().getString(R.string.mapillary), null);
}
};
}
@SuppressLint({"SetJavaScriptEnabled", "AddJavascriptInterface"})
private WebView getWebView(String url) {
final WebView webView = new WebView(view.getContext());
webView.setBackgroundColor(Color.BLACK);
//webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
webView.setScrollContainer(false);
webView.getSettings().setJavaScriptEnabled(true);
webView.addJavascriptInterface(new WebAppInterface(view.getContext()), "Android");
boolean portrait = AndroidUiHelper.isOrientationPortrait(getMapActivity());
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
portrait ? ViewGroup.LayoutParams.MATCH_PARENT : AndroidUtils.dpToPx(getMyApplication(), 360f),
AndroidUtils.dpToPx(getMyApplication(), 200f));
webView.setLayoutParams(lp);
webView.loadUrl(url);
return webView;
}
private void shiftMapPosition() {
OsmandMapTileView mapView = getMapActivity().getMapView();
if (AndroidUiHelper.isOrientationPortrait(getMapActivity())) {
if (mapView.getMapPosition() != OsmandSettings.MIDDLE_CONSTANT) {
prevMapPosition = mapView.getMapPosition();
mapView.setMapPosition(OsmandSettings.MIDDLE_CONSTANT);
}
} else {
mapView.setMapPositionX(1);
}
}
private void restoreMapPosition() {
if (AndroidUiHelper.isOrientationPortrait(getMapActivity())) {
getMapActivity().getMapView().setMapPosition(prevMapPosition);
} else {
getMapActivity().getMapView().setMapPositionX(0);
}
}
private void setSelectedImageLocation(LatLon latLon, double ca) {
MapillaryLayer layer = getMapActivity().getMapView().getLayerByClass(MapillaryLayer.class);
if (layer != null) {
layer.setSelectedImageLocation(latLon);
if (!Double.isNaN(ca)) {
layer.setSelectedImageCameraAngle((float) ca);
} else {
layer.setSelectedImageCameraAngle(null);
}
if (latLon != null) {
shiftMapPosition();
getMapActivity().setMapLocation(latLon.getLatitude(), latLon.getLongitude());
} else {
getMapActivity().refreshMap();
}
}
}
private class WebAppInterface {
Context mContext;
WebAppInterface(Context c) {
mContext = c;
}
@JavascriptInterface
public void onNodeChanged(double latitude, double longitude, double ca) {
LatLon latLon = null;
if (!Double.isNaN(latitude) && !Double.isNaN(longitude)) {
latLon = new LatLon(latitude, longitude);
}
setSelectedImageLocation(latLon, ca);
}
}
private static class MapillaryImageViewerController extends TopToolbarController {
MapillaryImageViewerController() {
super(TopToolbarControllerType.ONLINE_IMAGE);
setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
setBackBtnIconClrIds(0, 0);
setTitleTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
setDescrTextClrIds(R.color.primary_text_dark, R.color.primary_text_dark);
setBgIds(R.color.osmand_orange, R.color.osmand_orange,
R.color.osmand_orange, R.color.osmand_orange);
}
}
}

6
OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
View file

@ -108,10 +108,8 @@ public class MapillaryPlugin extends OsmandPlugin {
if (settings.SHOW_MAPILLARY.get()) {
mapillarySource = settings.getTileSourceByName(TileSourceManager.getMapillarySource().getName(), false);
}
if (!Algorithms.objectEquals(mapillarySource, layer.getMap())) {
if (mapillarySource == null) {
mapView.removeLayer(layer);
} else if (mapView.getMapRenderer() == null) {
if (!Algorithms.objectEquals(mapillarySource, layer.getMap()) || !mapView.isLayerVisible(layer)) {
if (mapView.getMapRenderer() == null && !mapView.isLayerVisible(layer)) {
mapView.addLayer(layer, layerOrder);
}
layer.setMap(mapillarySource);

1
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -42,7 +42,6 @@ public class MapInfoWidgetsFactory {
CONTEXT_MENU,
TRACK_DETAILS,
DISCOUNT,
ONLINE_IMAGE,
}
public TextInfoWidget createAltitudeControl(final MapActivity map) {