diff --git a/graphview/src/main/java/dev/bandb/graphview/layouts/layered/SugiyamaLayoutManager.kt b/graphview/src/main/java/dev/bandb/graphview/layouts/layered/SugiyamaLayoutManager.kt index 9b7553b..75d6c42 100644 --- a/graphview/src/main/java/dev/bandb/graphview/layouts/layered/SugiyamaLayoutManager.kt +++ b/graphview/src/main/java/dev/bandb/graphview/layouts/layered/SugiyamaLayoutManager.kt @@ -368,7 +368,7 @@ class SugiyamaLayoutManager @JvmOverloads constructor(private val context: Conte root[i][n] = n align[i][n] = n sink[i][n] = n - shift[i][n] = java.lang.Float.MAX_VALUE + shift[i][n] = 0f x[i][n] = java.lang.Float.MIN_VALUE blockWidth[i][n] = 0f } @@ -596,9 +596,9 @@ class SugiyamaLayoutManager @JvmOverloads constructor(private val context: Conte // the first median val median = floor((adjNodes.size + 1) / 2.0).toInt() val medianCount = if (adjNodes.size % 2 == 1) 1 else 2 - + val medianIndexList = if (leftToRight) (0 until medianCount) else (0 until medianCount).reversed() // for all median neighbours in direction of H - (0 until medianCount).forEach { count -> + medianIndexList.forEach { count -> val m = adjNodes[median + count - 1] val posM = pos(m) diff --git a/sample/build.gradle b/sample/build.gradle index a48898e..6b9dd19 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -20,6 +20,10 @@ android { } } + packagingOptions { + pickFirst 'META-INF/library_release.kotlin_module' + } + compileOptions { sourceCompatibility 1.8 targetCompatibility 1.8 @@ -34,7 +38,7 @@ dependencies { implementation "androidx.recyclerview:recyclerview:1.2.0" implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.0-beta01' - implementation 'com.otaliastudios:zoomlayout:1.8.0' + implementation 'com.otaliastudios:zoomlayout:1.9.0' implementation 'com.google.android.material:material:1.3.0' implementation project(path: ':graphview') } \ No newline at end of file