Migrate to androidx (#178)

* Initial refactor

* Remove alpha version usages

* Update test code

* Add tests for checkbox

* Fix invalid card import

* Remove more old support content

* Update kotlin version

* Add back kotterknife with new imports

* Update docs

* Use bold notice

* Add changelog

* Remove deprecation for kotterknife

* Remove unused dependencies

* Update changelog

3 files changed, 147 insertions, 11 deletions

diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/ColorPickerTest.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/ColorPickerTest.kt
index 39aee93..3b7f932 100644
--- a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/ColorPickerTest.kt
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/ColorPickerTest.kt
@@ -1,16 +1,16 @@
 package ca.allanwang.kau.sample
 
-import android.support.test.espresso.DataInteraction
-import android.support.test.espresso.Espresso.onData
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.ViewAssertion
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.espresso.DataInteraction
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
 import android.view.View
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import ca.allanwang.kau.colorpicker.CircleView
 import org.hamcrest.Matchers.anything
 import org.junit.Rule
@@ -22,6 +22,8 @@ import kotlin.test.fail
 
 /**
  * Created by Allan Wang on 22/02/2018.
+ *
+ * Tests related to the :colorpicker module
  */
 @RunWith(AndroidJUnit4::class)
 @MediumTest
@@ -43,7 +45,7 @@ class ColorPickerTest {
     private val colorNotSelected = ViewAssertion { view, _ -> view.colorSelected(false) }
 
     @Test
-    fun test() {
+    fun colorClick() {
         onView(withText(R.string.accent_color)).perform(click())
         val colors = onData(anything()).inAdapterView(withId(R.id.md_grid))
 
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt
new file mode 100644
index 0000000..31dfcb3
--- /dev/null
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/KPrefViewTest.kt
@@ -0,0 +1,112 @@
+package ca.allanwang.kau.sample
+
+import android.view.View
+import android.widget.CheckBox
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.BoundedMatcher
+import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers.allOf
+import org.hamcrest.Matchers.instanceOf
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+/**
+ * Created by Allan Wang on 21/12/2018.
+ *
+ * Tests related to the :kpref-activity module
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class KPrefViewTest {
+
+    @get:Rule
+    val activity: ActivityTestRule<MainActivity> = ActivityTestRule(MainActivity::class.java)
+
+    fun verifyCheck(checked: Boolean): Matcher<View> {
+        return object : BoundedMatcher<View, View>(View::class.java) {
+
+
+            override fun describeTo(description: Description) {
+                description.appendText("Checkbox is ${if (checked) "checked" else "not checked"}")
+            }
+
+            override fun matchesSafely(item: View): Boolean = item.findViewById<CheckBox>(R.id.kau_pref_inner_content).isChecked == checked
+        }
+    }
+
+    inline fun <reified T : View> ViewInteraction.checkInnerContent(desc: String, crossinline matcher: (T) -> Boolean): ViewInteraction {
+        val viewMatcher = object : BaseMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText(desc)
+            }
+
+            override fun matches(item: Any?): Boolean {
+                val view = item as? View ?: return false
+                val inner = view.findViewById<View>(R.id.kau_pref_inner_content) as? T
+                        ?: return false
+                return matcher(inner)
+            }
+        }
+        return check(matches(viewMatcher))
+    }
+
+    fun ViewInteraction.verifyCheck(tag: String, checked: Boolean, enabled: Boolean = true) =
+            checkInnerContent<CheckBox>("$tag should be ${if (checked) "checked" else "not checked"}") {
+                it.isChecked == checked
+            }.check { view, _ ->
+                ((view.alpha == 1f) == enabled)
+            }
+
+    fun onCheckboxView(vararg matchers: Matcher<View>) =
+            onView(allOf(*matchers, withChild(withChild(instanceOf(CheckBox::class.java)))))
+
+    @Test
+    fun basicCheckboxToggle() {
+        val checkbox1 = onCheckboxView(withChild(withText(R.string.checkbox_1)))
+
+        val initiallyChecked = KPrefSample.check1
+
+        checkbox1.verifyCheck("checkbox1 init", initiallyChecked)
+        checkbox1.perform(click())
+        checkbox1.verifyCheck("checkbox1 after click", !initiallyChecked)
+    }
+
+    /**
+     * Note that checkbox3 depends on checkbox2
+     */
+    @Test
+    fun dependentCheckboxToggle() {
+        val checkbox2 = onCheckboxView(withChild(withText(R.string.checkbox_2)))
+        val checkbox3 = onCheckboxView(withChild(withText(R.string.checkbox_3)), withChild(withText(R.string.desc_dependent)))
+
+        // normalize so that both are checked
+        if (!KPrefSample.check2)
+            checkbox2.perform(click())
+        if (!KPrefSample.check3)
+            checkbox3.perform(click())
+
+        checkbox3.verifyCheck("checkbox3 init", true, true)
+        checkbox3.perform(click())
+        checkbox3.verifyCheck("checkbox3 after click", false, true)
+
+        checkbox2.perform(click())
+        checkbox2.verifyCheck("checkbox2 after click", false, true)
+        checkbox3.verifyCheck("checkbox3 after checkbox2 click", false, false)
+
+        checkbox3.perform(click())
+        checkbox3.verifyCheck("checkbox3 after disabled click", false, false)
+    }
+
+}
diff --git a/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt
new file mode 100644
index 0000000..2acdc4d
--- /dev/null
+++ b/sample/src/androidTest/kotlin/ca/allanwang/kau/sample/utils/EspressoUtils.kt
@@ -0,0 +1,22 @@
+package ca.allanwang.kau.sample.utils
+
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+
+fun <T> index(index: Int, matcher: Matcher<T>): Matcher<T> =
+        object : BaseMatcher<T>() {
+
+            var current = 0
+
+            override fun describeTo(description: Description) {
+                description.appendText("Should return item at index $index")
+            }
+
+            override fun matches(item: Any?): Boolean {
+                println("AA")
+                return matcher.matches(item) && current++ == index
+            }
+        }
+
+fun <T> first(matcher: Matcher<T>): Matcher<T> = index(0, matcher)