summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--[-rwxr-xr-x]src/com/android/gallery3d/app/TimeLineDataLoader.java33
-rw-r--r--[-rwxr-xr-x]src/com/android/gallery3d/app/TimeLinePage.java0
-rw-r--r--src/com/android/gallery3d/data/ClusterAlbumSet.java9
-rw-r--r--src/com/android/gallery3d/ui/TimeLineSlidingWindow.java17
-rw-r--r--src/com/android/gallery3d/ui/TimeLineSlotRenderer.java13
-rw-r--r--src/com/android/gallery3d/ui/TimeLineSlotView.java375
6 files changed, 168 insertions, 279 deletions
diff --git a/src/com/android/gallery3d/app/TimeLineDataLoader.java b/src/com/android/gallery3d/app/TimeLineDataLoader.java
index 7816c2943..9532ab057 100755..100644
--- a/src/com/android/gallery3d/app/TimeLineDataLoader.java
+++ b/src/com/android/gallery3d/app/TimeLineDataLoader.java
@@ -39,7 +39,6 @@ public class TimeLineDataLoader {
@SuppressWarnings("unused")
private static final String TAG = "TimeLineDataLoader";
private static final int DATA_CACHE_SIZE = 1000;
- private boolean mNewVersion = false;
private static final int MSG_LOAD_START = 1;
private static final int MSG_LOAD_FINISH = 2;
@@ -54,18 +53,15 @@ public class TimeLineDataLoader {
public static interface DataListener {
public void onContentChanged(int index);
- public void onSizeChanged(int size);
- public void onVersionChanged();
+ public void onSizeChanged();
}
-
private int mActiveStart = 0;
private int mActiveEnd = 0;
private int mContentStart = 0;
private int mContentEnd = 0;
- private ArrayList<MediaItem> mTotalMediaItems;
private final MediaSet mSource;
private long mSourceVersion = MediaObject.INVALID_DATA_VERSION;
@@ -122,9 +118,8 @@ public class TimeLineDataLoader {
mSource.removeContentListener(mSourceListener);
}
-
public MediaSet getMediaSet(int index) {
- MediaSet mediaSet = ((ClusterAlbumSet)mSource).getAlbumFromindex(index);
+ MediaSet mediaSet = ((ClusterAlbumSet)mSource).getAlbumFromindex(index);
return mediaSet;
}
@@ -139,10 +134,6 @@ public class TimeLineDataLoader {
return ((ClusterAlbumSet) mSource).getSubMediaSetCount();
}
- public ArrayList<MediaItem> getAllMediaItems() {
- return mTotalMediaItems;
- }
-
public int getActiveStart() {
return mActiveStart;
}
@@ -155,6 +146,16 @@ public class TimeLineDataLoader {
return mSize;
}
+ public int[] getSubMediaSetCount() {
+ ClusterAlbumSet set = (ClusterAlbumSet) mSource;
+ int albumCount = set.getSubMediaSetCount();
+ int[] counts = new int[albumCount];
+ for (int i = albumCount - 1; i >= 0; --i) {
+ counts[i] = set.getSubMediaSet(i).getSelectableItemCount();
+ }
+ return counts;
+ }
+
// Returns the index of the MediaItem with the given path or
// -1 if the path is not cached
public int findItem(Path id) {
@@ -298,13 +299,10 @@ public class TimeLineDataLoader {
@Override
public Void call() throws Exception {
UpdateInfo info = mUpdateInfo;
- if ( info.version != mSourceVersion) {
- mNewVersion = true;
- }
mSourceVersion = info.version;
if (mSize != info.size) {
mSize = info.size;
- if (mDataListener != null) mDataListener.onSizeChanged(mSize);
+ if (mDataListener != null) mDataListener.onSizeChanged();
if (mContentEnd > mSize) mContentEnd = mSize;
if (mActiveEnd > mSize) mActiveEnd = mSize;
}
@@ -402,11 +400,6 @@ public class TimeLineDataLoader {
}
executeAndWait(new UpdateContent(info));
- if (mNewVersion) {
- mNewVersion = false;
- mTotalMediaItems = mSource.getMediaItem(0, mSource.getMediaItemCount());
- mDataListener.onVersionChanged();
- }
}
updateLoading(false);
}
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index 618f219f4..618f219f4 100755..100644
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
diff --git a/src/com/android/gallery3d/data/ClusterAlbumSet.java b/src/com/android/gallery3d/data/ClusterAlbumSet.java
index 4046a1595..d83b4dadf 100644
--- a/src/com/android/gallery3d/data/ClusterAlbumSet.java
+++ b/src/com/android/gallery3d/data/ClusterAlbumSet.java
@@ -70,12 +70,8 @@ public class ClusterAlbumSet extends MediaSet implements ContentListener {
public long reload() {
synchronized(this){
if (mBaseSet.reload() > mDataVersion) {
- if (mFirstReloadDone) {
- updateClustersContents();
- } else {
- updateClusters();
- mFirstReloadDone = true;
- }
+ updateClusters();
+ mFirstReloadDone = true;
mDataVersion = nextVersionNumber();
}
if (mKind == ClusterSource.CLUSTER_ALBUMSET_TIME) {
@@ -112,7 +108,6 @@ public class ClusterAlbumSet extends MediaSet implements ContentListener {
clustering = new SizeClustering(context);
break;
}
-
clustering.run(mBaseSet);
int n = clustering.getNumberOfClusters();
DataManager dataManager = mApplication.getDataManager();
diff --git a/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java b/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
index 6fdd34935..5041ba683 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlidingWindow.java
@@ -42,9 +42,8 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
private static final int JOB_LIMIT = 2;
public static interface Listener {
- public void onSizeChanged(int size);
+ public void onSizeChanged(int[] size);
public void onContentChanged();
- public void onVersionChanged();
public int getTitleWidth();
}
@@ -185,10 +184,6 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
}
}
- public ArrayList<MediaItem> getAllMediaItems() {
- return mSource.getAllMediaItems();
- }
-
private void updateTextureUploadQueue() {
if (!mIsActive) return;
mTileUploader.clear();
@@ -355,10 +350,11 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
}
@Override
- public void onSizeChanged(int size) {
+ public void onSizeChanged() {
+ int size = mSource.size();
if (mSize != size) {
mSize = size;
- if (mListener != null) mListener.onSizeChanged(mSize);
+ if (mListener != null) mListener.onSizeChanged(mSource.getSubMediaSetCount());
if (mContentEnd > mSize) mContentEnd = mSize;
if (mActiveEnd > mSize) mActiveEnd = mSize;
}
@@ -377,11 +373,6 @@ public class TimeLineSlidingWindow implements TimeLineDataLoader.DataListener {
}
}
- @Override
- public void onVersionChanged() {
- mListener.onVersionChanged();
- }
-
public void resume() {
mIsActive = true;
TiledTexture.prepareResources();
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
index adad59c01..b0a8a0cba 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
@@ -99,10 +99,6 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
: texture;
}
- public ArrayList<MediaItem> getAllMediaItems() {
- return mDataWindow.getAllMediaItems();
- }
-
protected int renderOverlay(GLCanvas canvas, int index,
TimeLineSlidingWindow.AlbumEntry entry, int width, int height) {
int renderRequestFlags = 0;
@@ -133,17 +129,12 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
}
@Override
- public void onSizeChanged(int size) {
+ public void onSizeChanged(int[] size) {
mSlotView.setSlotCount(size);
mSlotView.invalidate();
}
@Override
- public void onVersionChanged() {
- mSlotView.onVersionChanged();
- }
-
- @Override
public int getTitleWidth() {
return mSlotView.getTitleWidth();
}
@@ -184,14 +175,12 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
public void setModel(TimeLineDataLoader model) {
if (mDataWindow != null) {
mDataWindow.setListener(null);
- mSlotView.setSlotCount(0);
mDataWindow = null;
}
if (model != null) {
mDataWindow = new TimeLineSlidingWindow(mActivity, model, CACHE_SIZE, mLabelSpec,
mSelectionManager, mSlotView);
mDataWindow.setListener(new MyDataModelListener());
- mSlotView.setSlotCount(model.size());
}
}
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotView.java b/src/com/android/gallery3d/ui/TimeLineSlotView.java
index dadd5ff25..5c93d31bd 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotView.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotView.java
@@ -85,9 +85,6 @@ public class TimeLineSlotView extends GLView {
public static final int OVERSCROLL_3D = 0;
- // to prevent allocating memory
- private final Rect mTempRect = new Rect();
-
// Flag to check whether it is come from Photo Page.
private boolean isFromPhotoPage = false;
@@ -105,18 +102,19 @@ public class TimeLineSlotView extends GLView {
}
public void setCenterIndex(int index) {
- int slotCount = mLayout.mSlotCount;
- if (index < 0 || index >= slotCount) {
+ int size = mLayout.getSlotSize();
+ if (index < 0 || index >= size) {
return;
}
- Rect rect = mLayout.getSlotRect(index, mTempRect);
+ Rect rect = mLayout.getSlotRect(index);
int position = (rect.top + rect.bottom - getHeight()) / 2;
setScrollPosition(position);
}
public void makeSlotVisible(int index) {
- Rect rect = mLayout.getSlotRect(index, mTempRect);
+ Rect rect = mLayout.getSlotRect(index);
+ if (rect == null) return;
int visibleBegin = mScrollY;
int visibleLength = getHeight();
int visibleEnd = visibleBegin + visibleLength;
@@ -146,13 +144,6 @@ public class TimeLineSlotView extends GLView {
public void setScrollPosition(int position) {
- /*if (View.LAYOUT_DIRECTION_RTL == TextUtils
- .getLayoutDirectionFromLocale(Locale.getDefault())
- && position == 0 && !isFromPhotoPage) {
- // If RTL and not from Photo Page, set position to max.
- position = mLayout.getScrollLimit();
- }*/
-
position = Utils.clamp(position, 0, mLayout.getScrollLimit());
mScroller.setPosition(position);
updateScrollPosition(position, false);
@@ -167,7 +158,7 @@ public class TimeLineSlotView extends GLView {
if (!changeSize) return;
mWidth = r - l;
- // Make sure we are still at a resonable scroll position after the size
+ // Make sure we are still at a reasonable scroll position after the size
// is changed (like orientation change). We choose to keep the center
// visible slot still visible. This is arbitrary but reasonable.
int visibleIndex =
@@ -181,13 +172,13 @@ public class TimeLineSlotView extends GLView {
public void startScatteringAnimation(RelativePosition position) {
mAnimation = new ScatteringAnimation(position);
mAnimation.start();
- if (mLayout.mSlotCount != 0) invalidate();
+ if (mLayout.getSlotSize() != 0) invalidate();
}
public void startRisingAnimation() {
mAnimation = new RisingAnimation();
mAnimation.start();
- if (mLayout.mSlotCount != 0) invalidate();
+ if (mLayout.getSlotSize() != 0) invalidate();
}
private void updateScrollPosition(int position, boolean force) {
@@ -203,7 +194,7 @@ public class TimeLineSlotView extends GLView {
}
public Rect getSlotRect(int slotIndex) {
- return mLayout.getSlotRect(slotIndex, new Rect());
+ return mLayout.getSlotRect(slotIndex);
}
@Override
@@ -297,7 +288,7 @@ public class TimeLineSlotView extends GLView {
private int renderItem(
GLCanvas canvas, int index, int pass, boolean paperActive) {
- Rect rect = mLayout.getSlotRect(index, mTempRect);
+ Rect rect = mLayout.getSlotRect(index);
if (rect == null) return 0;
canvas.save(GLCanvas.SAVE_FLAG_ALPHA | GLCanvas.SAVE_FLAG_MATRIX);
canvas.translate(rect.left, rect.top, 0);
@@ -364,10 +355,10 @@ public class TimeLineSlotView extends GLView {
root.lockRenderThread();
try {
if (isDown) return;
- int index = mLayout.getSlotIndexByPosition(e.getX(), e.getY());
- if (index != INDEX_NONE) {
+ Slot slot = mLayout.getSlotByPosition(e.getX(), e.getY());
+ if (slot != null) {
isDown = true;
- mListener.onDown(index);
+ mListener.onDown(slot.index);
}
} finally {
root.unlockRenderThread();
@@ -413,19 +404,11 @@ public class TimeLineSlotView extends GLView {
public boolean onSingleTapUp(MotionEvent e) {
cancelDown(false);
if (mDownInScrolling) return true;
- RectSlot slot = mLayout.getRectSlotByPosition(e.getX(), e.getY());
- if (slot == null) {
- return true;
- }
- int index = slot.slotIndex;
- if (index != INDEX_NONE) {
- if (slot.mediaType == MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
- mListener.onSingleTapUp(index, true);
- return true;
- }
- mListener.onSingleTapUp(index, false);
- }
- return true;
+ Slot slot = mLayout.getSlotByPosition(e.getX(), e.getY());
+ if (slot != null) {
+ mListener.onSingleTapUp(slot.index, slot.isTitle);
+ }
+ return true;
}
@Override
@@ -434,17 +417,9 @@ public class TimeLineSlotView extends GLView {
if (mDownInScrolling) return;
lockRendering();
try {
- RectSlot slot = mLayout.getRectSlotByPosition(e.getX(), e.getY());
- if (slot == null) return;
-
- int index = slot.slotIndex;
- if (index != INDEX_NONE) {
- if (slot.mediaType == MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
- mListener.onLongTap(index, true);
-
- } else {
- mListener.onLongTap(index, false);
- }
+ Slot slot = mLayout.getSlotByPosition(e.getX(), e.getY());
+ if (slot != null) {
+ mListener.onLongTap(slot.index, slot.isTitle);
}
} finally {
unlockRendering();
@@ -456,9 +431,8 @@ public class TimeLineSlotView extends GLView {
mStartIndex = index;
}
- // Return true if the layout parameters have been changed
- public boolean setSlotCount(int slotCount) {
- boolean changed = mLayout.setSlotCount(slotCount);
+ public void setSlotCount(int[] count) {
+ mLayout.setSlotCount(count);
// mStartIndex is applied the first time setSlotCount is called.
if (mStartIndex != INDEX_NONE) {
@@ -467,12 +441,6 @@ public class TimeLineSlotView extends GLView {
}
// Reset the scroll position to avoid scrolling over the updated limit.
setScrollPosition(mScrollY);
- return changed;
- }
-
- public void onVersionChanged() {
- mLayout.createSlots();
- invalidate();
}
public int getVisibleStart() {
@@ -522,14 +490,14 @@ public class TimeLineSlotView extends GLView {
}
public class Layout {
-
private int mVisibleStart;
private int mVisibleEnd;
- public int mSlotCount;
+ public int mSlotSize;
private int mSlotWidth;
private int mSlotHeight;
private int mSlotGap;
+ private int[] mSlotCount;
private Spec mSpec;
@@ -540,30 +508,41 @@ public class TimeLineSlotView extends GLView {
private int mContentLength;
private int mScrollPosition;
- private ArrayList<Integer> mHeightList;
- private HashMap<Integer, RectSlot> mMediaSlotMap;
-
public void setSlotSpec(TimeLineSlotView.Spec spec) {
mSpec = spec;
}
- public boolean setSlotCount(int slotCount) {
- if (slotCount == mSlotCount) return false;
- mSlotCount = slotCount;
- initLayoutParameters();
- updateVisibleSlotRange();
- return true;
+ public void setSlotCount(int[] count) {
+ mSlotCount = count;
+ if (mHeight != 0) {
+ initLayoutParameters();
+ createSlots();
+ }
}
- public Rect getSlotRect(int index, Rect rect) {
+ public int getSlotSize() {
+ return mSlotSize;
+ }
+
+ public Rect getSlotRect(int index) {
if (index >= mVisibleStart && index < mVisibleEnd && mVisibleEnd != 0) {
- RectSlot slot = getRectSlot(index);
- if (slot == null) {
- return null;
+ int height = 0, base = 0, top = 0;
+ for (int count : mSlotCount) {
+ if (index == base) {
+ return getSlotRect(getSlot(true, index, index, top));
+ }
+ top += mSpec.titleHeight;
+ ++base;
+
+ if (index >= base && index < base + count) {
+ return getSlotRect(getSlot(false, index, base, top));
+ }
+ int rows = (count + mUnitCount - 1) / mUnitCount;
+ top += mSlotHeight * rows + mSlotGap * (rows > 0 ? rows - 1 : 0);
+ base += count;
}
- return getSlotRect(slot, rect);
}
- return rect;
+ return null;
}
private void initLayoutParameters() {
@@ -577,11 +556,12 @@ public class TimeLineSlotView extends GLView {
}
private void setSize(int width, int height) {
- mWidth = width;
- mHeight = height;
- initLayoutParameters();
- createSlots();
- updateVisibleSlotRange();
+ if (width != mWidth || height != mHeight) {
+ mWidth = width;
+ mHeight = height;
+ initLayoutParameters();
+ createSlots();
+ }
}
public void setScrollPosition(int position) {
@@ -590,57 +570,30 @@ public class TimeLineSlotView extends GLView {
updateVisibleSlotRange();
}
- private Rect getSlotRect(RectSlot slot, Rect rect) {
- if (rect == null) {
- Log.e(TAG, "LAYOUT: null rect passed");
- Utils.assertTrue(false);
- }
- int x = 0;
- int y = 0;
- int w = mSlotWidth;
- int h = 0;
- if (slot.mediaType == MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
- x = 0;
- y = slot.totalHeight - (mSpec.titleHeight);
- w = mWidth;
- h = mSpec.titleHeight;
+ private Rect getSlotRect(Slot slot) {
+ int x, y, w, h;
+ if (slot.isTitle) {
+ x = 0;
+ y = slot.top;
+ w = mWidth;
+ h = mSpec.titleHeight;
} else {
- x = slot.slotCol * (mSlotWidth + mSlotGap);
- y = slot.totalHeight -(mSlotHeight);
- w = mSlotWidth;
- h = mSlotHeight;
+ x = slot.col * (mSlotWidth + mSlotGap);
+ y = slot.top;
+ w = mSlotWidth;
+ h = mSlotHeight;
}
- rect.set(x, y, x + w, y + h);
- return rect;
+ return new Rect(x, y, x + w, y + h);
}
private synchronized void updateVisibleSlotRange() {
int position = mScrollPosition;
- if(mHeightList!= null && mHeightList.size()>0 ) {
- int indexStart = Arrays.binarySearch(mHeightList.toArray(new Integer[0]), position);
- int indexEnd = Arrays.binarySearch(mHeightList.toArray(new Integer[0]), position+mHeight);
- if(indexStart<0) {
- indexStart = (indexStart * (- 1)) - 1;
- } if (indexEnd<0) {
- indexEnd = (indexEnd * (- 1)) - 1;
+ if (mSlotCount != null) {
+ Slot begin = getSlotByPosition(0, mScrollPosition, true, false),
+ end = getSlotByPosition(0, mScrollPosition + mHeight, true, true);
+ if (begin != null && end != null) {
+ setVisibleRange(begin.index, end.index);
}
-
- if (indexStart > mHeightList.size() - 1) {
- indexStart = mHeightList.size() - 1;
- }
- int startSlotIndex = mHeightList.indexOf(mHeightList.get(indexStart));
- if(indexEnd> mHeightList.size()-1) {
- indexEnd = mHeightList.size()-1;
- }
- int endSlotIndex = mHeightList.lastIndexOf(mHeightList.get(indexEnd));
-
-
- int endSlotIndexStr = mHeightList.indexOf(mHeightList.get(indexEnd));
- if(((endSlotIndex-endSlotIndexStr) % mUnitCount) == (mUnitCount-1) && (startSlotIndex>mUnitCount)) {
- startSlotIndex= startSlotIndex-mUnitCount;
- }
-
- setVisibleRange(startSlotIndex, Math.min(mSlotCount, endSlotIndex + 1));
}
}
@@ -665,133 +618,101 @@ public class TimeLineSlotView extends GLView {
return mVisibleEnd;
}
- public int getSlotIndexByPosition(float x, float y) {
- RectSlot slot = getRectSlotByPosition(x, y);
- if (slot == null) return INDEX_NONE;
-
- return slot.slotIndex;
-
+ private Slot getSlot(boolean isTitle, int index, int indexBase, int top) {
+ if (isTitle) {
+ return new Slot(true, index, 0, top);
+ } else {
+ int row = (index - indexBase) / mUnitCount;
+ return new Slot(false, index, (index - indexBase) % mUnitCount,
+ top + row * (mSlotHeight + mSlotGap));
+ }
}
- public RectSlot getRectSlotByPosition(float x, float y) {
- int absoluteX = Math.round(x);
- int absoluteY = Math.round(y) + mScrollPosition;
-
- if (absoluteX < 0 || absoluteY < 0) {
+ public Slot getSlotByPosition(float x, float y, boolean rowStart, boolean roundUp) {
+ if (x < 0 || y < 0 || mSlotCount == null) {
return null;
}
- if (absoluteY > mContentLength)
- return null;
-
- int columnIdx = absoluteX / (mSlotWidth + mSlotGap);
-
- RectSlot rectSlot;
-
- if (mHeightList != null && mHeightList.size() > 0) {
- int index = Arrays.binarySearch(mHeightList.toArray(new Integer[0]), absoluteY);
- if (index < 0) {
- index = (index * -1) - 1;
- }
- if (index >= mHeightList.size()) {
- index = mHeightList.size() - 1;
- }
- int startIndex = mHeightList.indexOf(mHeightList.get(index));
- int maxIndex = mHeightList.lastIndexOf(mHeightList.get(index));
- if (mMediaSlotMap.get(startIndex).mediaType ==
- MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
- return mMediaSlotMap.get(startIndex);
+ int pos = (int) y, index = 0, top = 0;
+ for (int count : mSlotCount) {
+ int h = mSpec.titleHeight;
+ if (pos < top + h) {
+ if (roundUp) {
+ return getSlot(false, index + 1, index, top + h);
+ } else {
+ return getSlot(true, index, index, top);
+ }
}
- for (int i = startIndex; (i < startIndex + mUnitCount) && (i <= maxIndex); i++) {
- rectSlot = mMediaSlotMap.get(i);
- if (rectSlot.slotCol == columnIdx) {
- return rectSlot;
+ top += h;
+ ++index;
+
+ int rows = (count + mUnitCount - 1) / mUnitCount;
+ h = mSlotHeight * rows + mSlotGap * (rows > 0 ? rows - 1 : 0);
+ if (pos < top + h) {
+ int row = ((int) pos - top) / (mSlotHeight + mSlotGap);
+ int col = 0;
+ if (roundUp) {
+ int idx = (row + 1) * mUnitCount;
+ if (idx > count)
+ idx = count + 1;
+ return getSlot(false, index + idx, index, top + mSlotHeight);
+ }
+ if (!rowStart) {
+ col = ((int) x) / (mSlotWidth + mSlotGap);
+ if (TextUtils.getLayoutDirectionFromLocale(Locale.getDefault())
+ == View.LAYOUT_DIRECTION_RTL) {
+ col = mUnitCount - col;
+ }
+ if (row * mUnitCount + col >= count) {
+ break;
+ }
}
+ return getSlot(false, index + row * mUnitCount + col, index, top);
}
+ top += h;
+ index += count;
+ }
+ if (roundUp) {
+ return getSlot(false, index, index, top);
}
return null;
}
- public int getScrollLimit() {
- if (mHeightList != null && mHeightList.size() > 0) {
- return Math.max(0, mContentLength -mHeight);
- }
- return 0;
+ public Slot getSlotByPosition(float x, float y) {
+ return getSlotByPosition(x, mScrollPosition + y, false, false);
}
-
+ public int getScrollLimit() {
+ return Math.max(0, mContentLength - mHeight);
+ }
public void createSlots() {
- ArrayList<MediaItem> mediaItemlist = new ArrayList<MediaItem>();
- if (mRenderer != null) {
- mediaItemlist = mRenderer.getAllMediaItems();
- }
- if (mHeightList == null) {
- mHeightList = new ArrayList<Integer>();
- }
- if (mMediaSlotMap == null) {
- mMediaSlotMap = new HashMap<Integer, RectSlot>();
- }
- mHeightList.clear();
- mMediaSlotMap.clear();
- if (mediaItemlist != null && mediaItemlist.size() > 0) {
- boolean isPrevTitle = false;
- int j = 0;
- int col = 0;
- int totalHeight = 0;
- for (int i = 0; i < mediaItemlist.size(); ++i) {
- MediaItem info = mediaItemlist.get(i);
-
- if (info.getMediaType() == MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
- totalHeight += (mSpec.titleHeight + mSlotGap);
- isPrevTitle = true;
- col = 0;
- } else {
- if (isPrevTitle) {
- j = 0;
- isPrevTitle = false;
- } else {
- ++j;
- }
- if (j % mUnitCount == 0) {
- totalHeight += (mSlotHeight + mSlotGap);
- col = 0;
- } else {
- col = j % mUnitCount;
- }
-
- }
- mHeightList.add(totalHeight);
- if (View.LAYOUT_DIRECTION_RTL == TextUtils
- .getLayoutDirectionFromLocale(Locale.getDefault())) {
- col = mUnitCount - col - 1;
- }
- RectSlot rectslot = new RectSlot(info.getMediaType(), i, col, totalHeight);
- mMediaSlotMap.put(rectslot.slotIndex, rectslot);
+ int height = 0;
+ int size = 0;
+ if (mSlotCount != null) {
+ for (int count : mSlotCount) {
+ int rows = (count + mUnitCount - 1) / mUnitCount;
+ height += mSlotHeight * rows + mSlotGap * (rows > 0 ? rows - 1 : 0);
+ size += 1 + count;
}
- mContentLength = mHeightList.get(mHeightList.size() -1);
- mSlotCount = mediaItemlist.size();
+ height += mSpec.titleHeight * mSlotCount.length;
+ mContentLength = height;
+ mSlotSize = size;
+ updateVisibleSlotRange();
}
- updateVisibleSlotRange();
- }
-
- public RectSlot getRectSlot(int slotIndex) {
- return mMediaSlotMap.get(slotIndex);
}
}
+ private static class Slot {
+ public boolean isTitle;
+ public int index;
+ public int col;
+ public int top;
-
- public static class RectSlot {
- public int mediaType;
- public int slotIndex;
- public int slotCol;
- public int totalHeight;
-
- public RectSlot(int type, int index, int col, int height) {
- mediaType = type;
- slotIndex = index;
- slotCol = col;
- totalHeight = height;
+ public Slot(boolean isTitle, int index, int col, int top) {
+ this.isTitle = isTitle;
+ this.index = index;
+ this.col = col;
+ this.top = top;
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 13:42:50 +0000