diff --git a/app/build.gradle b/app/build.gradle index f6ac85b48..7992706c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion applicationId "com.mapbox.mapboxsdk.plugins.testapp" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java index f0baf827b..39f95d291 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java @@ -4,27 +4,30 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.test.espresso.Espresso; -import android.support.test.espresso.IdlingRegistry; -import android.support.test.espresso.IdlingResourceTimeoutException; -import android.support.test.espresso.ViewInteraction; -import android.support.test.rule.ActivityTestRule; -import com.mapbox.mapboxsdk.maps.MapboxMap; +import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction; import com.mapbox.mapboxsdk.plugins.annotation.WaitAction; import com.mapbox.mapboxsdk.plugins.utils.OnMapReadyIdlingResource; + import junit.framework.Assert; + import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.rules.TestName; + +import androidx.test.espresso.Espresso; +import androidx.test.espresso.IdlingRegistry; +import androidx.test.espresso.IdlingResourceTimeoutException; +import androidx.test.espresso.ViewInteraction; +import androidx.test.rule.ActivityTestRule; import timber.log.Timber; -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.isDisplayed; -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.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; public abstract class BaseActivityTest { diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs index e1827e8ce..25f47339f 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs @@ -5,7 +5,7 @@ // This file is generated package com.mapbox.mapboxsdk.plugins.gen.<%- subPackage %>; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import com.mapbox.mapboxsdk.plugins.testapp.activity.<%- subPackage %>.<%- activity %>; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java index bf3580b9d..e93883a94 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java @@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java index 94ba2707c..05d71a861 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java @@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java index d0891a185..904157f6f 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java @@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java index 4fa600460..7e3ab864d 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java @@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java index 008b3e375..28cf06b2b 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java @@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java index a36f8b51b..e2a55d2e7 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java @@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java index 1bb8ae087..156b805c9 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java @@ -1,14 +1,17 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; import android.view.View; + import com.mapbox.mapboxsdk.maps.MapboxMap; + import org.hamcrest.Matcher; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; public class MapboxMapAction implements ViewAction { diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java index 5d33fa5f2..1bcf14321 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java @@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java index 9ff42415b..4057a1f37 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java @@ -3,7 +3,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java index 2550bcb51..f8a479c3e 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java @@ -1,11 +1,14 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; import android.view.View; + import org.hamcrest.Matcher; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; + +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; + public final class WaitAction implements ViewAction { diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginAction.java index f22b7a0e7..46c8025f5 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginAction.java @@ -1,15 +1,17 @@ package com.mapbox.mapboxsdk.plugins.building; import android.content.Context; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; import android.view.View; import com.mapbox.mapboxsdk.maps.MapboxMap; import org.hamcrest.Matcher; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; + +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; + class BuildingPluginAction implements ViewAction { diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginTest.java index 179cd84f1..c3ca5660f 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/building/BuildingPluginTest.java @@ -1,9 +1,5 @@ package com.mapbox.mapboxsdk.plugins.building; -import android.support.test.espresso.IdlingRegistry; -import android.support.test.espresso.IdlingResourceTimeoutException; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.plugins.testapp.R; @@ -17,13 +13,17 @@ import org.junit.Test; import org.junit.runner.RunWith; +import androidx.test.espresso.IdlingRegistry; +import androidx.test.espresso.IdlingResourceTimeoutException; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import timber.log.Timber; -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.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +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.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static junit.framework.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java index 5cb9e2945..9527436fa 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java @@ -1,8 +1,5 @@ package com.mapbox.mapboxsdk.plugins.offline; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; - import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin; import com.mapbox.mapboxsdk.plugins.testapp.R; @@ -16,9 +13,12 @@ import java.util.List; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/LiveDataTestUtil.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/LiveDataTestUtil.java index c3baea6d6..3f0baeb41 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/LiveDataTestUtil.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/LiveDataTestUtil.java @@ -1,12 +1,12 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.Observer; -import android.support.annotation.Nullable; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import androidx.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.Observer; + public class LiveDataTestUtil { /** diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDaoTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDaoTest.java index 38e1bf6ba..a06ee2ec4 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDaoTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDaoTest.java @@ -1,9 +1,5 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.data; -import android.arch.core.executor.testing.InstantTaskExecutorRule; -import android.arch.persistence.room.Room; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; import com.mapbox.mapboxsdk.plugins.places.autocomplete.LiveDataTestUtil; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.dao.SearchHistoryDao; @@ -18,6 +14,11 @@ import java.util.List; +import androidx.arch.core.executor.testing.InstantTaskExecutorRule; +import androidx.room.Room; +import androidx.test.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + import static com.mapbox.mapboxsdk.plugins.places.autocomplete.data.TestData.SEARCH_HISTORY_ENTITY; import static com.mapbox.mapboxsdk.plugins.places.autocomplete.data.TestData.SEARCH_HISTORY_ENTITY_TWO; import static junit.framework.Assert.assertTrue; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragmentTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragmentTest.java index 948e627d5..889691e9b 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragmentTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragmentTest.java @@ -3,9 +3,6 @@ import android.content.Context; import android.graphics.Color; import android.net.wifi.WifiManager; -import android.support.test.espresso.action.ViewActions; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.TestData; import com.mapbox.mapboxsdk.plugins.places.autocomplete.model.PlaceOptions; @@ -18,17 +15,20 @@ import org.junit.Test; import org.junit.runner.RunWith; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.typeText; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.hasBackground; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withHint; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import androidx.test.espresso.action.ViewActions; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.typeText; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.hasBackground; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withHint; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java index 17464e5e6..299594c2d 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java @@ -2,8 +2,6 @@ import android.app.Activity; -import android.support.test.runner.AndroidJUnit4; -import android.support.v4.content.ContextCompat; import android.view.View; import com.mapbox.mapboxsdk.maps.MapView; @@ -17,6 +15,8 @@ import org.junit.Test; import org.junit.runner.RunWith; +import androidx.core.content.ContextCompat; +import androidx.test.ext.junit.runners.AndroidJUnit4; import timber.log.Timber; import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginAction.java index e39ab3507..7e4d9aa41 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginAction.java @@ -1,14 +1,15 @@ package com.mapbox.mapboxsdk.plugins.traffic; -import android.support.test.espresso.UiController; -import android.support.test.espresso.ViewAction; import android.view.View; import com.mapbox.mapboxsdk.maps.MapboxMap; import org.hamcrest.Matcher; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import androidx.test.espresso.UiController; +import androidx.test.espresso.ViewAction; + +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; class TrafficPluginAction implements ViewAction { diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java index 77e99d328..6b9c03ab3 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPluginTest.java @@ -1,10 +1,5 @@ package com.mapbox.mapboxsdk.plugins.traffic; -import android.support.test.espresso.Espresso; -import android.support.test.espresso.IdlingResourceTimeoutException; -import android.support.test.espresso.UiController; -import android.support.test.rule.ActivityTestRule; -import android.support.test.runner.AndroidJUnit4; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; @@ -20,12 +15,17 @@ import org.junit.Test; import org.junit.runner.RunWith; +import androidx.test.espresso.Espresso; +import androidx.test.espresso.IdlingResourceTimeoutException; +import androidx.test.espresso.UiController; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.rule.ActivityTestRule; import timber.log.Timber; -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.isDisplayed; -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.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import static com.mapbox.mapboxsdk.plugins.traffic.TrafficPlugin.Local; import static com.mapbox.mapboxsdk.plugins.traffic.TrafficPlugin.MotorWay; import static com.mapbox.mapboxsdk.plugins.traffic.TrafficPlugin.Primary; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java index 62abbd183..083be640a 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java @@ -3,8 +3,6 @@ import android.app.Activity; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.test.espresso.IdlingResource; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -12,6 +10,9 @@ import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.plugins.testapp.R; +import androidx.annotation.NonNull; +import androidx.test.espresso.IdlingResource; + public class OnMapReadyIdlingResource implements IdlingResource, OnMapReadyCallback { private MapboxMap mapboxMap; diff --git a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java index c71132af9..d2e47679f 100644 --- a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java +++ b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java @@ -1,14 +1,15 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; import android.view.ViewGroup; import android.widget.FrameLayout; import com.mapbox.mapboxsdk.plugins.testapp.R; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; + /** * Used for testing fragments inside a fake activity. */ diff --git a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt index 94be37279..0cba4bfe5 100644 --- a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt +++ b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt @@ -1,7 +1,7 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapView import com.mapbox.mapboxsdk.plugins.testapp.R diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java index caf5b5f8a..bc1a4fa1c 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java @@ -12,13 +12,6 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; @@ -28,6 +21,14 @@ import com.mapbox.android.core.permissions.PermissionsListener; import com.mapbox.android.core.permissions.PermissionsManager; import com.mapbox.mapboxsdk.plugins.testapp.R; + +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import timber.log.Timber; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java index 453c5c566..5f670f8e4 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java @@ -4,8 +4,9 @@ import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.view.MenuItemCompat; import android.view.Menu; import android.view.MenuItem; import android.view.View; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java index 30dd2f73b..f79bab1c8 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java @@ -2,7 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -27,6 +26,8 @@ import java.util.Locale; import java.util.Random; +import androidx.appcompat.app.AppCompatActivity; + /** * Activity showcasing adding circles using the annotation plugin */ diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java index 98722aea5..09a83d3e0 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java @@ -5,10 +5,8 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -20,6 +18,9 @@ import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; import com.mapbox.mapboxsdk.plugins.testapp.R; +import androidx.annotation.DrawableRes; +import androidx.appcompat.app.AppCompatActivity; + /** * Test activity showcasing updating a Marker position, title, icon and snippet. */ diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java index a36aa0d26..154007ef2 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java @@ -2,14 +2,11 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; import com.google.gson.JsonElement; -import com.google.gson.JsonNull; -import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.FeatureCollection; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; @@ -19,7 +16,6 @@ import com.mapbox.mapboxsdk.plugins.annotation.Fill; import com.mapbox.mapboxsdk.plugins.annotation.FillManager; import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; -import com.mapbox.mapboxsdk.plugins.annotation.OnFillClickListener; import com.mapbox.mapboxsdk.plugins.testapp.R; import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; @@ -29,6 +25,8 @@ import java.util.List; import java.util.Random; +import androidx.appcompat.app.AppCompatActivity; + /** * Activity showcasing adding fills using the annotation plugin */ diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java index 4f816603a..40a1eb086 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java @@ -2,8 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; @@ -24,6 +22,9 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BLUE_COLOR; import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BROKEN_SHAPE_POINTS; import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.FULL_ALPHA; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java index 918f35474..0d13e69f5 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java @@ -2,7 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.widget.Toast; @@ -23,6 +22,8 @@ import java.util.List; import java.util.Random; +import androidx.appcompat.app.AppCompatActivity; + /** * Activity showcasing adding lines using the annotation plugin */ diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java index 81b7f477e..5a7b00987 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java @@ -2,7 +2,6 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -24,6 +23,8 @@ import java.util.Collections; import java.util.List; +import androidx.appcompat.app.AppCompatActivity; + /** * Test activity showcasing the Polyline annotations API. *

diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java index 7a8d62c5a..4cb5637bc 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java @@ -5,11 +5,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; @@ -20,6 +15,12 @@ import com.mapbox.mapboxsdk.plugins.testapp.R; import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; + /** * Test activity showcasing to add a Symbol on click. *

diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java index 0fcab2556..69d1e8449 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java @@ -4,7 +4,6 @@ import android.graphics.Color; import android.graphics.PointF; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -36,6 +35,7 @@ import java.util.Locale; import java.util.Random; +import androidx.appcompat.app.AppCompatActivity; import timber.log.Timber; import static com.mapbox.mapboxsdk.style.expressions.Expression.eq; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt index 381960dc3..a54775678 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt @@ -2,11 +2,11 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.building import android.graphics.Color import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.view.View import android.widget.SeekBar +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapView import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt index 4b3d0ce19..fa30ae105 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt @@ -1,8 +1,8 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.ktx.maps import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt index 5076a1994..ca40aa7a9 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt @@ -1,10 +1,10 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.localization import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt index ecbfdb037..668c7219e 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt @@ -2,7 +2,6 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.markerview import android.animation.ValueAnimator import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.LayoutInflater import android.view.View import android.view.animation.AccelerateDecelerateInterpolator @@ -18,6 +17,7 @@ import com.mapbox.mapboxsdk.plugins.testapp.R import java.util.Random import android.view.ViewGroup.LayoutParams.WRAP_CONTENT +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.Style import com.mapbox.mapboxsdk.plugins.testapp.Utils import kotlinx.android.synthetic.main.activity_annotation.* diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt index 1708bf1ca..fdc1be18f 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt @@ -1,10 +1,10 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.ArrayAdapter import android.widget.SeekBar import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.constants.MapboxConstants import com.mapbox.mapboxsdk.geometry.LatLng diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt index ad5a05990..eb8fae21b 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt @@ -1,9 +1,9 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.View import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt index f1354cd1f..916c9ecea 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt @@ -2,11 +2,11 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.* +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt index 663540a13..376ae52a3 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt @@ -3,8 +3,8 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteFragmentActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteFragmentActivity.kt index 5c3f5548e..f676ea768 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteFragmentActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteFragmentActivity.kt @@ -2,9 +2,9 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.places import android.graphics.Color import android.os.Bundle -import android.support.v4.content.ContextCompat -import android.support.v7.app.AppCompatActivity +import androidx.core.content.ContextCompat import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.api.geocoding.v5.models.CarmenFeature import com.mapbox.mapboxsdk.Mapbox diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteLauncherActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteLauncherActivity.kt index 7bbbcee7c..38eb0db51 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteLauncherActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/AutocompleteLauncherActivity.kt @@ -4,8 +4,8 @@ import android.app.Activity import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.google.gson.JsonObject import com.mapbox.api.geocoding.v5.models.CarmenFeature import com.mapbox.geojson.Point diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerLauncherActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerLauncherActivity.kt index 51ec2d51a..b8a0fdb1b 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerLauncherActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/places/PickerLauncherActivity.kt @@ -3,8 +3,8 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.places import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.Mapbox import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt index e4c147334..ba52e0cab 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt @@ -1,7 +1,7 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.scalebar import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.turf.TurfMeasurement import com.mapbox.mapboxsdk.maps.Style @@ -18,8 +18,6 @@ import com.mapbox.mapboxsdk.style.layers.LineLayer import com.mapbox.mapboxsdk.style.sources.GeoJsonSource import com.mapbox.turf.TurfConstants -import java.util.* - /** * Activity showing a scalebar used on a MapView. */ diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/traffic/TrafficActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/traffic/TrafficActivity.kt index 5f56143cc..3f3d358d0 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/traffic/TrafficActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/traffic/TrafficActivity.kt @@ -1,7 +1,7 @@ package com.mapbox.mapboxsdk.plugins.testapp.activity.traffic import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback diff --git a/app/src/main/res/layout/activity_annotation.xml b/app/src/main/res/layout/activity_annotation.xml index dfbf3e818..dac55772e 100644 --- a/app/src/main/res/layout/activity_annotation.xml +++ b/app/src/main/res/layout/activity_annotation.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_building.xml b/app/src/main/res/layout/activity_building.xml index b9f1f7a0f..783eddee2 100644 --- a/app/src/main/res/layout/activity_building.xml +++ b/app/src/main/res/layout/activity_building.xml @@ -18,7 +18,7 @@ app:mapbox_cameraZoom="16" app:mapbox_uiAttribution="false"/> - diff --git a/app/src/main/res/layout/activity_feature_overview.xml b/app/src/main/res/layout/activity_feature_overview.xml index f917189a7..51ab4315c 100644 --- a/app/src/main/res/layout/activity_feature_overview.xml +++ b/app/src/main/res/layout/activity_feature_overview.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_maps_ktx.xml b/app/src/main/res/layout/activity_maps_ktx.xml index 5ddcf8171..cd90d434f 100644 --- a/app/src/main/res/layout/activity_maps_ktx.xml +++ b/app/src/main/res/layout/activity_maps_ktx.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_offline_download.xml b/app/src/main/res/layout/activity_offline_download.xml index 4cd73ddcb..a45015512 100644 --- a/app/src/main/res/layout/activity_offline_download.xml +++ b/app/src/main/res/layout/activity_offline_download.xml @@ -1,5 +1,5 @@ - - @@ -175,9 +175,9 @@ android:orientation="vertical"> - + - android:tint="@android:color/white" app:backgroundTint="@color/colorPrimary"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_offline_region_detail.xml b/app/src/main/res/layout/activity_offline_region_detail.xml index cf1743f64..03862b88a 100644 --- a/app/src/main/res/layout/activity_offline_region_detail.xml +++ b/app/src/main/res/layout/activity_offline_region_detail.xml @@ -1,5 +1,5 @@ - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_offline_ui_components.xml b/app/src/main/res/layout/activity_offline_ui_components.xml index bbfc4ae32..fc95eb63c 100644 --- a/app/src/main/res/layout/activity_offline_ui_components.xml +++ b/app/src/main/res/layout/activity_offline_ui_components.xml @@ -1,11 +1,11 @@ - - - + diff --git a/app/src/main/res/layout/activity_picker_launcher.xml b/app/src/main/res/layout/activity_picker_launcher.xml index e53dde63d..864b99fa6 100644 --- a/app/src/main/res/layout/activity_picker_launcher.xml +++ b/app/src/main/res/layout/activity_picker_launcher.xml @@ -1,5 +1,5 @@ - - - + diff --git a/app/src/main/res/layout/activity_places_fragment.xml b/app/src/main/res/layout/activity_places_fragment.xml index fca5026f2..a70547842 100644 --- a/app/src/main/res/layout/activity_places_fragment.xml +++ b/app/src/main/res/layout/activity_places_fragment.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_places_launcher.xml b/app/src/main/res/layout/activity_places_launcher.xml index 6ab618909..ecf5ac3e5 100644 --- a/app/src/main/res/layout/activity_places_launcher.xml +++ b/app/src/main/res/layout/activity_places_launcher.xml @@ -1,5 +1,5 @@ - - - - + diff --git a/app/src/main/res/layout/activity_scalebar.xml b/app/src/main/res/layout/activity_scalebar.xml index 199ce4fc6..2ec55c852 100644 --- a/app/src/main/res/layout/activity_scalebar.xml +++ b/app/src/main/res/layout/activity_scalebar.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_traffic.xml b/app/src/main/res/layout/activity_traffic.xml index 7886df66a..1aa2b2695 100644 --- a/app/src/main/res/layout/activity_traffic.xml +++ b/app/src/main/res/layout/activity_traffic.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/marker_view.xml b/app/src/main/res/layout/marker_view.xml index 78c05662d..bcefe96c5 100644 --- a/app/src/main/res/layout/marker_view.xml +++ b/app/src/main/res/layout/marker_view.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c57ffcb5f..4ca140768 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,8 @@ POM_DEVELOPER_NAME=Mapbox # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. org.gradle.jvmargs=-Xmx2560M +android.useAndroidX=true +android.enableJetifier=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 1d27b8dd3..1d087251d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -39,58 +39,58 @@ ] dependenciesList = [ - // mapbox - mapboxMapSdk : "com.mapbox.mapboxsdk:mapbox-android-sdk:${version.mapboxMapSdk}", - mapboxGeoJson : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${version.mapboxJava}", - mapboxGeocoding : "com.mapbox.mapboxsdk:mapbox-sdk-services:${version.mapboxJava}", - mapboxTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${version.mapboxTurf}", + // mapbox + mapboxMapSdk : "com.mapbox.mapboxsdk:mapbox-android-sdk:${version.mapboxMapSdk}", + mapboxGeoJson : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${version.mapboxJava}", + mapboxGeocoding : "com.mapbox.mapboxsdk:mapbox-sdk-services:${version.mapboxJava}", + mapboxTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${version.mapboxTurf}", - // Google Play Location - playLocation : "com.google.android.gms:play-services-location:${version.playLocation}", + // Google Play Location + playLocation : "com.google.android.gms:play-services-location:${version.playLocation}", - // AutoValue - autoValue : "com.google.auto.value:auto-value:${version.autoValue}", - autoValuesParcel : "com.ryanharter.auto.value:auto-value-parcel:${version.autoValueParcel}", - autoValuesParcelAdapter: "com.ryanharter.auto.value:auto-value-parcel-adapter:${version.autoValueParcel}", + // AutoValue + autoValue : "com.google.auto.value:auto-value:${version.autoValue}", + autoValuesParcel : "com.ryanharter.auto.value:auto-value-parcel:${version.autoValueParcel}", + autoValuesParcelAdapter: "com.ryanharter.auto.value:auto-value-parcel-adapter:${version.autoValueParcel}", - // support - supportAnnotation : "com.android.support:support-annotations:${version.supportLib}", - supportAppcompatV7 : "com.android.support:appcompat-v7:${version.supportLib}", - supportV4 : "com.android.support:support-v4:${version.supportLib}", - supportDesign : "com.android.support:design:${version.supportLib}", - supportRecyclerView : "com.android.support:recyclerview-v7:${version.supportLib}", - supportCardView : "com.android.support:cardview-v7:${version.supportLib}", - supportConstraintLayout: "com.android.support.constraint:constraint-layout:${version.constraintLayout}", + // support + supportAnnotation : 'androidx.annotation:annotation:1.0.0', + supportAppcompatV7 : 'androidx.appcompat:appcompat:1.0.0', + supportV4 : 'androidx.legacy:legacy-support-v4:1.0.0', + supportDesign : 'com.google.android.material:material:1.0.0', + supportRecyclerView : 'androidx.recyclerview:recyclerview:1.0.0', + supportCardView : 'androidx.cardview:cardview:1.0.0', + supportConstraintLayout: 'androidx.constraintlayout:constraintlayout:1.1.3', - // architecture - lifecycleExtensions : "android.arch.lifecycle:extensions:${version.lifecycleExtensions}", - lifecycleCompiler : "android.arch.lifecycle:compiler:${version.lifecycleCompiler}", - roomRuntime : "android.arch.persistence.room:runtime:${version.room}", - roomCompiler : "android.arch.persistence.room:compiler:${version.room}", + // architecture + lifecycleExtensions : 'androidx.lifecycle:lifecycle-extensions:2.0.0', + lifecycleCompiler : "android.arch.lifecycle:compiler:${version.lifecycleCompiler}", + roomRuntime : 'androidx.room:room-runtime:2.0.0', + roomCompiler : 'androidx.room:room-compiler:2.0.0', - // square crew - timber : "com.jakewharton.timber:timber:${version.timber}", - leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${version.leakCanary}", - leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", - leakCanaryTest : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", + // square crew + timber : "com.jakewharton.timber:timber:${version.timber}", + leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${version.leakCanary}", + leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", + leakCanaryTest : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", - // instrumentation test - testRunner : "com.android.support.test:runner:${version.testRunner}", - testRules : "com.android.support.test:rules:${version.testRunner}", - testEspressoCore : "com.android.support.test.espresso:espresso-core:${version.espresso}", - testEspressoIntents : "com.android.support.test.espresso:espresso-intents:${version.espresso}", - testRoom : "android.arch.persistence.room:testing:${version.room}", - testArchCore : "android.arch.core:core-testing:${version.androidArchCore}", - mockitoCore : "org.mockito:mockito-core:${version.mockito}", - mockitoAndroid : "org.mockito:mockito-android:${version.mockito}", - mockk : "io.mockk:mockk:${version.mockk}", + // instrumentation test + testRunner : 'androidx.test.ext:junit:1.1.1', + testRules : 'androidx.test:rules:1.1.1', + testEspressoCore : 'androidx.test.espresso:espresso-core:3.1.0', + testEspressoIntents : "com.android.support.test.espresso:espresso-intents:${version.espresso}", + testRoom : 'androidx.room:room-testing:2.0.0', + testArchCore : 'androidx.arch.core:core-testing:2.0.0', + mockitoCore : "org.mockito:mockito-core:${version.mockito}", + mockitoAndroid : "org.mockito:mockito-android:${version.mockito}", + mockk : "io.mockk:mockk:${version.mockk}", - // unit test - junit : "junit:junit:${version.junit}", - mockito : "org.mockito:mockito-inline:${version.mockito}", - androidArchCore : "android.arch.core:core-testing:${version.androidArchCore}", - robolectric : "org.robolectric:robolectric:${version.robolectric}", - kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${pluginVersion.kotlin}", + // unit test + junit : "junit:junit:${version.junit}", + mockito : "org.mockito:mockito-inline:${version.mockito}", + androidArchCore : 'androidx.arch.core:core-testing:2.0.0', + robolectric : "org.robolectric:robolectric:${version.robolectric}", + kotlin : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${pluginVersion.kotlin}", ] pluginDependencies = [ diff --git a/ktx-mapbox-maps/build.gradle b/ktx-mapbox-maps/build.gradle index 6547fbd0a..abb791cb6 100644 --- a/ktx-mapbox-maps/build.gradle +++ b/ktx-mapbox-maps/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } configurations { diff --git a/plugin-annotation/build.gradle b/plugin-annotation/build.gradle index 314a6414f..c1d70124c 100644 --- a/plugin-annotation/build.gradle +++ b/plugin-annotation/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } configurations { diff --git a/plugin-annotation/scripts/annotation.java.ejs b/plugin-annotation/scripts/annotation.java.ejs index 5606638cd..b744656aa 100644 --- a/plugin-annotation/scripts/annotation.java.ejs +++ b/plugin-annotation/scripts/annotation.java.ejs @@ -7,9 +7,11 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.graphics.PointF; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import com.google.gson.JsonArray; import com.google.gson.JsonNull; import com.google.gson.JsonObject; @@ -18,8 +20,6 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.style.layers.Property; import com.mapbox.mapboxsdk.style.layers.PropertyFactory; import com.mapbox.mapboxsdk.utils.ColorUtils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.android.gestures.MoveDistancesObject; import com.mapbox.mapboxsdk.maps.Projection; diff --git a/plugin-annotation/scripts/annotation_element_provider.java.ejs b/plugin-annotation/scripts/annotation_element_provider.java.ejs index 900187b5f..667b2fe8f 100644 --- a/plugin-annotation/scripts/annotation_element_provider.java.ejs +++ b/plugin-annotation/scripts/annotation_element_provider.java.ejs @@ -7,7 +7,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; diff --git a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs index 82f06eef5..d2e5e6454 100644 --- a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs @@ -7,7 +7,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.BaseActivityTest; diff --git a/plugin-annotation/scripts/annotation_manager.java.ejs b/plugin-annotation/scripts/annotation_manager.java.ejs index 821eced3b..dd0cb1b64 100644 --- a/plugin-annotation/scripts/annotation_manager.java.ejs +++ b/plugin-annotation/scripts/annotation_manager.java.ejs @@ -7,10 +7,10 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; diff --git a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs index 418e08261..5355a1081 100644 --- a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs @@ -6,7 +6,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; diff --git a/plugin-annotation/scripts/annotation_options.java.ejs b/plugin-annotation/scripts/annotation_options.java.ejs index 0b25329d4..0391b26ad 100644 --- a/plugin-annotation/scripts/annotation_options.java.ejs +++ b/plugin-annotation/scripts/annotation_options.java.ejs @@ -7,8 +7,8 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.*; import com.mapbox.geojson.Geometry; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java index 093509286..27b097b1e 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java @@ -1,14 +1,14 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.mapbox.android.gestures.MoveDistancesObject; import com.mapbox.geojson.Geometry; import com.mapbox.mapboxsdk.maps.Projection; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public abstract class Annotation { static final String ID_KEY = "id"; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java index 511fcbc7c..a86998aee 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java @@ -1,11 +1,6 @@ package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.annotation.VisibleForTesting; -import android.support.v4.util.LongSparseArray; import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; @@ -21,12 +16,15 @@ import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; +import androidx.collection.LongSparseArray; /** * Generic AnnotationManager, can be used to create annotation specific managers. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java index fac544e4c..5ef645eb5 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java @@ -2,9 +2,11 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.graphics.PointF; -import android.support.annotation.UiThread; +import androidx.annotation.UiThread; import com.google.gson.JsonArray; import com.google.gson.JsonNull; import com.google.gson.JsonObject; @@ -13,8 +15,6 @@ import com.mapbox.mapboxsdk.style.layers.Property; import com.mapbox.mapboxsdk.style.layers.PropertyFactory; import com.mapbox.mapboxsdk.utils.ColorUtils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.android.gestures.MoveDistancesObject; import com.mapbox.mapboxsdk.maps.Projection; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java index 4f6faea0b..c454f0a14 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java @@ -2,7 +2,7 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.CircleLayer; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java index ee6b6744d..61a8fcc49 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java @@ -2,10 +2,10 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; import com.mapbox.geojson.Feature; import com.mapbox.geojson.FeatureCollection; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java index 2a222195e..d839cb728 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java @@ -2,8 +2,8 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.gson.*; import com.mapbox.geojson.Geometry; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java index 1f9a331da..5460063b7 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java @@ -1,9 +1,9 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.Nullable; - import com.google.gson.JsonArray; +import androidx.annotation.Nullable; + class ConvertUtils { @Nullable diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java index 9428abfaf..8fd531c44 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java @@ -1,10 +1,11 @@ package com.mapbox.mapboxsdk.plugins.annotation; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; +import androidx.annotation.Nullable; + interface CoreElementProvider { String getLayerId(); diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java index e68997ae1..153f1fd19 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java @@ -2,9 +2,6 @@ import android.annotation.SuppressLint; import android.graphics.PointF; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; import android.view.MotionEvent; import android.view.View; @@ -15,6 +12,10 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + final class DraggableAnnotationController> { private final MapboxMap mapboxMap; private AnnotationManager annotationManager; @@ -24,7 +25,8 @@ final class DraggableAnnotationController diff --git a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java index 1d306c891..33a9f7d74 100644 --- a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java +++ b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.plugins.markerview; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -9,6 +7,9 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; + /** * Class responsible for synchronising views at a LatLng on top of a Map. */ diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java index 8c907d580..54b229172 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java @@ -3,7 +3,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; @@ -11,6 +10,8 @@ import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; +import androidx.annotation.NonNull; + import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java index 61f1ec8d1..289159274 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java @@ -2,11 +2,12 @@ import android.content.Context; import android.os.Parcelable; -import android.support.annotation.DrawableRes; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.plugins.offline.R; +import androidx.annotation.DrawableRes; + @AutoValue public abstract class NotificationOptions implements Parcelable { diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java index 15de0f6d4..65d9f4ce3 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java @@ -1,8 +1,6 @@ package com.mapbox.mapboxsdk.plugins.offline.model; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.offline.OfflineRegion; @@ -12,6 +10,9 @@ import java.util.UUID; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * This model class wraps the offline region definition with notifications options and the offline * region metadata. It is a companion object to {@link OfflineRegion} with regionId and diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java index 687aff87d..971e45ccb 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java @@ -1,14 +1,15 @@ package com.mapbox.mapboxsdk.plugins.offline.model; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Options specific to the Region Selection UI component. * diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java index a55a9d8e6..81bd3dac3 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java @@ -6,10 +6,11 @@ import android.content.res.Resources; import android.os.Build; import android.os.IBinder; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.util.LongSparseArray; + +import androidx.annotation.Nullable; +import androidx.collection.LongSparseArray; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import com.mapbox.mapboxsdk.offline.OfflineManager; import com.mapbox.mapboxsdk.offline.OfflineRegion; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java index 811e09bb6..cd0df7370 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java @@ -4,8 +4,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.offline.OfflineRegion; import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; @@ -13,6 +11,9 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; /** diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java index 23e7d5bd4..d7e390a3f 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java @@ -2,9 +2,6 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.constraint.ConstraintLayout; -import android.support.v7.app.AppCompatActivity; import android.view.Window; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; @@ -13,6 +10,10 @@ import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; import com.mapbox.mapboxsdk.plugins.offline.utils.ColorUtils; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; + import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java index 34057ef5d..1194034ce 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java @@ -3,15 +3,12 @@ import android.graphics.PointF; import android.graphics.RectF; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.mapbox.geojson.Feature; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -29,6 +26,9 @@ import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import timber.log.Timber; public class RegionSelectionFragment extends Fragment implements OnMapReadyCallback, diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java index c54732589..aa389bce7 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java @@ -2,11 +2,12 @@ import android.content.Context; import android.content.res.Resources; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; import android.util.TypedValue; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; + public final class ColorUtils { private ColorUtils() { diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java index 64daec90f..df3519d51 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java @@ -8,8 +8,9 @@ import android.content.Intent; import android.graphics.Color; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v4.app.NotificationCompat; + +import androidx.annotation.RequiresApi; +import androidx.core.app.NotificationCompat; import com.mapbox.mapboxsdk.plugins.offline.R; import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java index f3420f797..8a4061f27 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java @@ -1,6 +1,5 @@ package com.mapbox.mapboxsdk.plugins.offline.utils; -import android.support.annotation.NonNull; import android.util.Log; import com.mapbox.mapboxsdk.camera.CameraPosition; @@ -8,6 +7,8 @@ import org.json.JSONObject; +import androidx.annotation.NonNull; + public class OfflineUtils { private static final String JSON_CHARSET = "UTF-8"; diff --git a/plugin-offline/src/main/res/layout/mapbox_offline_activity.xml b/plugin-offline/src/main/res/layout/mapbox_offline_activity.xml index 367954970..0bdb367a1 100644 --- a/plugin-offline/src/main/res/layout/mapbox_offline_activity.xml +++ b/plugin-offline/src/main/res/layout/mapbox_offline_activity.xml @@ -1,18 +1,18 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-offline/src/main/res/layout/mapbox_offline_region_selection_fragment.xml b/plugin-offline/src/main/res/layout/mapbox_offline_region_selection_fragment.xml index 26de1fe7d..4ddd1c718 100644 --- a/plugin-offline/src/main/res/layout/mapbox_offline_region_selection_fragment.xml +++ b/plugin-offline/src/main/res/layout/mapbox_offline_region_selection_fragment.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-offline/src/main/res/layout/mapbox_offline_toolbar.xml b/plugin-offline/src/main/res/layout/mapbox_offline_toolbar.xml index 7de9f4a40..d91eea732 100644 --- a/plugin-offline/src/main/res/layout/mapbox_offline_toolbar.xml +++ b/plugin-offline/src/main/res/layout/mapbox_offline_toolbar.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/DataRepository.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/DataRepository.java index 66c2fecb2..6a2fd9654 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/DataRepository.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/DataRepository.java @@ -1,15 +1,16 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MediatorLiveData; -import android.arch.lifecycle.Observer; -import android.support.annotation.Nullable; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.SearchHistoryDatabase; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.entity.SearchHistoryEntity; import java.util.List; +import androidx.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MediatorLiveData; +import androidx.lifecycle.Observer; + /** * Used internally for the autocomplete view diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/PlaceAutocomplete.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/PlaceAutocomplete.java index d78766e0e..994ab9275 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/PlaceAutocomplete.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/PlaceAutocomplete.java @@ -3,7 +3,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; import com.mapbox.api.geocoding.v5.models.CarmenFeature; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.SearchHistoryDatabase; @@ -13,6 +12,8 @@ import java.util.ArrayList; +import androidx.annotation.NonNull; + /** * PlaceAutocomplete provides an activity that allows a user to start typing a place name or an * address and see place predictions appear as they type. The activity can also display recent diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDatabase.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDatabase.java index 8ec620281..91dc53d32 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDatabase.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/SearchHistoryDatabase.java @@ -1,20 +1,21 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.data; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.persistence.db.SupportSQLiteDatabase; -import android.arch.persistence.room.Database; -import android.arch.persistence.room.Room; -import android.arch.persistence.room.RoomDatabase; -import android.arch.persistence.room.TypeConverters; import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.NonNull; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.converter.CarmenFeatureConverter; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.dao.SearchHistoryDao; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.entity.SearchHistoryEntity; +import androidx.annotation.NonNull; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.room.Database; +import androidx.room.Room; +import androidx.room.RoomDatabase; +import androidx.room.TypeConverters; +import androidx.sqlite.db.SupportSQLiteDatabase; + @Database(entities = {SearchHistoryEntity.class}, version = 1) @TypeConverters(CarmenFeatureConverter.class) public abstract class SearchHistoryDatabase extends RoomDatabase { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverter.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverter.java index 58f00df80..53e189506 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverter.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverter.java @@ -1,10 +1,11 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.data.converter; -import android.arch.persistence.room.TypeConverter; -import android.support.annotation.NonNull; import com.mapbox.api.geocoding.v5.models.CarmenFeature; +import androidx.annotation.NonNull; +import androidx.room.TypeConverter; + public final class CarmenFeatureConverter { private CarmenFeatureConverter() { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/dao/SearchHistoryDao.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/dao/SearchHistoryDao.java index d39f560b3..834d12b49 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/dao/SearchHistoryDao.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/dao/SearchHistoryDao.java @@ -1,15 +1,16 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.data.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Query; import com.mapbox.mapboxsdk.plugins.places.autocomplete.data.entity.SearchHistoryEntity; import java.util.List; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; + /** * The Data Access Objects specifically for the search history database * diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/entity/SearchHistoryEntity.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/entity/SearchHistoryEntity.java index d0372cb7f..80992d15b 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/entity/SearchHistoryEntity.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/entity/SearchHistoryEntity.java @@ -1,13 +1,14 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.data.entity; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.PrimaryKey; -import android.support.annotation.NonNull; import com.mapbox.api.geocoding.v5.models.CarmenFeature; import com.mapbox.mapboxsdk.plugins.places.autocomplete.model.SearchHistory; +import androidx.annotation.NonNull; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.PrimaryKey; + @Entity(tableName = "searchhistory") public class SearchHistoryEntity implements SearchHistory { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/model/PlaceOptions.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/model/PlaceOptions.java index 5a02c6019..19264983e 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/model/PlaceOptions.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/model/PlaceOptions.java @@ -2,11 +2,6 @@ import android.graphics.Color; import android.os.Parcelable; -import android.support.annotation.ColorInt; -import android.support.annotation.FloatRange; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.api.geocoding.v5.GeocodingCriteria.GeocodingTypeCriteria; @@ -20,6 +15,12 @@ import java.util.List; import java.util.Locale; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Create a PlaceOptions object which can be used to customize the autocomplete geocoder results and * the UI component. There are two modes to further change the autocomplete UI to fit your app diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteActivity.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteActivity.java index 800e4c563..4eb0bfc03 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteActivity.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteActivity.java @@ -2,14 +2,15 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; import com.mapbox.api.geocoding.v5.models.CarmenFeature; import com.mapbox.mapboxsdk.places.R; import com.mapbox.mapboxsdk.plugins.places.autocomplete.model.PlaceOptions; import com.mapbox.mapboxsdk.plugins.places.common.PlaceConstants; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + public class PlaceAutocompleteActivity extends AppCompatActivity implements PlaceSelectionListener { @Override diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragment.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragment.java index af3edaa2e..a0fc794a6 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragment.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/PlaceAutocompleteFragment.java @@ -1,13 +1,8 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui; import android.app.Activity; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,6 +22,11 @@ import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import timber.log.Timber; public class PlaceAutocompleteFragment extends Fragment implements ResultClickCallback, diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultCardView.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultCardView.java index ce19281d3..860d3893c 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultCardView.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultCardView.java @@ -1,12 +1,13 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.AttributeSet; import com.mapbox.mapboxsdk.places.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public class ResultCardView extends ResultView { public ResultCardView(@NonNull Context context) { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultItemDecoration.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultItemDecoration.java index 3ba316617..f53c73e0f 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultItemDecoration.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultItemDecoration.java @@ -3,8 +3,9 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import android.view.View; import com.mapbox.mapboxsdk.places.R; diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultView.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultView.java index 893167c0f..3d0eeb67d 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultView.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/ResultView.java @@ -1,10 +1,6 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.AttributeSet; import android.widget.LinearLayout; @@ -14,6 +10,11 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class ResultView extends LinearLayout { private final List results; diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchResultAdapter.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchResultAdapter.java index e06f2306b..fa2aae1cd 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchResultAdapter.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchResultAdapter.java @@ -1,9 +1,11 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; + +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchView.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchView.java index 72f2772bb..bf2fb3919 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchView.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/ui/SearchView.java @@ -1,12 +1,6 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.ui; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleObserver; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.OnLifecycleEvent; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; @@ -18,6 +12,13 @@ import com.mapbox.mapboxsdk.places.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.OnLifecycleEvent; + public class SearchView extends LinearLayout implements ImageButton.OnClickListener, TextWatcher, LifecycleObserver { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/viewmodel/PlaceAutocompleteViewModel.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/viewmodel/PlaceAutocompleteViewModel.java index de0a1bf0d..a8315da86 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/viewmodel/PlaceAutocompleteViewModel.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/viewmodel/PlaceAutocompleteViewModel.java @@ -1,12 +1,6 @@ package com.mapbox.mapboxsdk.plugins.places.autocomplete.viewmodel; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.api.geocoding.v5.MapboxGeocoding; import com.mapbox.api.geocoding.v5.models.CarmenFeature; @@ -21,6 +15,12 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/common/utils/ColorUtils.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/common/utils/ColorUtils.java index 60752e385..64faf7782 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/common/utils/ColorUtils.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/common/utils/ColorUtils.java @@ -2,11 +2,12 @@ import android.content.Context; import android.content.res.Resources; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; import android.util.TypedValue; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; + public final class ColorUtils { private ColorUtils() { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/PlacePicker.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/PlacePicker.java index bbb86629b..3bb2469cc 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/PlacePicker.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/PlacePicker.java @@ -2,8 +2,6 @@ import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.mapbox.api.geocoding.v5.models.CarmenFeature; import com.mapbox.mapboxsdk.camera.CameraPosition; @@ -11,6 +9,9 @@ import com.mapbox.mapboxsdk.plugins.places.picker.model.PlacePickerOptions; import com.mapbox.mapboxsdk.plugins.places.picker.ui.PlacePickerActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public final class PlacePicker { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/model/PlacePickerOptions.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/model/PlacePickerOptions.java index 0090ac2bc..46fe9171f 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/model/PlacePickerOptions.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/model/PlacePickerOptions.java @@ -1,9 +1,6 @@ package com.mapbox.mapboxsdk.plugins.places.picker.model; import android.os.Parcelable; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import com.google.auto.value.AutoValue; import com.mapbox.api.geocoding.v5.GeocodingCriteria.GeocodingTypeCriteria; @@ -12,6 +9,10 @@ import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.plugins.places.common.model.BasePlaceOptions; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @AutoValue public abstract class PlacePickerOptions implements BasePlaceOptions, Parcelable { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/CurrentPlaceSelectionBottomSheet.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/CurrentPlaceSelectionBottomSheet.java index 485715dee..ac7bac2be 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/CurrentPlaceSelectionBottomSheet.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/CurrentPlaceSelectionBottomSheet.java @@ -1,18 +1,19 @@ package com.mapbox.mapboxsdk.plugins.places.picker.ui; import android.content.Context; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.CoordinatorLayout; import android.util.AttributeSet; import android.widget.ProgressBar; import android.widget.TextView; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.mapbox.api.geocoding.v5.models.CarmenFeature; import com.mapbox.mapboxsdk.places.R; -import static android.support.design.widget.BottomSheetBehavior.STATE_COLLAPSED; -import static android.support.design.widget.BottomSheetBehavior.STATE_HIDDEN; +import androidx.annotation.Nullable; +import androidx.coordinatorlayout.widget.CoordinatorLayout; + +import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED; +import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN; import static com.mapbox.mapboxsdk.plugins.places.common.utils.GeocodingUtils.removeNameFromAddress; public class CurrentPlaceSelectionBottomSheet extends CoordinatorLayout { diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/PlacePickerActivity.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/PlacePickerActivity.java index 5c5f2b03c..407211958 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/PlacePickerActivity.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/ui/PlacePickerActivity.java @@ -1,23 +1,18 @@ package com.mapbox.mapboxsdk.plugins.places.picker.ui; -import android.arch.lifecycle.Observer; -import android.arch.lifecycle.ViewModelProviders; import android.content.Intent; import android.location.Location; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.constraint.ConstraintLayout; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; + +import androidx.annotation.NonNull; import android.view.View; import android.view.Window; import android.view.animation.OvershootInterpolator; import android.widget.ImageView; import android.widget.Toast; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonObject; import com.mapbox.android.core.permissions.PermissionsListener; import com.mapbox.android.core.permissions.PermissionsManager; @@ -45,9 +40,15 @@ import java.util.List; import java.util.Locale; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.lifecycle.Observer; +import androidx.lifecycle.ViewModelProviders; import timber.log.Timber; -import static android.support.design.widget.Snackbar.LENGTH_LONG; +import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; /** * Do not use this class directly, instead create an intent using the {@link IntentBuilder} inside diff --git a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/viewmodel/PlacePickerViewModel.java b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/viewmodel/PlacePickerViewModel.java index 12460e4de..e8ab7acf8 100644 --- a/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/viewmodel/PlacePickerViewModel.java +++ b/plugin-places/src/main/java/com/mapbox/mapboxsdk/plugins/places/picker/viewmodel/PlacePickerViewModel.java @@ -1,9 +1,6 @@ package com.mapbox.mapboxsdk.plugins.places.picker.viewmodel; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.MutableLiveData; -import android.support.annotation.NonNull; import com.mapbox.api.geocoding.v5.MapboxGeocoding; import com.mapbox.api.geocoding.v5.models.CarmenFeature; @@ -11,6 +8,9 @@ import com.mapbox.geojson.Point; import com.mapbox.mapboxsdk.plugins.places.picker.model.PlacePickerOptions; +import androidx.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.MutableLiveData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/plugin-places/src/main/res/layout/mapbox_activity_autocomplete.xml b/plugin-places/src/main/res/layout/mapbox_activity_autocomplete.xml index 0cbb6713c..954e588ae 100644 --- a/plugin-places/src/main/res/layout/mapbox_activity_autocomplete.xml +++ b/plugin-places/src/main/res/layout/mapbox_activity_autocomplete.xml @@ -1,5 +1,5 @@ - - + diff --git a/plugin-places/src/main/res/layout/mapbox_activity_place_picker.xml b/plugin-places/src/main/res/layout/mapbox_activity_place_picker.xml index ed0987f6c..ae1157bc2 100644 --- a/plugin-places/src/main/res/layout/mapbox_activity_place_picker.xml +++ b/plugin-places/src/main/res/layout/mapbox_activity_place_picker.xml @@ -1,20 +1,20 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_content_place_picker.xml b/plugin-places/src/main/res/layout/mapbox_content_place_picker.xml index 802c0ea44..ee7bdacf7 100644 --- a/plugin-places/src/main/res/layout/mapbox_content_place_picker.xml +++ b/plugin-places/src/main/res/layout/mapbox_content_place_picker.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_card.xml b/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_card.xml index a7e7600de..8076b84b5 100644 --- a/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_card.xml +++ b/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_card.xml @@ -1,5 +1,5 @@ - - - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_full.xml b/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_full.xml index b99d92e1f..86e495271 100644 --- a/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_full.xml +++ b/plugin-places/src/main/res/layout/mapbox_fragment_autocomplete_full.xml @@ -1,5 +1,5 @@ - - - + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_item_offline_message.xml b/plugin-places/src/main/res/layout/mapbox_item_offline_message.xml index 9eb52b4fa..3dbf1999e 100644 --- a/plugin-places/src/main/res/layout/mapbox_item_offline_message.xml +++ b/plugin-places/src/main/res/layout/mapbox_item_offline_message.xml @@ -1,5 +1,5 @@ - - + diff --git a/plugin-places/src/main/res/layout/mapbox_item_search_result.xml b/plugin-places/src/main/res/layout/mapbox_item_search_result.xml index 367368018..60faaf68b 100644 --- a/plugin-places/src/main/res/layout/mapbox_item_search_result.xml +++ b/plugin-places/src/main/res/layout/mapbox_item_search_result.xml @@ -1,5 +1,5 @@ - - + diff --git a/plugin-places/src/main/res/layout/mapbox_toolbar_place_picker.xml b/plugin-places/src/main/res/layout/mapbox_toolbar_place_picker.xml index 584ae7320..a7815aae7 100644 --- a/plugin-places/src/main/res/layout/mapbox_toolbar_place_picker.xml +++ b/plugin-places/src/main/res/layout/mapbox_toolbar_place_picker.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_view_bottom_sheet_container.xml b/plugin-places/src/main/res/layout/mapbox_view_bottom_sheet_container.xml index 345604a26..85e0e33c1 100644 --- a/plugin-places/src/main/res/layout/mapbox_view_bottom_sheet_container.xml +++ b/plugin-places/src/main/res/layout/mapbox_view_bottom_sheet_container.xml @@ -1,12 +1,12 @@ - - - + app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"> - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_view_card_results.xml b/plugin-places/src/main/res/layout/mapbox_view_card_results.xml index f6630d5fe..eb06ace4c 100644 --- a/plugin-places/src/main/res/layout/mapbox_view_card_results.xml +++ b/plugin-places/src/main/res/layout/mapbox_view_card_results.xml @@ -1,5 +1,5 @@ - - - - + + diff --git a/plugin-places/src/main/res/layout/mapbox_view_details_bottom_header.xml b/plugin-places/src/main/res/layout/mapbox_view_details_bottom_header.xml index 3fe061840..3a5c47319 100644 --- a/plugin-places/src/main/res/layout/mapbox_view_details_bottom_header.xml +++ b/plugin-places/src/main/res/layout/mapbox_view_details_bottom_header.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-places/src/main/res/layout/mapbox_view_results.xml b/plugin-places/src/main/res/layout/mapbox_view_results.xml index 9eda6983f..2592e9b50 100644 --- a/plugin-places/src/main/res/layout/mapbox_view_results.xml +++ b/plugin-places/src/main/res/layout/mapbox_view_results.xml @@ -1,12 +1,12 @@ - - - - + + diff --git a/plugin-places/src/main/res/layout/mapbox_view_search.xml b/plugin-places/src/main/res/layout/mapbox_view_search.xml index f6aea32f4..919b87db4 100644 --- a/plugin-places/src/main/res/layout/mapbox_view_search.xml +++ b/plugin-places/src/main/res/layout/mapbox_view_search.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/plugin-scalebar/build.gradle b/plugin-scalebar/build.gradle index 1ba76c1b6..64dc5fc15 100644 --- a/plugin-scalebar/build.gradle +++ b/plugin-scalebar/build.gradle @@ -7,7 +7,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } configurations { diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java index c4a70c9a2..20bfab614 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java @@ -1,11 +1,12 @@ package com.mapbox.pluginscalebar; import android.content.Context; -import android.support.annotation.ColorRes; -import android.support.annotation.DimenRes; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.support.v4.content.ContextCompat; + +import androidx.annotation.ColorRes; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.ContextCompat; import java.util.Locale; diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java index 6c7f73e30..0c9e53227 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java @@ -1,8 +1,5 @@ package com.mapbox.pluginscalebar; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; -import android.support.annotation.VisibleForTesting; import android.view.View; import com.mapbox.mapboxsdk.camera.CameraPosition; @@ -11,6 +8,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Projection; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; + /** * Plugin class that shows a scale bar on MapView and changes the scale corresponding to the MapView's scale. */ diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java index 4e219cc65..c63d616fb 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java @@ -5,8 +5,6 @@ import android.graphics.Paint; import android.os.Handler; import android.os.Message; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; import android.util.Pair; import android.view.View; @@ -14,6 +12,9 @@ import java.text.DecimalFormat; import java.util.ArrayList; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; + import static com.mapbox.pluginscalebar.ScaleBarConstants.FEET_PER_MILE; import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER; import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER_UNIT; diff --git a/plugin-traffic/build.gradle b/plugin-traffic/build.gradle index 7c8afcbfe..391821cfc 100644 --- a/plugin-traffic/build.gradle +++ b/plugin-traffic/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } configurations { diff --git a/plugin-traffic/src/main/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPlugin.java b/plugin-traffic/src/main/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPlugin.java index 347914013..e15a62e60 100644 --- a/plugin-traffic/src/main/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPlugin.java +++ b/plugin-traffic/src/main/java/com/mapbox/mapboxsdk/plugins/traffic/TrafficPlugin.java @@ -1,11 +1,6 @@ package com.mapbox.mapboxsdk.plugins.traffic; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; -import android.support.annotation.VisibleForTesting; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -22,6 +17,11 @@ import java.util.ArrayList; import java.util.List; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; +import androidx.annotation.VisibleForTesting; import timber.log.Timber; import static com.mapbox.mapboxsdk.style.expressions.Expression.exponential;