Merge branch 'develop'

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
+        classpath 'com.android.tools.build:gradle:3.5.0-alpha01'
 
         // For the library uploading to the Bintray
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'

gradle.properties

@@ -12,7 +12,8 @@
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
+android.enableJetifier=true
+android.useAndroidX=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 27 15:42:22 MSK 2018
+#Fri Jan 25 22:04:15 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-milestone-1-all.zip

library/build.gradle

@@ -16,7 +16,7 @@ ext {
     bintrayName = 'cicerone'
     publishedGroupId = 'ru.terrakok.cicerone'
     artifact = 'cicerone'
-    libraryVersion = '4.0.2'
+    libraryVersion = '5.0.0'
     gitUrl = 'https://github.com/terrakok/Cicerone'
     allLicenses = ['MIT']
 }

library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppNavigator.java

@@ -3,10 +3,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import java.util.LinkedList;
 

library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppScreen.java

@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import ru.terrakok.cicerone.Screen;
 

library/stub-android/src/main/java/android/support/v4/app/Fragment.java → library/stub-android/src/main/java/androidx/fragment/app/Fragment.java

@@ -1,6 +1,7 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
 
 /**
  * Created by Konstantin Tckhovrebov (aka @terrakok)

library/stub-android/src/main/java/android/support/v4/app/FragmentActivity.java → library/stub-android/src/main/java/androidx/fragment/app/FragmentActivity.java

@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 import android.app.Activity;
 

library/stub-android/src/main/java/android/support/v4/app/FragmentManager.java → library/stub-android/src/main/java/androidx/fragment/app/FragmentManager.java

@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 /**
  * Created by Konstantin Tckhovrebov (aka @terrakok)

library/stub-android/src/main/java/android/support/v4/app/FragmentTransaction.java → library/stub-android/src/main/java/androidx/fragment/app/FragmentTransaction.java

@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 /**
  * Created by Konstantin Tckhovrebov (aka @terrakok)

sample/build.gradle

@@ -5,11 +5,11 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0.0"
         applicationId "ru.terrakok.cicerone.sample"
@@ -27,15 +27,15 @@ android {
 }
 
 ext {
-    supportLibraryVersion = "25.3.0"
+    androidXVersion = "1.0.0"
     moxyVersion = "1.4.6"
     daggerVersion = "2.10"
 }
 
 dependencies {
     // Support libraries
-    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
-    implementation "com.android.support:design:$supportLibraryVersion"
+    implementation "androidx.appcompat:appcompat:$androidXVersion"
+    implementation "com.google.android.material:material:$androidXVersion"
 
     //MVP Moxy
     implementation "com.arello-mobile:moxy:$moxyVersion"

sample/src/main/java/ru/terrakok/cicerone/sample/Screens.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import ru.terrakok.cicerone.android.support.SupportAppScreen;
 import ru.terrakok.cicerone.sample.ui.animations.ProfileActivity;

sample/src/main/java/ru/terrakok/cicerone/sample/ui/animations/ProfileActivity.java

@@ -1,10 +1,10 @@
 package ru.terrakok.cicerone.sample.ui.animations;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.transition.ChangeBounds;
 import android.view.View;
 

sample/src/main/java/ru/terrakok/cicerone/sample/ui/animations/photos/SelectPhotoFragment.java

@@ -1,12 +1,12 @@
 package ru.terrakok.cicerone.sample.ui.animations.photos;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
 import com.arellomobile.mvp.MvpAppCompatFragment;
 import com.arellomobile.mvp.presenter.InjectPresenter;
 import com.arellomobile.mvp.presenter.ProvidePresenter;
@@ -26,7 +26,8 @@
  * Created by Konstantin Tskhovrebov (aka @terrakok) on 14.07.17.
  */
 
