From a4efc7ec094f775bd684b18bf86832877befa3d9 Mon Sep 17 00:00:00 2001 From: Ilya Lim Date: Mon, 25 Feb 2019 16:49:16 +0700 Subject: [PATCH] Migrate to AndroidX --- buildsystem/dependencies.gradle | 31 ++++++++++--------- .../-screen-actions/index.md | 1 - .../com.agoda.kakao.screen/-screen/idle.md | 11 +++++++ .../com.agoda.kakao.screen/-screen/index.md | 8 ++++- .../-screen/on-screen.md | 5 +++ kakao/build.gradle | 4 +-- .../bottomnav/BottomNavigationViewActions.kt | 10 +++--- .../BottomNavigationViewAssertions.kt | 4 +-- .../kakao/bottomnav/KBottomNavigationView.kt | 2 +- .../com/agoda/kakao/check/CheckableActions.kt | 6 ++-- .../agoda/kakao/check/CheckableAssertions.kt | 4 +-- .../kotlin/com/agoda/kakao/check/KCheckBox.kt | 2 +- .../agoda/kakao/common/actions/BaseActions.kt | 6 ++-- .../kakao/common/actions/SwipeableActions.kt | 2 +- .../common/assertions/AdapterAssertions.kt | 2 +- .../kakao/common/assertions/BaseAssertions.kt | 12 +++---- .../kakao/common/builders/RootBuilder.kt | 4 +-- .../kakao/common/builders/ViewBuilder.kt | 12 +++---- .../kakao/common/matchers/AnyTextMatcher.kt | 2 +- .../common/matchers/BackgroundColorMatcher.kt | 4 +-- .../kakao/common/matchers/DrawableMatcher.kt | 6 ++-- .../kakao/common/matchers/FirstViewMatcher.kt | 2 +- .../kakao/common/matchers/ItemMatcher.kt | 4 +-- .../matchers/ListViewAdapterSizeMatcher.kt | 2 +- .../common/matchers/NavigationItemMatcher.kt | 4 +-- .../kakao/common/matchers/PageMatcher.kt | 4 +-- .../kakao/common/matchers/PositionMatcher.kt | 4 +-- .../kakao/common/matchers/ProgressMatcher.kt | 2 +- .../kakao/common/matchers/RatingBarMatcher.kt | 2 +- .../RecyclerViewAdapterSizeMatcher.kt | 4 +-- .../matchers/SwipeRefreshLayoutMatcher.kt | 2 +- .../TextInputLayoutCounterEnabledMatcher.kt | 2 +- .../TextInputLayoutErrorEnabledMatcher.kt | 2 +- .../TextInputLayoutHintEnabledMatcher.kt | 2 +- .../com/agoda/kakao/common/views/KBaseView.kt | 10 +++--- .../agoda/kakao/common/views/KSwipeView.kt | 2 +- .../com/agoda/kakao/common/views/KView.kt | 2 +- .../com/agoda/kakao/drawer/DrawerActions.kt | 2 +- .../com/agoda/kakao/drawer/KDrawerView.kt | 2 +- .../com/agoda/kakao/edit/EditableActions.kt | 2 +- .../agoda/kakao/edit/EditableAssertions.kt | 6 ++-- .../kotlin/com/agoda/kakao/edit/KEditText.kt | 2 +- .../com/agoda/kakao/edit/KTextInputLayout.kt | 4 +-- .../kakao/edit/TextInputLayoutAssertions.kt | 4 +-- .../agoda/kakao/image/ImageViewAssertions.kt | 4 +-- .../com/agoda/kakao/image/KImageView.kt | 2 +- .../com/agoda/kakao/intent/BundleBuilder.kt | 2 +- .../kakao/intent/ComponentNameBuilder.kt | 2 +- .../com/agoda/kakao/intent/IntentBuilder.kt | 2 +- .../kotlin/com/agoda/kakao/intent/KIntent.kt | 4 +-- .../com/agoda/kakao/intent/UriBuilder.kt | 2 +- .../com/agoda/kakao/list/KAdapterItem.kt | 6 ++-- .../com/agoda/kakao/list/KAdapterItemType.kt | 2 +- .../kakao/list/KAdapterItemTypeBuilder.kt | 2 +- .../com/agoda/kakao/list/KEmptyAdapterItem.kt | 2 +- .../kotlin/com/agoda/kakao/list/KListView.kt | 10 +++--- .../kakao/list/ListViewAdapterAssertions.kt | 2 +- .../com/agoda/kakao/list/ScrollViewActions.kt | 6 ++-- .../agoda/kakao/navigation/KNavigationView.kt | 2 +- .../kakao/navigation/NavigationViewActions.kt | 2 +- .../navigation/NavigationViewAssertions.kt | 2 +- .../com/agoda/kakao/pager/KViewPager.kt | 2 +- .../agoda/kakao/pager/ViewPagerAssertions.kt | 2 +- .../com/agoda/kakao/progress/KProgressBar.kt | 2 +- .../com/agoda/kakao/progress/KSeekBar.kt | 2 +- .../com/agoda/kakao/progress/PreciseSwipe.kt | 8 ++--- .../kakao/progress/ProgressBarActions.kt | 6 ++-- .../kakao/progress/ProgressBarAssertions.kt | 2 +- .../agoda/kakao/progress/SeekBarActions.kt | 12 +++---- .../com/agoda/kakao/rating/KRatingBar.kt | 2 +- .../agoda/kakao/rating/RatingBarActions.kt | 6 ++-- .../agoda/kakao/rating/RatingBarAssertions.kt | 2 +- .../com/agoda/kakao/recycler/KRecyclerItem.kt | 4 +-- .../com/agoda/kakao/recycler/KRecyclerView.kt | 12 +++---- .../agoda/kakao/recycler/RecyclerActions.kt | 10 +++--- .../recycler/RecyclerAdapterAssertions.kt | 2 +- .../kotlin/com/agoda/kakao/screen/Screen.kt | 10 +++--- .../com/agoda/kakao/screen/ScreenActions.kt | 10 ++---- .../kakao/swiperefresh/KSwipeRefreshLayout.kt | 2 +- .../swiperefresh/SwipeRefreshLayoutActions.kt | 8 ++--- .../SwipeRefreshLayoutAssertions.kt | 2 +- .../kotlin/com/agoda/kakao/tabs/KTabLayout.kt | 2 +- .../com/agoda/kakao/tabs/TabLayoutActions.kt | 10 +++--- .../agoda/kakao/tabs/TabLayoutAssertions.kt | 2 +- .../kotlin/com/agoda/kakao/text/KButton.kt | 2 +- .../kotlin/com/agoda/kakao/text/KSnackbar.kt | 6 ++-- .../kotlin/com/agoda/kakao/text/KTextView.kt | 2 +- .../com/agoda/kakao/text/TextViewActions.kt | 2 +- .../agoda/kakao/text/TextViewAssertions.kt | 8 ++--- .../kotlin/com/agoda/kakao/web/KWebView.kt | 2 +- .../kotlin/com/agoda/kakao/web/WebActions.kt | 8 ++--- .../com/agoda/kakao/web/WebAssertions.kt | 10 +++--- .../com/agoda/kakao/web/WebElementBuilder.kt | 10 +++--- sample/build.gradle | 5 +-- .../com/agoda/sample/AutoCompleteTest.kt | 6 ++-- .../com/agoda/sample/IntentActivityTest.kt | 6 ++-- .../kotlin/com/agoda/sample/ListTest.kt | 6 ++-- .../com/agoda/sample/NestedRecyclerTest.kt | 6 ++-- .../kotlin/com/agoda/sample/RecyclerTest.kt | 6 ++-- .../com/agoda/sample/TestActivityTest.kt | 6 ++-- .../com/agoda/sample/TextInputLayoutTest.kt | 6 ++-- .../kotlin/com/agoda/sample/WebTest.kt | 8 ++--- .../screen/AutoCompleteActivityScreen.kt | 2 +- .../com/agoda/sample/screen/TestListScreen.kt | 2 +- .../com/agoda/sample/AutoCompleteActivity.kt | 2 +- .../kotlin/com/agoda/sample/IntentActivity.kt | 2 +- .../kotlin/com/agoda/sample/ListActivity.kt | 2 +- .../agoda/sample/NestedRecyclerActivity.kt | 6 ++-- .../com/agoda/sample/NestedRecyclerAdapter.kt | 8 ++--- .../com/agoda/sample/RecyclerActivity.kt | 6 ++-- .../com/agoda/sample/RecyclerAdapter.kt | 4 +-- .../kotlin/com/agoda/sample/TestActivity.kt | 4 +-- .../agoda/sample/TextInputLayoutActivity.kt | 4 +-- .../kotlin/com/agoda/sample/WebAcitivty.kt | 2 +- .../res/layout/activity_auto_complete.xml | 3 +- .../main/res/layout/activity_input_layout.xml | 6 ++-- .../src/main/res/layout/activity_recycler.xml | 2 +- .../main/res/layout/item_nested_recycler.xml | 2 +- 118 files changed, 282 insertions(+), 264 deletions(-) create mode 100644 docs/kakao/com.agoda.kakao.screen/-screen/idle.md create mode 100644 docs/kakao/com.agoda.kakao.screen/-screen/on-screen.md diff --git a/buildsystem/dependencies.gradle b/buildsystem/dependencies.gradle index 4c2b24bd..c57a3da2 100644 --- a/buildsystem/dependencies.gradle +++ b/buildsystem/dependencies.gradle @@ -5,10 +5,13 @@ ext.versions = [ bintray : '1.7.3', maven : '1.5', oss : '4.5.4', - support_library: '28.0.0', - espresso : '3.0.1', - espresso_rules : '1.0.1', - espresso_runner: '1.0.1', + appcompat : '1.0.2', + recyclerview : '1.0.0', + annotation : '1.0.0', + design : '1.0.0', + espresso : '3.1.1', + espresso_rules : '1.1.1', + espresso_runner: '1.1.1', junit : '4.12' ] @@ -20,16 +23,16 @@ ext.libraries = [ bintray : "com.jfrog.bintray.gradle:gradle-bintray-plugin:$versions.bintray", maven : "com.github.dcendents:android-maven-gradle-plugin:$versions.maven", oss : "org.jfrog.buildinfo:build-info-extractor-gradle:$versions.oss", - appcompat : "com.android.support:appcompat-v7:$versions.support_library", - recyclerview : "com.android.support:recyclerview-v7:$versions.support_library", - design : "com.android.support:design:$versions.support_library", - annotations : "com.android.support:support-annotations:$versions.support_library", - espresso_runner : "com.android.support.test:runner:$versions.espresso_runner", - espresso_rules : "com.android.support.test:rules:$versions.espresso_rules", - espresso_core : "com.android.support.test.espresso:espresso-core:$versions.espresso", - espresso_web : "com.android.support.test.espresso:espresso-web:$versions.espresso", - espresso_contrib: "com.android.support.test.espresso:espresso-contrib:$versions.espresso", - espresso_intents: "com.android.support.test.espresso:espresso-intents:$versions.espresso", + appcompat : "androidx.appcompat:appcompat:$versions.appcompat", + recyclerview : "androidx.recyclerview:recyclerview:$versions.recyclerview", + annotation : "androidx.annotation:annotation:$versions.annotation", + design : "com.google.android.material:material:$versions.design", + espresso_runner : "androidx.test:runner:$versions.espresso_runner", + espresso_rules : "androidx.test:rules:$versions.espresso_rules", + espresso_core : "androidx.test.espresso:espresso-core:$versions.espresso", + espresso_web : "androidx.test.espresso:espresso-web:$versions.espresso", + espresso_contrib: "androidx.test.espresso:espresso-contrib:$versions.espresso", + espresso_intents: "androidx.test.espresso:espresso-intents:$versions.espresso", junit : "junit:junit:$versions.junit" ] diff --git a/docs/kakao/com.agoda.kakao.screen/-screen-actions/index.md b/docs/kakao/com.agoda.kakao.screen/-screen-actions/index.md index baf87798..c1309264 100644 --- a/docs/kakao/com.agoda.kakao.screen/-screen-actions/index.md +++ b/docs/kakao/com.agoda.kakao.screen/-screen-actions/index.md @@ -19,7 +19,6 @@ Provides basic actions that can be performed on each and every screen | Name | Summary | |---|---| | [closeSoftKeyboard](close-soft-keyboard.md) | `open fun closeSoftKeyboard(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Closes soft keyboard, if opened | -| [idle](idle.md) | `open fun idle(duration: `[`Long`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-long/index.html)` = 1000L): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Idles for given amount of time | | [pressBack](press-back.md) | `open fun pressBack(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Performs click on device's back button | | [pressKey](press-key.md) | `open fun pressKey(keyCode: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses a key with corresponding KeyCode`open fun pressKey(key: EspressoKey): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses a key with correspondingKeyCode and modifiers | | [pressMenuKey](press-menu-key.md) | `open fun pressMenuKey(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses the hardware menu key | diff --git a/docs/kakao/com.agoda.kakao.screen/-screen/idle.md b/docs/kakao/com.agoda.kakao.screen/-screen/idle.md new file mode 100644 index 00000000..8d5b6ee8 --- /dev/null +++ b/docs/kakao/com.agoda.kakao.screen/-screen/idle.md @@ -0,0 +1,11 @@ +[kakao](../../index.md) / [com.agoda.kakao.screen](../index.md) / [Screen](index.md) / [idle](./idle.md) + +# idle + +`fun idle(duration: `[`Long`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-long/index.html)` = 1000L): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) + +Idles for given amount of time + +### Parameters + +`duration` - Time to idle in milliseconds (1 second by default) \ No newline at end of file diff --git a/docs/kakao/com.agoda.kakao.screen/-screen/index.md b/docs/kakao/com.agoda.kakao.screen/-screen/index.md index 86ebec96..cb8d09ce 100644 --- a/docs/kakao/com.agoda.kakao.screen/-screen/index.md +++ b/docs/kakao/com.agoda.kakao.screen/-screen/index.md @@ -40,7 +40,13 @@ such as tapBack() and closeSoftKeyboard() | Name | Summary | |---|---| | [closeSoftKeyboard](../-screen-actions/close-soft-keyboard.md) | `open fun closeSoftKeyboard(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Closes soft keyboard, if opened | -| [idle](../-screen-actions/idle.md) | `open fun idle(duration: `[`Long`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-long/index.html)` = 1000L): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Idles for given amount of time | | [pressBack](../-screen-actions/press-back.md) | `open fun pressBack(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Performs click on device's back button | | [pressKey](../-screen-actions/press-key.md) | `open fun pressKey(keyCode: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses a key with corresponding KeyCode`open fun pressKey(key: EspressoKey): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses a key with correspondingKeyCode and modifiers | | [pressMenuKey](../-screen-actions/press-menu-key.md) | `open fun pressMenuKey(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Presses the hardware menu key | + +### Companion Object Functions + +| Name | Summary | +|---|---| +| [idle](idle.md) | `fun idle(duration: `[`Long`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-long/index.html)` = 1000L): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)
Idles for given amount of time | +| [onScreen](on-screen.md) | `fun > onScreen(function: `[`T`](on-screen.md#T)`.() -> `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)`): `[`T`](on-screen.md#T) | diff --git a/docs/kakao/com.agoda.kakao.screen/-screen/on-screen.md b/docs/kakao/com.agoda.kakao.screen/-screen/on-screen.md new file mode 100644 index 00000000..0305e05c --- /dev/null +++ b/docs/kakao/com.agoda.kakao.screen/-screen/on-screen.md @@ -0,0 +1,5 @@ +[kakao](../../index.md) / [com.agoda.kakao.screen](../index.md) / [Screen](index.md) / [onScreen](./on-screen.md) + +# onScreen + +`inline fun > onScreen(function: `[`T`](on-screen.md#T)`.() -> `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)`): `[`T`](on-screen.md#T) \ No newline at end of file diff --git a/kakao/build.gradle b/kakao/build.gradle index 6dc09e5a..c30f3a20 100644 --- a/kakao/build.gradle +++ b/kakao/build.gradle @@ -33,9 +33,7 @@ dependencies { implementation libraries.espresso_core implementation libraries.espresso_web implementation libraries.espresso_intents - implementation (libraries.espresso_contrib) { - exclude group: 'com.android.support' - } + implementation libraries.espresso_contrib } apply plugin: 'com.github.dcendents.android-maven' diff --git a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewActions.kt index 0ca4ab35..24fb73ea 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewActions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.bottomnav -import android.support.design.widget.BottomNavigationView -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.BaseActions +import com.google.android.material.bottomnavigation.BottomNavigationView /** * Provides actions for BottomNavigationView @@ -31,4 +31,4 @@ interface BottomNavigationViewActions : BaseActions { } }) } -} \ No newline at end of file +} diff --git a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewAssertions.kt index 5935239e..71e0ec07 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/BottomNavigationViewAssertions.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.bottomnav -import android.support.design.widget.BottomNavigationView import com.agoda.kakao.common.assertions.BaseAssertions +import com.google.android.material.bottomnavigation.BottomNavigationView /** * Provides assertion for BottomNavigationview @@ -28,4 +28,4 @@ interface BottomNavigationViewAssertions : BaseAssertions { } } } -} \ No newline at end of file +} diff --git a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/KBottomNavigationView.kt b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/KBottomNavigationView.kt index c28279d0..aec931a8 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/KBottomNavigationView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/bottomnav/KBottomNavigationView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.bottomnav -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableActions.kt index ab100e49..5bc740a8 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableActions.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.check -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View import android.widget.Checkable +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.BaseActions import org.hamcrest.Description import org.hamcrest.Matchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableAssertions.kt index 709d201d..8480a62e 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/check/CheckableAssertions.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.check -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.ViewMatchers +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.assertions.BaseAssertions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/check/KCheckBox.kt b/kakao/src/main/kotlin/com/agoda/kakao/check/KCheckBox.kt index 9249f4da..4868713c 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/check/KCheckBox.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/check/KCheckBox.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.check -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import com.agoda.kakao.text.TextViewAssertions diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/actions/BaseActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/actions/BaseActions.kt index 778447ed..1f6bf74a 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/actions/BaseActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/actions/BaseActions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.common.actions -import android.support.test.espresso.ViewAction -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.action.* import android.view.InputDevice import android.view.MotionEvent import android.view.View +import androidx.test.espresso.ViewAction +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.action.* import com.agoda.kakao.common.builders.ViewBuilder import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/actions/SwipeableActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/actions/SwipeableActions.kt index 34d7ba3e..d4d649aa 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/actions/SwipeableActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/actions/SwipeableActions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.common.actions -import android.support.test.espresso.action.ViewActions +import androidx.test.espresso.action.ViewActions /** * Provides swipe actions for views diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/AdapterAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/AdapterAssertions.kt index 64645901..5125f7d0 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/AdapterAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/AdapterAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.common.assertions -import android.support.test.espresso.ViewInteraction +import androidx.test.espresso.ViewInteraction /** * Provides assertions for view with adapters diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/BaseAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/BaseAssertions.kt index 364d6b8e..3fda2112 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/BaseAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/assertions/BaseAssertions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.common.assertions -import android.support.annotation.ColorRes -import android.support.test.espresso.Root -import android.support.test.espresso.ViewAssertion -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.ViewMatchers +import androidx.annotation.ColorRes +import androidx.test.espresso.Root +import androidx.test.espresso.ViewAssertion +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.builders.RootBuilder import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.matchers.BackgroundColorMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/builders/RootBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/builders/RootBuilder.kt index 7865eeb5..4ed0c8fe 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/builders/RootBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/builders/RootBuilder.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.builders -import android.support.test.espresso.Root -import android.support.test.espresso.matcher.RootMatchers +import androidx.test.espresso.Root +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import org.hamcrest.Matcher import org.hamcrest.Matchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/builders/ViewBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/builders/ViewBuilder.kt index 158188eb..ca0fa35f 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/builders/ViewBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/builders/ViewBuilder.kt @@ -4,13 +4,13 @@ package com.agoda.kakao.common.builders import android.graphics.Bitmap import android.graphics.drawable.Drawable -import android.support.annotation.ColorRes -import android.support.annotation.DrawableRes -import android.support.annotation.StringRes -import android.support.test.espresso.Espresso -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.test.espresso.Espresso +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.matchers.* import org.hamcrest.CoreMatchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/AnyTextMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/AnyTextMatcher.kt index 78b30e59..dca4d01f 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/AnyTextMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/AnyTextMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View import android.widget.TextView +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/BackgroundColorMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/BackgroundColorMatcher.kt index dacd814b..cbbf8402 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/BackgroundColorMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/BackgroundColorMatcher.kt @@ -4,9 +4,9 @@ package com.agoda.kakao.common.matchers import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.support.annotation.ColorRes -import android.support.v4.content.ContextCompat import android.view.View +import androidx.annotation.ColorRes +import androidx.core.content.ContextCompat import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/DrawableMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/DrawableMatcher.kt index 05681e38..da18ca40 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/DrawableMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/DrawableMatcher.kt @@ -8,11 +8,11 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.StateListDrawable import android.os.Build -import android.support.annotation.DrawableRes -import android.support.v4.content.ContextCompat -import android.support.v4.graphics.drawable.DrawableCompat import android.view.View import android.widget.ImageView +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat +import androidx.core.graphics.drawable.DrawableCompat import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/FirstViewMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/FirstViewMatcher.kt index c3d2038a..99c5d544 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/FirstViewMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/FirstViewMatcher.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ItemMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ItemMatcher.kt index e1e20f20..3d2f78ea 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ItemMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ItemMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ListViewAdapterSizeMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ListViewAdapterSizeMatcher.kt index 053d252b..e53f1f4c 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ListViewAdapterSizeMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ListViewAdapterSizeMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View import android.widget.ListView +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/NavigationItemMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/NavigationItemMatcher.kt index d9ee7225..c5dd5827 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/NavigationItemMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/NavigationItemMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.design.widget.NavigationView -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View +import androidx.test.espresso.matcher.BoundedMatcher +import com.google.android.material.navigation.NavigationView import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PageMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PageMatcher.kt index c31b02f8..399386ff 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PageMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PageMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher -import android.support.v4.view.ViewPager import android.view.View +import androidx.test.espresso.matcher.BoundedMatcher +import androidx.viewpager.widget.ViewPager import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PositionMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PositionMatcher.kt index 227fa2ce..9d67cfb4 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PositionMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/PositionMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ProgressMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ProgressMatcher.kt index 6290ab7e..d17ef2fb 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ProgressMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/ProgressMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View import android.widget.ProgressBar +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RatingBarMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RatingBarMatcher.kt index 91a9c5d4..528dfed5 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RatingBarMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RatingBarMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher import android.view.View import android.widget.RatingBar +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RecyclerViewAdapterSizeMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RecyclerViewAdapterSizeMatcher.kt index 54644e33..04a0831b 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RecyclerViewAdapterSizeMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/RecyclerViewAdapterSizeMatcher.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.common.matchers -import android.support.test.espresso.matcher.BoundedMatcher -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView +import androidx.test.espresso.matcher.BoundedMatcher import org.hamcrest.Description /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/SwipeRefreshLayoutMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/SwipeRefreshLayoutMatcher.kt index 1c6659fb..f68dc278 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/SwipeRefreshLayoutMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/SwipeRefreshLayoutMatcher.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.matchers -import android.support.v4.widget.SwipeRefreshLayout import android.view.View +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutCounterEnabledMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutCounterEnabledMatcher.kt index 3d86e6df..7e3f3f24 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutCounterEnabledMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutCounterEnabledMatcher.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.matchers -import android.support.design.widget.TextInputLayout import android.view.View +import com.google.android.material.textfield.TextInputLayout import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutErrorEnabledMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutErrorEnabledMatcher.kt index 7cd5a683..b4e4bdee 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutErrorEnabledMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutErrorEnabledMatcher.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.matchers -import android.support.design.widget.TextInputLayout import android.view.View +import com.google.android.material.textfield.TextInputLayout import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutHintEnabledMatcher.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutHintEnabledMatcher.kt index 0cb39790..9be53eef 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutHintEnabledMatcher.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/matchers/TextInputLayoutHintEnabledMatcher.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.matchers -import android.support.design.widget.TextInputLayout import android.view.View +import com.google.android.material.textfield.TextInputLayout import org.hamcrest.Description import org.hamcrest.TypeSafeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KBaseView.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KBaseView.kt index 23061412..0270fc05 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KBaseView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KBaseView.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.common.views -import android.support.test.espresso.DataInteraction -import android.support.test.espresso.Root -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.RootMatchers import android.view.View +import androidx.test.espresso.DataInteraction +import androidx.test.espresso.Root +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.actions.BaseActions import com.agoda.kakao.common.assertions.BaseAssertions diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KSwipeView.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KSwipeView.kt index 7c735ad4..9131c442 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KSwipeView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KSwipeView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.views -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.actions.SwipeableActions import com.agoda.kakao.common.builders.ViewBuilder import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KView.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KView.kt index 59332d04..6f3d78ef 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/common/views/KView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/common/views/KView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.common.views -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/drawer/DrawerActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/drawer/DrawerActions.kt index deb2ff65..004fcb6c 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/drawer/DrawerActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/drawer/DrawerActions.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.drawer -import android.support.test.espresso.contrib.DrawerActions import android.view.Gravity +import androidx.test.espresso.contrib.DrawerActions import com.agoda.kakao.common.actions.BaseActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/drawer/KDrawerView.kt b/kakao/src/main/kotlin/com/agoda/kakao/drawer/KDrawerView.kt index 0c908743..7120b59c 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/drawer/KDrawerView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/drawer/KDrawerView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.drawer -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableActions.kt index 09398212..6a75ea20 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableActions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.edit -import android.support.test.espresso.action.ViewActions +import androidx.test.espresso.action.ViewActions import com.agoda.kakao.common.actions.BaseActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableAssertions.kt index 60e891a1..928d4bb7 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/edit/EditableAssertions.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.edit -import android.support.annotation.StringRes -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.ViewMatchers +import androidx.annotation.StringRes +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.text.TextViewAssertions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/KEditText.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/KEditText.kt index 37803934..2e914c90 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/edit/KEditText.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/edit/KEditText.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.edit -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/KTextInputLayout.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/KTextInputLayout.kt index d6a81f00..97bb900c 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/edit/KTextInputLayout.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/edit/KTextInputLayout.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.edit -import android.support.design.widget.TextInputEditText -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView +import com.google.android.material.textfield.TextInputEditText import org.hamcrest.Matcher /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt index ebd4ecc7..ef40d465 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.edit -import android.support.design.widget.TextInputLayout -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.TextInputLayoutCounterEnabledMatcher import com.agoda.kakao.common.matchers.TextInputLayoutErrorEnabledMatcher import com.agoda.kakao.common.matchers.TextInputLayoutHintEnabledMatcher +import com.google.android.material.textfield.TextInputLayout /** * Provides assertions for TextInputLayout diff --git a/kakao/src/main/kotlin/com/agoda/kakao/image/ImageViewAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/image/ImageViewAssertions.kt index fc0e7702..f4f34954 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/image/ImageViewAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/image/ImageViewAssertions.kt @@ -4,8 +4,8 @@ package com.agoda.kakao.image import android.graphics.Bitmap import android.graphics.drawable.Drawable -import android.support.annotation.DrawableRes -import android.support.test.espresso.assertion.ViewAssertions +import androidx.annotation.DrawableRes +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.DrawableMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/image/KImageView.kt b/kakao/src/main/kotlin/com/agoda/kakao/image/KImageView.kt index 4f16fcdf..5a543710 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/image/KImageView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/image/KImageView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.image -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/intent/BundleBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/intent/BundleBuilder.kt index 9d07c133..e7386f90 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/intent/BundleBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/intent/BundleBuilder.kt @@ -3,7 +3,7 @@ package com.agoda.kakao.intent import android.os.Bundle -import android.support.test.espresso.intent.matcher.BundleMatchers +import androidx.test.espresso.intent.matcher.BundleMatchers import com.agoda.kakao.common.KakaoDslMarker import org.hamcrest.Matcher import org.hamcrest.core.AllOf diff --git a/kakao/src/main/kotlin/com/agoda/kakao/intent/ComponentNameBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/intent/ComponentNameBuilder.kt index b133878b..659024a2 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/intent/ComponentNameBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/intent/ComponentNameBuilder.kt @@ -3,7 +3,7 @@ package com.agoda.kakao.intent import android.content.ComponentName -import android.support.test.espresso.intent.matcher.ComponentNameMatchers +import androidx.test.espresso.intent.matcher.ComponentNameMatchers import com.agoda.kakao.common.KakaoDslMarker import org.hamcrest.Matcher import org.hamcrest.core.AllOf diff --git a/kakao/src/main/kotlin/com/agoda/kakao/intent/IntentBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/intent/IntentBuilder.kt index cca05315..2b031022 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/intent/IntentBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/intent/IntentBuilder.kt @@ -7,7 +7,7 @@ import android.content.ComponentName import android.content.Intent import android.net.Uri import android.os.Bundle -import android.support.test.espresso.intent.matcher.IntentMatchers +import androidx.test.espresso.intent.matcher.IntentMatchers import com.agoda.kakao.common.KakaoDslMarker import org.hamcrest.Matcher import org.hamcrest.core.AllOf diff --git a/kakao/src/main/kotlin/com/agoda/kakao/intent/KIntent.kt b/kakao/src/main/kotlin/com/agoda/kakao/intent/KIntent.kt index 5aec7fe5..0945abc6 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/intent/KIntent.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/intent/KIntent.kt @@ -3,8 +3,8 @@ package com.agoda.kakao.intent import android.app.Instrumentation.ActivityResult -import android.support.test.espresso.intent.Intents -import android.support.test.espresso.intent.VerificationMode +import androidx.test.espresso.intent.Intents +import androidx.test.espresso.intent.VerificationMode /** * This class is intended to be used when you need to check if some intent has been sent diff --git a/kakao/src/main/kotlin/com/agoda/kakao/intent/UriBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/intent/UriBuilder.kt index 06bb755d..e15f9084 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/intent/UriBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/intent/UriBuilder.kt @@ -3,7 +3,7 @@ package com.agoda.kakao.intent import android.net.Uri -import android.support.test.espresso.intent.matcher.UriMatchers +import androidx.test.espresso.intent.matcher.UriMatchers import com.agoda.kakao.common.KakaoDslMarker import org.hamcrest.Matcher import org.hamcrest.core.AllOf diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItem.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItem.kt index 496f7927..51389f90 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItem.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItem.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.list -import android.support.test.espresso.DataInteraction -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.RootMatchers +import androidx.test.espresso.DataInteraction +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.actions.BaseActions import com.agoda.kakao.common.assertions.BaseAssertions diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemType.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemType.kt index f09d7f6d..5340217e 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemType.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemType.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.list -import android.support.test.espresso.DataInteraction +import androidx.test.espresso.DataInteraction /** * For internal use. Don't use manually. diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemTypeBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemTypeBuilder.kt index f874301e..91e9f25f 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemTypeBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/KAdapterItemTypeBuilder.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.list -import android.support.test.espresso.DataInteraction +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.KakaoDslMarker import kotlin.reflect.KClass diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/KEmptyAdapterItem.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/KEmptyAdapterItem.kt index b570041e..1be15e38 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/KEmptyAdapterItem.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/KEmptyAdapterItem.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.list -import android.support.test.espresso.DataInteraction +import androidx.test.espresso.DataInteraction /** * Empty implementation of KAdapterItem diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/KListView.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/KListView.kt index b0f02c99..a74fcad6 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/KListView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/KListView.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.list -import android.support.test.espresso.DataInteraction -import android.support.test.espresso.Espresso -import android.support.test.espresso.Root -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.matcher.RootMatchers import android.view.View +import androidx.test.espresso.DataInteraction +import androidx.test.espresso.Espresso +import androidx.test.espresso.Root +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.builders.ViewBuilder diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/ListViewAdapterAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/ListViewAdapterAssertions.kt index f70e1b29..fcdbdd19 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/ListViewAdapterAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/ListViewAdapterAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.list -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.AdapterAssertions import com.agoda.kakao.common.matchers.ListViewAdapterSizeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/list/ScrollViewActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/list/ScrollViewActions.kt index 876ea94b..ec4da286 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/list/ScrollViewActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/list/ScrollViewActions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.list -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View import android.widget.AdapterView import android.widget.ScrollView +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.ScrollableActions import com.agoda.kakao.common.actions.SwipeableActions import org.hamcrest.Matchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/navigation/KNavigationView.kt b/kakao/src/main/kotlin/com/agoda/kakao/navigation/KNavigationView.kt index 9e9c272e..24e2c688 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/navigation/KNavigationView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/navigation/KNavigationView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.navigation -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewActions.kt index ba5856b0..df04e71d 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewActions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.navigation -import android.support.test.espresso.contrib.NavigationViewActions +import androidx.test.espresso.contrib.NavigationViewActions import com.agoda.kakao.common.actions.BaseActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewAssertions.kt index 5b12ae9d..31aef229 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/navigation/NavigationViewAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.navigation -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.NavigationItemMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/pager/KViewPager.kt b/kakao/src/main/kotlin/com/agoda/kakao/pager/KViewPager.kt index a158c21e..bc0f662b 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/pager/KViewPager.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/pager/KViewPager.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.pager -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.actions.SwipeableActions import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView diff --git a/kakao/src/main/kotlin/com/agoda/kakao/pager/ViewPagerAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/pager/ViewPagerAssertions.kt index cef8815a..3a7523cd 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/pager/ViewPagerAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/pager/ViewPagerAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.pager -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.PageMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/KProgressBar.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/KProgressBar.kt index c405f738..09516842 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/KProgressBar.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/KProgressBar.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.progress -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/KSeekBar.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/KSeekBar.kt index 2afdf761..98545274 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/KSeekBar.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/KSeekBar.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.progress -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/PreciseSwipe.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/PreciseSwipe.kt index 4b509926..6f2d88b8 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/PreciseSwipe.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/PreciseSwipe.kt @@ -3,11 +3,11 @@ package com.agoda.kakao.progress import android.os.SystemClock -import android.support.test.espresso.UiController -import android.support.test.espresso.action.MotionEvents -import android.support.test.espresso.action.Swiper -import android.support.test.espresso.core.internal.deps.guava.base.Preconditions.checkElementIndex import android.util.Log +import androidx.test.espresso.UiController +import androidx.test.espresso.action.MotionEvents +import androidx.test.espresso.action.Swiper +import androidx.test.espresso.core.internal.deps.guava.base.Preconditions.checkElementIndex object PreciseSwipe : Swiper { override fun sendSwipe(uiController: UiController, startCoordinates: FloatArray, diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarActions.kt index 271bcc38..7d46711a 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarActions.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.progress -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View import android.widget.ProgressBar +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.BaseActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarAssertions.kt index c47872ed..6937ad57 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/ProgressBarAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.progress -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.ProgressMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/progress/SeekBarActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/progress/SeekBarActions.kt index f1aca01c..8573e243 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/progress/SeekBarActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/progress/SeekBarActions.kt @@ -2,14 +2,14 @@ package com.agoda.kakao.progress -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.action.CoordinatesProvider -import android.support.test.espresso.action.GeneralSwipeAction -import android.support.test.espresso.action.Press -import android.support.test.espresso.matcher.ViewMatchers import android.view.View import android.widget.SeekBar +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.action.CoordinatesProvider +import androidx.test.espresso.action.GeneralSwipeAction +import androidx.test.espresso.action.Press +import androidx.test.espresso.matcher.ViewMatchers /** * Provides action for SeekBar diff --git a/kakao/src/main/kotlin/com/agoda/kakao/rating/KRatingBar.kt b/kakao/src/main/kotlin/com/agoda/kakao/rating/KRatingBar.kt index b9bd4b79..777350b2 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/rating/KRatingBar.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/rating/KRatingBar.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.rating -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarActions.kt index eb73f73d..c481416d 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarActions.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.rating -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View import android.widget.RatingBar +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.BaseActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarAssertions.kt index 22fa1199..7df8aa43 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/rating/RatingBarAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.rating -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.RatingBarMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerItem.kt b/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerItem.kt index c4c4aed0..b5ba3071 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerItem.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerItem.kt @@ -2,9 +2,9 @@ package com.agoda.kakao.recycler -import android.support.test.espresso.Espresso -import android.support.test.espresso.matcher.RootMatchers import android.view.View +import androidx.test.espresso.Espresso +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.actions.BaseActions import com.agoda.kakao.common.assertions.BaseAssertions diff --git a/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerView.kt b/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerView.kt index 909b8c43..51dfa3c6 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/recycler/KRecyclerView.kt @@ -2,13 +2,13 @@ package com.agoda.kakao.recycler -import android.support.test.espresso.DataInteraction -import android.support.test.espresso.Espresso -import android.support.test.espresso.Root -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.RootMatchers import android.view.View +import androidx.test.espresso.DataInteraction +import androidx.test.espresso.Espresso +import androidx.test.espresso.Root +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.RootMatchers import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.builders.ViewBuilder diff --git a/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerActions.kt index 39cca4fc..5bd1868a 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerActions.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.recycler -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.contrib.RecyclerViewActions -import android.support.test.espresso.matcher.ViewMatchers -import android.support.v7.widget.RecyclerView import android.view.View +import androidx.recyclerview.widget.RecyclerView +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.contrib.RecyclerViewActions +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.ScrollableActions import com.agoda.kakao.common.actions.SwipeableActions import com.agoda.kakao.common.builders.ViewBuilder diff --git a/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerAdapterAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerAdapterAssertions.kt index b1705a1c..b58a6a1f 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerAdapterAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/recycler/RecyclerAdapterAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.recycler -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.AdapterAssertions import com.agoda.kakao.common.matchers.RecyclerViewAdapterSizeMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/screen/Screen.kt b/kakao/src/main/kotlin/com/agoda/kakao/screen/Screen.kt index 099b0bb8..95e2ea6a 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/screen/Screen.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/screen/Screen.kt @@ -2,12 +2,12 @@ package com.agoda.kakao.screen -import android.support.test.espresso.Espresso -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View +import androidx.test.espresso.Espresso +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.KakaoDslMarker /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/screen/ScreenActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/screen/ScreenActions.kt index 0949cf7f..93fab9b4 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/screen/ScreenActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/screen/ScreenActions.kt @@ -2,13 +2,9 @@ package com.agoda.kakao.screen -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.ViewInteraction -import android.support.test.espresso.action.EspressoKey -import android.support.test.espresso.action.ViewActions -import android.support.test.espresso.matcher.ViewMatchers -import android.view.View +import androidx.test.espresso.ViewInteraction +import androidx.test.espresso.action.EspressoKey +import androidx.test.espresso.action.ViewActions /** * Interface with common actions for all screens diff --git a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/KSwipeRefreshLayout.kt b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/KSwipeRefreshLayout.kt index 1f3886a9..ab494eee 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/KSwipeRefreshLayout.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/KSwipeRefreshLayout.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.swiperefresh -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutActions.kt index 71ddea2b..9d104402 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutActions.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.swiperefresh -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers -import android.support.v4.widget.SwipeRefreshLayout import android.view.View +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.SwipeableActions /** diff --git a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutAssertions.kt index 7fa7d758..2d930a50 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/swiperefresh/SwipeRefreshLayoutAssertions.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.swiperefresh -import android.support.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.assertion.ViewAssertions import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.SwipeRefreshLayoutMatcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/tabs/KTabLayout.kt b/kakao/src/main/kotlin/com/agoda/kakao/tabs/KTabLayout.kt index fbb57b66..710b5fe2 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/tabs/KTabLayout.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/tabs/KTabLayout.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.tabs -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutActions.kt index e936768f..85b2e382 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutActions.kt @@ -2,13 +2,13 @@ package com.agoda.kakao.tabs -import android.support.design.widget.BottomNavigationView -import android.support.design.widget.TabLayout -import android.support.test.espresso.UiController -import android.support.test.espresso.ViewAction -import android.support.test.espresso.matcher.ViewMatchers import android.view.View +import androidx.test.espresso.UiController +import androidx.test.espresso.ViewAction +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.actions.BaseActions +import com.google.android.material.bottomnavigation.BottomNavigationView +import com.google.android.material.tabs.TabLayout /** * Provides action for TabLayout diff --git a/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutAssertions.kt index 776f9617..1d1586c2 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/tabs/TabLayoutAssertions.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.tabs -import android.support.design.widget.TabLayout import com.agoda.kakao.common.assertions.BaseAssertions +import com.google.android.material.tabs.TabLayout /** * Provides assertions for TabLayout diff --git a/kakao/src/main/kotlin/com/agoda/kakao/text/KButton.kt b/kakao/src/main/kotlin/com/agoda/kakao/text/KButton.kt index 0792d727..ed7a4d76 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/text/KButton.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/text/KButton.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.text -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/text/KSnackbar.kt b/kakao/src/main/kotlin/com/agoda/kakao/text/KSnackbar.kt index 7437899f..e7e404a5 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/text/KSnackbar.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/text/KSnackbar.kt @@ -2,10 +2,10 @@ package com.agoda.kakao.text -import android.support.design.widget.Snackbar -import android.support.v7.widget.AppCompatButton -import android.support.v7.widget.AppCompatTextView +import androidx.appcompat.widget.AppCompatButton +import androidx.appcompat.widget.AppCompatTextView import com.agoda.kakao.common.views.KBaseView +import com.google.android.material.snackbar.Snackbar /** * View with internal TextView and a Button diff --git a/kakao/src/main/kotlin/com/agoda/kakao/text/KTextView.kt b/kakao/src/main/kotlin/com/agoda/kakao/text/KTextView.kt index 4fbdf40e..dfa03684 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/text/KTextView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/text/KTextView.kt @@ -2,8 +2,8 @@ package com.agoda.kakao.text -import android.support.test.espresso.DataInteraction import android.view.View +import androidx.test.espresso.DataInteraction import com.agoda.kakao.common.builders.ViewBuilder import com.agoda.kakao.common.views.KBaseView import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewActions.kt index ea6c39cb..f34f0de2 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewActions.kt @@ -3,7 +3,7 @@ package com.agoda.kakao.text import android.net.Uri -import android.support.test.espresso.action.ViewActions +import androidx.test.espresso.action.ViewActions import com.agoda.kakao.common.actions.BaseActions import org.hamcrest.Matcher diff --git a/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewAssertions.kt index b8b93f96..5e7d2d83 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/text/TextViewAssertions.kt @@ -2,10 +2,10 @@ package com.agoda.kakao.text -import android.support.annotation.ColorRes -import android.support.annotation.StringRes -import android.support.test.espresso.assertion.ViewAssertions -import android.support.test.espresso.matcher.ViewMatchers +import androidx.annotation.ColorRes +import androidx.annotation.StringRes +import androidx.test.espresso.assertion.ViewAssertions +import androidx.test.espresso.matcher.ViewMatchers import com.agoda.kakao.common.assertions.BaseAssertions import com.agoda.kakao.common.matchers.AnyTextMatcher import org.hamcrest.CoreMatchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/web/KWebView.kt b/kakao/src/main/kotlin/com/agoda/kakao/web/KWebView.kt index 8c9cbb0f..484c35af 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/web/KWebView.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/web/KWebView.kt @@ -2,7 +2,7 @@ package com.agoda.kakao.web -import android.support.test.espresso.web.sugar.Web +import androidx.test.espresso.web.sugar.Web import com.agoda.kakao.common.KakaoDslMarker import com.agoda.kakao.common.builders.ViewBuilder diff --git a/kakao/src/main/kotlin/com/agoda/kakao/web/WebActions.kt b/kakao/src/main/kotlin/com/agoda/kakao/web/WebActions.kt index ba7c7d92..a480a43f 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/web/WebActions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/web/WebActions.kt @@ -2,10 +2,10 @@ package com.agoda.kakao.web -import android.support.test.espresso.web.model.Atom -import android.support.test.espresso.web.model.ElementReference -import android.support.test.espresso.web.sugar.Web -import android.support.test.espresso.web.webdriver.DriverAtoms +import androidx.test.espresso.web.model.Atom +import androidx.test.espresso.web.model.ElementReference +import androidx.test.espresso.web.sugar.Web +import androidx.test.espresso.web.webdriver.DriverAtoms /** * Provides action for interacting with WebViews diff --git a/kakao/src/main/kotlin/com/agoda/kakao/web/WebAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/web/WebAssertions.kt index f1c7006e..8ab52148 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/web/WebAssertions.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/web/WebAssertions.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.web -import android.support.test.espresso.web.assertion.WebViewAssertions -import android.support.test.espresso.web.model.Atom -import android.support.test.espresso.web.model.ElementReference -import android.support.test.espresso.web.sugar.Web -import android.support.test.espresso.web.webdriver.DriverAtoms +import androidx.test.espresso.web.assertion.WebViewAssertions +import androidx.test.espresso.web.model.Atom +import androidx.test.espresso.web.model.ElementReference +import androidx.test.espresso.web.sugar.Web +import androidx.test.espresso.web.webdriver.DriverAtoms import org.hamcrest.CoreMatchers import org.hamcrest.Matcher import org.hamcrest.Matchers diff --git a/kakao/src/main/kotlin/com/agoda/kakao/web/WebElementBuilder.kt b/kakao/src/main/kotlin/com/agoda/kakao/web/WebElementBuilder.kt index 62f174e1..fed5fb09 100644 --- a/kakao/src/main/kotlin/com/agoda/kakao/web/WebElementBuilder.kt +++ b/kakao/src/main/kotlin/com/agoda/kakao/web/WebElementBuilder.kt @@ -2,11 +2,11 @@ package com.agoda.kakao.web -import android.support.test.espresso.web.model.Atom -import android.support.test.espresso.web.model.ElementReference -import android.support.test.espresso.web.sugar.Web -import android.support.test.espresso.web.webdriver.DriverAtoms -import android.support.test.espresso.web.webdriver.Locator +import androidx.test.espresso.web.model.Atom +import androidx.test.espresso.web.model.ElementReference +import androidx.test.espresso.web.sugar.Web +import androidx.test.espresso.web.webdriver.DriverAtoms +import androidx.test.espresso.web.webdriver.Locator import com.agoda.kakao.common.KakaoDslMarker /** diff --git a/sample/build.gradle b/sample/build.gradle index c4776bd9..ba16268d 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion 28 versionCode 1 versionName '1.0.0' - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } sourceSets { @@ -35,9 +35,10 @@ dependencies { testImplementation libraries.junit androidTestImplementation project(':kakao') - androidTestImplementation libraries.annotations + androidTestImplementation libraries.annotation androidTestImplementation libraries.espresso_runner androidTestImplementation libraries.espresso_rules androidTestImplementation libraries.espresso_intents androidTestImplementation libraries.espresso_core + androidTestImplementation libraries.espresso_web } \ No newline at end of file diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/AutoCompleteTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/AutoCompleteTest.kt index c65595f5..81424c05 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/AutoCompleteTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/AutoCompleteTest.kt @@ -1,14 +1,14 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.AutoCompleteActivityScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class AutoCompleteTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/IntentActivityTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/IntentActivityTest.kt index ac3d2f2d..e77efb51 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/IntentActivityTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/IntentActivityTest.kt @@ -1,14 +1,14 @@ package com.agoda.sample -import android.support.test.espresso.intent.rule.IntentsTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.espresso.intent.rule.IntentsTestRule +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.IntentActivityScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class IntentActivityTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/ListTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/ListTest.kt index 6ec378ce..af027579 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/ListTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/ListTest.kt @@ -1,14 +1,14 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TestListScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class ListTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/NestedRecyclerTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/NestedRecyclerTest.kt index 6dc7e882..00a5a8ba 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/NestedRecyclerTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/NestedRecyclerTest.kt @@ -1,7 +1,7 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TestNestedRecyclerScreen import com.agoda.sample.screen.TestNestedRecyclerScreen.NestedItem @@ -10,7 +10,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class NestedRecyclerTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/RecyclerTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/RecyclerTest.kt index 7175b1f7..e1cd4a4e 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/RecyclerTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/RecyclerTest.kt @@ -1,14 +1,14 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TestRecyclerScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class RecyclerTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/TestActivityTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/TestActivityTest.kt index e0046b23..ec701558 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/TestActivityTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/TestActivityTest.kt @@ -1,7 +1,7 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.idle import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TestActivityScreen @@ -9,7 +9,7 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class TestActivityTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt index fb6a5db9..e5c1d543 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt @@ -1,14 +1,14 @@ package com.agoda.sample -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TextInputLayoutScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class TextInputLayoutTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/WebTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/WebTest.kt index 103f3ead..f2c1d754 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/WebTest.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/WebTest.kt @@ -1,15 +1,15 @@ package com.agoda.sample -import android.support.test.espresso.web.webdriver.Locator -import android.support.test.rule.ActivityTestRule -import android.support.test.runner.AndroidJUnit4 +import androidx.test.espresso.web.webdriver.Locator +import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner +import androidx.test.rule.ActivityTestRule import com.agoda.kakao.screen.Screen.Companion.onScreen import com.agoda.sample.screen.TestWebScreen import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -@RunWith(AndroidJUnit4::class) +@RunWith(AndroidJUnit4ClassRunner::class) class WebTest { @Rule @JvmField diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/screen/AutoCompleteActivityScreen.kt b/sample/src/androidTest/kotlin/com/agoda/sample/screen/AutoCompleteActivityScreen.kt index 08c7ad16..df1abf96 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/screen/AutoCompleteActivityScreen.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/screen/AutoCompleteActivityScreen.kt @@ -1,7 +1,7 @@ package com.agoda.sample.screen -import android.support.test.espresso.DataInteraction import android.widget.ListView +import androidx.test.espresso.DataInteraction import com.agoda.kakao.list.KAdapterItem import com.agoda.kakao.edit.KEditText import com.agoda.kakao.list.KListView diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/screen/TestListScreen.kt b/sample/src/androidTest/kotlin/com/agoda/sample/screen/TestListScreen.kt index d7a23490..15967946 100644 --- a/sample/src/androidTest/kotlin/com/agoda/sample/screen/TestListScreen.kt +++ b/sample/src/androidTest/kotlin/com/agoda/sample/screen/TestListScreen.kt @@ -1,6 +1,6 @@ package com.agoda.sample.screen -import android.support.test.espresso.DataInteraction +import androidx.test.espresso.DataInteraction import com.agoda.kakao.list.KAdapterItem import com.agoda.kakao.list.KListView import com.agoda.kakao.screen.Screen diff --git a/sample/src/main/kotlin/com/agoda/sample/AutoCompleteActivity.kt b/sample/src/main/kotlin/com/agoda/sample/AutoCompleteActivity.kt index db230814..b56cb555 100644 --- a/sample/src/main/kotlin/com/agoda/sample/AutoCompleteActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/AutoCompleteActivity.kt @@ -1,9 +1,9 @@ package com.agoda.sample import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.ArrayAdapter import android.widget.AutoCompleteTextView +import androidx.appcompat.app.AppCompatActivity class AutoCompleteActivity : AppCompatActivity() { diff --git a/sample/src/main/kotlin/com/agoda/sample/IntentActivity.kt b/sample/src/main/kotlin/com/agoda/sample/IntentActivity.kt index 57d70719..b195b8f3 100644 --- a/sample/src/main/kotlin/com/agoda/sample/IntentActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/IntentActivity.kt @@ -3,9 +3,9 @@ package com.agoda.sample import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.Button import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity class IntentActivity : AppCompatActivity() { private val resultText by lazy { findViewById(R.id.result_text) } diff --git a/sample/src/main/kotlin/com/agoda/sample/ListActivity.kt b/sample/src/main/kotlin/com/agoda/sample/ListActivity.kt index b470799e..315d833b 100644 --- a/sample/src/main/kotlin/com/agoda/sample/ListActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/ListActivity.kt @@ -1,12 +1,12 @@ package com.agoda.sample import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.View import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.ListView import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity class ListActivity : AppCompatActivity() { val items = listOf("Title 1", "Title 2", "Title 3", "Title 4", "Title 5", diff --git a/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerActivity.kt b/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerActivity.kt index 54f3a079..9385f74d 100644 --- a/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerActivity.kt @@ -1,9 +1,9 @@ package com.agoda.sample import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView class NestedRecyclerActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerAdapter.kt b/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerAdapter.kt index cb0f9751..97acc40c 100644 --- a/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerAdapter.kt +++ b/sample/src/main/kotlin/com/agoda/sample/NestedRecyclerAdapter.kt @@ -1,13 +1,11 @@ package com.agoda.sample -import android.support.annotation.LayoutRes -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button -import android.widget.TextView +import androidx.annotation.LayoutRes +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView class NestedRecyclerAdapter : RecyclerView.Adapter() { override fun getItemCount() = 1 diff --git a/sample/src/main/kotlin/com/agoda/sample/RecyclerActivity.kt b/sample/src/main/kotlin/com/agoda/sample/RecyclerActivity.kt index 152f3d63..602592f6 100644 --- a/sample/src/main/kotlin/com/agoda/sample/RecyclerActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/RecyclerActivity.kt @@ -1,9 +1,9 @@ package com.agoda.sample import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView class RecyclerActivity: AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/sample/src/main/kotlin/com/agoda/sample/RecyclerAdapter.kt b/sample/src/main/kotlin/com/agoda/sample/RecyclerAdapter.kt index 9ee6fcc1..bacb84be 100644 --- a/sample/src/main/kotlin/com/agoda/sample/RecyclerAdapter.kt +++ b/sample/src/main/kotlin/com/agoda/sample/RecyclerAdapter.kt @@ -1,12 +1,12 @@ package com.agoda.sample -import android.support.annotation.LayoutRes -import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.TextView +import androidx.annotation.LayoutRes +import androidx.recyclerview.widget.RecyclerView class RecyclerAdapter: RecyclerView.Adapter() { override fun getItemCount() = 10 diff --git a/sample/src/main/kotlin/com/agoda/sample/TestActivity.kt b/sample/src/main/kotlin/com/agoda/sample/TestActivity.kt index cee22704..8153e519 100644 --- a/sample/src/main/kotlin/com/agoda/sample/TestActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/TestActivity.kt @@ -2,12 +2,12 @@ package com.agoda.sample import android.content.Intent import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity import android.util.Log import android.widget.Button import android.widget.ImageView import android.widget.SeekBar +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.snackbar.Snackbar class TestActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt b/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt index 79acdf67..7d927fa6 100644 --- a/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt +++ b/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt @@ -1,9 +1,9 @@ package com.agoda.sample import android.os.Bundle -import android.support.design.widget.TextInputLayout -import android.support.v7.app.AppCompatActivity import android.widget.Button +import androidx.appcompat.app.AppCompatActivity +import com.google.android.material.textfield.TextInputLayout class TextInputLayoutActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/sample/src/main/kotlin/com/agoda/sample/WebAcitivty.kt b/sample/src/main/kotlin/com/agoda/sample/WebAcitivty.kt index dcb702a1..92d6b7ca 100644 --- a/sample/src/main/kotlin/com/agoda/sample/WebAcitivty.kt +++ b/sample/src/main/kotlin/com/agoda/sample/WebAcitivty.kt @@ -1,8 +1,8 @@ package com.agoda.sample import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.webkit.WebView +import androidx.appcompat.app.AppCompatActivity class WebAcitivty : AppCompatActivity(){ diff --git a/sample/src/main/res/layout/activity_auto_complete.xml b/sample/src/main/res/layout/activity_auto_complete.xml index 7270a15c..e49f8c88 100644 --- a/sample/src/main/res/layout/activity_auto_complete.xml +++ b/sample/src/main/res/layout/activity_auto_complete.xml @@ -1,5 +1,6 @@ - - - - +