Merge branch 'master' into bump

rubensousa · May 16, 2023 · 4275a04 · 4275a04
2 parents 50ef2fc + 5bfaeaf
commit 4275a04
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/dpadrecyclerview-test-fixtures/build.gradle b/dpadrecyclerview-test-fixtures/build.gradle
@@ -10,7 +10,7 @@ android {
     compileSdk versions.compileSdkVersion
 
     defaultConfig {
-        minSdk versions.minSdkVersion
+        minSdk 19
         targetSdk versions.targetSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/dpadrecyclerview-testing/build.gradle b/dpadrecyclerview-testing/build.gradle
@@ -11,11 +11,12 @@ android {
     compileSdk versions.compileSdkVersion
 
     defaultConfig {
-        minSdk versions.minSdkVersion
+        minSdk 19
         targetSdk versions.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
+        multiDexEnabled true
     }
 
     buildTypes {

diff --git a/dpadrecyclerview/build.gradle b/dpadrecyclerview/build.gradle
@@ -11,11 +11,12 @@ android {
     compileSdk versions.compileSdkVersion
 
     defaultConfig {
-        minSdk versions.minSdkVersion
+        minSdk 19
         targetSdk versions.targetSdkVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
+        multiDexEnabled true
     }
 
     buildTypes {

diff --git a/dpadrecyclerview/src/main/java/com/rubensousa/dpadrecyclerview/DpadRecyclerView.kt b/dpadrecyclerview/src/main/java/com/rubensousa/dpadrecyclerview/DpadRecyclerView.kt
@@ -155,11 +155,12 @@ open class DpadRecyclerView @JvmOverloads constructor(
                 typedArray.getInt(R.styleable.DpadRecyclerView_android_gravity, Gravity.NO_GRAVITY)
             )
         }
+        val edge = ParentAlignment.Edge.values()[typedArray.getInt(
+            R.styleable.DpadRecyclerView_dpadRecyclerViewParentAlignmentEdge,
+            ParentAlignment.Edge.MIN_MAX.ordinal
+        )]
         val parentAlignment = ParentAlignment(
-            edge = ParentAlignment.Edge.values()[typedArray.getInt(
-                R.styleable.DpadRecyclerView_dpadRecyclerViewParentAlignmentEdge,
-                ParentAlignment.Edge.MIN_MAX.ordinal
-            )],
+            edge = edge,
             offset = typedArray.getDimensionPixelSize(
                 R.styleable.DpadRecyclerView_dpadRecyclerViewParentAlignmentOffset,
                 ViewAlignment.DEFAULT_OFFSET
@@ -171,7 +172,11 @@ open class DpadRecyclerView @JvmOverloads constructor(
             isFractionEnabled = typedArray.getBoolean(
                 R.styleable.DpadRecyclerView_dpadRecyclerViewParentAlignmentFractionEnabled,
                 true
-            )
+            ),
+            preferKeylineOverEdge = typedArray.getBoolean(
+                R.styleable.DpadRecyclerView_dpadRecyclerViewParentAlignmentPreferKeylineOverEdge,
+                edge == ParentAlignment.Edge.MAX
+            ),
         )
         val childAlignment = ChildAlignment(
             offset = typedArray.getDimensionPixelSize(

diff --git a/dpadrecyclerview/src/main/res/values/attrs.xml b/dpadrecyclerview/src/main/res/values/attrs.xml
@@ -21,6 +21,7 @@
         <attr name="dpadRecyclerViewParentAlignmentOffset" format="dimension" />
         <attr name="dpadRecyclerViewParentAlignmentFraction" format="float" />
         <attr name="dpadRecyclerViewParentAlignmentFractionEnabled" format="boolean" />
+        <attr name="dpadRecyclerViewParentAlignmentPreferKeylineOverEdge" format="dimension" />
         <attr name="dpadRecyclerViewFocusableDirection" format="enum">
             <enum name="standard" value="0" />
             <enum name="circular" value="1" />