Merge remote-tracking branch 'origin/master'

OsmAnd/res/layout/two_line_with_images_list_item.xml

@@ -57,7 +57,7 @@
 
         </LinearLayout>
 
-        <ImageButton
+        <ImageView
             android:id="@+id/rightImageButton"
             android:layout_width="@dimen/list_item_height"
             android:layout_height="@dimen/list_item_height"
@@ -65,6 +65,7 @@
             android:layout_marginLeft="@dimen/dashFavIconMargin"
             android:background="?attr/dashboard_button"
             tools:src="@drawable/ic_action_import"
+            android:scaleType="center"
             tools:visibility="visible"
             android:visibility="gone"/>
 

OsmAnd/res/values/strings.xml

@@ -2002,4 +2002,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
     <string name="show_free_version_banner">Show free version banner</string>
     <string name="show_free_version_banner_description">Even if you have paid version you still can see free version banner</string>
     <string name="buy">BUY</string>
+    <string name="activate_seamarks_plugin">Please activate Seamarks plugin</string>
+    <string name="activate_srtm_plugin">Please activate SRTM plugin</string>
 </resources>

OsmAnd/src/net/osmand/plus/download/items/ItemViewHolder.java

@@ -1,7 +1,9 @@
 package net.osmand.plus.download.items;
 
+import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.Button;
@@ -14,6 +16,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.access.AccessibleToast;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
+import net.osmand.plus.Version;
 import net.osmand.plus.WorldRegion;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadActivityType;
@@ -35,6 +38,7 @@ public class ItemViewHolder {
 	private boolean freeVersion;
 	private int textColorPrimary;
 	private int textColorSecondary;
+	private RightButtonAction rightButtonAction;
 
 	private enum RightButtonAction {
 		UNKNOWN,
@@ -72,10 +76,11 @@ public class ItemViewHolder {
 		this.freeVersion = freeVersion;
 	}
 
-	public void bindIndexItem(final IndexItem indexItem, final DownloadActivity context, boolean showTypeInTitle, boolean showTypeInDesc) {
+	public void bindIndexItem(final IndexItem indexItem, final DownloadActivity context,
+							  boolean showTypeInTitle, boolean showTypeInDesc) {
 		boolean disabled = false;
 		String textButtonCaption = "GET";
-		RightButtonAction rightButtonAction = RightButtonAction.UNKNOWN;
+		rightButtonAction = RightButtonAction.UNKNOWN;
 
 		if (indexItem.getType() == DownloadActivityType.VOICE_FILE) {
 			nameTextView.setText(indexItem.getVisibleName(context,
@@ -118,7 +123,6 @@ public class ItemViewHolder {
 		} else {
 			descrTextView.setText(indexItem.getSizeDescription(context));
 		}
-		// TODO replace with imageView.
 		rightImageButton.setVisibility(View.VISIBLE);
 		rightImageButton.setImageDrawable(getContextIcon(context, R.drawable.ic_action_import));
 		progressBar.setVisibility(View.GONE);
@@ -135,16 +139,26 @@ public class ItemViewHolder {
 				public void onClick(View v) {
 					switch (action) {
 						case ASK_FOR_FULL_VERSION_PURCHASE:
-							AccessibleToast.makeText(context, "Please purchase Full version", Toast.LENGTH_SHORT).show();
+							Intent intent = new Intent(Intent.ACTION_VIEW,
+									Uri.parse(Version.marketPrefix(context.getMyApplication())
+											+ "net.osmand.plus"));
+							context.startActivity(intent);
 							break;
 						case ASK_FOR_SEAMARKS_PLUGIN:
-							AccessibleToast.makeText(context.getApplicationContext(), "Please turn on Seamarks plugin", Toast.LENGTH_SHORT).show();
+							context.startActivity(new Intent(context,
+									context.getMyApplication().getAppCustomization().getPluginsActivity()));
+							AccessibleToast.makeText(context.getApplicationContext(),
+									context.getString(R.string.activate_seamarks_plugin), Toast.LENGTH_SHORT).show();
 							break;
 						case ASK_FOR_SRTM_PLUGIN_PURCHASE:
-							AccessibleToast.makeText(context, "Please purchase SRTM plugin", Toast.LENGTH_SHORT).show();
+							OsmandPlugin plugin = OsmandPlugin.getPlugin(SRTMPlugin.class);
+							context.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));
 							break;
 						case ASK_FOR_SRTM_PLUGIN_ENABLE:
-							AccessibleToast.makeText(context, "Please activate SRTM plugin", Toast.LENGTH_SHORT).show();
+							context.startActivity(new Intent(context,
+									context.getMyApplication().getAppCustomization().getPluginsActivity()));
+							AccessibleToast.makeText(context,
+									context.getString(R.string.activate_srtm_plugin), Toast.LENGTH_SHORT).show();
 							break;
 					}
 				}
@@ -190,4 +204,8 @@ public class ItemViewHolder {
 	private Drawable getContextIcon(DownloadActivity context, int resourceId, int color) {
 		return context.getMyApplication().getIconsCache().getPaintedContentIcon(resourceId, color);
 	}
+
+	public boolean isItemAvailable() {
+		return rightButtonAction == RightButtonAction.UNKNOWN;
+	}
 }

OsmAnd/src/net/osmand/plus/download/items/RegionItemsFragment.java

@@ -99,10 +99,13 @@ public class RegionItemsFragment extends OsmandExpandableListFragment {
 					.onRegionSelected(region.getRegionId());
 			return true;
 		} else if (obj instanceof ItemsListBuilder.ResourceItem) {
-			IndexItem indexItem = ((ItemsListBuilder.ResourceItem) obj).getIndexItem();
-			((BaseDownloadActivity) getActivity())
-					.startDownload(indexItem);
-			return true;
+			if(((ItemViewHolder) v.getTag()).isItemAvailable()) {
+				IndexItem indexItem = ((ItemsListBuilder.ResourceItem) obj).getIndexItem();
+				((BaseDownloadActivity) getActivity())
+						.startDownload(indexItem);
+
+				return true;
+			}
 		}
 		return false;
 	}

OsmAnd/src/net/osmand/plus/download/newimplementation/DownloadsUiHelper.java

@@ -133,7 +133,6 @@ public final class DownloadsUiHelper {
 
 		@Override
 		public void onFinished() {
-			freeVersionBanner.setVisibility(View.VISIBLE);
 			downloadProgressLayout.setVisibility(View.GONE);
 		}
 	}