diff --git a/.idea/misc.xml b/.idea/misc.xml index cfa53fa..b81e32d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -40,7 +40,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index a59541f..692f5a4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,9 @@ - - - + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2aa0b38..01abb09 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.2' classpath 'me.tatarka:gradle-retrolambda:3.7.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index da2adac..f7316fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,11 @@ org.gradle.jvmargs=-Xmx1536m # org.gradle.parallel=true org.gradle.daemon=true org.gradle.parallel=true -COMPILE_SDK_VERSION=28 -BUILD_TOOLS_VERSION=28.0.3 +COMPILE_SDK_VERSION=29 +BUILD_TOOLS_VERSION=29.0.1 MIN_SDK_VERSION=18 -TARGET_SDK_VERSION=28 +TARGET_SDK_VERSION=29 VERSION_CODE=93 -VERSION_NAME=0.2.4 \ No newline at end of file +VERSION_NAME=0.2.4 +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 38bd9ca..7210f02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 25 09:36:23 BRT 2019 +#Tue Jun 01 20:31:52 BRT 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/sample/build.gradle b/sample/build.gradle index 6efddf0..c70a500 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -16,7 +16,7 @@ android { targetSdkVersion global_targetSdkVersion versionCode global_versionCode versionName global_versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } @@ -39,19 +39,19 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation project(":ui-library") implementation 'us.feras.mdv:markdownview:1.1.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' // implementation 'com.github.stantmob:stant-ui-android-library:v0.0.5' // Support for java 8 features @@ -73,13 +73,13 @@ dependencies { testImplementation 'org.powermock:powermock-api-mockito:1.6.5' // Espresso UI Testing - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.google.guava' exclude module: 'espresso-idling-resource' }) - androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2') { + androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') { exclude group: 'com.android.support', module: 'appcompat' exclude module: 'support-annotations' exclude module: 'support-v4' @@ -89,13 +89,13 @@ dependencies { } - androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' + androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2" - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0' - androidTestImplementation("com.android.support.test.espresso:espresso-contrib:3.0.2") { + androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') { exclude group: 'com.android.support', module: 'appcompat' exclude group: 'com.android.support', module: 'support-v4' exclude group: 'com.android.support', module: 'support-v7' @@ -103,12 +103,12 @@ dependencies { } // Resolve conflicts between main and test APK: - androidTestImplementation "com.android.support:support-annotations:28.0.0" - androidTestImplementation 'com.android.support:appcompat-v7:28.0.0' - androidTestImplementation 'com.android.support:design:28.0.0' - androidTestImplementation 'com.android.support:support-v4:28.0.0' - androidTestImplementation 'com.android.support:recyclerview-v7:28.0.0' + androidTestImplementation 'androidx.annotation:annotation:1.0.0' + androidTestImplementation 'androidx.appcompat:appcompat:1.0.0' + androidTestImplementation 'com.google.android.material:material:1.0.0' + androidTestImplementation 'androidx.legacy:legacy-support-v4:1.0.0' + androidTestImplementation 'androidx.recyclerview:recyclerview:1.0.0' - androidTestImplementation 'com.android.support.test:rules:1.0.2' + androidTestImplementation 'androidx.test:rules:1.1.1' } diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/ExampleInstrumentedTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/ExampleInstrumentedTest.java index 816a648..00a2149 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/ExampleInstrumentedTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ActionButtonViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ActionButtonViewActivityTest.java index cf80a7c..ea05dcd 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ActionButtonViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ActionButtonViewActivityTest.java @@ -1,9 +1,9 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -17,15 +17,15 @@ import br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview.ActionButtonViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.withDecorView; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.withDecorView; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/BasicToolbarViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/BasicToolbarViewActivityTest.java index e75b061..9dceac3 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/BasicToolbarViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/BasicToolbarViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -16,11 +16,11 @@ import br.com.stant.libraries.stantuiandroid.componentsactivities.basictoolbarview.BasicToolbarViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ButtonComponentViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ButtonComponentViewActivityTest.java index 29bd220..9f3bffd 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ButtonComponentViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ButtonComponentViewActivityTest.java @@ -2,13 +2,12 @@ import android.content.Intent; import android.graphics.drawable.Drawable; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.runners.Enclosed; @@ -16,20 +15,18 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview.ActionButtonViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.buttoncomponentview.ButtonComponentViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.withDecorView; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; -import static br.com.stant.libraries.stantuiandroid.testutils.ColorUtils.withBackgroundColor; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.withDecorView; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExecutedPercentBarViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExecutedPercentBarViewActivityTest.java index b21f9c7..88afaaf 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExecutedPercentBarViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExecutedPercentBarViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -13,15 +13,14 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.buttoncomponentview.ButtonComponentViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview.ExecutedPercentBarViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExpandableTextViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExpandableTextViewActivityTest.java index 5789063..4299a93 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExpandableTextViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExpandableTextViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -13,17 +13,16 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview.ExecutedPercentBarViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.expandabletextview.ExpandableTextViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withSpinnerText; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/HeaderEntityCardViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/HeaderEntityCardViewActivityTest.java index 4998908..700bc75 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/HeaderEntityCardViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/HeaderEntityCardViewActivityTest.java @@ -5,8 +5,8 @@ */ import android.content.Intent; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -18,15 +18,14 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; import br.com.stant.libraries.stantuiandroid.componentsactivities.headerentitycardview.HeaderEntityCardViewActivity; -import br.com.stant.libraries.stantuiandroid.componentsactivities.informationcardview.InformationCardViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/IncreaseDecreaseButtonsViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/IncreaseDecreaseButtonsViewActivityTest.java index 5d47af0..9f42c47 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/IncreaseDecreaseButtonsViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/IncreaseDecreaseButtonsViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -13,19 +13,18 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview.ExecutedPercentBarViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.increasedecreasebuttonsview.IncreaseDecreaseButtonsViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.withDecorView; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.withDecorView; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InfoActionCardViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InfoActionCardViewActivityTest.java index 40b7d26..e6bda91 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InfoActionCardViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InfoActionCardViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -13,18 +13,17 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.increasedecreasebuttonsview.IncreaseDecreaseButtonsViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.infoactioncardview.InfoActionCardViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.withDecorView; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.withDecorView; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InformationCardViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InformationCardViewActivityTest.java index 20bcc09..dc56cf5 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InformationCardViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/InformationCardViewActivityTest.java @@ -5,8 +5,8 @@ */ import android.content.Intent; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -19,14 +19,13 @@ import br.com.stant.libraries.stantuiandroid.TestBase; import br.com.stant.libraries.stantuiandroid.componentsactivities.informationcardview.InformationCardViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import br.com.stant.libraries.uilibrary.components.severitylevelindicatorlateralsideview.SeverityLevelEnum; - -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectDatePickerViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectDatePickerViewActivityTest.java index 4e903df..734dbd4 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectDatePickerViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectDatePickerViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.espresso.contrib.PickerActions; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.contrib.PickerActions; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import android.widget.DatePicker; @@ -21,13 +21,13 @@ import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; import br.com.stant.libraries.uilibrary.utils.DateUtils; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withClassName; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withClassName; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; /** diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectTimePickerViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectTimePickerViewActivityTest.java index 01a5684..c701ead 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectTimePickerViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SelectTimePickerViewActivityTest.java @@ -2,39 +2,33 @@ import android.content.Intent; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; -import android.widget.DatePicker; -import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; -import java.util.Date; - import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.selectdatepickerview.SelectDatePickerViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.selecttimepickerview.SelectTimePickerViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import br.com.stant.libraries.uilibrary.utils.DateUtils; - -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.scrollTo; -import static android.support.test.espresso.action.ViewActions.swipeDown; -import static android.support.test.espresso.action.ViewActions.swipeUp; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isNotChecked; -import static android.support.test.espresso.matcher.ViewMatchers.withClassName; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.scrollTo; +import static androidx.test.espresso.action.ViewActions.swipeDown; +import static androidx.test.espresso.action.ViewActions.swipeUp; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isNotChecked; +import static androidx.test.espresso.matcher.ViewMatchers.withClassName; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.findAndClick; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.not; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorLateralSideViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorLateralSideViewActivityTest.java index 63d02da..2e4eb2e 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorLateralSideViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorLateralSideViewActivityTest.java @@ -1,7 +1,7 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -17,10 +17,10 @@ import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; import br.com.stant.libraries.uilibrary.components.severitylevelindicatorlateralsideview.SeverityLevelEnum; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static br.com.stant.libraries.stantuiandroid.testutils.CustomMatchers.withDrawable; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorViewActivityTest.java index 2af301e..2faef5a 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SeverityLevelIndicatorViewActivityTest.java @@ -1,7 +1,7 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.rule.ActivityTestRule; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -13,18 +13,15 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.selecttimepickerview.SelectTimePickerViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.severitylevelindicatorview.SeverityLevelndicatorViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; import br.com.stant.libraries.uilibrary.components.severitylevelindicatorview.SeverityLevelEnum; -import br.com.stant.libraries.uilibrary.components.severitylevelindicatorview.SeverityLevelIndicatorView; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; -import static br.com.stant.libraries.stantuiandroid.testutils.ColorUtils.withBackgroundColor; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.CustomMatchers.withDrawable; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimplePercentageBarViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimplePercentageBarViewActivityTest.java index 15d4d12..6125e90 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimplePercentageBarViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimplePercentageBarViewActivityTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -17,12 +17,12 @@ import br.com.stant.libraries.stantuiandroid.componentsactivities.simplepercentagebarview.SimplePercentageBarViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; /** diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimpleRequestInfoSnackbarActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimpleRequestInfoSnackbarActivityTest.java index d9604d1..09ffcc5 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimpleRequestInfoSnackbarActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/SimpleRequestInfoSnackbarActivityTest.java @@ -1,12 +1,11 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; -import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -15,21 +14,18 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview.ActionButtonViewActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.simplerequestinfosnackbar.SimpleRequestInfoSnackbarActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.RootMatchers.withDecorView; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; -import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.checkIfIdIsDisplayed; -import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.getResourceString; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.RootMatchers.withDecorView; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/UserInformationCardViewActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/UserInformationCardViewActivityTest.java index 650accb..1d7b8fd 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/UserInformationCardViewActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/UserInformationCardViewActivityTest.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.graphics.drawable.Drawable; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.junit.Before; @@ -22,12 +22,12 @@ import br.com.stant.libraries.stantuiandroid.componentsactivities.userinformationcardview.UserInformationCardViewActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso; import static org.hamcrest.Matchers.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ViewingUserDialogActivityTest.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ViewingUserDialogActivityTest.java index 8a920b1..dddc0b1 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ViewingUserDialogActivityTest.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ViewingUserDialogActivityTest.java @@ -1,10 +1,9 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities; import android.content.Intent; -import android.graphics.drawable.Drawable; -import android.support.test.InstrumentationRegistry; -import android.support.test.espresso.matcher.ViewMatchers; -import android.support.test.rule.ActivityTestRule; + +import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.rule.ActivityTestRule; import android.test.suitebuilder.annotation.LargeTest; import org.hamcrest.Matchers; @@ -16,18 +15,17 @@ import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.TestBase; -import br.com.stant.libraries.stantuiandroid.componentsactivities.simplerequestinfosnackbar.SimpleRequestInfoSnackbarActivity; import br.com.stant.libraries.stantuiandroid.componentsactivities.viewinguserdialog.ViewingUserDialogActivity; import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory; import br.com.stant.libraries.uilibrary.components.viewinguserdialog.ViewingUserDto; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.RecyclerViewMatcher.withRecyclerView; import static org.hamcrest.core.AllOf.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/ColorUtils.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/ColorUtils.java index 6f82178..abcdd64 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/ColorUtils.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/ColorUtils.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.testutils; import android.graphics.drawable.ColorDrawable; -import android.support.test.espresso.intent.Checks; -import android.support.test.espresso.matcher.BoundedMatcher; +import androidx.test.espresso.intent.Checks; +import androidx.test.espresso.matcher.BoundedMatcher; import android.util.Log; import android.view.View; import android.widget.LinearLayout; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/IntentFactory.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/IntentFactory.java index e7c4029..6d286ae 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/IntentFactory.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/IntentFactory.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; +import androidx.test.platform.app.InstrumentationRegistry; public class IntentFactory { diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/RecyclerViewMatcher.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/RecyclerViewMatcher.java index 239a838..f5262fd 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/RecyclerViewMatcher.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/RecyclerViewMatcher.java @@ -2,20 +2,20 @@ import android.content.res.Resources; -import android.support.annotation.IdRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static br.com.stant.libraries.stantuiandroid.testutils.ColorUtils.withBgColor; import static org.hamcrest.CoreMatchers.allOf; diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TestUtils.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TestUtils.java index cfb139d..0a7f91c 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TestUtils.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TestUtils.java @@ -1,15 +1,15 @@ package br.com.stant.libraries.stantuiandroid.testutils; import android.content.Context; -import android.support.test.InstrumentationRegistry; - -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.Visibility; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import androidx.test.platform.app.InstrumentationRegistry; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.Visibility; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static java.lang.Thread.sleep; public class TestUtils { diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TextMatcher.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TextMatcher.java index 0509200..c0b01d7 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TextMatcher.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/TextMatcher.java @@ -1,6 +1,6 @@ package br.com.stant.libraries.stantuiandroid.testutils; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.text.TextUtils; import android.view.View; @@ -8,17 +8,17 @@ import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard; -import static android.support.test.espresso.action.ViewActions.replaceText; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.core.internal.deps.guava.base.Preconditions.checkArgument; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; -import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard; +import static androidx.test.espresso.action.ViewActions.replaceText; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.core.internal.deps.guava.base.Preconditions.checkArgument; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.hamcrest.Matchers.allOf; public class TextMatcher { diff --git a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/VisibilityMatcher.java b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/VisibilityMatcher.java index c7be725..afce3b5 100644 --- a/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/VisibilityMatcher.java +++ b/sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/testutils/VisibilityMatcher.java @@ -1,7 +1,7 @@ package br.com.stant.libraries.stantuiandroid.testutils; -import android.support.test.espresso.NoMatchingViewException; -import android.support.test.espresso.ViewAssertion; +import androidx.test.espresso.NoMatchingViewException; +import androidx.test.espresso.ViewAssertion; import android.view.View; import org.hamcrest.BaseMatcher; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/actionbuttonview/ActionButtonViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/actionbuttonview/ActionButtonViewActivity.java index 91ea49a..6a5dc0c 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/actionbuttonview/ActionButtonViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/actionbuttonview/ActionButtonViewActivity.java @@ -1,13 +1,12 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.ActionButtonViewTestActBinding; -import br.com.stant.libraries.uilibrary.components.actionbuttonview.ActionButtonViewContract.OnClickActionButtonListener; public class ActionButtonViewActivity extends AppCompatActivity { diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/basictoolbarview/BasicToolbarViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/basictoolbarview/BasicToolbarViewActivity.java index 9ba3057..5b91b71 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/basictoolbarview/BasicToolbarViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/basictoolbarview/BasicToolbarViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.basictoolbarview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.BasicToolbarViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/buttoncomponentview/ButtonComponentViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/buttoncomponentview/ButtonComponentViewActivity.java index 2b421ba..923bcc9 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/buttoncomponentview/ButtonComponentViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/buttoncomponentview/ButtonComponentViewActivity.java @@ -1,9 +1,9 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.buttoncomponentview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import br.com.stant.libraries.stantuiandroid.R; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/executedpercentbarview/ExecutedPercentBarViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/executedpercentbarview/ExecutedPercentBarViewActivity.java index 45c4dc1..b33e981 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/executedpercentbarview/ExecutedPercentBarViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/executedpercentbarview/ExecutedPercentBarViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.ExecutedPercentBarViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/expandabletextview/ExpandableTextViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/expandabletextview/ExpandableTextViewActivity.java index c7f1867..ae96b2c 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/expandabletextview/ExpandableTextViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/expandabletextview/ExpandableTextViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.expandabletextview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.ExpandableTextViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/headerentitycardview/HeaderEntityCardViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/headerentitycardview/HeaderEntityCardViewActivity.java index e5213f7..951d85f 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/headerentitycardview/HeaderEntityCardViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/headerentitycardview/HeaderEntityCardViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.headerentitycardview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.HeaderEntityCardViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/increasedecreasebuttonsview/IncreaseDecreaseButtonsViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/increasedecreasebuttonsview/IncreaseDecreaseButtonsViewActivity.java index 9ddc010..a113bd9 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/increasedecreasebuttonsview/IncreaseDecreaseButtonsViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/increasedecreasebuttonsview/IncreaseDecreaseButtonsViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.increasedecreasebuttonsview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import br.com.stant.libraries.stantuiandroid.R; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/infoactioncardview/InfoActionCardViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/infoactioncardview/InfoActionCardViewActivity.java index e321781..66ba294 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/infoactioncardview/InfoActionCardViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/infoactioncardview/InfoActionCardViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.infoactioncardview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import br.com.stant.libraries.stantuiandroid.R; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/informationcardview/InformationCardViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/informationcardview/InformationCardViewActivity.java index eac1278..99f2345 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/informationcardview/InformationCardViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/informationcardview/InformationCardViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.informationcardview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.InformationCardViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selectdatepickerview/SelectDatePickerViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selectdatepickerview/SelectDatePickerViewActivity.java index b33263a..1759251 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selectdatepickerview/SelectDatePickerViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selectdatepickerview/SelectDatePickerViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.selectdatepickerview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SelectDatePickerViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selecttimepickerview/SelectTimePickerViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selecttimepickerview/SelectTimePickerViewActivity.java index 0b3a877..7622ae1 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selecttimepickerview/SelectTimePickerViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/selecttimepickerview/SelectTimePickerViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.selecttimepickerview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SelectTimePickerViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorlateralsideview/SeverityLevelndicatorLateralSideViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorlateralsideview/SeverityLevelndicatorLateralSideViewActivity.java index 056572b..e051ef3 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorlateralsideview/SeverityLevelndicatorLateralSideViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorlateralsideview/SeverityLevelndicatorLateralSideViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.severitylevelindicatorlateralsideview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SeverityLevelIndicatorLateralSideViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorview/SeverityLevelndicatorViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorview/SeverityLevelndicatorViewActivity.java index 918034c..9293567 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorview/SeverityLevelndicatorViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/severitylevelindicatorview/SeverityLevelndicatorViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.severitylevelindicatorview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SeverityLevelIndicatorViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplepercentagebarview/SimplePercentageBarViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplepercentagebarview/SimplePercentageBarViewActivity.java index dfe7d18..1fd42b1 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplepercentagebarview/SimplePercentageBarViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplepercentagebarview/SimplePercentageBarViewActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.simplepercentagebarview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SimplePercentageBarViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplerequestinfosnackbar/SimpleRequestInfoSnackbarActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplerequestinfosnackbar/SimpleRequestInfoSnackbarActivity.java index 1ca3672..20f292a 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplerequestinfosnackbar/SimpleRequestInfoSnackbarActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/simplerequestinfosnackbar/SimpleRequestInfoSnackbarActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.simplerequestinfosnackbar; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.ActionButtonViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/userinformationcardview/UserInformationCardViewActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/userinformationcardview/UserInformationCardViewActivity.java index b202e69..9bfb66c 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/userinformationcardview/UserInformationCardViewActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/userinformationcardview/UserInformationCardViewActivity.java @@ -1,9 +1,9 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.userinformationcardview; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.UserInformationCardViewTestActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/viewinguserdialog/ViewingUserDialogActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/viewinguserdialog/ViewingUserDialogActivity.java index d6f3758..06135de 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/viewinguserdialog/ViewingUserDialogActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/componentsactivities/viewinguserdialog/ViewingUserDialogActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.componentsactivities.viewinguserdialog; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import java.util.ArrayList; import java.util.List; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentdetail/SampleComponentDetailActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentdetail/SampleComponentDetailActivity.java index a9e6077..4a8fd56 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentdetail/SampleComponentDetailActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentdetail/SampleComponentDetailActivity.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.samplecomponentdetail; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SampleComponentDetailActBinding; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListActivity.java index 3c75eb9..a699be0 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListActivity.java @@ -1,11 +1,11 @@ package br.com.stant.libraries.stantuiandroid.samplecomponentslist; import android.content.Intent; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; 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; import java.util.ArrayList; import java.util.List; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListAdapter.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListAdapter.java index a1ca1b0..fed3905 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListAdapter.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/samplecomponentslist/SampleComponentsListAdapter.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.stantuiandroid.samplecomponentslist; -import android.databinding.DataBindingUtil; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/workspace/WorkspaceActivity.java b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/workspace/WorkspaceActivity.java index fd45c0e..864fd62 100644 --- a/sample/src/main/java/br/com/stant/libraries/stantuiandroid/workspace/WorkspaceActivity.java +++ b/sample/src/main/java/br/com/stant/libraries/stantuiandroid/workspace/WorkspaceActivity.java @@ -1,29 +1,18 @@ package br.com.stant.libraries.stantuiandroid.workspace; -import android.app.Dialog; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.view.Gravity; -import android.view.LayoutInflater; +import androidx.appcompat.app.AppCompatActivity; + import android.view.View; -import android.view.Window; -import android.view.WindowManager; -import android.widget.Button; -import android.widget.Toast; import java.util.ArrayList; import java.util.List; import br.com.stant.libraries.stantuiandroid.R; import br.com.stant.libraries.stantuiandroid.databinding.SampleWorkspaceActBinding; -import br.com.stant.libraries.uilibrary.components.severitylevelindicatorview.SeverityLevelEnum; -import br.com.stant.libraries.uilibrary.components.severitylevelindicatorview.SeverityLevelIndicatorView; -import br.com.stant.libraries.uilibrary.components.simplerequestinfosnackbar.SimpleRequestInfoSnackbar; -import br.com.stant.libraries.uilibrary.components.simplerequestinfosnackbar.SimpleRequestInfoSnackbarTypeEnum; import br.com.stant.libraries.uilibrary.components.viewinguserdialog.ViewingUserDto; import br.com.stant.libraries.uilibrary.components.viewinguserdialog.ViewingUsersDialog; -import br.com.stant.libraries.uilibrary.databinding.ViewingUsersDialogBinding; /** * Created by denisvieira on 29/10/17. diff --git a/sample/src/main/res/layout/sample_component_detail_act.xml b/sample/src/main/res/layout/sample_component_detail_act.xml index ce864ea..b715d0d 100644 --- a/sample/src/main/res/layout/sample_component_detail_act.xml +++ b/sample/src/main/res/layout/sample_component_detail_act.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - - + - diff --git a/ui-library/build.gradle b/ui-library/build.gradle index 035e6b6..1cd6c69 100644 --- a/ui-library/build.gradle +++ b/ui-library/build.gradle @@ -11,7 +11,7 @@ android { versionCode global_versionCode versionName global_versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } @@ -35,17 +35,17 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'de.hdodenhof:circleimageview:2.0.0' diff --git a/ui-library/src/androidTest/java/br/com/stant/libraries/uilibrary/ExampleInstrumentedTest.java b/ui-library/src/androidTest/java/br/com/stant/libraries/uilibrary/ExampleInstrumentedTest.java index 547b9ee..bed4179 100644 --- a/ui-library/src/androidTest/java/br/com/stant/libraries/uilibrary/ExampleInstrumentedTest.java +++ b/ui-library/src/androidTest/java/br/com/stant/libraries/uilibrary/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/actionbuttonview/ActionButtonView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/actionbuttonview/ActionButtonView.java index b4a535a..a683ec6 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/actionbuttonview/ActionButtonView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/actionbuttonview/ActionButtonView.java @@ -1,13 +1,12 @@ package br.com.stant.libraries.uilibrary.components.actionbuttonview; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.drawable.Drawable; -import android.support.v7.widget.CardView; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.LinearLayout; import br.com.stant.libraries.uilibrary.R; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/basictoolbarview/BasicToolbarView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/basictoolbarview/BasicToolbarView.java index c191828..ca9e499 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/basictoolbarview/BasicToolbarView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/basictoolbarview/BasicToolbarView.java @@ -1,7 +1,7 @@ package br.com.stant.libraries.uilibrary.components.basictoolbarview; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/buttoncomponentview/ButtonComponentView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/buttoncomponentview/ButtonComponentView.java index 446d355..c7fd72a 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/buttoncomponentview/ButtonComponentView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/buttoncomponentview/ButtonComponentView.java @@ -1,9 +1,8 @@ package br.com.stant.libraries.uilibrary.components.buttoncomponentview; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.drawable.Drawable; -import android.support.v7.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/executedpercentbarview/ExecutedPercentBarView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/executedpercentbarview/ExecutedPercentBarView.java index b3f2e27..0d9946b 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/executedpercentbarview/ExecutedPercentBarView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/executedpercentbarview/ExecutedPercentBarView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.executedpercentbarview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.CardView; +import androidx.databinding.DataBindingUtil; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/expandabletextview/ExpandableTextView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/expandabletextview/ExpandableTextView.java index 4a0daf3..ead1416 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/expandabletextview/ExpandableTextView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/expandabletextview/ExpandableTextView.java @@ -1,7 +1,7 @@ package br.com.stant.libraries.uilibrary.components.expandabletextview; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.text.Layout; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/headerentitycardview/HeaderEntityCardView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/headerentitycardview/HeaderEntityCardView.java index f3dd27e..4008083 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/headerentitycardview/HeaderEntityCardView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/headerentitycardview/HeaderEntityCardView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.headerentitycardview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.CardView; +import androidx.databinding.DataBindingUtil; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/increasedecreasebuttonsview/IncreaseDecreaseButtonsView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/increasedecreasebuttonsview/IncreaseDecreaseButtonsView.java index 0adac71..ec774d7 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/increasedecreasebuttonsview/IncreaseDecreaseButtonsView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/increasedecreasebuttonsview/IncreaseDecreaseButtonsView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.increasedecreasebuttonsview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.annotation.Nullable; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/infoactioncardview/InfoActionCardView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/infoactioncardview/InfoActionCardView.java index 93eb402..605a158 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/infoactioncardview/InfoActionCardView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/infoactioncardview/InfoActionCardView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.infoactioncardview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.CardView; +import androidx.databinding.DataBindingUtil; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/informationcardview/InformationCardView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/informationcardview/InformationCardView.java index 8e6aa76..cefe129 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/informationcardview/InformationCardView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/informationcardview/InformationCardView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.informationcardview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.CardView; +import androidx.databinding.DataBindingUtil; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selectdatepickerview/SelectDatePickerView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selectdatepickerview/SelectDatePickerView.java index 5b9fce1..2203eee 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selectdatepickerview/SelectDatePickerView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selectdatepickerview/SelectDatePickerView.java @@ -2,7 +2,7 @@ import android.app.DatePickerDialog; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selecttimepickerview/SelectTimePickerView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selecttimepickerview/SelectTimePickerView.java index c961166..49360f6 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selecttimepickerview/SelectTimePickerView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/selecttimepickerview/SelectTimePickerView.java @@ -2,7 +2,7 @@ import android.app.Dialog; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorlateralsideview/SeverityLevelIndicatorLateralSideView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorlateralsideview/SeverityLevelIndicatorLateralSideView.java index b794cdf..01d8061 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorlateralsideview/SeverityLevelIndicatorLateralSideView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorlateralsideview/SeverityLevelIndicatorLateralSideView.java @@ -1,9 +1,9 @@ package br.com.stant.libraries.uilibrary.components.severitylevelindicatorlateralsideview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorview/SeverityLevelIndicatorView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorview/SeverityLevelIndicatorView.java index d8b0562..9d43395 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorview/SeverityLevelIndicatorView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/severitylevelindicatorview/SeverityLevelIndicatorView.java @@ -1,9 +1,9 @@ package br.com.stant.libraries.uilibrary.components.severitylevelindicatorview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simpleinformationscardview/SimpleInformationsCardView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simpleinformationscardview/SimpleInformationsCardView.java index 1534e06..49b5b45 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simpleinformationscardview/SimpleInformationsCardView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simpleinformationscardview/SimpleInformationsCardView.java @@ -1,11 +1,10 @@ package br.com.stant.libraries.uilibrary.components.simpleinformationscardview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.CardView; +import androidx.databinding.DataBindingUtil; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.widget.LinearLayout; import br.com.stant.libraries.uilibrary.R; import br.com.stant.libraries.uilibrary.databinding.SimpleInformationsCardViewBinding; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplepercentagebarview/SimplePercentageBarView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplepercentagebarview/SimplePercentageBarView.java index 5622905..7786a1c 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplepercentagebarview/SimplePercentageBarView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplepercentagebarview/SimplePercentageBarView.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.simplepercentagebarview; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v4.content.ContextCompat; +import androidx.databinding.DataBindingUtil; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplerequestinfosnackbar/SimpleRequestInfoSnackbar.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplerequestinfosnackbar/SimpleRequestInfoSnackbar.java index 3a55d8b..a937977 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplerequestinfosnackbar/SimpleRequestInfoSnackbar.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/simplerequestinfosnackbar/SimpleRequestInfoSnackbar.java @@ -2,9 +2,9 @@ import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.TextView; @@ -35,7 +35,7 @@ private void makeSnackbar(){ Snackbar snackbar = Snackbar.make(mView, mInfoText, Snackbar.LENGTH_SHORT); View snackbarView = snackbar.getView(); - TextView tv = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text); + TextView tv = (TextView) snackbarView.findViewById(R.id.snackbar_text); tv.setTextColor(Color.WHITE); snackbarView.setBackgroundColor(getBgColor()); diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/userinformationcardview/UserInformationCardView.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/userinformationcardview/UserInformationCardView.java index c92f68a..afd16ed 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/userinformationcardview/UserInformationCardView.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/userinformationcardview/UserInformationCardView.java @@ -1,14 +1,12 @@ package br.com.stant.libraries.uilibrary.components.userinformationcardview; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.drawable.Drawable; -import android.support.v7.widget.CardView; +import androidx.cardview.widget.CardView; import android.util.AttributeSet; import android.view.LayoutInflater; -import com.squareup.picasso.Picasso; - import br.com.stant.libraries.uilibrary.R; import br.com.stant.libraries.uilibrary.databinding.UserInformationCardViewBinding; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialog.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialog.java index 1cfa45d..420d6e8 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialog.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialog.java @@ -2,12 +2,12 @@ import android.app.Dialog; import android.content.Context; -import android.databinding.DataBindingUtil; +import androidx.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialogAdapter.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialogAdapter.java index ab9dd32..00df02f 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialogAdapter.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/components/viewinguserdialog/ViewingUsersDialogAdapter.java @@ -1,8 +1,8 @@ package br.com.stant.libraries.uilibrary.components.viewinguserdialog; import android.content.Context; -import android.databinding.DataBindingUtil; -import android.support.v7.widget.RecyclerView; +import androidx.databinding.DataBindingUtil; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/ImageBinding.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/ImageBinding.java index 7739ef0..e13d73b 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/ImageBinding.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/ImageBinding.java @@ -1,6 +1,6 @@ package br.com.stant.libraries.uilibrary.utils; -import android.databinding.BindingAdapter; +import androidx.databinding.BindingAdapter; import android.graphics.drawable.Drawable; import android.widget.ImageView; diff --git a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/bindings/WeightBinding.java b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/bindings/WeightBinding.java index 837bbb4..e9b49d2 100644 --- a/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/bindings/WeightBinding.java +++ b/ui-library/src/main/java/br/com/stant/libraries/uilibrary/utils/bindings/WeightBinding.java @@ -1,6 +1,6 @@ package br.com.stant.libraries.uilibrary.utils.bindings; -import android.databinding.BindingAdapter; +import androidx.databinding.BindingAdapter; import android.widget.LinearLayout; /** diff --git a/ui-library/src/main/res/layout/basic_toolbar_view.xml b/ui-library/src/main/res/layout/basic_toolbar_view.xml index 9ff52da..c068b52 100644 --- a/ui-library/src/main/res/layout/basic_toolbar_view.xml +++ b/ui-library/src/main/res/layout/basic_toolbar_view.xml @@ -16,7 +16,7 @@ - - + \ No newline at end of file diff --git a/ui-library/src/main/res/layout/information_card_view.xml b/ui-library/src/main/res/layout/information_card_view.xml index 75e6362..27833e4 100644 --- a/ui-library/src/main/res/layout/information_card_view.xml +++ b/ui-library/src/main/res/layout/information_card_view.xml @@ -35,7 +35,7 @@ - - + diff --git a/ui-library/src/main/res/layout/user_information_card_view.xml b/ui-library/src/main/res/layout/user_information_card_view.xml index f33fe01..9ae6831 100644 --- a/ui-library/src/main/res/layout/user_information_card_view.xml +++ b/ui-library/src/main/res/layout/user_information_card_view.xml @@ -35,7 +35,7 @@ - - @@ -166,9 +166,9 @@ app:layout_constraintTop_toBottomOf="@+id/user_information_card_name" tools:text="User Role" /> - + - + diff --git a/ui-library/src/main/res/layout/viewing_users_dialog.xml b/ui-library/src/main/res/layout/viewing_users_dialog.xml index 2c25bca..ffe58cb 100644 --- a/ui-library/src/main/res/layout/viewing_users_dialog.xml +++ b/ui-library/src/main/res/layout/viewing_users_dialog.xml @@ -46,7 +46,7 @@ android:background="@drawable/shape_rounded_white" android:orientation="vertical"> -