Make ChipsLayoutManger implement IFlexibleLayoutManager

ChipsLayoutManager/build.gradle

@@ -100,6 +100,8 @@ dependencies {
     compile "com.android.support:appcompat-v7:$supportVersion"
     compile "com.android.support:recyclerview-v7:$supportVersion"
 
+    provided 'eu.davidea:flexible-adapter:5.0.0-rc2'
+
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile "com.android.support:support-annotations:$supportVersion"

ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/ChipsLayoutManager.java

@@ -9,46 +9,48 @@
 import android.support.annotation.RestrictTo;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.OrientationHelper;
 import android.support.v7.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
 
 import com.beloo.widget.chipslayoutmanager.anchor.AnchorViewState;
 import com.beloo.widget.chipslayoutmanager.anchor.IAnchorFactory;
+import com.beloo.widget.chipslayoutmanager.cache.IViewCacheStorage;
+import com.beloo.widget.chipslayoutmanager.cache.ViewCacheFactory;
+import com.beloo.widget.chipslayoutmanager.gravity.CenterChildGravity;
+import com.beloo.widget.chipslayoutmanager.gravity.CustomGravityResolver;
+import com.beloo.widget.chipslayoutmanager.gravity.IChildGravityResolver;
+import com.beloo.widget.chipslayoutmanager.layouter.AbstractPositionIterator;
 import com.beloo.widget.chipslayoutmanager.layouter.ColumnsStateFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.ICanvas;
+import com.beloo.widget.chipslayoutmanager.layouter.ILayouter;
 import com.beloo.widget.chipslayoutmanager.layouter.IMeasureSupporter;
 import com.beloo.widget.chipslayoutmanager.layouter.IStateFactory;
+import com.beloo.widget.chipslayoutmanager.layouter.LayouterFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.MeasureSupporter;
 import com.beloo.widget.chipslayoutmanager.layouter.RowsStateFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.breaker.EmptyRowBreaker;
 import com.beloo.widget.chipslayoutmanager.layouter.breaker.IRowBreaker;
-import com.beloo.widget.chipslayoutmanager.cache.IViewCacheStorage;
-import com.beloo.widget.chipslayoutmanager.cache.ViewCacheFactory;
-import com.beloo.widget.chipslayoutmanager.gravity.CenterChildGravity;
-import com.beloo.widget.chipslayoutmanager.gravity.CustomGravityResolver;
-import com.beloo.widget.chipslayoutmanager.gravity.IChildGravityResolver;
-import com.beloo.widget.chipslayoutmanager.layouter.LayouterFactory;
-import com.beloo.widget.chipslayoutmanager.layouter.AbstractPositionIterator;
-import com.beloo.widget.chipslayoutmanager.layouter.ILayouter;
 import com.beloo.widget.chipslayoutmanager.layouter.criteria.AbstractCriteriaFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.criteria.ICriteriaFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.criteria.InfiniteCriteriaFactory;
 import com.beloo.widget.chipslayoutmanager.layouter.placer.PlacerFactory;
-import com.beloo.widget.chipslayoutmanager.util.log.IFillLogger;
-import com.beloo.widget.chipslayoutmanager.util.log.LoggerFactory;
 import com.beloo.widget.chipslayoutmanager.util.AssertionUtils;
 import com.beloo.widget.chipslayoutmanager.util.LayoutManagerUtil;
+import com.beloo.widget.chipslayoutmanager.util.log.IFillLogger;
 import com.beloo.widget.chipslayoutmanager.util.log.Log;
 import com.beloo.widget.chipslayoutmanager.util.log.LogSwitcherFactory;
+import com.beloo.widget.chipslayoutmanager.util.log.LoggerFactory;
 import com.beloo.widget.chipslayoutmanager.util.testing.EmptySpy;
 import com.beloo.widget.chipslayoutmanager.util.testing.ISpy;
 
 import java.util.Locale;
 
+import eu.davidea.flexibleadapter.common.IFlexibleLayoutManager;
+
 public class ChipsLayoutManager extends RecyclerView.LayoutManager implements IChipsLayoutManagerContract,
-        IStateHolder,
-        ScrollingController.IScrollerListener {
+        IStateHolder, ScrollingController.IScrollerListener, IFlexibleLayoutManager {
     ///////////////////////////////////////////////////////////////////////////
     // orientation types
     ///////////////////////////////////////////////////////////////////////////
@@ -497,6 +499,27 @@ public boolean supportsPredictiveItemAnimations() {
         return true;
     }
 
+    ///////////////////////////////////////////////////////////////////////////
+    // FlexibleAdapter support
+    ///////////////////////////////////////////////////////////////////////////
+
+    @Override
+    public int getOrientation() {
+        switch (layoutOrientation()) {
+            case VERTICAL:
+                return OrientationHelper.VERTICAL;
+            case HORIZONTAL:
+                return OrientationHelper.HORIZONTAL;
+            default:
+                throw new IllegalStateException("Invalid layoutOrientation!");
+        }
+    }
+
+    @Override
+    public int getSpanCount() {
+        return maxViewsInRow == null ? INT_ROW_SIZE_APPROXIMATELY_FOR_CACHE : maxViewsInRow;
+    }
+
     ///////////////////////////////////////////////////////////////////////////
     // visible items
     ///////////////////////////////////////////////////////////////////////////

ChipsLayoutManager/src/main/java/com/beloo/widget/chipslayoutmanager/gravity/TopGravityModifier.java

@@ -3,23 +3,20 @@
 import android.graphics.Rect;
 
 class TopGravityModifier implements IGravityModifier {
-
     @Override
     public Rect modifyChildRect(int minStart, int maxEnd, Rect childRect) {
-        if (childRect.left < minStart) {
+        if (childRect.top < minStart) {
             throw new IllegalArgumentException("top point of input rect can't be lower than minTop");
         }
-        if (childRect.right > maxEnd) {
+        if (childRect.bottom > maxEnd) {
             throw new IllegalArgumentException("bottom point of input rect can't be bigger than maxTop");
         }
+        Rect modified = new Rect(childRect);
 
-        childRect = new Rect(childRect);
-
-        if (childRect.top > minStart) {
-            childRect.bottom -= (childRect.top - minStart);
-            childRect.top = minStart;
+        if (modified.top > minStart) {
+            modified.bottom -= (modified.top - minStart);
+            modified.top = minStart;
         }
-
-        return childRect;
+        return modified;
     }
 }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -24,6 +24,7 @@ project.ext {
 allprojects {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com' }
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 23 11:38:19 EET 2016
+#Mon Jun 19 08:49:58 CDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip