Fix issue with blinking in recycler view

OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java

@@ -137,13 +137,13 @@ public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		return false;
 	}
 
-	public void setNeededMapsCard(TravelNeededMapsCard card) {
+	public void addNeededMapsCard(TravelNeededMapsCard card) {
 		if (addItem(getNeededMapsCardPosition(), card)) {
 			notifyDataSetChanged();
 		}
 	}
 
-	public void updateNeededMapsCard() {
+	public void updateNeededMapsCard(boolean onlyProgress) {
 		int pos = getNeededMapsCardPosition();
 		if (neededMapsCardExists(pos)) {
 			notifyItemChanged(pos);
@@ -169,13 +169,13 @@ public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		return items.size() > position && items.get(position).getCardType() == TravelNeededMapsCard.TYPE;
 	}
 
-	public void setDownloadUpdateCard(TravelDownloadUpdateCard card) {
+	public void addDownloadUpdateCard(TravelDownloadUpdateCard card) {
 		if (addItem(getDownloadUpdateCardPosition(), card)) {
 			notifyDataSetChanged();
 		}
 	}
 
-	public void updateDownloadUpdateCard() {
+	public void updateDownloadUpdateCard(boolean onlyProgress) {
 		int pos = getDownloadUpdateCardPosition();
 		if (downloadUpdateCardExists(pos)) {
 			notifyItemChanged(pos);

OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java

@@ -90,8 +90,8 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 			currentDownloadingIndexItem = current;
 			removeRedundantCards();
 		}
-		adapter.updateDownloadUpdateCard();
+		adapter.updateDownloadUpdateCard(true);
-		adapter.updateNeededMapsCard();
+		adapter.updateNeededMapsCard(true);
 	}
 
 	@Override
@@ -194,7 +194,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 				public void onPrimaryButtonClick() {
 					if (mainIndexItem != null) {
 						downloadManager.startDownload(getMyActivity(), mainIndexItem);
-						adapter.updateDownloadUpdateCard();
+						adapter.updateDownloadUpdateCard(false);
 					}
 				}
 
@@ -202,7 +202,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 				public void onSecondaryButtonClick() {
 					if (downloadUpdateCard.isLoading()) {
 						downloadThread.cancelDownload(mainIndexItem);
-						adapter.updateDownloadUpdateCard();
+						adapter.updateDownloadUpdateCard(false);
 					} else if (!downloadUpdateCard.isDownload()) {
 						removeDownloadUpdateCard();
 					} else if (downloadUpdateCard.isShowOtherMapsBtn()) {
@@ -217,7 +217,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 				}
 			});
 			downloadUpdateCard.setIndexItem(mainIndexItem);
-			adapter.setDownloadUpdateCard(downloadUpdateCard);
+			adapter.addDownloadUpdateCard(downloadUpdateCard);
 		}
 	}
 
@@ -230,14 +230,14 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 				@Override
 				public void onPrimaryButtonClick() {
 					downloadManager.startDownload(getMyActivity(), getAllItemsForDownload());
-					adapter.updateNeededMapsCard();
+					adapter.updateNeededMapsCard(false);
 				}
 
 				@Override
 				public void onSecondaryButtonClick() {
 					if (neededMapsCard.isDownloading()) {
 						app.getDownloadThread().cancelDownload(neededIndexItems);
-						adapter.updateNeededMapsCard();
+						adapter.updateNeededMapsCard(false);
 					} else {
 						removeNeededMapsCard();
 					}
@@ -257,11 +257,11 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 						} else if (!item.isDownloaded()) {
 							downloadManager.startDownload(getMyActivity(), item);
 						}
-						adapter.updateNeededMapsCard();
+						adapter.updateNeededMapsCard(false);
 					}
 				}
 			});
-			adapter.setNeededMapsCard(neededMapsCard);
+			adapter.addNeededMapsCard(neededMapsCard);
 		}
 	}
 

OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java

@@ -10,11 +10,11 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.download.IndexItem;
 
