migration to androidx

build.gradle

@@ -21,14 +21,14 @@ dependencies {
     api project(path: ':libraries:components')
 
     api 'net.danlew:android.joda:2.9.9'
-    api 'com.android.support:multidex:1.0.2'
+    api 'androidx.multidex:multidex:2.0.1'
     api "io.reactivex:rxandroid:$rxAndroidVersion"
     api "io.reactivex:rxjava:$rxJavaVersion"
 
-    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 'com.squareup.retrofit2:retrofit:2.3.0'
+    compileOnly "com.squareup.retrofit2:retrofit:$retrofit"
     compileOnly('com.google.http-client:google-http-client-jackson2:1.23.0') {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }

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;
 

src/main/java/ru/touchin/templates/ApiModel.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates;
 
-import android.support.annotation.CallSuper;
+import androidx.annotation.CallSuper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 import java.io.Serializable;

src/main/java/ru/touchin/templates/CryptoUtils.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.tozny.crypto.android.AesCbcWithIntegrity;
 

src/main/java/ru/touchin/templates/DeviceUtils.java

@@ -26,7 +26,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
@@ -220,4 +220,4 @@ public final class DeviceUtils {
 
     }
 
-}
+}

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 androidx.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.utils.Logic;

src/main/java/ru/touchin/templates/TouchinApp.java

@@ -23,9 +23,6 @@ import android.app.Application;
 import android.content.Context;
 import android.os.Looper;
 import android.os.StrictMode;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.multidex.MultiDex;
 import android.util.Log;
 
 import com.crashlytics.android.Crashlytics;
@@ -37,6 +34,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.multidex.MultiDex;
 import io.fabric.sdk.android.Fabric;
 import ru.touchin.roboswag.components.adapters.ObservableCollectionAdapter;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;

src/main/java/ru/touchin/templates/TouchinService.java

@@ -23,7 +23,7 @@ import android.app.Service;
 import android.content.Intent;
 import android.os.Handler;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.utils.Logic;

src/main/java/ru/touchin/templates/calendar/CalendarAdapter.java

@@ -19,10 +19,6 @@
 
 package ru.touchin.templates.calendar;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.ViewGroup;
 
 import org.joda.time.DateTime;
