Migration to androidx

build.gradle

@@ -16,8 +16,8 @@ android {
 dependencies {
     api project(':libraries:core')
 
-    compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
+    compileOnly "androidx.appcompat:appcompat:$appcompat"
-    compileOnly "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    compileOnly "androidx.recyclerview:recyclerview:$androidx"
 
     compileOnly "io.reactivex:rxandroid:$rxAndroidVersion"
     compileOnly "io.reactivex:rxjava:$rxJavaVersion"

src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.components.adapters;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 
 import ru.touchin.roboswag.components.utils.LifecycleBindable;

src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java

@@ -20,17 +20,17 @@
 package ru.touchin.roboswag.components.adapters;
 
 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.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 import rx.Completable;

src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java

@@ -1,6 +1,6 @@
 package ru.touchin.roboswag.components.adapters;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 
 import java.util.List;

src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java

@@ -20,9 +20,9 @@
 package ru.touchin.roboswag.components.adapters;
 
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;

src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java

@@ -1,6 +1,6 @@
 package ru.touchin.roboswag.components.adapters;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewGroup;
 
 import java.util.List;

src/main/java/ru/touchin/roboswag/components/deeplinks/ActivityDeepLinkController.java

@@ -22,7 +22,7 @@ package ru.touchin.roboswag.components.deeplinks;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 
@@ -72,4 +72,4 @@ public abstract class ActivityDeepLinkController<TActivity extends BaseActivity>
         activity.getIntent().setData(null);
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/deeplinks/DeepLink.java

@@ -20,7 +20,7 @@
 package ru.touchin.roboswag.components.deeplinks;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 
@@ -48,4 +48,4 @@ public interface DeepLink<TActivity extends BaseActivity> {
      */
     void navigateTo(@NonNull TActivity activity, @NonNull Uri deepLinkUri);
 
-}
+}

src/main/java/ru/touchin/roboswag/components/deeplinks/DeepLinkController.java

@@ -22,8 +22,8 @@ package ru.touchin.roboswag.components.deeplinks;
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 
@@ -120,4 +120,4 @@ public abstract class DeepLinkController<TActivity extends BaseActivity> {
     protected abstract void processDeepLink(@NonNull final TActivity activity,
                                             @NonNull final Uri deepLinkUri);
 
-}
+}

src/main/java/ru/touchin/roboswag/components/deeplinks/SimpleActivityDeepLinkController.java

@@ -20,8 +20,8 @@
 package ru.touchin.roboswag.components.deeplinks;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 
@@ -48,4 +48,4 @@ public abstract class SimpleActivityDeepLinkController<TActivity extends BaseAct
     @Nullable
     protected abstract TDeepLink getDeepLinkByUri(@NonNull final Uri deepLinkUri);
 
-}
+}

src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java

@@ -20,7 +20,7 @@
 package ru.touchin.roboswag.components.navigation;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.io.Serializable;
 

src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java

@@ -22,12 +22,12 @@ package ru.touchin.roboswag.components.navigation;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.MenuItem;
 
 import ru.touchin.roboswag.core.log.Lc;
@@ -35,7 +35,7 @@ import rx.functions.Func1;
 
 /**
  * Created by Gavriil Sitnikov on 07/03/2016.
- * Navigation which is controlling fragments on activity using {@link android.support.v4.app.FragmentManager}.
+ * Navigation which is controlling fragments on activity using {@link androidx.core.app.FragmentManager}.
  * Basically there are 4 main actions to add fragments to activity.
  * 1) {@link #setInitial} means to set fragment on top and remove all previously added fragments from stack;
  * 2) {@link #push} means to simply add fragment on top of the stack;

src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.components.navigation;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 /**
  * Created by Gavriil Sitnikov on 08/10/2014.
@@ -30,10 +30,10 @@ import android.support.v4.app.Fragment;
 public interface OnFragmentStartedListener {
 
     /**
-     * Calls by child fragment (added via {@link android.support.v4.app.FragmentManager}) on it'sstart.
+     * Calls by child fragment (added via {@link androidx.core.app.FragmentManager}) on it'sstart.
      *
      * @param fragment Child fragment which called this method.
      */
     void onFragmentStarted(@NonNull Fragment fragment);
 
-}
+}

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 androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java

