Merge branch 'develop'

advancedscreenswitchersample/build.gradle

@@ -1,17 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "me.aartikov.advancedscreenswitchersample"
         minSdkVersion 15
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {
@@ -28,16 +28,16 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
+        exclude group: 'androidx.annotation', module: 'annotation'
     })
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
     testImplementation 'junit:junit:4.12'
 
     implementation project (':alligator')
     annotationProcessor project(':alligator-compiler')
 
-    implementation 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    implementation 'com.jakewharton:butterknife:10.1.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 }

advancedscreenswitchersample/src/androidTest/java/me/aartikov/advancedscreenswitchersample/ExampleInstrumentedTest.java

@@ -1,14 +1,14 @@
 package me.aartikov.advancedscreenswitchersample;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumentation test, which will execute on an Android device.

advancedscreenswitchersample/src/main/java/me/aartikov/advancedscreenswitchersample/SampleTransitionAnimationProvider.java

@@ -1,13 +1,14 @@
 package me.aartikov.advancedscreenswitchersample;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import me.aartikov.alligator.animations.AnimationData;
 import me.aartikov.alligator.Screen;
-import me.aartikov.alligator.animations.TransitionAnimation;
-import me.aartikov.alligator.animations.providers.TransitionAnimationProvider;
 import me.aartikov.alligator.TransitionType;
+import me.aartikov.alligator.animations.AnimationData;
 import me.aartikov.alligator.animations.SimpleTransitionAnimation;
