Merge branch 'lib_setup'

Author: leshchenko

README.md

@@ -3,24 +3,35 @@
 Simple in usage Recycler Layout Manager with circular item positioning.
 
 ![](animation.gif)
+![](example.gif)
+![](example2.gif)
 
+## What's new
+
+1.1.0 - Now you can configure some individual components like `anglePerItem`, `firstCircleRadius`, `angleStepForCircles`. Also horizontal scrolling works, it moves all elements by a circle.
 
 ## Usage
-Register configuration providers like this:
-```java
+Just add a `CircularRecyclerLayoutManager` as a layout manager for your recycler view.
+```kotlin
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        circularRecycler.layoutManager = CircularRecyclerLayoutManager()
+        circularRecycler.layoutManager = CircularRecyclerLayoutManager(
+                   canScrollHorizontally = true,
+                   itemsPerCircle = 4,
+                   anglePerItem = 100.0,
+                   firstCircleRadius = 200.0,
+                   angleStepForCircles = 45.0
+               )
         circularRecycler.adapter = Adapter()
     }
 }
 ```
 
 ### Installation
-- Add this to your project level `build.gradle`:
+- Add this to your project level `build.gradle`: 
 ```
 allprojects {
     repositories {

app/build.gradle

@@ -26,11 +26,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
-    implementation 'com.github.leshchenko:CircularLayoutManager:1.0.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
+    implementation 'com.github.leshchenko:CircularLayoutManager:1.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/java/com/leshchenko/circularlayoutmanager/MainActivity.kt

@@ -14,7 +14,13 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        circularRecycler.layoutManager = CircularRecyclerLayoutManager()
+        circularRecycler.layoutManager = CircularRecyclerLayoutManager(
+            canScrollHorizontally = true,
+            itemsPerCircle = 4,
+            anglePerItem = 100.0,
+            firstCircleRadius = 200.0,
+            angleStepForCircles = 45.0
+        )
         circularRecycler.adapter = Adapter()
     }
 

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

circularlayoutmanagerlib/build.gradle

@@ -29,12 +29,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation "androidx.core:core-ktx:1.0.2"
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
+    implementation "androidx.core:core-ktx:1.1.0"
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

circularlayoutmanagerlib/src/main/java/com/leshchenko/circularlayoutmanagerlib/CircularRecyclerLayoutManager.kt

@@ -5,29 +5,34 @@ import android.util.SparseArray
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 
-class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : RecyclerView.LayoutManager() {
+class CircularRecyclerLayoutManager(
+        private val itemsPerCircle: Int = 6,
+        private var anglePerItem: Double = Double.NaN,
+        private var firstCircleRadius: Double = Double.NaN,
+        private var angleStepForCircles: Double = Double.NaN,
+        private val canScrollHorizontally: Boolean = false
+) : RecyclerView.LayoutManager() {
     override fun generateDefaultLayoutParams() =
-        RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.MATCH_PARENT)
+            RecyclerView.LayoutParams(
+                    RecyclerView.LayoutParams.MATCH_PARENT,
+                    RecyclerView.LayoutParams.MATCH_PARENT
+            )
 
-    override fun canScrollHorizontally() = false
+    override fun canScrollHorizontally() = canScrollHorizontally
 
     override fun canScrollVertically() = true
 
     override fun measureChildWithMargins(child: View, widthUsed: Int, heightUsed: Int) {
         child.measure(
-            View.MeasureSpec.makeMeasureSpec(widthUsed, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(heightUsed, View.MeasureSpec.EXACTLY)
+                View.MeasureSpec.makeMeasureSpec(widthUsed, View.MeasureSpec.EXACTLY),
+                View.MeasureSpec.makeMeasureSpec(heightUsed, View.MeasureSpec.EXACTLY)
         )
     }
 
     private lateinit var centerPoint: PointF
 
-    private var firstCircleRadius = 0.0
-
     private var itemWidth = 0
 
-    private var anglePerItem = 0.0
-
     private val viewCalculation = SparseArray<ItemData>(itemCount)
 
     override fun onLayoutChildren(recycler: RecyclerView.Recycler?, state: RecyclerView.State?) {
@@ -43,7 +48,9 @@ class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : Recyc
 
         val circleRadius = firstCircleRadius + (itemWidth * 1.5 * circleOrderPosition)
 
-        val angle = (anglePerItem * position) + if (circleOrderPosition.isDivideByTwo()) 0.0 else anglePerItem.div(2)
+        val angleStep = if (angleStepForCircles.isNaN()) anglePerItem.div(2) else angleStepForCircles
+
+        val angle = (anglePerItem * position) + if (circleOrderPosition.isDivideByTwo()) 0.0 else angleStep
 
         val positionData = calculatePosition(circleRadius, angle)
 
@@ -79,7 +86,11 @@ class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : Recyc
         }
     }
 
-    override fun scrollVerticallyBy(dy: Int, recycler: RecyclerView.Recycler?, state: RecyclerView.State?): Int {
+    override fun scrollVerticallyBy(
+            dy: Int,
+            recycler: RecyclerView.Recycler?,
+            state: RecyclerView.State?
+    ): Int {
         updateCalculation(dy)
         updateViews(recycler)
         return dy
@@ -103,10 +114,10 @@ class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : Recyc
     }
 
     private fun layoutItemIfNeeded(
-        positionData: PositionData,
-        data: ItemData,
-        recycler: RecyclerView.Recycler?,
-        position: Int
+            positionData: PositionData,
+            data: ItemData,
+            recycler: RecyclerView.Recycler?,
+            position: Int
     ) {
         if (isViewVisible(positionData) && data.currentRadius > 0.0) {
             recycler?.getViewForPosition(position)?.let { viewForPosition ->
@@ -118,7 +129,10 @@ class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : Recyc
         }
     }
 
-    private fun updateAllChild(viewsForDetaching: MutableList<View>, updatedPositions: MutableList<Int>) {
+    private fun updateAllChild(
+            viewsForDetaching: MutableList<View>,
+            updatedPositions: MutableList<Int>
+    ) {
         for (position in 0 until childCount) {
             getChildAt(position)?.let { childAt ->
                 val childPosition = getPosition(childAt)
@@ -165,12 +179,31 @@ class CircularRecyclerLayoutManager(private val itemsPerCircle: Int = 6) : Recyc
 
     private fun calculateConstants() {
         centerPoint = PointF(width / 2f, height / 2f)
-        firstCircleRadius = width / 4.0
+        if (firstCircleRadius.isNaN()) {
+            firstCircleRadius = width / 4.0
+        }
         val firstCircleLength = 2 * Math.PI * firstCircleRadius
         itemWidth = ((firstCircleLength / (itemsPerCircle)) * 0.4).toInt()
-        anglePerItem = 360 / if (itemCount > itemsPerCircle) itemsPerCircle.toDouble() else itemCount.toDouble()
+        if (anglePerItem.isNaN()) {
+            anglePerItem = 360 / if (itemCount > itemsPerCircle) itemsPerCircle.toDouble() else itemCount.toDouble()
+        }
+    }
+
+    override fun scrollHorizontallyBy(
+            dx: Int,
+            recycler: RecyclerView.Recycler?,
+            state: RecyclerView.State?
+    ): Int {
+        for (position in 0 until viewCalculation.size()) {
+            if (shouldItemMove(position).not()) {
+                continue
+            }
+            viewCalculation.get(position).angle += dx * 0.1
+        }
+        updateViews(recycler)
+        return dx
     }
 
-    inner class ItemData(val initialRadius: Double, var currentRadius: Double, val angle: Double)
+    inner class ItemData(val initialRadius: Double, var currentRadius: Double, var angle: Double)
     inner class PositionData(val left: Int, val top: Int, val right: Int, val bottom: Int)
 }

example.gif

@@ -1,6 +1,6 @@
-#Fri Aug 16 16:15:20 EEST 2019
+#Mon Sep 23 14:39:23 EEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip