GitHub/Cicerone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor library and sample to AndroidX packaging system.

Browse Source
This commit is contained in:
Roman Pihariev
2018-11-02 14:38:46 +02:00
parent dd4fdb5b83
commit 6b195590de
20 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+2 -1
View File
@@ -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
library/src/main/java/ru/terrakok/cicerone/android/support/SupportAppNavigator.java
+4 -4
View File
@@ -3,10 +3,10 @@ package ru.terrakok.cicerone.android.support;
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
+1 -1
View File
@@ -2,7 +2,7 @@ package ru.terrakok.cicerone.android.support;
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
+2 -1
View File
@@ -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 -1
View File
@@ -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 -1
View File
@@ -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 -1
View File
@@ -1,4 +1,4 @@
package android.support.v4.app;
package androidx.fragment.app;
/**
* Created by Konstantin Tckhovrebov (aka @terrakok)
sample/build.gradle
+5 -5
View File
@@ -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
+1 -1
View File
@@ -3,7 +3,7 @@ package ru.terrakok.cicerone.sample;
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
+4 -4
View File
@@ -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
+3 -2
View File
@@ -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 @@ import ru.terrakok.cicerone.sample.ui.common.BackButtonListener;
* 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 -1
View File
@@ -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
+5 -4
View File
@@ -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 @@ import ru.terrakok.cicerone.sample.ui.common.RouterProvider;
/**
* 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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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/MainActivity.java
+2 -3
View File
@@ -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;
sample/src/main/java/ru/terrakok/cicerone/sample/ui/main/SampleFragment.java
+2 -2
View File
@@ -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;
sample/src/main/res/layout/activity_start.xml
+2 -2
View File
@@ -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"/>
sample/src/main/res/layout/fragment_forward.xml
+3 -3
View File
@@ -7,7 +7,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"
@@ -15,7 +15,7 @@
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"/>
sample/src/main/res/layout/fragment_sample.xml
+1 -1
View File
@@ -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"