mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated selection tracker to version 1.1.0-alpha01

This commit is contained in:
M66B 2019-02-12 12:50:23 +00:00
parent 57f8dc1b0e
commit ab814ae495
7 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/androidx/recyclerview/selection/DefaultSelectionTracker.java
View File

@ -348,7 +348,7 @@ public class DefaultSelectionTracker<K> extends SelectionTracker<K> {
}
@Override
AdapterDataObserver getAdapterDataObserver() {
protected AdapterDataObserver getAdapterDataObserver() {
return mAdapterObserver;
}

2
app/src/main/java/androidx/recyclerview/selection/GridModel.java
View File

@ -259,7 +259,7 @@ final class GridModel<K> {
private void updateModel() {
RelativePoint old = mRelPointer;
mRelPointer = createRelativePoint(mPointer);
if (old != null && mRelPointer.equals(old)) {
if (mRelPointer.equals(old)) {
return;
}

7
app/src/main/java/androidx/recyclerview/selection/ItemDetailsLookup.java
View File

@ -16,10 +16,13 @@
package androidx.recyclerview.selection;
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import android.view.MotionEvent;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.recyclerview.widget.RecyclerView;
/**
@ -67,8 +70,10 @@ public abstract class ItemDetailsLookup<K> {
/**
* @return true if there is an item w/ a stable ID at the event coordinates.
* @hide
*/
final boolean overItemWithSelectionKey(@NonNull MotionEvent e) {
@RestrictTo(LIBRARY_GROUP)
protected boolean overItemWithSelectionKey(@NonNull MotionEvent e) {
return overItem(e) && hasSelectionKey(getItemDetails(e));
}

8
app/src/main/java/androidx/recyclerview/selection/MotionEvents.java
View File

@ -33,18 +33,10 @@ final class MotionEvents {
return e.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE;
}
static boolean isTouchEvent(@NonNull MotionEvent e) {
return e.getToolType(0) == MotionEvent.TOOL_TYPE_FINGER;
}
static boolean isActionMove(@NonNull MotionEvent e) {
return e.getActionMasked() == MotionEvent.ACTION_MOVE;
}
static boolean isActionDown(@NonNull MotionEvent e) {
return e.getActionMasked() == MotionEvent.ACTION_DOWN;
}
static boolean isActionUp(@NonNull MotionEvent e) {
return e.getActionMasked() == MotionEvent.ACTION_UP;
}

42
app/src/main/java/androidx/recyclerview/selection/SelectionTracker.java
View File

@ -16,6 +16,7 @@
package androidx.recyclerview.selection;
import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
import static androidx.core.util.Preconditions.checkArgument;
import android.content.Context;
@ -28,6 +29,7 @@ import android.view.MotionEvent;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
@ -177,7 +179,9 @@ public abstract class SelectionTracker<K> {
*/
public abstract boolean deselect(@NonNull K key);
abstract AdapterDataObserver getAdapterDataObserver();
/** @hide */
@RestrictTo(LIBRARY_GROUP)
protected abstract AdapterDataObserver getAdapterDataObserver();
/**
* Attempts to establish a range selection at {@code position}, selecting the item
@ -186,8 +190,10 @@ public abstract class SelectionTracker<K> {
* @param position The "anchor" position for the range. Subsequent range operations
* (primarily keyboard and mouse based operations like SHIFT + click)
* work with the established anchor point to define selection ranges.
* @hide
*/
abstract void startRange(int position);
@RestrictTo(LIBRARY_GROUP)
public abstract void startRange(int position);
/**
* Sets the end point for the active range selection.
@ -200,20 +206,26 @@ public abstract class SelectionTracker<K> {
* @param position The new end position for the selection range.
* @throws IllegalStateException if a range selection is not active. Range selection
* must have been started by a call to {@link #startRange(int)}.
* @hide
*/
abstract void extendRange(int position);
@RestrictTo(LIBRARY_GROUP)
public abstract void extendRange(int position);
/**
* Clears an in-progress range selection. Provisional range selection established
* using {@link #extendProvisionalRange(int)} will be cleared (unless
* {@link #mergeProvisionalSelection()} is called first.)
* @hide
*/
abstract void endRange();
@RestrictTo(LIBRARY_GROUP)
public abstract void endRange();
/**
* @return Whether or not there is a current range selection active.
* @hide
*/
abstract boolean isRangeActive();
@RestrictTo(LIBRARY_GROUP)
public abstract boolean isRangeActive();
/**
* Establishes the "anchor" at which a selection range begins. This "anchor" is consulted
@ -223,32 +235,42 @@ public abstract class SelectionTracker<K> {
* TODO: Reconcile this with startRange. Maybe just docs need to be updated.
*
* @param position the anchor position. Must already be selected.
* @hide
*/
abstract void anchorRange(int position);
@RestrictTo(LIBRARY_GROUP)
public abstract void anchorRange(int position);
/**
* Creates a provisional selection from anchor to {@code position}.
*
* @param position the end point.
* @hide
*/
abstract void extendProvisionalRange(int position);
@RestrictTo(LIBRARY_GROUP)
protected abstract void extendProvisionalRange(int position);
/**
* Sets the provisional selection, replacing any existing selection.
* @param newSelection
* @hide
*/
abstract void setProvisionalSelection(@NonNull Set<K> newSelection);
@RestrictTo(LIBRARY_GROUP)
protected abstract void setProvisionalSelection(@NonNull Set<K> newSelection);
/**
* Clears any existing provisional selection
* @hide
*/
abstract void clearProvisionalSelection();
@RestrictTo(LIBRARY_GROUP)
protected abstract void clearProvisionalSelection();
/**
* Converts the provisional selection into primary selection, then clears
* provisional selection.
* @hide
*/
abstract void mergeProvisionalSelection();
@RestrictTo(LIBRARY_GROUP)
protected abstract void mergeProvisionalSelection();
/**
* Preserves selection, if any. Call this method from Activity#onSaveInstanceState

11
app/src/main/java/androidx/recyclerview/selection/StableIdKeyProvider.java
View File

@ -21,12 +21,10 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.collection.LongSparseArray;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.OnChildAttachStateChangeListener;
import java.util.HashMap;
import java.util.Map;
/**
* An {@link ItemKeyProvider} that provides stable ids by way of cached
* {@link RecyclerView.Adapter} stable ids. Items enter the cache as they are laid out by
@ -40,7 +38,7 @@ import java.util.Map;
public final class StableIdKeyProvider extends ItemKeyProvider<Long> {
private final SparseArray<Long> mPositionToKey = new SparseArray<>();
private final Map<Long, Integer> mKeyToPosition = new HashMap<Long, Integer>();
private final LongSparseArray<Integer> mKeyToPosition = new LongSparseArray<>();
private final RecyclerView mRecyclerView;
/**
@ -102,9 +100,6 @@ public final class StableIdKeyProvider extends ItemKeyProvider<Long> {
@Override
public int getPosition(@NonNull Long key) {
if (mKeyToPosition.containsKey(key)) {
return mKeyToPosition.get(key);
}
return RecyclerView.NO_POSITION;
return mKeyToPosition.get(key, RecyclerView.NO_POSITION);
}
}

6
app/src/main/java/androidx/recyclerview/selection/package-info.java
View File

@ -116,9 +116,9 @@
* <b>Include Selection in Activity lifecycle events</b>
*
* <p>
* In order to preserve state the author must the selection library in handling
* of Activity lifecycle events. See SelectionTracker#onSaveInstanceState
* and SelectionTracker#onRestoreInstanceState.
* In order to preserve state, the author must include the selection library in the handling
* of Activity lifecycle events. See SelectionTracker#onSaveInstanceState and
* SelectionTracker#onRestoreInstanceState.
*
* <p>A unique selection id must be supplied to
* {@link androidx.recyclerview.selection.SelectionTracker.Builder SelectionTracker.Builder}