AndroidX migration

2018-09-28 21:40:03 +03:00 · 2018-09-28 21:40:03 +03:00 · 766132bc06
parent bf482870d0
commit 766132bc06
83 changed files with 200 additions and 196 deletions
--- a/api-logansquare/build.gradle
+++ b/api-logansquare/build.gradle
@ -17,7 +17,7 @@ dependencies {
    api project(":storable")
    api 'net.danlew:android.joda:2.9.9.4'

-    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+    implementation "androidx.annotation:annotation:$versions.androidx"
    implementation "com.squareup.retrofit2:retrofit:$versions.retrofit"
    implementation 'ru.touchin:logansquare:1.4.3'
 }
--- a/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
+++ b/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
@ -1,6 +1,6 @@
 package com.bluelinelabs.logansquare;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import java.lang.reflect.Type;

--- a/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
@ -19,8 +19,8 @@

 package ru.touchin.templates;

-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;

 import java.io.IOException;
 import java.io.Serializable;
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java
@ -20,8 +20,8 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
 import com.fasterxml.jackson.core.JsonGenerator;
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java
@ -19,7 +19,7 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 /**
 * Created by Gavriil Sitnikov.
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
@ -19,8 +19,8 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;

--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
@ -20,8 +20,8 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;

 import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java
@ -19,8 +19,8 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.bluelinelabs.logansquare.ConverterUtils;
 import com.bluelinelabs.logansquare.LoganSquare;
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java
@ -19,7 +19,7 @@

 package ru.touchin.templates.logansquare;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.templates.ApiModel;
--- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java
@ -20,8 +20,8 @@
 package ru.touchin.templates.logansquare;

 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import com.bluelinelabs.logansquare.LoganSquare;

--- a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java
@ -20,7 +20,7 @@
 package ru.touchin.templates.retrofit;


-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
--- a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
+++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
@ -19,7 +19,7 @@

 package ru.touchin.templates.retrofit;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import java.io.IOException;
 import java.io.InterruptedIOException;
@ -109,4 +109,4 @@ public abstract class JsonResponseBodyConverter<T> implements Converter<Response
    @NonNull
    protected abstract T parseResponse(@NonNull ResponseBody value) throws IOException;

-}
+}
--- a/build.gradle
+++ b/build.gradle
@ -27,8 +27,9 @@ ext {
    versions = [
            compileSdk    : 28,
            supportLibrary: '28.0.0',
+            androidx      : '1.0.0',
            navigation    : '1.0.0-alpha04',
-            lifecycle     : '1.1.1',
+            lifecycle     : '2.0.0',
            dagger        : '2.16',
            retrofit      : '2.4.0',
            rxJava        : '2.1.17',
--- a/gradle.properties
+++ b/gradle.properties
@ -6,6 +6,9 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
+
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
--- a/kotlin-extensions/build.gradle
+++ b/kotlin-extensions/build.gradle
@ -12,5 +12,5 @@ android {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:recyclerview-v7:$versions.supportLibrary"
+    implementation "androidx.recyclerview:recyclerview:$versions.androidx"
 }
--- a/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
+++ b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@ -3,13 +3,13 @@ package ru.touchin.roboswag.components.extensions
 import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.annotation.DrawableRes
-import android.support.annotation.IdRes
-import android.support.annotation.StringRes
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View

 fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)
--- a/lifecycle-common/build.gradle
+++ b/lifecycle-common/build.gradle
@ -21,7 +21,7 @@ dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+    implementation "androidx.appcompat:appcompat:$versions.androidx"

-    implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
+    implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"
 }
--- a/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt
@ -1,15 +1,15 @@
 package ru.touchin.templates.livedata

-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import java.util.concurrent.atomic.AtomicBoolean

 class SingleLiveEvent<T> : MutableLiveData<T>() {

    private val pending = AtomicBoolean(false)

-    override fun observe(owner: LifecycleOwner, observer: Observer<T?>) {
+    override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
        super.observe(owner, Observer { value ->
            if (pending.compareAndSet(true, false)) {
                observer.onChanged(value)
--- a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt
@ -1,11 +1,11 @@
 package ru.touchin.templates.viewmodel

 import android.app.Activity
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController

 object LifecycleViewModelProviders {
--- a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt
@ -1,7 +1,7 @@
 package ru.touchin.templates.viewmodel

-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider

 import javax.inject.Inject
 import javax.inject.Provider
--- a/lifecycle-rx/build.gradle
+++ b/lifecycle-rx/build.gradle
@ -15,9 +15,9 @@ dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+    implementation "androidx.appcompat:appcompat:$versions.androidx"

-    implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
+    implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"

    implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava"
    implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt
@ -1,6 +1,6 @@
 package ru.touchin.livedata.dispatcher

-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Maybe
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt
@ -1,6 +1,6 @@
 package ru.touchin.livedata.dispatcher

-import android.arch.lifecycle.MutableLiveData
+import androidx.lifecycle.MutableLiveData
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Maybe
--- a/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt
@ -1,7 +1,7 @@
 package ru.touchin.templates.viewmodel

-import android.arch.lifecycle.ViewModel
-import android.support.annotation.CallSuper
+import androidx.lifecycle.ViewModel
+import androidx.annotation.CallSuper
 import ru.touchin.livedata.dispatcher.BaseLiveDataDispatcher
 import ru.touchin.livedata.dispatcher.LiveDataDispatcher
 import ru.touchin.livedata.destroyable.BaseDestroyable
--- a/logging/build.gradle
+++ b/logging/build.gradle
@ -14,5 +14,5 @@ android {
 }

 dependencies {
-    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+    implementation "androidx.annotation:annotation:$versions.androidx"
 }
--- a/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.log;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;

 /**
@ -60,4 +60,4 @@ public class ConsoleLogProcessor extends LogProcessor {

    }

-}
+}
--- a/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java
@ -22,8 +22,8 @@ package ru.touchin.roboswag.core.log;
 import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;

--- a/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.log;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.text.SimpleDateFormat;
 import java.util.Locale;
--- a/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.log;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;

 /**
--- a/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.log;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 /**
 * Created by Gavriil Sitnikov on 13/11/2015.
--- a/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.utils;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 /**
 * Created by Gavriil Sitnikov on 13/11/2015.
--- a/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java
+++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.utils;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 /**
 * Created by Gavriil Sitnikov on 13/11/2015.
--- a/navigation/build.gradle
+++ b/navigation/build.gradle
@ -20,5 +20,5 @@ dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+    implementation "androidx.appcompat:appcompat:$versions.androidx"
 }
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation

 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.IdRes
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentTransaction
+import androidx.annotation.IdRes
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction
 import android.view.MenuItem

 import ru.touchin.roboswag.core.log.Lc
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
@ -2,8 +2,8 @@ package ru.touchin.roboswag.components.navigation;

 import android.os.Bundle;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.io.IOException;
 import java.io.ObjectInputStream;
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
@ -20,11 +20,11 @@
 package ru.touchin.roboswag.components.navigation;

 import android.animation.ValueAnimator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import android.view.MenuItem;
 import android.view.View;

--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation.activities;

 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.ArraySet;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.collection.ArraySet;
+import androidx.appcompat.app.AppCompatActivity;

 import java.util.Set;

--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@ -21,17 +21,17 @@ package ru.touchin.roboswag.components.navigation.fragments;

 import android.animation.Animator;
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.support.annotation.CallSuper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@ -20,27 +20,27 @@
 package ru.touchin.roboswag.components.navigation.viewcontrollers;

 import android.animation.Animator;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.LifecycleRegistry;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.CallSuper;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.CallSuper;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@ -21,11 +21,11 @@ package ru.touchin.roboswag.components.navigation.viewcontrollers

 import android.content.Context
 import android.os.Parcelable
-import android.support.annotation.IdRes
-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.annotation.IdRes
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentTransaction

 import ru.touchin.roboswag.components.navigation.FragmentNavigation
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
--- a/recyclerview-adapters/build.gradle
+++ b/recyclerview-adapters/build.gradle
@ -14,5 +14,5 @@ dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:recyclerview-v7:$versions.supportLibrary"
+    implementation "androidx.recyclerview:recyclerview:$versions.androidx"
 }
--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@ -19,9 +19,9 @@

 package ru.touchin.roboswag.components.adapters;

-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;

 import java.util.List;
--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
@ -1,6 +1,6 @@
 package ru.touchin.roboswag.components.adapters

-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.SparseArray
 import android.view.ViewGroup

--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@ -1,9 +1,9 @@
 package ru.touchin.roboswag.components.adapters

-import android.support.v7.recyclerview.extensions.AsyncDifferConfig
-import android.support.v7.recyclerview.extensions.AsyncListDiffer
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.AsyncDifferConfig
+import androidx.recyclerview.widget.AsyncListDiffer
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import ru.touchin.roboswag.components.extensions.setOnRippleClickListener

--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@ -1,7 +1,7 @@
 package ru.touchin.roboswag.components.adapters;

-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 import java.util.List;

--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
@ -1,7 +1,7 @@
 package ru.touchin.roboswag.components.adapters

-import android.support.v7.util.ListUpdateCallback
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.ListUpdateCallback
+import androidx.recyclerview.widget.RecyclerView

 class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback  {

--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@ -1,7 +1,7 @@
 package ru.touchin.roboswag.components.adapters;

-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;

 import java.util.List;

--- a/sample/build.gradle
+++ b/sample/build.gradle
@ -24,8 +24,8 @@ android {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

-    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "androidx.appcompat:appcompat:$versions.androidx"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
 }

 ext.buildScriptsDir = "$rootDir/BuildScripts"
--- a/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
+++ b/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
@ -1,6 +1,6 @@
 package ru.touchin.roboswag.components

-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle

 class MainActivity : AppCompatActivity() {
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
@ -16,4 +16,4 @@
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/storable/build.gradle
+++ b/storable/build.gradle
@ -17,7 +17,7 @@ dependencies {
    api project(":utils")
    api project(":logging")

-    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+    implementation "androidx.annotation:annotation:$versions.androidx"

    implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava"
    implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"
--- a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
+++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
@ -20,8 +20,8 @@
 package ru.touchin.roboswag.components.utils.storables;

 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;

--- a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
+++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
@ -20,8 +20,8 @@
 package ru.touchin.roboswag.components.utils.storables;

 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;

--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java
@ -13,8 +13,8 @@

 package ru.touchin.roboswag.core.observables;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;
 import java.util.concurrent.Executors;
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;

--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import java.util.Arrays;
 import java.util.List;
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import io.reactivex.Single;

--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.util.concurrent.TimeUnit;

--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java
@ -1,7 +1,7 @@
 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;

--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;
 import java.util.concurrent.TimeUnit;
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.observables.storable;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.lang.reflect.Type;

--- a/templates/build.gradle
+++ b/templates/build.gradle
@ -19,11 +19,11 @@ dependencies {
    api project(":api-logansquare")
    api project(":navigation")

-    api 'com.android.support:multidex:1.0.3'
+    api 'androidx.multidex:multidex:2.0.0'

    api 'net.danlew:android.joda:2.9.9.4'

-    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+    implementation "androidx.appcompat:appcompat:$versions.androidx"

    implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") {
        transitive = true
--- a/templates/src/main/java/ru/touchin/templates/TouchinActivity.java
+++ b/templates/src/main/java/ru/touchin/templates/TouchinActivity.java
@ -24,11 +24,11 @@ import android.content.Intent;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;

 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 import ru.touchin.roboswag.core.log.Lc;
--- a/templates/src/main/java/ru/touchin/templates/TouchinApp.java
+++ b/templates/src/main/java/ru/touchin/templates/TouchinApp.java
@ -22,9 +22,9 @@ package ru.touchin.templates;
 import android.app.Application;
 import android.content.Context;
 import android.os.StrictMode;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.multidex.MultiDex;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.multidex.MultiDex;
 import android.util.Log;

 import com.crashlytics.android.Crashlytics;
--- a/utils/build.gradle
+++ b/utils/build.gradle
@ -14,5 +14,5 @@ android {
 }

 dependencies {
-    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+    implementation "androidx.annotation:annotation:$versions.androidx"
 }
--- a/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
+++ b/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
@ -1,6 +1,6 @@
 package ru.touchin.defaults;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Editable;
 import android.text.TextWatcher;

--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@ -25,8 +25,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;
--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.components.utils.spans;

-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;

--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
@ -3,7 +3,7 @@ package ru.touchin.roboswag.components.utils.spans;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 import android.view.View;
--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
@ -21,7 +21,7 @@ package ru.touchin.roboswag.components.utils.spans;

 import android.graphics.Paint;
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;

@ -52,4 +52,4 @@ public class TypefaceSpan extends MetricAffectingSpan {
        textPaint.setFlags(textPaint.getFlags() | Paint.SUBPIXEL_TEXT_FLAG);
    }

-}
+}
--- a/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java
@ -19,8 +19,8 @@

 package ru.touchin.roboswag.core.utils;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import java.util.Arrays;
 import java.util.Collection;
--- a/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.utils;

-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;

 import java.io.Serializable;

--- a/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java
@ -21,8 +21,8 @@ package ru.touchin.roboswag.core.utils;

 import android.app.Service;
 import android.os.Binder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 /**
 * Created by Gavriil Sitnikov on 03/10/2015.
--- a/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java
@ -19,7 +19,7 @@

 package ru.touchin.roboswag.core.utils;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
--- a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
+++ b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
@ -26,7 +26,7 @@ import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Process;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.TelephonyManager;

 /**
--- a/views/build.gradle
+++ b/views/build.gradle
@ -17,5 +17,5 @@ dependencies {
    api project(":utils")
    api project(":logging")

-    implementation "com.android.support:design:$versions.supportLibrary"
+    implementation 'com.google.android.material:material:1.0.0'
 }
--- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
@ -22,10 +22,10 @@ package ru.touchin.roboswag.components.views;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.TypedValue;

--- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
@ -30,9 +30,9 @@ import android.graphics.RectF;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;

 import ru.touchin.roboswag.components.utils.UiUtils;

@ -289,4 +289,4 @@ public class MaterialProgressDrawable extends Drawable implements Runnable, Anim

    }

-}
+}
--- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.views;

 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
--- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
@ -22,9 +22,9 @@ package ru.touchin.roboswag.components.views;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.text.TextUtils;
 import android.text.method.TransformationMethod;
 import android.util.AttributeSet;
--- a/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
@ -21,8 +21,8 @@ package ru.touchin.roboswag.components.views.internal;

 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleableRes;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;
--- a/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java
+++ b/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java
@ -2,14 +2,14 @@ package ru.touchin.roboswag.widget;

 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.transition.Fade;
-import android.support.transition.Transition;
-import android.support.transition.TransitionInflater;
-import android.support.transition.TransitionManager;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.transition.Fade;
+import androidx.transition.Transition;
+import androidx.transition.TransitionInflater;
+import androidx.transition.TransitionManager;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;