chore: working on overlap property

Author: farfromrefug

packages/collectionview/platforms/android/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nativescript.collectionview">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nativescript.collectionview" >
 </manifest>

packages/collectionview/platforms/android/include.gradle

@@ -1,7 +1,8 @@
 dependencies {
 	def androidXRecyclerViewVersion =  project.hasProperty("androidXRecyclerViewVersion") ? project.androidXRecyclerViewVersion : "1.3.0"
     implementation "androidx.recyclerview:recyclerview:$androidXRecyclerViewVersion"
-    implementation ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0@aar'){
-        transitive=true
-    }
+    // implementation ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0@aar'){
+    //     transitive=true
+    // }
+    implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
 }

packages/collectionview/platforms/android/java/com/nativescript/collectionview/OverlapDecoration.java

@@ -0,0 +1,22 @@
+package com.nativescript.collectionview;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.View;
+import android.graphics.Rect;
+
+public class OverlapDecoration extends RecyclerView.ItemDecoration {
+
+    public int top = 0;
+    public int right = 0;
+    public int bottom = 0;
+    public int left = 0;
+
+    @Override
+    public void getItemOffsets (Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        final int itemPosition = parent.getChildAdapterPosition(view);
+        int position = parent.getChildAdapterPosition(view);
+        boolean isLast = position == state.getItemCount()-1;
+        if (itemPosition == 0) {
+            return; }
+        outRect.set(left, top, right, bottom);
+    }
+}

src/collectionview/index-common.ts

@@ -7,6 +7,7 @@ import {
     ItemsSource,
     KeyedTemplate,
     Label,
+    Length,
     Observable,
     ObservableArray,
     PercentLength,
@@ -743,3 +744,60 @@ export const autoReloadItemOnLayoutProperty = new Property<CollectionViewBase, b
     valueConverter: booleanConverter
 });
 autoReloadItemOnLayoutProperty.register(CollectionViewBase);
+
+function parseThickness(value: string): any {
+    if (typeof value === 'string') {
+        const arr = value.split(/[ ,]+/);
+
+        let top: string;
+        let right: string;
+        let bottom: string;
+        let left: string;
+
+        if (arr.length === 1) {
+            top = arr[0];
+            right = arr[0];
+            bottom = arr[0];
+            left = arr[0];
+        } else if (arr.length === 2) {
+            top = arr[0];
+            bottom = arr[0];
+            right = arr[1];
+            left = arr[1];
+        } else if (arr.length === 3) {
+            top = arr[0];
+            right = arr[1];
+            left = arr[1];
+            bottom = arr[2];
+        } else if (arr.length === 4) {
+            top = arr[0];
+            right = arr[1];
+            bottom = arr[2];
+            left = arr[3];
+        } else {
+            throw new Error('Expected 1, 2, 3 or 4 parameters. Actual: ' + value);
+        }
+
+        return {
+            top,
+            right,
+            bottom,
+            left
+        };
+    } else {
+        return value;
+    }
+}
+export const itemOverlapProperty = new Property<CollectionViewBase, CoreTypes.LengthType[]>({
+    name: 'itemOverlap',
+    valueConverter: (value) => {
+        if (typeof value === 'string' && value !== 'auto') {
+            const thickness = parseThickness(value);
+
+            return [Length.parse(thickness.top), Length.parse(thickness.right), Length.parse(thickness.bottom), Length.parse(thickness.left)];
+        } else {
+            return [value, value, value, value];
+        }
+    }
+});
+itemOverlapProperty.register(CollectionViewBase);

src/collectionview/index.android.ts

@@ -4,6 +4,7 @@ import {
     ChangedData,
     ContentView,
     CoreTypes,
+    Length,
     Property,
     ProxyViewContainer,
     Trace,
@@ -17,7 +18,7 @@ import {
     paddingTopProperty,
     profile
 } from '@nativescript/core';
-import { CollectionViewItemEventData, Orientation, reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty, scrollBarIndicatorVisibleProperty } from '.';
+import { CollectionViewItemEventData, Orientation, itemOverlapProperty, reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty, scrollBarIndicatorVisibleProperty } from '.';
 import { CLog, CLogTypes, CollectionViewBase, ListViewViewTypes, isScrollEnabledProperty, orientationProperty } from './index-common';
 
 export * from './index-common';
@@ -176,7 +177,7 @@ export class CollectionView extends CollectionViewBase {
         if (!CollectionViewRecyclerView) {
             CollectionViewRecyclerView = com.nativescript.collectionview.RecyclerView as any;
         }
-        const recyclerView = (CollectionViewRecyclerView as any).createRecyclerView(this._context);
+        const recyclerView = (CollectionViewRecyclerView as any).createRecyclerView(this._context) as com.nativescript.collectionview.RecyclerView;
         // const expMgr = new RecyclerViewExpandableItemManager(null);
         // adapter.setDisplayHeadersAtStartUp(true).setStickyHeaders(true); //Make headers sticky
         // Endless scroll with 1 item threshold
@@ -255,18 +256,18 @@ export class CollectionView extends CollectionViewBase {
         });
         this.spanSize = this._getSpanSize;
 
-        const animator = new com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator();
-
+        const animator = new jp.wasabeef.recyclerview.animators.FadeInAnimator();
+        animator.setInterpolator(new android.view.animation.OvershootInterpolator());
+        animator.setMoveDuration(200);
         // Change animations are enabled by default since support-v7-recyclerview v22.
         // Need to disable them when using animation indicator.
-        animator.setSupportsChangeAnimations(false);
+        // animator.setSupportsChangeAnimations(false);
 
         nativeView.setItemAnimator(animator);
 
         this.refresh();
     }
     public disposeNativeView() {
-        // clear the cache
         // this.eachChildView((view) => {
         //     view.parent._removeView(view);
         //     return true;
@@ -524,6 +525,17 @@ export class CollectionView extends CollectionViewBase {
     [paddingLeftProperty.setNative](value: CoreTypes.LengthType) {
         this._setPadding({ left: this.effectivePaddingLeft });
     }
+    decorator: com.nativescript.collectionview.OverlapDecoration;
+    [itemOverlapProperty.setNative](value: CoreTypes.LengthType[]) {
+        if (!this.decorator) {
+            this.decorator = new com.nativescript.collectionview.OverlapDecoration();
+            this.nativeViewProtected.addItemDecoration(this.decorator);
+        }
+        this.decorator.top = Length.toDevicePixels(value[0], 0);
+        this.decorator.right = Length.toDevicePixels(value[1], 0);
+        this.decorator.bottom = Length.toDevicePixels(value[2], 0);
+        this.decorator.left = Length.toDevicePixels(value[3], 0);
+    }
 
     public [orientationProperty.getDefault](): Orientation {
         return 'vertical';

src/collectionview/typings/android.d.ts

@@ -71,6 +71,12 @@ declare namespace com {
             }
 
             export class SmoothScroller extends androidx.recyclerview.widget.LinearSmoothScroller {}
+            export class OverlapDecoration extends androidx.recyclerview.widget.RecyclerView.ItemDecoration {
+                public top: number;
+                public right: number;
+                public bottom: number;
+                public left: number;
+            }
         }
     }
 }