+import me.aartikov.alligator.animations.TransitionAnimation;
+import me.aartikov.alligator.animations.providers.TransitionAnimationProvider;
 
 /**
  * Date: 28.02.2017
@@ -17,7 +18,9 @@
  */
 public class SampleTransitionAnimationProvider implements TransitionAnimationProvider {
 	@Override
-	public TransitionAnimation getAnimation(TransitionType transitionType, Class<? extends Screen> screenClassFrom, Class<? extends Screen> screenClassTo, boolean isActivity, @Nullable AnimationData animationData) {
+	@NonNull
+	public TransitionAnimation getAnimation(@NonNull TransitionType transitionType, @NonNull Class<? extends Screen> screenClassFrom, @NonNull Class<? extends Screen> screenClassTo,
+	                                        boolean isActivity, @Nullable AnimationData animationData) {
 		if (isActivity) {
 			return TransitionAnimation.DEFAULT;
 		} else {

advancedscreenswitchersample/src/main/java/me/aartikov/advancedscreenswitchersample/ui/InnerFragment.java

@@ -1,8 +1,6 @@
 package me.aartikov.advancedscreenswitchersample.ui;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +9,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;

advancedscreenswitchersample/src/main/java/me/aartikov/advancedscreenswitchersample/ui/MainActivity.java

@@ -7,13 +7,14 @@
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import me.aartikov.advancedscreenswitchersample.R;
@@ -78,7 +79,7 @@ protected void onResumeFragments() {
 
 	@Override
 	protected void onPause() {
-		mNavigationContextBinder.unbind();
+		mNavigationContextBinder.unbind(this);
 		super.onPause();
 	}
 
@@ -110,7 +111,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
 	}
 
 	@Override
-	public void onScreenSwitched(@Nullable Screen screenFrom, Screen screenTo) {
+	public void onScreenSwitched(@Nullable Screen screenFrom, @NonNull Screen screenTo) {
 		int tabId = getTabId(screenTo);
 		mBottomBar.getMenu().findItem(tabId).setChecked(true);
 		bindNavigationContext();    // rebind NavigationContext because we need to set another container id and another child fragment manager.

advancedscreenswitchersample/src/main/java/me/aartikov/advancedscreenswitchersample/ui/TabFragment.java

@@ -1,13 +1,13 @@
 package me.aartikov.advancedscreenswitchersample.ui;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;

advancedscreenswitchersample/src/main/res/layout/activity_main.xml

@@ -11,7 +11,7 @@
 		android:layout_height="0dp"
 		android:layout_weight="1" />
 
-	<android.support.design.widget.BottomNavigationView
+	<com.google.android.material.bottomnavigation.BottomNavigationView
 		android:id="@+id/bottom_bar"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

alligator-compiler/src/main/java/me/aartikov/alligator/annotations/RegisterScreen.java

@@ -9,7 +9,7 @@
 import me.aartikov.alligator.ScreenResult;
 
 @Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
+@Retention(RetentionPolicy.CLASS)
 public @interface RegisterScreen {
 	Class<? extends Screen> value();
 

alligator-compiler/src/main/java/me/aartikov/alligatorcompiler/RegistrationAnnotatedClassCreator.java

@@ -7,8 +7,8 @@
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.MirroredTypeException;
 
-import me.aartikov.alligator.annotations.RegisterScreen;
 import me.aartikov.alligator.ScreenResult;
+import me.aartikov.alligator.annotations.RegisterScreen;
 
 public class RegistrationAnnotatedClassCreator {
 	private ProcessingUtils utils;
@@ -52,7 +52,7 @@ private ScreenType obtainScreenType(TypeElement classElement) throws ProcessingE
 				return screenType;
 			}
 		}
-		throw new ProcessingException(classElement, "Only Activity, support Fragment and support DialogFragment can be annotated with @RegisterScreen.");
+		throw new ProcessingException(classElement, "Only Activity, AndroidX Fragment and AndroidX DialogFragment can be annotated with @RegisterScreen.");
 	}
 
 	private String obtainScreenClassName(TypeElement classElement) {

alligator-compiler/src/main/java/me/aartikov/alligatorcompiler/ScreenType.java

@@ -2,8 +2,8 @@
 
 public enum ScreenType {
 	ACTIVITY("android.app.Activity"),
-	DIALOG_FRAGMENT("android.support.v4.app.DialogFragment"),
-	FRAGMENT("android.support.v4.app.Fragment");
+	DIALOG_FRAGMENT("androidx.fragment.app.DialogFragment"),
+	FRAGMENT("androidx.fragment.app.Fragment");
 
 	private final String className;
 

alligator-compiler/src/main/resources/META-INF/gradle/incremental.annotation.processors

@@ -0,0 +1 @@
+me.aartikov.alligatorcompiler.AlligatorCompiler,aggregating

alligator/build.gradle

@@ -4,8 +4,8 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.aartikov'
 
 android {
-	compileSdkVersion 26
-	buildToolsVersion "26.0.2"
+	compileSdkVersion 28
+	buildToolsVersion "28.0.3"
 
 	defaultConfig {
 		minSdkVersion 14
@@ -20,7 +20,7 @@ android {
 
 dependencies {
 	implementation fileTree(include: ['*.jar'], dir: 'libs')
-	implementation 'com.android.support:appcompat-v7:26.1.0'
+	implementation 'androidx.appcompat:appcompat:1.0.2'
 }
 
 task sourcesJar(type: Jar) {

alligator/src/main/java/me/aartikov/alligator/ActivityResult.java

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
+import androidx.annotation.Nullable;
 
 /**
  * Date: 12.03.2017
@@ -16,9 +17,10 @@
  */
 public class ActivityResult {
 	private int mResultCode;
+	@Nullable
 	private Intent mIntent;
 
-	public ActivityResult(int resultCode, Intent intent) {
+	public ActivityResult(int resultCode, @Nullable Intent intent) {
 		mResultCode = resultCode;
 		mIntent = intent;
 	}
@@ -27,10 +29,12 @@ public int getResultCode() {
 		return mResultCode;
 	}
 
+	@Nullable
 	public Intent getIntent() {
 		return mIntent;
 	}
 
+	@Nullable
 	public Uri getDataUri() {
 		return mIntent != null ? mIntent.getData() : null;
 	}

alligator/src/main/java/me/aartikov/alligator/ActivityResultHandler.java

@@ -1,6 +1,8 @@
 package me.aartikov.alligator;
 
 import android.content.Intent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import me.aartikov.alligator.helpers.ScreenResultHelper;
 import me.aartikov.alligator.listeners.ScreenResultListener;
@@ -23,11 +25,11 @@ public class ActivityResultHandler {
 	private ScreenResultListener mScreenResultListener;
 	private ScreenResultPair mPendingScreenResultPair;
 
-	ActivityResultHandler(NavigationFactory navigationFactory) {
+	ActivityResultHandler(@NonNull NavigationFactory navigationFactory) {
 		mNavigationFactory = navigationFactory;
 	}
 
-	void setScreenResultListener(ScreenResultListener screenResultListener) {
+	void setScreenResultListener(@NonNull ScreenResultListener screenResultListener) {
 		mScreenResultListener = screenResultListener;
 		handlePendingScreenResult();
 	}
@@ -43,7 +45,7 @@ void resetScreenResultListener() {
 	 * @param resultCode  resultCode passed to {@code onActivityResult}
 	 * @param data        intent passed to {@code onActivityResult}
 	 */
-	public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+	public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 		Class<? extends Screen> screenClass = mNavigationFactory.getScreenClass(requestCode);
 		if (screenClass != null) {
 			ScreenImplementation screenImplementation = mNavigationFactory.getScreenImplementation(screenClass);
@@ -62,7 +64,7 @@ public void onActivityResult(final int requestCode, final int resultCode, final
 	 *
 	 * @param intent intent passed to {@code onNewIntent}
 	 */
-	public void onNewIntent(Intent intent) {
+	public void onNewIntent(@NonNull Intent intent) {
 		int requestCode = intent.getIntExtra(ScreenResultHelper.KEY_REQUEST_CODE, -1);
 		if (requestCode != -1) {
 			int resultCode = intent.getIntExtra(ScreenResultHelper.KEY_RESULT_CODE, 0);
@@ -81,7 +83,7 @@ private class ScreenResultPair {
 		Class<? extends Screen> mScreenClass;
 		ScreenResult mScreenResult;
 
-		ScreenResultPair(Class<? extends Screen> screenClass, ScreenResult screenResult) {
+		ScreenResultPair(@NonNull Class<? extends Screen> screenClass, @Nullable ScreenResult screenResult) {
 			mScreenClass = screenClass;
 			mScreenResult = screenResult;
 		}