TouchInstinct
/
RoboSwag
303
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

AndroidX migration

This commit is contained in:
Denis Karmyshakov 2018-09-28 21:40:03 +03:00
parent bf482870d0
commit 766132bc06
83 changed files with 200 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-logansquare/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
api project(":storable") api project(":storable")
api 'net.danlew:android.joda:2.9.9.4' 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 "com.squareup.retrofit2:retrofit:$versions.retrofit"
implementation 'ru.touchin:logansquare:1.4.3' implementation 'ru.touchin:logansquare:1.4.3'
} }

2
api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
View File

@ -1,6 +1,6 @@
package com.bluelinelabs.logansquare; package com.bluelinelabs.logansquare;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.lang.reflect.Type; import java.lang.reflect.Type;

4
api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
View File

@ -19,8 +19,8 @@
package ru.touchin.templates; 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.IOException;
import java.io.Serializable; import java.io.Serializable;

4
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java
View File

@ -20,8 +20,8 @@
package ru.touchin.templates.logansquare; 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.bluelinelabs.logansquare.typeconverters.TypeConverter;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;

2
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java
View File

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

4
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
View File

@ -19,8 +19,8 @@
package ru.touchin.templates.logansquare; 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; import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;

4
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
View File

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

4
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java
View File

@ -19,8 +19,8 @@
package ru.touchin.templates.logansquare; 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.ConverterUtils; import com.bluelinelabs.logansquare.ConverterUtils;
import com.bluelinelabs.logansquare.LoganSquare; import com.bluelinelabs.logansquare.LoganSquare;

2
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java
View File

@ -19,7 +19,7 @@
package ru.touchin.templates.logansquare; package ru.touchin.templates.logansquare;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.log.Lc; import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.templates.ApiModel; import ru.touchin.templates.ApiModel;

4
api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java
View File

@ -20,8 +20,8 @@
package ru.touchin.templates.logansquare; package ru.touchin.templates.logansquare;
import android.content.SharedPreferences; 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; import com.bluelinelabs.logansquare.LoganSquare;

2
api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java
View File

@ -20,7 +20,7 @@
package ru.touchin.templates.retrofit; package ru.touchin.templates.retrofit;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;

4
api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
View File

@ -19,7 +19,7 @@
package ru.touchin.templates.retrofit; package ru.touchin.templates.retrofit;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
@ -109,4 +109,4 @@ public abstract class JsonResponseBodyConverter<T> implements Converter<Response
@NonNull @NonNull
protected abstract T parseResponse(@NonNull ResponseBody value) throws IOException; protected abstract T parseResponse(@NonNull ResponseBody value) throws IOException;
} }

3
build.gradle
View File

@ -27,8 +27,9 @@ ext {
versions = [ versions = [
compileSdk : 28, compileSdk : 28,
supportLibrary: '28.0.0', supportLibrary: '28.0.0',
androidx : '1.0.0',
navigation : '1.0.0-alpha04', navigation : '1.0.0-alpha04',
lifecycle : '1.1.1', lifecycle : '2.0.0',
dagger : '2.16', dagger : '2.16',
retrofit : '2.4.0', retrofit : '2.4.0',
rxJava : '2.1.17', rxJava : '2.1.17',

3
gradle.properties
View File

@ -6,6 +6,9 @@
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit

2
kotlin-extensions/build.gradle
View File

@ -12,5 +12,5 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:recyclerview-v7:$versions.supportLibrary" implementation "androidx.recyclerview:recyclerview:$versions.androidx"
} }

14
kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
View File

@ -3,13 +3,13 @@ package ru.touchin.roboswag.components.extensions
import android.content.Context import android.content.Context
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
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.StringRes import androidx.annotation.StringRes
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.View import android.view.View
fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId) fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)

4
lifecycle-common/build.gradle
View File

@ -21,7 +21,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 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"
} }

8
lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt
View File

@ -1,15 +1,15 @@
package ru.touchin.templates.livedata package ru.touchin.templates.livedata
import android.arch.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import android.arch.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import android.arch.lifecycle.Observer import androidx.lifecycle.Observer
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
class SingleLiveEvent<T> : MutableLiveData<T>() { class SingleLiveEvent<T> : MutableLiveData<T>() {
private val pending = AtomicBoolean(false) 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 -> super.observe(owner, Observer { value ->
if (pending.compareAndSet(true, false)) { if (pending.compareAndSet(true, false)) {
observer.onChanged(value) observer.onChanged(value)

10
lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt
View File

@ -1,11 +1,11 @@
package ru.touchin.templates.viewmodel package ru.touchin.templates.viewmodel
import android.app.Activity import android.app.Activity
import android.arch.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import android.arch.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.support.v4.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController
object LifecycleViewModelProviders { object LifecycleViewModelProviders {

4
lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt
View File

@ -1,7 +1,7 @@
package ru.touchin.templates.viewmodel package ru.touchin.templates.viewmodel
import android.arch.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Provider import javax.inject.Provider

4
lifecycle-rx/build.gradle
View File

@ -15,9 +15,9 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" 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:rxjava:$versions.rxJava"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"

2
lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt
View File

@ -1,6 +1,6 @@
package ru.touchin.livedata.dispatcher package ru.touchin.livedata.dispatcher
import android.arch.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.Maybe import io.reactivex.Maybe

2
lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt
View File

@ -1,6 +1,6 @@
package ru.touchin.livedata.dispatcher package ru.touchin.livedata.dispatcher
import android.arch.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import io.reactivex.Completable import io.reactivex.Completable
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.Maybe import io.reactivex.Maybe

4
lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt
View File

@ -1,7 +1,7 @@
package ru.touchin.templates.viewmodel package ru.touchin.templates.viewmodel
import android.arch.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import android.support.annotation.CallSuper import androidx.annotation.CallSuper
import ru.touchin.livedata.dispatcher.BaseLiveDataDispatcher import ru.touchin.livedata.dispatcher.BaseLiveDataDispatcher
import ru.touchin.livedata.dispatcher.LiveDataDispatcher import ru.touchin.livedata.dispatcher.LiveDataDispatcher
import ru.touchin.livedata.destroyable.BaseDestroyable import ru.touchin.livedata.destroyable.BaseDestroyable

2
logging/build.gradle
View File

@ -14,5 +14,5 @@ android {
} }
dependencies { dependencies {
implementation "com.android.support:support-annotations:$versions.supportLibrary" implementation "androidx.annotation:annotation:$versions.androidx"
} }

6
logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.log; package ru.touchin.roboswag.core.log;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
/** /**
@ -60,4 +60,4 @@ public class ConsoleLogProcessor extends LogProcessor {
} }
} }

4
logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java
View File

@ -22,8 +22,8 @@ package ru.touchin.roboswag.core.log;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;

4
logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.log; package ru.touchin.roboswag.core.log;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Locale; import java.util.Locale;

2
logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.log; package ru.touchin.roboswag.core.log;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.util.Log; import android.util.Log;
/** /**

4
logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.log; package ru.touchin.roboswag.core.log;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** /**
* Created by Gavriil Sitnikov on 13/11/2015. * Created by Gavriil Sitnikov on 13/11/2015.

2
logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.utils; package ru.touchin.roboswag.core.utils;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
/** /**
* Created by Gavriil Sitnikov on 13/11/2015. * Created by Gavriil Sitnikov on 13/11/2015.

2
logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.utils; package ru.touchin.roboswag.core.utils;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
/** /**
* Created by Gavriil Sitnikov on 13/11/2015. * Created by Gavriil Sitnikov on 13/11/2015.

2
navigation/build.gradle
View File

@ -20,5 +20,5 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$versions.supportLibrary" implementation "androidx.appcompat:appcompat:$versions.androidx"
} }

8
navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
View File

@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation
import android.content.Context import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.support.annotation.IdRes import androidx.annotation.IdRes
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 android.view.MenuItem
import ru.touchin.roboswag.core.log.Lc import ru.touchin.roboswag.core.log.Lc

4
navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
View File

@ -2,8 +2,8 @@ package ru.touchin.roboswag.components.navigation;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; 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.IOException;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;

10
navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
View File

@ -20,11 +20,11 @@
package ru.touchin.roboswag.components.navigation; package ru.touchin.roboswag.components.navigation;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.widget.DrawerLayout; import androidx.drawerlayout.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import androidx.appcompat.app.ActionBarDrawerToggle;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;

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

@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation.activities;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.util.ArraySet; import androidx.collection.ArraySet;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import java.util.Set; import java.util.Set;

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

@ -21,17 +21,17 @@ package ru.touchin.roboswag.components.navigation.fragments;
import android.animation.Animator; import android.animation.Animator;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.arch.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.SystemClock; import android.os.SystemClock;
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.v4.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;

32
navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
View File

@ -20,27 +20,27 @@
package ru.touchin.roboswag.components.navigation.viewcontrollers; package ru.touchin.roboswag.components.navigation.viewcontrollers;
import android.animation.Animator; import android.animation.Animator;
import android.arch.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import android.arch.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
import android.arch.lifecycle.LifecycleRegistry; import androidx.lifecycle.LifecycleRegistry;
import android.content.Intent; import android.content.Intent;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
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.support.v4.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;

10
navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
View File

@ -21,11 +21,11 @@ package ru.touchin.roboswag.components.navigation.viewcontrollers
import android.content.Context import android.content.Context
import android.os.Parcelable import android.os.Parcelable
import android.support.annotation.IdRes import androidx.annotation.IdRes
import android.support.v4.app.Fragment import androidx.fragment.app.Fragment
import android.support.v4.app.FragmentActivity import androidx.fragment.app.FragmentActivity
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.FragmentNavigation import ru.touchin.roboswag.components.navigation.FragmentNavigation
import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment

2
recyclerview-adapters/build.gradle
View File

@ -14,5 +14,5 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:recyclerview-v7:$versions.supportLibrary" implementation "androidx.recyclerview:recyclerview:$versions.androidx"
} }

6
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
View File

@ -19,9 +19,9 @@
package ru.touchin.roboswag.components.adapters; package ru.touchin.roboswag.components.adapters;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.view.ViewCompat; import androidx.core.view.ViewCompat;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.ViewGroup; import android.view.ViewGroup;
import java.util.List; import java.util.List;

2
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
View File

@ -1,6 +1,6 @@
package ru.touchin.roboswag.components.adapters package ru.touchin.roboswag.components.adapters
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.util.SparseArray import android.util.SparseArray
import android.view.ViewGroup import android.view.ViewGroup

8
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
View File

@ -1,9 +1,9 @@
package ru.touchin.roboswag.components.adapters package ru.touchin.roboswag.components.adapters
import android.support.v7.recyclerview.extensions.AsyncDifferConfig import androidx.recyclerview.widget.AsyncDifferConfig
import android.support.v7.recyclerview.extensions.AsyncListDiffer import androidx.recyclerview.widget.AsyncListDiffer
import android.support.v7.util.DiffUtil import androidx.recyclerview.widget.DiffUtil
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import android.view.ViewGroup import android.view.ViewGroup
import ru.touchin.roboswag.components.extensions.setOnRippleClickListener import ru.touchin.roboswag.components.extensions.setOnRippleClickListener

4
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
View File

@ -1,7 +1,7 @@
package ru.touchin.roboswag.components.adapters; package ru.touchin.roboswag.components.adapters;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import java.util.List; import java.util.List;

4
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
View File

@ -1,7 +1,7 @@
package ru.touchin.roboswag.components.adapters package ru.touchin.roboswag.components.adapters
import android.support.v7.util.ListUpdateCallback import androidx.recyclerview.widget.ListUpdateCallback
import android.support.v7.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback { class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback {

4
recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
View File

@ -1,7 +1,7 @@
package ru.touchin.roboswag.components.adapters; package ru.touchin.roboswag.components.adapters;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import java.util.List; import java.util.List;

4
sample/build.gradle
View File

@ -24,8 +24,8 @@ android {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$versions.supportLibrary" implementation "androidx.appcompat:appcompat:$versions.androidx"
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
} }
ext.buildScriptsDir = "$rootDir/BuildScripts" ext.buildScriptsDir = "$rootDir/BuildScripts"

2
sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
View File

@ -1,6 +1,6 @@
package ru.touchin.roboswag.components package ru.touchin.roboswag.components
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {

4
sample/src/main/res/layout/activity_main.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
@ -16,4 +16,4 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
</android.support.constraint.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
storable/build.gradle
View File

@ -17,7 +17,7 @@ dependencies {
api project(":utils") api project(":utils")
api project(":logging") 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:rxjava:$versions.rxJava"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"

4
storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
View File

@ -20,8 +20,8 @@
package ru.touchin.roboswag.components.utils.storables; package ru.touchin.roboswag.components.utils.storables;
import android.content.SharedPreferences; 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; import java.lang.reflect.Type;

4
storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
View File

@ -20,8 +20,8 @@
package ru.touchin.roboswag.components.utils.storables; package ru.touchin.roboswag.components.utils.storables;
import android.content.SharedPreferences; 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; import java.lang.reflect.Type;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java
View File

@ -13,8 +13,8 @@
package ru.touchin.roboswag.core.observables; package ru.touchin.roboswag.core.observables;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.reflect.Type; import java.lang.reflect.Type;

2
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import io.reactivex.Single; import io.reactivex.Single;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java
View File

@ -1,7 +1,7 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.reflect.Type; import java.lang.reflect.Type;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

4
storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.storable; package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.reflect.Type; import java.lang.reflect.Type;

4
templates/build.gradle
View File

@ -19,11 +19,11 @@ dependencies {
api project(":api-logansquare") api project(":api-logansquare")
api project(":navigation") 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' 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") { implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") {
transitive = true transitive = true

10
templates/src/main/java/ru/touchin/templates/TouchinActivity.java
View File

@ -24,11 +24,11 @@ import android.content.Intent;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; 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.BaseActivity; import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
import ru.touchin.roboswag.core.log.Lc; import ru.touchin.roboswag.core.log.Lc;

6
templates/src/main/java/ru/touchin/templates/TouchinApp.java
View File

@ -22,9 +22,9 @@ package ru.touchin.templates;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import android.os.StrictMode; import android.os.StrictMode;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.multidex.MultiDex; import androidx.multidex.MultiDex;
import android.util.Log; import android.util.Log;
import com.crashlytics.android.Crashlytics; import com.crashlytics.android.Crashlytics;

2
utils/build.gradle
View File

@ -14,5 +14,5 @@ android {
} }
dependencies { dependencies {
implementation "com.android.support:support-annotations:$versions.supportLibrary" implementation "androidx.annotation:annotation:$versions.androidx"
} }

2
utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
View File

@ -1,6 +1,6 @@
package ru.touchin.defaults; package ru.touchin.defaults;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;

4
utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
View File

@ -25,8 +25,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.support.annotation.LayoutRes; import androidx.annotation.LayoutRes;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Display; import android.view.Display;

4
utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.components.utils.spans; 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.TextPaint;
import android.text.style.URLSpan; import android.text.style.URLSpan;

2
utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
View File

@ -3,7 +3,7 @@ package ru.touchin.roboswag.components.utils.spans;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.view.View; import android.view.View;

4
utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
View File

@ -21,7 +21,7 @@ package ru.touchin.roboswag.components.utils.spans;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.style.MetricAffectingSpan; import android.text.style.MetricAffectingSpan;
@ -52,4 +52,4 @@ public class TypefaceSpan extends MetricAffectingSpan {
textPaint.setFlags(textPaint.getFlags() | Paint.SUBPIXEL_TEXT_FLAG); textPaint.setFlags(textPaint.getFlags() | Paint.SUBPIXEL_TEXT_FLAG);
} }
} }

4
utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.utils; package ru.touchin.roboswag.core.utils;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;

2
utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.utils; package ru.touchin.roboswag.core.utils;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.io.Serializable; import java.io.Serializable;

4
utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java
View File

@ -21,8 +21,8 @@ package ru.touchin.roboswag.core.utils;
import android.app.Service; import android.app.Service;
import android.os.Binder; import android.os.Binder;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** /**
* Created by Gavriil Sitnikov on 03/10/2015. * Created by Gavriil Sitnikov on 03/10/2015.

2
utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.utils; package ru.touchin.roboswag.core.utils;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.MessageDigest; import java.security.MessageDigest;

2
utils/src/main/java/ru/touchin/templates/DeviceUtils.java
View File

@ -26,7 +26,7 @@ import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.os.Process; import android.os.Process;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
/** /**

2
views/build.gradle
View File

@ -17,5 +17,5 @@ dependencies {
api project(":utils") api project(":utils")
api project(":logging") api project(":logging")
implementation "com.android.support:design:$versions.supportLibrary" implementation 'com.google.android.material:material:1.0.0'
} }

8
views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
View File

@ -22,10 +22,10 @@ package ru.touchin.roboswag.components.views;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Build; 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.AttributeSet;
import android.util.TypedValue; import android.util.TypedValue;

8
views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
View File

@ -30,9 +30,9 @@ import android.graphics.RectF;
import android.graphics.drawable.Animatable; import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.SystemClock; 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; import ru.touchin.roboswag.components.utils.UiUtils;
@ -289,4 +289,4 @@ public class MaterialProgressDrawable extends Drawable implements Runnable, Anim
} }
} }

8
views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
View File

@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.views;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; 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.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v7.widget.AppCompatEditText; import androidx.appcompat.widget.AppCompatEditText;
import android.text.InputType; import android.text.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher; import android.text.TextWatcher;

6
views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
View File

@ -22,9 +22,9 @@ package ru.touchin.roboswag.components.views;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; 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.AppCompatTextView; import androidx.appcompat.widget.AppCompatTextView;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.method.TransformationMethod; import android.text.method.TransformationMethod;
import android.util.AttributeSet; import android.util.AttributeSet;

4
views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
View File

@ -21,8 +21,8 @@ package ru.touchin.roboswag.components.views.internal;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; 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.InputType;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.AttributeSet; import android.util.AttributeSet;

16
views/src/main/java/ru/touchin/roboswag/widget/Switcher.java
View File

@ -2,14 +2,14 @@ package ru.touchin.roboswag.widget;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
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.transition.Fade; import androidx.transition.Fade;
import android.support.transition.Transition; import androidx.transition.Transition;
import android.support.transition.TransitionInflater; import androidx.transition.TransitionInflater;
import android.support.transition.TransitionManager; import androidx.transition.TransitionManager;
import android.support.v4.view.ViewCompat; import androidx.core.view.ViewCompat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;