@nativescript-community/ui-collectionview 5.2.0 → 5.3.0

package/index.ios.d.ts

@@ -92,7 +92,7 @@ export declare class CollectionView extends CollectionViewBase {
 }
 interface ViewItemIndex {
 }
-declare type ItemView = View & ViewItemIndex;
+type ItemView = View & ViewItemIndex;
 declare class CollectionViewCell extends UICollectionViewCell {
     owner: WeakRef<ItemView>;
     currentIndex: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nativescript-community/ui-collectionview",
-    "version": "5.2.0",
+    "version": "5.3.0",
     "description": "Allows you to easily add a collection view (grid list view) to your projects. Supports vertical and horizontal modes, templating, and more.",
     "main": "./index",
     "sideEffects": false,
@@ -56,5 +56,5 @@
     },
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
-    "gitHead": "1c3456a693c41eadf509ecf5b26defe94b1b3f66"
+    "gitHead": "3eb64b60bab938d79853920e290ee8f26afbf178"
 }

package/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>

package/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'
 }

package/platforms/android/java/com/nativescript/collectionview/GridLayoutManager.java

@@ -6,8 +6,14 @@ import android.view.View;
 import java.util.HashMap;
 
 public class GridLayoutManager extends androidx.recyclerview.widget.GridLayoutManager {
+    
     private HashMap<Integer, Integer> childSizesMap = new HashMap();
     public boolean isScrollEnabled = true;
+    public LayoutCompletedListener layoutCompletedListener;
+
+    public interface LayoutCompletedListener {
+        public void onLayoutCompleted();
+    }
 
     public GridLayoutManager(Context context, int spanCount) {
         super(context, spanCount);
@@ -20,6 +26,9 @@ public class GridLayoutManager extends androidx.recyclerview.widget.GridLayoutMa
             View child = getChildAt(i);
             childSizesMap.put(getPosition(child), child.getHeight());
         }
+        if (layoutCompletedListener != null) {
+            layoutCompletedListener.onLayoutCompleted();
+        }
     }
 
    public  int computeVerticalScrollOffset(RecyclerView.State state) {

package/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);
+    }
+}

package/platforms/android/java/com/nativescript/collectionview/RecyclerView.java

@@ -5,11 +5,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.util.Log;
 import androidx.recyclerview.widget.LinearSmoothScroller;
+// import jp.wasabeef.recyclerview.animators.FadeInAnimator;
+// import jp.wasabeef.recyclerview.animators.BaseItemAnimator;
+import android.view.animation.OvershootInterpolator;
 
 public class RecyclerView extends androidx.recyclerview.widget.RecyclerView {
     static final String TAG = "RecyclerView";
     public SizeChangedListener sizeChangedListener = null;
     protected com.nativescript.collectionview.SmoothScroller smoothScroller;
+    // public FadeInAnimator animator;
     public RecyclerView(Context context) {
         this(context, null);
     }
@@ -21,6 +25,15 @@ public class RecyclerView extends androidx.recyclerview.widget.RecyclerView {
         setHasFixedSize(true);
         setFocusable(true);
         setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
+
+
+        // animator = new FadeInAnimator();
+        // animator.setInterpolator(new OvershootInterpolator());
+        // animator.setMoveDuration(200);
+        // setItemAnimator(animator);
+      // Change animations are enabled by default since support-v7-recyclerview v22.
+        // Need to disable them when using animation indicator.
+        // animator.setSupportsChangeAnimations(false);
     }
 
     static public RecyclerView createRecyclerView(Context context) {
@@ -46,7 +59,14 @@ public class RecyclerView extends androidx.recyclerview.widget.RecyclerView {
             sizeChangedListener.onMeasure();
         }
     }
-
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        if (sizeChangedListener != null) {
+            sizeChangedListener.onLayout(changed, l, t, r, b);
+        }
+    }
+    
     @Override
     public void smoothScrollToPosition(int position) {
         this.smoothScrollToPosition(position, LinearSmoothScroller.SNAP_TO_START);

package/platforms/android/java/com/nativescript/collectionview/SizeChangedListener.java

@@ -1,6 +1,7 @@
 package com.nativescript.collectionview;
 
 public interface SizeChangedListener {
-    public void onSizeChanged(int w, int h, int oldw, int oldh);
+    // public void onSizeChanged(int w, int h, int oldw, int oldh);
+    public void onLayout(boolean changed, int l, int t, int r, int b);
     public void onMeasure();
 }

package/react/index.d.ts

@@ -2,8 +2,8 @@ import * as React from 'react';
 import { CoreTypes, ItemEventData, ItemsSource, View } from '@nativescript/core';
 import { NSVElement, NativeScriptProps, ViewAttributes } from 'react-nativescript';
 import { CollectionView as NativeScriptCollectionView } from '..';
-export declare type CellViewContainer = View;
-declare type CellFactory = (item: any) => React.ReactElement;
+export type CellViewContainer = View;
+type CellFactory = (item: any) => React.ReactElement;
 export declare function registerCollectionView(): void;
 interface CollectionViewAttributes extends ViewAttributes {
     colWidth?: CoreTypes.PercentLengthType | string;
@@ -33,7 +33,7 @@ declare global {
         }
     }
 }
-declare type OwnProps = {
+type OwnProps = {
     items: ItemsSource | any[];
     /** User may specify cellFactory for single-template or cellFactories for multi-template. */
     cellFactory?: CellFactory;
@@ -52,10 +52,10 @@ declare type OwnProps = {
         onCellRecycle?: (container: CellViewContainer) => void;
     };
 } & Omit<CollectionViewAttributes, 'onItemLoading'>;
-declare type Props = OwnProps & {
+type Props = OwnProps & {
     forwardedRef?: React.RefObject<NSVElement<NativeScriptCollectionView>>;
 };
-declare type NumberKey = number | string;
+type NumberKey = number | string;
 interface State {
     nativeCells: Record<NumberKey, CellViewContainer>;
     nativeCellToItemIndex: Map<CellViewContainer, NumberKey>;

package/svelte/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="svelte-native" />
 import { NativeViewElementNode, ViewNode } from 'svelte-native/dom';
 import { CollectionView } from '..';
 declare module '@nativescript/core/ui/core/view-base' {

package/typings/android.d.ts

@@ -10,6 +10,14 @@ declare namespace com {
             }
             export class GridLayoutManager extends androidx.recyclerview.widget.GridLayoutManager {
                 isScrollEnabled: boolean;
+                layoutCompletedListener: LayoutCompletedListener;
+            }
+            export namespace GridLayoutManager {
+
+                export class LayoutCompletedListener {
+                    onLayoutCompleted();
+                    constructor(implementation?: { onLayoutCompleted() });
+                } 
             }
             export class PreCachingGridLayoutManager extends GridLayoutManager {
                 setExtraLayoutSpace(space: number);
@@ -41,8 +49,8 @@ declare namespace com {
                 smoothScrollToPosition(position: number, snapPosition?: number);
             }
             export class SizeChangedListener {
-                constructor(impl?: { onSizeChanged(w: number, h: number, oldw: number, oldh: number); onMeasure() });
-                onSizeChanged(w: number, h: number, oldw: number, oldh: number);
+                constructor(impl?: { onLayout(changed:boolean, l: number, t: number, r: number, b: number); onMeasure() });
+                onLayout(changed:boolean, l: number, t: number, r: number, b: number);
                 onMeasure();
             }
             export class OnScrollListener extends androidx.recyclerview.widget.RecyclerView.OnScrollListener {
@@ -71,6 +79,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;
+            }
         }
     }
 }