@@ -31,6 +27,10 @@ import org.joda.time.format.DateTimeFormat;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 
 /**
@@ -337,4 +337,4 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
 
     }
 
-}
+}

src/main/java/ru/touchin/templates/calendar/CalendarDayItem.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.calendar;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Ilia Kurtov on 17/03/2016.
@@ -84,4 +84,4 @@ public class CalendarDayItem implements CalendarItem {
         return comparingToToday;
     }
 
-}
+}

src/main/java/ru/touchin/templates/calendar/CalendarRecyclerView.java

@@ -20,12 +20,12 @@
 package ru.touchin.templates.calendar;
 
 import android.content.Context;
-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.support.v7.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import ru.touchin.roboswag.core.log.Lc;
 
 /**
@@ -91,4 +91,4 @@ public class CalendarRecyclerView extends RecyclerView {
         Lc.assertion("Unsupported adapter class. Use CalendarAdapter instead.");
     }
 
-}
+}

src/main/java/ru/touchin/templates/calendar/CalendarUtils.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.calendar;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeFieldType;
@@ -270,4 +270,4 @@ public final class CalendarUtils {
     private CalendarUtils() {
     }
 
-}
+}

src/main/java/ru/touchin/templates/chat/Chat.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.chat;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/ru/touchin/templates/googlejson/GoogleJsonFactory.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.googlejson;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.api.client.http.json.JsonHttpContent;
 import com.google.api.client.json.jackson2.JacksonFactory;
@@ -88,4 +88,4 @@ public class GoogleJsonFactory extends Converter.Factory {
 
     }
 
-}
+}

src/main/java/ru/touchin/templates/googlejson/GoogleJsonModel.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.googlejson;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
@@ -114,4 +114,4 @@ public abstract class GoogleJsonModel extends ApiModel {
         super();
     }
 
-}
+}

src/main/java/ru/touchin/templates/googlejson/GoogleJsonPreferences.java

@@ -20,8 +20,8 @@
 package ru.touchin.templates.googlejson;
 
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.api.client.http.json.JsonHttpContent;
 

src/main/java/ru/touchin/templates/googlejson/GoogleJsonRequest.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.googlejson;
 
-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.InputStream;
@@ -84,4 +84,4 @@ public abstract class GoogleJsonRequest<T> extends HttpRequest<T> {
         POST
     }
 
-}
+}

src/main/java/ru/touchin/templates/googlejson/GoogleJsonSocketEvent.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.googlejson;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.IOException;
 

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.

src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.logansquare;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;
 

src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java

@@ -20,8 +20,8 @@
 
 package ru.touchin.templates.logansquare;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
 import com.fasterxml.jackson.core.JsonGenerator;

src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.logansquare;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bluelinelabs.logansquare.ConverterUtils;
 import com.bluelinelabs.logansquare.LoganSquare;
@@ -108,4 +108,4 @@ public class LoganSquareJsonFactory extends Converter.Factory {
 
     }
 
-}
+}

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;

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 androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 

src/main/java/ru/touchin/templates/postprocessors/BlurPostprocessor.java

@@ -22,7 +22,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.os.Build;
 import android.renderscript.RSRuntimeException;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.cache.common.CacheKey;
 import com.facebook.cache.common.SimpleCacheKey;
@@ -102,4 +102,4 @@ public class BlurPostprocessor extends BasePostprocessor {
         return new SimpleCacheKey("radius=" + radius + ",sampling=" + sampling);
     }
 
-}
+}

src/main/java/ru/touchin/templates/requests/HttpRequest.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.requests;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -237,4 +237,4 @@ public abstract class HttpRequest<T> {
 
     }
 
-}
+}

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;

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

src/main/java/ru/touchin/templates/socket/SocketConnection.java

@@ -19,9 +19,9 @@
 
 package ru.touchin.templates.socket;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 

src/main/java/ru/touchin/templates/socket/SocketEvent.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.socket;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.IOException;
 

src/main/java/ru/touchin/templates/socket/SocketMessageHandler.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.socket;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Gavriil Sitnikov on 29/02/16.

src/main/java/ru/touchin/templates/validation/ValidationFunc.java

@@ -1,6 +1,6 @@
 package ru.touchin.templates.validation;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Serializable;
 
@@ -25,4 +25,4 @@ public interface ValidationFunc<TInput, TReturn> extends Serializable {
     @NonNull
     TReturn call(@NonNull final TInput input) throws Throwable;
 
-}
+}

src/main/java/ru/touchin/templates/validation/ValidationState.java

@@ -20,7 +20,7 @@
 package ru.touchin.templates.validation;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
@@ -83,4 +83,4 @@ public class ValidationState implements Serializable {
         return 31 * code;
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/ViewWithError.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.validation;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Created by Ilia Kurtov on 24/01/2017.

src/main/java/ru/touchin/templates/validation/validationcontrollers/BooleanValidationController.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.validation.validationcontrollers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import ru.touchin.templates.validation.ValidationState;
 import ru.touchin.templates.validation.validators.SameTypeValidator;
@@ -57,4 +57,4 @@ public class BooleanValidationController extends ValidationController<Boolean, B
                 .doOnNext(validationState -> getValidator().getValidationState().set(validationState));
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/validationcontrollers/EditTextValidationController.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.validation.validationcontrollers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import java.io.Serializable;
@@ -104,4 +104,4 @@ public class EditTextValidationController<TModel extends Serializable>
         this.showErrorOnFocusOut = showErrorOnFocusOut;
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/validationcontrollers/SimpleValidationController.java

@@ -1,6 +1,6 @@
 package ru.touchin.templates.validation.validationcontrollers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Serializable;
 
@@ -42,4 +42,4 @@ public class SimpleValidationController<TModel extends Serializable, TValidator
                 .doOnNext(validationState -> getValidator().getValidationState().set(validationState));
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/validationcontrollers/ValidationController.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.validation.validationcontrollers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
@@ -93,4 +93,4 @@ public class ValidationController
         return !validationState.equals(ValidationState.VALID) && !validationState.equals(ValidationState.INITIAL);
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java

@@ -19,8 +19,8 @@
 
 package ru.touchin.templates.validation.validators;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.Serializable;
 
@@ -157,4 +157,4 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
                 .first();
     }
 
-}
+}

src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java

@@ -1,7 +1,7 @@
 package ru.touchin.templates.validation.validators;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Serializable;
 

src/main/java/ru/touchin/templates/validation/validators/Validator.java

@@ -19,7 +19,7 @@
 
 package ru.touchin.templates.validation.validators;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Serializable;
 
@@ -103,4 +103,4 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
     @NonNull
     public abstract Observable<HalfNullablePair<ValidationState, TModel>> fullValidateAndGetModel(@NonNull final TWrapperModel wrapperModel);
 
-}
+}