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

[android] Added android x pager, fragments, activities, started using new classes instead of support library

Browse source
This commit is contained in:
Dmitry Donskoy 2019-10-28 17:04:12 +03:00 • committed by Aleksandr Zatsepin
parent 9fc2a9ff2d
commit 5a77f4fe8c
9 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/res/drawable/all_pass_marker_active.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="4dp"
android:height="4dp"/>
<solid android:color="@color/white_primary"/>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size
android:width="@dimen/margin_quarter"
android:height="@dimen/margin_quarter" />
<solid android:color="@color/white_primary" />
</shape>

13
android/res/drawable/all_pass_marker_inactive.xml
View file

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="4dp"
android:height="4dp"/>
<solid android:color="@color/white_lightest"/>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size
android:width="@dimen/margin_quarter"
android:height="@dimen/margin_quarter" />
<solid android:color="@color/white_lightest" />
</shape>

1
android/res/layout/pager_fragment_all_pass_premium.xml
View file

@ -40,6 +40,7 @@
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="@dimen/subscription_view_pager_height"
android:overScrollMode="never"
app:autoScroll="true"
app:scrollPeriod="4000"/>

3
android/src/com/mapswithme/maps/purchase/AllPassPremiumActivity.java
View file

@ -1,7 +1,6 @@
package com.mapswithme.maps.purchase;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.mapswithme.maps.base.BaseMwmFragmentActivity;
public class AllPassPremiumActivity extends BaseMwmFragmentActivity

8
android/src/com/mapswithme/maps/purchase/AllPassPremiumFragment.java
View file

@ -1,14 +1,14 @@
package com.mapswithme.maps.purchase;
import android.databinding.DataBindingUtil;
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;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
import com.mapswithme.maps.R;
import com.mapswithme.maps.databinding.FragmentAllPassPremiumBinding;

14
android/src/com/mapswithme/maps/purchase/AllPassPremiumPagerFragment.java
View file

@ -1,17 +1,17 @@
package com.mapswithme.maps.purchase;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmFragment;
import com.mapswithme.maps.widget.DotPager;

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

@ -1,6 +1,7 @@
package com.mapswithme.maps.widget;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;

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

@ -1,8 +1,8 @@
package com.mapswithme.maps.widget;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.FragmentActivity;
public class PageViewProviderFactory
{

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

@ -1,12 +1,13 @@
package com.mapswithme.maps.widget;
import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager;
import androidx.appcompat.app.FragmentActivity;
import androidx.app.Activity;
import android.app.Activity;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager.widget.ViewPager;
import java.util.Collections;
import java.util.List;
@ -56,10 +57,10 @@ public class ParallaxBackgroundPageListener implements ViewPager.OnPageChangeLis
@Override
public void onPageScrollStateChanged(int state)
{
if (state == ViewPager.SCROLL_STATE_IDLE)
boolean isIdle = state == ViewPager.SCROLL_STATE_IDLE;
if (isIdle)
setIdlePosition();
boolean isIdle = state == ViewPager.SCROLL_STATE_IDLE;
mScrollStarted = isIdle && !mScrollStarted;
if (mScrollStarted)