+import java.lang.ref.WeakReference;
 import java.text.DateFormat;
 
 public class TravelDownloadUpdateCard extends BaseTravelCard {
@@ -23,6 +23,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 
 	private boolean download;
 	private boolean showOtherMapsBtn;
+	private WeakReference<DownloadUpdateVH> ref;
 
 	private ClickListener listener;
 
@@ -62,6 +63,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 		if (viewHolder instanceof DownloadUpdateVH) {
 			boolean loading = isLoading();
 			DownloadUpdateVH holder = (DownloadUpdateVH) viewHolder;
+			this.ref = new WeakReference<TravelDownloadUpdateCard.DownloadUpdateVH>(holder);
 			holder.title.setText(getTitle(loading));
 			holder.icon.setImageDrawable(getIcon());
 			holder.description.setText(getDescription());
@@ -73,6 +75,22 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 				holder.fileTitle.setText(getFileTitle());
 				holder.fileDescription.setText(getFileDescription());
 				holder.progressBar.setVisibility(loading ? View.VISIBLE : View.GONE);
+				updateProgressBar(holder);
+			}
+			boolean primaryBtnVisible = updatePrimaryButton(holder, loading);
+			boolean secondaryBtnVisible = updateSecondaryButton(holder, loading);
+			holder.buttonsDivider.setVisibility(primaryBtnVisible && secondaryBtnVisible ? View.VISIBLE : View.GONE);
+		}
+	}
+	
+	public void updateProgresBar() {
+		DownloadUpdateVH holder = ref.get();
+		if (holder != null && holder.itemView.isShown()) {
+			updateProgressBar(holder);
+		}
+	}
+
+	private void updateProgressBar(DownloadUpdateVH holder) {
 		if (isLoadingInProgress()) {
 			int progress = app.getDownloadThread().getCurrentDownloadingItemProgress();
 			holder.progressBar.setProgress(progress < 0 ? 0 : progress);
@@ -80,11 +98,6 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 			holder.progressBar.setProgress(0);
 		}
 	}
-			boolean primaryBtnVisible = updatePrimaryButton(holder, loading);
-			boolean secondaryBtnVisible = updateSecondaryButton(holder, loading);
-			holder.buttonsDivider.setVisibility(primaryBtnVisible && secondaryBtnVisible ? View.VISIBLE : View.GONE);
-		}
-	}
 
 	@Override
 	public int getCardType() {

OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelNeededMapsCard.java

@@ -10,14 +10,15 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.download.DownloadActivityType;
 import net.osmand.plus.download.DownloadIndexesThread;
 import net.osmand.plus.download.IndexItem;
+import net.osmand.plus.wikivoyage.explore.travelcards.TravelDownloadUpdateCard.DownloadUpdateVH;
 
+import java.lang.ref.WeakReference;
 import java.util.List;
 
 public class TravelNeededMapsCard extends BaseTravelCard {
@@ -29,7 +30,7 @@ public class TravelNeededMapsCard extends BaseTravelCard {
 
 	private Drawable downloadIcon;
 	private Drawable cancelIcon;
-
+	private WeakReference<NeededMapsVH> ref;
 	private CardListener listener;
 	private View.OnClickListener onItemClickListener;
 
@@ -57,11 +58,27 @@ public class TravelNeededMapsCard extends BaseTravelCard {
 	public void bindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
 		if (viewHolder instanceof NeededMapsVH) {
 			NeededMapsVH holder = (NeededMapsVH) viewHolder;
-
+			ref = new WeakReference<NeededMapsVH>(holder);
 			holder.description.setText(isInternetAvailable()
 					? R.string.maps_you_need_descr : R.string.no_index_file_to_download);
 			adjustChildCount(holder.itemsContainer);
 
+			updateView(holder);
+
+			boolean primaryBtnVisible = updatePrimaryButton(holder);
+			boolean secondaryBtnVisible = updateSecondaryButton(holder);
+			holder.buttonsDivider.setVisibility(primaryBtnVisible && secondaryBtnVisible ? View.VISIBLE : View.GONE);
+		}
+	}
+	
+	public void updateView() {
+		NeededMapsVH holder = ref.get();
+		if (holder != null && holder.itemView.isShown()) {
+			updateView(holder);
+		}
+	}
+
+	private void updateView(NeededMapsVH holder) {
 		boolean paidVersion = Version.isPaidVersion(app);
 
 		for (int i = 0; i < items.size(); i++) {
@@ -109,11 +126,6 @@ public class TravelNeededMapsCard extends BaseTravelCard {
 
 			view.findViewById(R.id.divider).setVisibility(lastItem ? View.GONE : View.VISIBLE);
 		}
-
-			boolean primaryBtnVisible = updatePrimaryButton(holder);
-			boolean secondaryBtnVisible = updateSecondaryButton(holder);
-			holder.buttonsDivider.setVisibility(primaryBtnVisible && secondaryBtnVisible ? View.VISIBLE : View.GONE);
-		}
 	}
 
 	@Override