Refactor library and sample to AndroidX packaging system.

terrakok · Nov 2, 2018 · 6b19559 · 6b19559
1 parent dd4fdb5
commit 6b19559
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 42 deletions.
diff --git a/gradle.properties b/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

diff --git a/library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppNavigator.java b/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;
 

diff --git a/library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppScreen.java b/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;
 

diff --git a/...java/android/support/v4/app/Fragment.java → .../java/androidx/fragment/app/Fragment.java b/...java/android/support/v4/app/Fragment.java → .../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)

diff --git a/...roid/support/v4/app/FragmentActivity.java → ...droidx/fragment/app/FragmentActivity.java b/...roid/support/v4/app/FragmentActivity.java → ...droidx/fragment/app/FragmentActivity.java
@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 import android.app.Activity;
 

diff --git a/...droid/support/v4/app/FragmentManager.java → ...ndroidx/fragment/app/FragmentManager.java b/...droid/support/v4/app/FragmentManager.java → ...ndroidx/fragment/app/FragmentManager.java
@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 /**
  * Created by Konstantin Tckhovrebov (aka @terrakok)

diff --git a/...d/support/v4/app/FragmentTransaction.java → ...idx/fragment/app/FragmentTransaction.java b/...d/support/v4/app/FragmentTransaction.java → ...idx/fragment/app/FragmentTransaction.java
@@ -1,4 +1,4 @@
-package android.support.v4.app;
+package androidx.fragment.app;
 
 /**
  * Created by Konstantin Tckhovrebov (aka @terrakok)

diff --git a/sample/build.gradle b/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"

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/Screens.java b/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;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/animations/ProfileActivity.java b/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;
 

diff --git a/...e/src/main/java/ru/terrakok/cicerone/sample/ui/animations/photos/SelectPhotoFragment.java b/...e/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;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/animations/profile/ProfileFragment.java b/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;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/BottomNavigationActivity.java b/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

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/ForwardFragment.java b/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;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/bottom/TabContainerFragment.java b/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;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/MainActivity.java b/sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/MainActivity.java
@@ -1,12 +1,11 @@
 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.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

diff --git a/sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/SampleFragment.java b/sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/SampleFragment.java
@@ -1,12 +1,12 @@
 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 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;

diff --git a/sample/src/main/res/layout/activity_start.xml b/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"/>

diff --git a/sample/src/main/res/layout/fragment_forward.xml b/sample/src/main/res/layout/fragment_forward.xml
@@ -7,15 +7,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="@color/primary"
         app:navigationIcon="@drawable/ic_arrow_back_white_24dp"
         app:title="@string/app_name"/>
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"/>
@@ -48,7 +48,7 @@
         android:text="github"
         android:textSize="20sp"/>
 
-    <android.support.v4.widget.Space
+    <androidx.legacy.widget.Space
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="1"/>

diff --git a/sample/src/main/res/layout/fragment_sample.xml b/sample/src/main/res/layout/fragment_sample.xml
@@ -5,7 +5,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"