feat(kakao): reordering matchers

KakaoCup · Jul 3, 2023 · 9321378 · 9321378
1 parent 279170b
commit 9321378
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 27 deletions.
diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/views/KBaseView.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/common/views/KBaseView.kt
@@ -54,9 +54,10 @@ open class KBaseView<T> : KDSLView<T>, BaseActions, BaseAssertions, Interceptabl
      * @see ViewBuilder
      */
     constructor(parent: Matcher<View>, function: ViewBuilder.() -> Unit) :
-            this({
-                     isDescendantOfA { withMatcher(parent) }
-                     function(this)
+            this(
+                {
+                    isDescendantOfA { withMatcher(parent) }
+                    function(this)
                  })
 
     /**

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/edit/KTextInputLayout.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/edit/KTextInputLayout.kt
@@ -19,22 +19,22 @@ class KTextInputLayout : KBaseView<KTextInputLayout>, TextInputLayoutAssertions
 
     constructor(function: ViewBuilder.() -> Unit) : super(function) {
         edit = KEditText {
-            isDescendantOfA(function)
             isAssignableFrom(EditText::class.java)
+            isDescendantOfA(function)
         }
     }
 
     constructor(parent: Matcher<View>, function: ViewBuilder.() -> Unit) : super(parent, function) {
         edit = KEditText {
-            isDescendantOfA(function)
             isAssignableFrom(EditText::class.java)
+            isDescendantOfA(function)
         }
     }
 
     constructor(parent: DataInteraction, function: ViewBuilder.() -> Unit) : super(parent, function) {
         edit = KEditText {
-            isDescendantOfA(function)
             isAssignableFrom(EditText::class.java)
+            isDescendantOfA(function)
         }
     }
 }
diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/list/KAbsListView.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/list/KAbsListView.kt
@@ -60,10 +60,11 @@ class KAbsListView : ScrollViewActions, AbsListViewAdapterActions, BaseAssertion
     constructor(
         parent: Matcher<View>, builder: ViewBuilder.() -> Unit,
         itemTypeBuilder: KAdapterItemTypeBuilder.() -> Unit
-    ) : this({
-                 isDescendantOfA { withMatcher(parent) }
-                 builder(this)
-             }, itemTypeBuilder)
+    ) : this(
+        {
+            builder(this)
+            isDescendantOfA { withMatcher(parent) }
+        }, itemTypeBuilder)
 
     /**
      * Constructs view class with parent and view interaction from given ViewBuilder
@@ -84,7 +85,7 @@ class KAbsListView : ScrollViewActions, AbsListViewAdapterActions, BaseAssertion
 
         val vb = ViewBuilder().apply {
             isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
-            builder(this)
+
         }
 
         matcher = vb.getViewMatcher()

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/pager2/KViewPager2.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/pager2/KViewPager2.kt
@@ -56,10 +56,11 @@ class KViewPager2 : ViewPager2Actions, ViewPager2AdapterAssertions, SwipeableAct
     constructor(
         parent: Matcher<View>, builder: ViewBuilder.() -> Unit,
         itemTypeBuilder: KViewPagerItemTypeBuilder.() -> Unit
-    ) : this({
-                 isDescendantOfA { withMatcher(parent) }
-                 builder(this)
-             }, itemTypeBuilder)
+    ) : this(
+        {
+            builder(this)
+            isDescendantOfA { withMatcher(parent) }
+        }, itemTypeBuilder)
 
     /**
      * Constructs view class with parent and view interaction from given ViewBuilder
@@ -79,8 +80,8 @@ class KViewPager2 : ViewPager2Actions, ViewPager2AdapterAssertions, SwipeableAct
         val parentMatcher = makeTargetMatcher.invoke(parent)
 
         val vb = ViewBuilder().apply {
-            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
             builder(this)
+            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
         }
 
         matcher = vb.getViewMatcher()
@@ -106,8 +107,8 @@ class KViewPager2 : ViewPager2Actions, ViewPager2AdapterAssertions, SwipeableAct
         }
 
         val vb = ViewBuilder().apply {
-            isDescendantOfA { withMatcher(this@KViewPager2.matcher) }
             isInstanceOf(RecyclerView::class.java)
+            isDescendantOfA { withMatcher(this@KViewPager2.matcher) }
         }
 
         function(provideItem(PositionMatcher(vb.getViewMatcher(), position)) as T)

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/recycler/KRecyclerView.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/recycler/KRecyclerView.kt
@@ -62,10 +62,11 @@ class KRecyclerView : RecyclerActions, BaseAssertions, RecyclerAdapterAssertions
     constructor(
         parent: Matcher<View>, builder: ViewBuilder.() -> Unit,
         itemTypeBuilder: KRecyclerItemTypeBuilder.() -> Unit
-    ) : this({
-                 isDescendantOfA { withMatcher(parent) }
-                 builder(this)
-             }, itemTypeBuilder)
+    ) : this(
+        {
+            builder(this)
+            isDescendantOfA { withMatcher(parent) }
+        }, itemTypeBuilder)
 
     /**
      * Constructs view class with parent and view interaction from given ViewBuilder
@@ -85,8 +86,8 @@ class KRecyclerView : RecyclerActions, BaseAssertions, RecyclerAdapterAssertions
         val parentMatcher = makeTargetMatcher.invoke(parent)
 
         val vb = ViewBuilder().apply {
-            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
             builder(this)
+            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
         }
 
         matcher = vb.getViewMatcher()

diff --git a/kakao/src/main/kotlin/io/github/kakaocup/kakao/spinner/KSpinner.kt b/kakao/src/main/kotlin/io/github/kakaocup/kakao/spinner/KSpinner.kt
@@ -59,10 +59,11 @@ class KSpinner : SpinnerAdapterActions, SpinnerAdapterAssertions, BaseAssertions
     constructor(
         parent: Matcher<View>, builder: ViewBuilder.() -> Unit,
         itemTypeBuilder: KAdapterItemTypeBuilder.() -> Unit
-    ) : this({
-                 isDescendantOfA { withMatcher(parent) }
-                 builder(this)
-             }, itemTypeBuilder)
+    ) : this(
+        {
+            builder(this)
+            isDescendantOfA { withMatcher(parent) }
+        }, itemTypeBuilder)
 
     /**
      * Constructs view class with parent and view interaction from given ViewBuilder
@@ -82,8 +83,8 @@ class KSpinner : SpinnerAdapterActions, SpinnerAdapterAssertions, BaseAssertions
         val parentMatcher = makeTargetMatcher.invoke(parent)
 
         val vb = ViewBuilder().apply {
-            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
             builder(this)
+            isDescendantOfA { withMatcher(parentMatcher as Matcher<View>) }
         }
 
         matcher = vb.getViewMatcher()