From 8c57464baafcf04b5ac361f88eff4196aefc5921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Tue, 22 Oct 2019 15:34:24 +0300 Subject: [PATCH] [android] Fixed build after migration on Android X --- android/build.gradle | 7 +++++++ .../maps/widget/FragmentPageViewProvider.java | 10 +++++----- .../com/mapswithme/maps/widget/PageViewProvider.java | 2 +- .../maps/widget/PageViewProviderFactory.java | 6 +++--- .../maps/widget/ParallaxBackgroundPageListener.java | 6 +++--- .../maps/widget/ParallaxBackgroundViewPager.java | 8 ++++---- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index fdeeb9bcbf..97e0b1d540 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -145,6 +145,13 @@ configurations.all { force 'android.arch.core:runtime:1.1.1' force 'android.arch.core:common:1.1.1' + force 'androidx.legacy:legacy-support-core-utils:1.0.0-rc01' + force 'androidx.loader:loader:1.0.0-rc01' + force 'androidx.lifecycle:lifecycle-viewmodel:2.0.0-rc01' + force 'androidx.lifecycle:lifecycle-common:2.0.0-rc01' + force 'androidx.arch.core:core-common:2.0.0-rc01' + force 'androidx.arch.core:core-runtime:2.0.0-rc01' + force 'androidx.lifecycle:lifecycle-livedata-core:2.0.0-rc01' failOnVersionConflict(); } diff --git a/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java b/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java index 8e5b83c861..8e7522506a 100644 --- a/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java +++ b/android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.widget; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.View; import java.util.NoSuchElementException; diff --git a/android/src/com/mapswithme/maps/widget/PageViewProvider.java b/android/src/com/mapswithme/maps/widget/PageViewProvider.java index edd363bdfa..1bb9551a7c 100644 --- a/android/src/com/mapswithme/maps/widget/PageViewProvider.java +++ b/android/src/com/mapswithme/maps/widget/PageViewProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.widget; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; interface PageViewProvider diff --git a/android/src/com/mapswithme/maps/widget/PageViewProviderFactory.java b/android/src/com/mapswithme/maps/widget/PageViewProviderFactory.java index 6c4e9d9188..49e922114e 100644 --- a/android/src/com/mapswithme/maps/widget/PageViewProviderFactory.java +++ b/android/src/com/mapswithme/maps/widget/PageViewProviderFactory.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; public class PageViewProviderFactory { diff --git a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java index db3fd6bbce..b388793f1c 100755 --- a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java +++ b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java index 5b9fa6617a..2c33fc1d14 100755 --- a/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java +++ b/android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.content.res.TypedArray; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent;