Skip to content

Feature/fix select images multi touch crash #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature/fix select images multi touch crash #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93eb331
Guard against invalid selections. Notify-update clicked item only, in…
mateuszdrzazga May 7, 2021
470818b
Update other selected indices labels when uselecting item
mateuszdrzazga May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions ...n/java/com/google/android/apps/forscience/whistlepunk/actionarea/GalleryNoteFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,32 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.format.DateUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;

import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.google.android.apps.forscience.whistlepunk.GlideApp;
import com.google.android.apps.forscience.whistlepunk.NoteTakingActivity;
import com.google.android.apps.forscience.whistlepunk.actionarea.PhotoAsyncLoader.Image;
import com.google.android.apps.forscience.whistlepunk.PictureUtils;
import com.google.android.apps.forscience.whistlepunk.R;
import com.google.android.apps.forscience.whistlepunk.RxEvent;
import com.google.android.apps.forscience.whistlepunk.accounts.AppAccount;
import com.google.android.apps.forscience.whistlepunk.actionarea.PhotoAsyncLoader.Image;
import com.google.android.apps.forscience.whistlepunk.filemetadata.FileMetadataUtil;
import com.google.android.apps.forscience.whistlepunk.filemetadata.Label;
import com.google.android.apps.forscience.whistlepunk.metadata.GoosciLabel;
Expand All @@ -55,14 +57,16 @@
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.jakewharton.rxbinding2.view.RxView;
import com.tbruyelle.rxpermissions2.RxPermissions;
import io.reactivex.subjects.BehaviorSubject;
import io.reactivex.subjects.SingleSubject;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;

import io.reactivex.subjects.BehaviorSubject;
import io.reactivex.subjects.SingleSubject;

/**
* Fragment controlling adding picture notes from the gallery in the ExperimentActivity.
*
Expand Down Expand Up @@ -401,16 +405,23 @@ public boolean onResourceReady(

holder.image.setOnClickListener(
view -> {
boolean newlySelected = !selectedIndices.contains(holder.getAdapterPosition());
final int adapterPosition = holder.getAdapterPosition();
// Ignore invalid clicks that happened between layouts.
if (adapterPosition == RecyclerView.NO_POSITION) return;
boolean newlySelected = !selectedIndices.contains(adapterPosition);
if (newlySelected) {
// It was clicked for the first time.
setSelectedIndex(holder.getAdapterPosition());
setSelectedIndex(adapterPosition);
} else {
// A second click on the same image is a deselect.
selectedIndices.remove(selectedIndices.indexOf(holder.getAdapterPosition()));
selectedIndices.remove(selectedIndices.indexOf(adapterPosition));
// Update other selected items labels.
for (int i = 0; i < selectedIndices.size(); ++i) {
notifyItemChanged(selectedIndices.get(i));
}
// Update current selection
notifyItemChanged(adapterPosition);
}
holder.selectedIndicator.setSelected(newlySelected);
notifyDataSetChanged();

listener.onImageClicked();
});
Expand Down