@@ -20,14 +20,14 @@
 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 android.view.MenuItem;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.FragmentManager;
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 
 /**
@@ -245,4 +245,4 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
         super.onDrawerSlide(drawerView, this.slideOffset);
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java

@@ -19,18 +19,19 @@
 
 package ru.touchin.roboswag.components.navigation;
 
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
-import android.support.annotation.ColorRes;
+import androidx.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -329,6 +330,13 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         destroyed = true;
     }
 
+    /**
+     * Callback from parent fragment.
+     */
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        // do nothing
+    }
+
     /**
      * Similar to {@link ViewControllerFragment#onOptionsItemSelected(MenuItem)}.
      *
@@ -503,4 +511,4 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
 
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java

@@ -20,12 +20,12 @@
 package ru.touchin.roboswag.components.navigation;
 
 import android.content.Context;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.navigation.fragments.SimpleViewControllerFragment;
@@ -500,4 +500,4 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
                 SimpleViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java

@@ -23,18 +23,18 @@ import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-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 android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
 import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;

src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.roboswag.components.navigation.activities;
 
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.Menu;
 import android.view.View;
 

src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java

@@ -20,8 +20,8 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;

src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java

@@ -20,7 +20,7 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;

src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java

@@ -20,7 +20,7 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;

src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.components.navigation.fragments;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;

src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java

@@ -20,12 +20,11 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -39,6 +38,8 @@ import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
@@ -122,6 +123,8 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
     private TState state;
     private boolean started;
     private boolean stateCreated;
+    @Nullable
+    private ActivityResult pendingActivityResult;
 
     private void tryCreateState(@Nullable final Context context) {
         if (!stateCreated && state != null && context != null) {
@@ -256,6 +259,10 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
     public void onActivityCreated(@NonNull final View view, @NonNull final TActivity activity, @Nullable final Bundle savedInstanceState) {
         super.onActivityCreated(view, activity, savedInstanceState);
         activitySubject.onNext(new Optional<>(activity));
+        if (viewController != null && pendingActivityResult != null) {
+            viewController.onActivityResult(pendingActivityResult.requestCode, pendingActivityResult.resultCode, pendingActivityResult.data);
+            pendingActivityResult = null;
+        }
     }
 
     @Override
@@ -384,12 +391,37 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         super.onDestroy();
     }
 
+
+    @Override
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        if (viewController != null) {
+            viewController.onActivityResult(requestCode, resultCode, data);
+        } else {
+            pendingActivityResult = new ActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     @NonNull
     @Override
     public String toString() {
         return super.toString() + "ViewController: " + getViewControllerClass();
     }
 
+    private static class ActivityResult {
+
+        public final int requestCode;
+        public final int resultCode;
+        @Nullable
+        public final Intent data;
+
+        ActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+            this.requestCode = requestCode;
+            this.resultCode = resultCode;
+            this.data = data;
+        }
+
+    }
+
     private static class PlaceholderView extends FrameLayout {
 
         @NonNull

src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java

@@ -20,11 +20,11 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.components.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
@@ -284,4 +284,4 @@ public class BaseLifecycleBindable implements LifecycleBindable {
         return throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on " + method + " at " + codePoint, throwable));
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.roboswag.components.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import rx.Completable;
 import rx.CompletableSubscriber;
@@ -33,7 +33,7 @@ import rx.functions.Action1;
 
 /**
  * Created by Gavriil Sitnikov on 15/04/16.
- * Interface that should be implemented by lifecycle-based elements ({@link android.app.Activity}, {@link android.support.v4.app.Fragment} etc.)
+ * Interface that should be implemented by lifecycle-based elements ({@link android.app.Activity}, {@link androidx.core.app.Fragment} etc.)
  * to not manually manage subscriptions.
  * Use {@link #untilStop(Observable)} method to subscribe to observable where you want and unsubscribe onStop.
  * Use {@link #untilDestroy(Observable)} method to subscribe to observable where you want and unsubscribe onDestroy.
@@ -311,4 +311,4 @@ public interface LifecycleBindable {
     @NonNull
     Subscription untilDestroy(@NonNull Completable completable, @NonNull Action0 onCompletedAction, @NonNull Action1<Throwable> onErrorAction);
 
-}
+}

src/main/java/ru/touchin/roboswag/components/utils/Logic.java

@@ -20,7 +20,7 @@
 package ru.touchin.roboswag.components.utils;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Constructor;

src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java

@@ -23,8 +23,8 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.StyleableRes;
+import androidx.annotation.StyleableRes;
 import android.util.AttributeSet;
 
 import java.io.IOException;
@@ -102,4 +102,4 @@ public final class Typefaces {
     private Typefaces() {
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java

@@ -27,10 +27,10 @@ import android.content.res.Resources;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;

src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java

@@ -25,7 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import rx.Observable;
 import rx.subjects.BehaviorSubject;

src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java

@@ -25,7 +25,7 @@ import android.media.AudioManager;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;

src/main/java/ru/touchin/roboswag/components/utils/images/BlurUtils.java

@@ -22,8 +22,8 @@ import android.renderscript.Element;
 import android.renderscript.RSRuntimeException;
 import android.renderscript.RenderScript;
 import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 public final class BlurUtils {
 

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 androidx.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 

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;

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);
     }
 
-}
+}

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 androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.Type;
 

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 androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.lang.reflect.Type;
 

src/main/java/ru/touchin/roboswag/components/views/AspectRatioFrameLayout.java

@@ -22,8 +22,8 @@ package ru.touchin.roboswag.components.views;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Point;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -251,4 +251,4 @@ public class AspectRatioFrameLayout extends FrameLayout {
         super.onLayout(changed, left, top, right, bottom);
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java

@@ -22,9 +22,9 @@ package ru.touchin.roboswag.components.views;
 
 import android.content.Context;
 import android.os.Parcelable;
-import android.support.annotation.AttrRes;
+import androidx.annotation.AttrRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 

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 androidx.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 
@@ -117,4 +117,4 @@ public class MaterialLoadingBar extends AppCompatImageView {
         progressDrawable.setColor(colorInt);
     }
 
-}
+}

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 androidx.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import ru.touchin.roboswag.components.utils.UiUtils;
 
@@ -289,4 +289,4 @@ public class MaterialProgressDrawable extends Drawable implements Runnable, Anim
 
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java

@@ -21,9 +21,9 @@ package ru.touchin.roboswag.components.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -344,4 +344,4 @@ public class TypefacedEditText extends AppCompatEditText {
 
     }
 
-}
+}

src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java

@@ -22,9 +22,6 @@ 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 android.text.TextUtils;
 import android.text.method.TransformationMethod;
 import android.util.AttributeSet;
@@ -33,6 +30,9 @@ import android.util.TypedValue;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
 import ru.touchin.roboswag.components.R;
 import ru.touchin.roboswag.components.utils.Typefaces;
 import ru.touchin.roboswag.components.utils.UiUtils;

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 androidx.annotation.NonNull;
-import android.support.annotation.StyleableRes;
+import androidx.annotation.StyleableRes;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.AttributeSet;