-public class SelectPhotoFragment extends MvpAppCompatFragment implements SelectPhotoView, BackButtonListener {
+public class SelectPhotoFragment extends MvpAppCompatFragment
+    implements SelectPhotoView, BackButtonListener {
     private static final String ARG_ANIM_DESTINATION = "arg_anim_dest";
 
     private ImageView photo1;

sample/src/main/java/ru/terrakok/cicerone/sample/ui/animations/profile/ProfileFragment.java

@@ -1,12 +1,12 @@
 package ru.terrakok.cicerone.sample.ui.animations.profile;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
 import com.arellomobile.mvp.MvpAppCompatFragment;
 import com.arellomobile.mvp.presenter.InjectPresenter;
 import com.arellomobile.mvp.presenter.ProvidePresenter;

sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/BottomNavigationActivity.java

@@ -1,9 +1,9 @@
 package ru.terrakok.cicerone.sample.ui.bottom;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.arellomobile.mvp.MvpAppCompatActivity;
 import com.arellomobile.mvp.presenter.InjectPresenter;
@@ -27,7 +27,8 @@
 /**
  * Created by terrakok 25.11.16
  */
-public class BottomNavigationActivity extends MvpAppCompatActivity implements BottomNavigationView, RouterProvider {
+public class BottomNavigationActivity extends MvpAppCompatActivity
+    implements BottomNavigationView, RouterProvider {
     private BottomNavigationBar bottomNavigationBar;
 
     @Inject

sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/ForwardFragment.java

@@ -1,13 +1,13 @@
 package ru.terrakok.cicerone.sample.ui.bottom;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import com.arellomobile.mvp.MvpAppCompatFragment;
 import com.arellomobile.mvp.presenter.InjectPresenter;
 import com.arellomobile.mvp.presenter.ProvidePresenter;

sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/TabContainerFragment.java

@@ -1,8 +1,8 @@
 package ru.terrakok.cicerone.sample.ui.bottom;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/BaseFragment.java

@@ -0,0 +1,39 @@
+package ru.terrakok.cicerone.sample.ui.main;
+
+import android.content.Context;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import com.arellomobile.mvp.MvpAppCompatFragment;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.List;
+
+public abstract class BaseFragment extends MvpAppCompatFragment {
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        FragmentActivity activity = getActivity();
+        if (activity instanceof ChainHolder) {
+            ((ChainHolder) activity).getChain().add(new WeakReference<Fragment>(this));
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        FragmentActivity activity = getActivity();
+        if (activity instanceof ChainHolder) {
+            List<WeakReference<Fragment>> chain = ((ChainHolder) activity).getChain();
+            for (Iterator<WeakReference<Fragment>> it = chain.iterator(); it.hasNext();) {
+                WeakReference<Fragment> fragmentReference = it.next();
+                Fragment fragment = fragmentReference.get();
+                if (fragment != null && fragment == this) {
+                    it.remove();
+                    break;
+                }
+            }
+        }
+        super.onDetach();
+    }
+}

sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/ChainHolder.java

@@ -0,0 +1,10 @@
+package ru.terrakok.cicerone.sample.ui.main;
+
+import androidx.fragment.app.Fragment;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+public interface ChainHolder {
+    List<WeakReference<Fragment>> getChain();
+}

sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/MainActivity.java

@@ -1,16 +1,17 @@
 package ru.terrakok.cicerone.sample.ui.main;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.widget.TextView;
 
 import com.arellomobile.mvp.MvpAppCompatActivity;
-
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import java.util.List;
 import javax.inject.Inject;
 
 import ru.terrakok.cicerone.Navigator;
@@ -28,8 +29,9 @@
  * on 11.10.16
  */
 
-public class MainActivity extends MvpAppCompatActivity {
+public class MainActivity extends MvpAppCompatActivity implements ChainHolder {
     private TextView screensSchemeTV;
+    private List<WeakReference<Fragment>> chain = new ArrayList<>();
 
     @Inject
     NavigatorHolder navigatorHolder;
@@ -84,10 +86,11 @@ public void onBackPressed() {
 
     private void printScreensScheme() {
         ArrayList<SampleFragment> fragments = new ArrayList<>();
-        for (Fragment fragment : getSupportFragmentManager().getFragments()) {
-            if (fragment instanceof SampleFragment) {
-                fragments.add((SampleFragment) fragment);
-            }
+        for (WeakReference<Fragment> fragmentReference : chain) {
+          Fragment fragment = fragmentReference.get();
+          if (fragment != null && fragment instanceof SampleFragment) {
+            fragments.add((SampleFragment) fragment);
+          }
         }
         Collections.sort(fragments, new Comparator<SampleFragment>() {
             @Override
@@ -105,4 +108,9 @@ public int compare(SampleFragment f1, SampleFragment f2) {
         }
         screensSchemeTV.setText("Chain: " + keys.toString() + "");
     }
+
+    @Override
+    public List<WeakReference<Fragment>> getChain() {
+        return chain;
+    }
 }

sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/SampleFragment.java

@@ -1,13 +1,11 @@
 package ru.terrakok.cicerone.sample.ui.main;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
-import com.arellomobile.mvp.MvpAppCompatFragment;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import com.arellomobile.mvp.presenter.InjectPresenter;
 import com.arellomobile.mvp.presenter.ProvidePresenter;
 
@@ -25,7 +23,7 @@
  * on 11.10.16
  */
 
-public class SampleFragment extends MvpAppCompatFragment implements SampleView, BackButtonListener {
+public class SampleFragment extends BaseFragment implements SampleView, BackButtonListener {
     private static final String EXTRA_NUMBER = "extra_number";
     private static final String EXTRA_TIME = "extra_time";
 

sample/src/main/res/layout/activity_start.xml

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"/>
@@ -18,7 +18,7 @@
         android:text="@string/cicerone_description"
         android:textSize="18sp"/>
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"/>