RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed build after migration on Android X

Browse source
This commit is contained in:
Александр Зацепин 2019-10-22 15:34:24 +03:00 • committed by yoksnod
parent d41499279c
commit 8c57464baa
6 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/build.gradle
View file

@ -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();
}

10
android/src/com/mapswithme/maps/widget/FragmentPageViewProvider.java
View file

@ -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;

2
android/src/com/mapswithme/maps/widget/PageViewProvider.java
View file

@ -1,6 +1,6 @@
package com.mapswithme.maps.widget;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.view.View;
interface PageViewProvider

6
android/src/com/mapswithme/maps/widget/PageViewProviderFactory.java
View file

@ -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
{

6
android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java
View file

@ -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;

8
android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java
View file

@ -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;