anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-125 Editor | Enhancement | Scalable table grid

Browse source
This commit is contained in:
Mikhail Iudin 2022-08-16 22:17:29 +03:00 • committed by Mikhail
parent 2f2977049a
commit 3ae7af6f23
3 changed files with 36 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

103
core-ui/src/main/java/androidx/recyclerview/widget/GridLayoutManager2.java
View file

@ -15,9 +15,6 @@
*/
package androidx.recyclerview.widget;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import android.content.Context;
import android.graphics.Rect;
import android.util.AttributeSet;
@ -25,15 +22,11 @@ import android.util.Log;
import android.util.SparseIntArray;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import java.util.Arrays;
import timber.log.Timber;
/**
* A {@link RecyclerView.LayoutManager} implementations that lays out items in a grid.
* <p>
@ -55,14 +48,11 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* <p>For <b>i-th</b> item start is {@link #mCachedBorders}[i-1] + 1
* and end is {@link #mCachedBorders}[i].
*/
int[] mCachedBorders;
int[] mCachedHeights;
int mCurrentPosition;
int [] mCachedBorders;
/**
* Temporary array to keep views in layoutChunk method
*/
View[] mSet;
int[] mViewPos;
final SparseIntArray mPreLayoutSpanSizeCache = new SparseIntArray();
final SparseIntArray mPreLayoutSpanIndexCache = new SparseIntArray();
SpanSizeLookup mSpanSizeLookup = new DefaultSpanSizeLookup();
@ -75,11 +65,11 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* Constructor used when layout manager is set in XML by RecyclerView attribute
* "layoutManager". If spanCount is not specified in the XML, it defaults to a
* single column.
* <p>
*
* {@link androidx.recyclerview.R.attr#spanCount}
*/
public GridLayoutManager2(Context context, AttributeSet attrs, int defStyleAttr,
int defStyleRes) {
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
setSpanCount(properties.spanCount);
@ -88,7 +78,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
/**
* Creates a vertical GridLayoutManager
*
* @param context Current context, will be used to access resources.
* @param context Current context, will be used to access resources.
* @param spanCount The number of columns in the grid
*/
public GridLayoutManager2(Context context, int spanCount) {
@ -97,14 +87,14 @@ public class GridLayoutManager2 extends LinearLayoutManager {
}
/**
* @param context Current context, will be used to access resources.
* @param spanCount The number of columns or rows in the grid
* @param orientation Layout orientation. Should be {@link #HORIZONTAL} or {@link
* @param context Current context, will be used to access resources.
* @param spanCount The number of columns or rows in the grid
* @param orientation Layout orientation. Should be {@link #HORIZONTAL} or {@link
* #VERTICAL}.
* @param reverseLayout When set to true, layouts from end to start.
*/
public GridLayoutManager2(Context context, int spanCount,
@RecyclerView.Orientation int orientation, boolean reverseLayout) {
@RecyclerView.Orientation int orientation, boolean reverseLayout) {
super(context, orientation, reverseLayout);
setSpanCount(spanCount);
}
@ -167,7 +157,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
spanGroupIndex, 1, false, false));
} else { // VERTICAL
info.setCollectionItemInfo(AccessibilityNodeInfoCompat.CollectionItemInfoCompat.obtain(
spanGroupIndex, 1,
spanGroupIndex , 1,
glp.getSpanIndex(), glp.getSpanSize(), false, false));
}
}
@ -239,11 +229,11 @@ public class GridLayoutManager2 extends LinearLayoutManager {
@Override
public RecyclerView.LayoutParams generateDefaultLayoutParams() {
if (mOrientation == HORIZONTAL) {
return new LayoutParams(WRAP_CONTENT,
MATCH_PARENT);
return new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT);
} else {
return new LayoutParams(MATCH_PARENT,
WRAP_CONTENT);
return new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
}
}
@ -321,17 +311,13 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* @param totalSpace Total available space after padding is removed
*/
private void calculateItemBorders(int totalSpace) {
//mCachedBorders = calculateItemBorders(mCachedBorders, mSpanCount, totalSpace);
if (mCachedBorders == null || mCachedBorders.length != mSpanCount + 1) {
mCachedBorders = new int[mSpanCount + 1];
mCachedHeights = new int[mSpanCount + 1];
}
mCachedBorders = calculateItemBorders(mCachedBorders, mSpanCount, totalSpace);
}
/**
* @param cachedBorders The out array
* @param spanCount number of spans
* @param totalSpace total available space after padding is removed
* @param spanCount number of spans
* @param totalSpace total available space after padding is removed
* @return The updated array. Might be the same instance as the provided array if its size
* has not changed.
*/
@ -381,7 +367,6 @@ public class GridLayoutManager2 extends LinearLayoutManager {
private void ensureViewSet() {
if (mSet == null || mSet.length != mSpanCount) {
mSet = new View[mSpanCount];
mViewPos = new int[mSpanCount];
}
}
@ -555,7 +540,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
void layoutChunk(RecyclerView.Recycler recycler, RecyclerView.State state,
LayoutState layoutState, LayoutChunkResult result) {
final int otherDirSpecMode = mOrientationHelper.getModeInOther();
final boolean flexibleInOtherDir = true;
final boolean flexibleInOtherDir = otherDirSpecMode != View.MeasureSpec.EXACTLY;
final int currentOtherDirSize = getChildCount() > 0 ? mCachedBorders[mSpanCount] : 0;
// if grid layout's dimensions are not specified, let the new row change the measurements
// This is not perfect since we not covering all rows but still solves an important case
@ -589,7 +574,6 @@ public class GridLayoutManager2 extends LinearLayoutManager {
break;
}
mSet[count] = view;
mViewPos[count] = pos;
count++;
}
@ -600,7 +584,6 @@ public class GridLayoutManager2 extends LinearLayoutManager {
int maxSize = 0;
float maxSizeInOther = 0; // use a float to get size per span
int[] maxSizes = new int[mSet.length];
// we should assign spans before item decor offsets are calculated
assignSpans(recycler, state, count, layingOutInPrimaryDirection);
@ -629,17 +612,13 @@ public class GridLayoutManager2 extends LinearLayoutManager {
final LayoutParams lp = (LayoutParams) view.getLayoutParams();
final float otherSize = 1f * mOrientationHelper.getDecoratedMeasurementInOther(view)
/ lp.mSpanSize;
maxSizes[i] = Math.round(otherSize);
if (otherSize > maxSizeInOther) {
maxSizeInOther = otherSize;
}
}
if (flexibleInOtherDir) {
// re-distribute columns
mCurrentPosition = layoutState.mCurrentPosition;
int[] before = Arrays.copyOf(mCachedHeights, mCachedHeights.length);
guessMeasurement(maxSizes, currentOtherDirSize);
if (!Arrays.equals(before, mCachedHeights)) mRecyclerView.postDelayed(mRecyclerView::requestLayout, 200);
guessMeasurement(maxSizeInOther, currentOtherDirSize);
// now we should re-measure any item that was match parent.
maxSize = 0;
for (int i = 0; i < count; i++) {
@ -738,10 +717,10 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* Measures a child with currently known information. This is not necessarily the child's final
* measurement. (see fillChunk for details).
*
* @param view The child view to be measured
* @param view The child view to be measured
* @param otherDirParentSpecMode The RV measure spec that should be used in the secondary
* orientation
* @param alreadyMeasured True if we've already measured this view once
* @param alreadyMeasured True if we've already measured this view once
*/
private void measureChild(View view, int otherDirParentSpecMode, boolean alreadyMeasured) {
final LayoutParams lp = (LayoutParams) view.getLayoutParams();
@ -750,30 +729,21 @@ public class GridLayoutManager2 extends LinearLayoutManager {
+ lp.topMargin + lp.bottomMargin;
final int horizontalInsets = decorInsets.left + decorInsets.right
+ lp.leftMargin + lp.rightMargin;
int availableSpaceInOther = getSpaceForSpanRange(lp.mSpanIndex, lp.mSpanSize);
final int availableSpaceInOther = getSpaceForSpanRange(lp.mSpanIndex, lp.mSpanSize);
final int wSpec;
int hSpec;
final int hSpec;
if (mOrientation == VERTICAL) {
wSpec = getChildMeasureSpec(availableSpaceInOther, otherDirParentSpecMode,
horizontalInsets, lp.width, false);
hSpec = getChildMeasureSpec(mOrientationHelper.getTotalSpace(), getHeightMode(),
verticalInsets, lp.height, true);
} else {
if (!alreadyMeasured) {
lp.height = WRAP_CONTENT;
availableSpaceInOther = 100;
otherDirParentSpecMode = View.MeasureSpec.UNSPECIFIED;
}
hSpec = getChildMeasureSpec(availableSpaceInOther, otherDirParentSpecMode,
verticalInsets, lp.height, false);
wSpec = getChildMeasureSpec(mOrientationHelper.getTotalSpace(), getWidthMode(),
horizontalInsets, lp.width, true);
}
// if (!alreadyMeasured) {
// hSpec = 0;
// }
measureChildWithDecorationsAndMargin(view, wSpec, hSpec, alreadyMeasured);
lp.height = MATCH_PARENT;
}
/**
@ -783,28 +753,13 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* Here we try to assign a best guess width or height and re-do the layout to update other
* views that wanted to MATCH_PARENT in the non-scroll orientation.
*
* @param maxSizes The maximum size per span ratio from the measurement of the children.
* @param maxSizeInOther The maximum size per span ratio from the measurement of the children.
* @param currentOtherDirSize The size before this layout chunk. There is no reason to go below.
*/
private void guessMeasurement(int[] maxSizes, int currentOtherDirSize) {
//final int contentSize = Math.round(maxSizeInOther * mSpanCount);
private void guessMeasurement(float maxSizeInOther, int currentOtherDirSize) {
final int contentSize = Math.round(maxSizeInOther * mSpanCount);
// always re-calculate because borders were stretched during the fill
calculateItemBorders(Math.max(0, currentOtherDirSize));
for (int i = 0; i < mSpanCount; i++) {
int pos = mViewPos[i] % mSpanCount + 1;
if (pos <= mSpanCount) {
mCachedHeights[pos] = Math.max(mCachedHeights[pos], Math.round(maxSizes[i]));
}
}
for (int i = 1; i < mCachedBorders.length; i++) {
mCachedBorders[i] = mCachedBorders[i - 1] + mCachedHeights[i];
}
}
public void clearBorders() {
mCachedBorders = new int[mSpanCount + 1];
mCachedHeights = new int[mSpanCount + 1];
mRecyclerView.requestLayout();
calculateItemBorders(Math.max(contentSize, currentOtherDirSize));
}
private void measureChildWithDecorationsAndMargin(View child, int widthSpec, int heightSpec,
@ -816,7 +771,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
} else {
measure = shouldMeasureChild(child, widthSpec, heightSpec, lp);
}
if (true) {
if (measure) {
child.measure(widthSpec, heightSpec);
}
}
@ -927,7 +882,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* @param cacheSpanGroupIndices Whether results of getGroupSpanIndex should be cached or
* not.
*/
public void setSpanGroupIndexCacheEnabled(boolean cacheSpanGroupIndices) {
public void setSpanGroupIndexCacheEnabled(boolean cacheSpanGroupIndices) {
if (!cacheSpanGroupIndices) {
mSpanGroupIndexCache.clear();
}
@ -1077,7 +1032,7 @@ public class GridLayoutManager2 extends LinearLayoutManager {
* for item 1 will be 0, item 5 will be 1.
*
* @param adapterPosition The position in adapter
* @param spanCount The total number of spans in the grid
* @param spanCount The total number of spans in the grid
* @return The index of the span group including the item at the given adapter position
*/
public int getSpanGroupIndex(int adapterPosition, int spanCount) {

2
core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/table/holders/TableBlockHolder.kt
View file

@ -62,7 +62,7 @@ class TableBlockHolder(
lm.spanCount = item.rowCount
tableAdapter.setTableBlockId(item.id)
tableAdapter.submitList(item.cells)
recycler.postDelayed(lm::clearBorders, 300)
recycler.postDelayed(lm::clearBorders, 200)
}
fun processChangePayload(

13
core-ui/src/main/res/layout/item_block_table_row_item.xml
View file

@ -2,19 +2,18 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="@dimen/item_block_table_cell_width"
android:minHeight="@dimen/item_block_table_cell_height">
<com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/textContent"
style="@style/BlockCellTextContentStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/item_block_multi_select_mode_selector"
android:focusable="true"
android:textIsSelectable="true"
android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="false"
tools:text="@string/default_text_placeholder" />
<View