From 766132bc06c70759d7aa7e747d40572a1b44a970 Mon Sep 17 00:00:00 2001 From: Denis Karmyshakov Date: Fri, 28 Sep 2018 21:40:03 +0300 Subject: [PATCH] AndroidX migration --- api-logansquare/build.gradle | 2 +- .../logansquare/ConverterUtils.java | 2 +- .../java/ru/touchin/templates/ApiModel.java | 4 +-- .../LoganSquareBigDecimalConverter.java | 4 +-- .../logansquare/LoganSquareEnum.java | 2 +- .../logansquare/LoganSquareEnumConverter.java | 4 +-- .../LoganSquareJodaTimeConverter.java | 4 +-- .../logansquare/LoganSquareJsonFactory.java | 4 +-- .../logansquare/LoganSquareJsonModel.java | 2 +- .../logansquare/LoganSquarePreferences.java | 4 +-- .../retrofit/JsonRequestBodyConverter.java | 2 +- .../retrofit/JsonResponseBodyConverter.java | 4 +-- build.gradle | 3 +- gradle.properties | 3 ++ kotlin-extensions/build.gradle | 2 +- .../components/extensions/ViewHolder.kt | 14 ++++---- lifecycle-common/build.gradle | 4 +-- .../templates/livedata/SingleLiveEvent.kt | 8 ++--- .../viewmodel/LifecycleViewModelProviders.kt | 10 +++--- .../templates/viewmodel/ViewModelFactory.kt | 4 +-- lifecycle-rx/build.gradle | 4 +-- .../dispatcher/BaseLiveDataDispatcher.kt | 2 +- .../livedata/dispatcher/LiveDataDispatcher.kt | 2 +- .../templates/viewmodel/RxViewModel.kt | 4 +-- logging/build.gradle | 2 +- .../core/log/ConsoleLogProcessor.java | 6 ++-- .../java/ru/touchin/roboswag/core/log/Lc.java | 4 +-- .../ru/touchin/roboswag/core/log/LcGroup.java | 4 +-- .../ru/touchin/roboswag/core/log/LcLevel.java | 2 +- .../roboswag/core/log/LogProcessor.java | 4 +-- .../core/utils/ShouldNotHappenException.java | 2 +- .../roboswag/core/utils/ThreadLocalValue.java | 2 +- navigation/build.gradle | 2 +- .../navigation/FragmentNavigation.kt | 8 ++--- .../navigation/SerializableBundle.java | 4 +-- .../SimpleActionBarDrawerToggle.java | 10 +++--- .../navigation/activities/BaseActivity.java | 8 ++--- .../fragments/ViewControllerFragment.java | 12 +++---- .../viewcontrollers/ViewController.java | 32 +++++++++---------- .../ViewControllerNavigation.kt | 10 +++--- recyclerview-adapters/build.gradle | 2 +- .../components/adapters/AdapterDelegate.java | 6 ++-- .../components/adapters/DelegatesManager.kt | 2 +- .../adapters/DelegationListAdapter.kt | 8 ++--- .../adapters/ItemAdapterDelegate.java | 4 +-- .../adapters/OffsetAdapterUpdateCallback.kt | 4 +-- .../adapters/PositionAdapterDelegate.java | 4 +-- sample/build.gradle | 4 +-- .../roboswag/components/MainActivity.kt | 2 +- sample/src/main/res/layout/activity_main.xml | 4 +-- storable/build.gradle | 2 +- .../utils/storables/PreferenceStore.java | 4 +-- .../utils/storables/PreferenceUtils.java | 4 +-- .../ObservableRefCountWithCacheTime.java | 4 +-- .../observables/storable/BaseStorable.java | 4 +-- .../core/observables/storable/Converter.java | 4 +-- .../core/observables/storable/Migration.java | 2 +- .../core/observables/storable/Migrator.java | 2 +- .../observables/storable/NonNullStorable.java | 4 +-- .../storable/SameTypesConverter.java | 4 +-- .../core/observables/storable/Storable.java | 4 +-- .../core/observables/storable/Store.java | 4 +-- templates/build.gradle | 4 +-- .../ru/touchin/templates/TouchinActivity.java | 10 +++--- .../java/ru/touchin/templates/TouchinApp.java | 6 ++-- utils/build.gradle | 2 +- .../touchin/defaults/DefaultTextWatcher.java | 2 +- .../roboswag/components/utils/UiUtils.java | 4 +-- .../utils/spans/ColoredUrlSpan.java | 4 +-- .../components/utils/spans/PhoneSpan.java | 2 +- .../components/utils/spans/TypefaceSpan.java | 4 +-- .../roboswag/core/utils/ObjectUtils.java | 4 +-- .../touchin/roboswag/core/utils/Optional.java | 2 +- .../roboswag/core/utils/ServiceBinder.java | 4 +-- .../roboswag/core/utils/StringUtils.java | 2 +- .../ru/touchin/templates/DeviceUtils.java | 2 +- views/build.gradle | 2 +- .../components/views/MaterialLoadingBar.java | 8 ++--- .../views/MaterialProgressDrawable.java | 8 ++--- .../components/views/TypefacedEditText.java | 8 ++--- .../components/views/TypefacedTextView.java | 6 ++-- .../views/internal/AttributesUtils.java | 4 +-- .../ru/touchin/roboswag/widget/Switcher.java | 16 +++++----- 83 files changed, 200 insertions(+), 196 deletions(-) diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle index fdba457..c522cc9 100644 --- a/api-logansquare/build.gradle +++ b/api-logansquare/build.gradle @@ -17,7 +17,7 @@ dependencies { api project(":storable") api 'net.danlew:android.joda:2.9.9.4' - implementation "com.android.support:support-annotations:$versions.supportLibrary" + implementation "androidx.annotation:annotation:$versions.androidx" implementation "com.squareup.retrofit2:retrofit:$versions.retrofit" implementation 'ru.touchin:logansquare:1.4.3' } diff --git a/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java b/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java index f8f7bba..80a81ed 100644 --- a/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java +++ b/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java @@ -1,6 +1,6 @@ package com.bluelinelabs.logansquare; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.reflect.Type; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java b/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java index 5755445..1086021 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java @@ -19,8 +19,8 @@ package ru.touchin.templates; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; import java.io.IOException; import java.io.Serializable; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java index 9f08d6f..9969726 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java @@ -20,8 +20,8 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.typeconverters.TypeConverter; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java index a5d0963..9b01cf5 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java @@ -19,7 +19,7 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by Gavriil Sitnikov. diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java index c274667..3581342 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java @@ -19,8 +19,8 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java index 11f52b8..411a702 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java @@ -20,8 +20,8 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.bluelinelabs.logansquare.typeconverters.TypeConverter; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java index 20c5b15..52e4529 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java @@ -19,8 +19,8 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.ConverterUtils; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java index ea67fbe..3dbd536 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java @@ -19,7 +19,7 @@ package ru.touchin.templates.logansquare; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import ru.touchin.roboswag.core.log.Lc; import ru.touchin.templates.ApiModel; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java index 763ccf0..5bc0a77 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java @@ -20,8 +20,8 @@ package ru.touchin.templates.logansquare; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bluelinelabs.logansquare.LoganSquare; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java index e0ea113..52561f8 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java @@ -20,7 +20,7 @@ package ru.touchin.templates.retrofit; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java index 614c8e2..31c8257 100644 --- a/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java +++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java @@ -19,7 +19,7 @@ package ru.touchin.templates.retrofit; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.IOException; import java.io.InterruptedIOException; @@ -109,4 +109,4 @@ public abstract class JsonResponseBodyConverter implements Converter RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId) diff --git a/lifecycle-common/build.gradle b/lifecycle-common/build.gradle index 8b34a4c..f58b253 100644 --- a/lifecycle-common/build.gradle +++ b/lifecycle-common/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:appcompat-v7:$versions.supportLibrary" + implementation "androidx.appcompat:appcompat:$versions.androidx" - implementation "android.arch.lifecycle:extensions:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle" } diff --git a/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt b/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt index 27b0a1d..9836e78 100644 --- a/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt +++ b/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt @@ -1,15 +1,15 @@ package ru.touchin.templates.livedata -import android.arch.lifecycle.LifecycleOwner -import android.arch.lifecycle.MutableLiveData -import android.arch.lifecycle.Observer +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer import java.util.concurrent.atomic.AtomicBoolean class SingleLiveEvent : MutableLiveData() { private val pending = AtomicBoolean(false) - override fun observe(owner: LifecycleOwner, observer: Observer) { + override fun observe(owner: LifecycleOwner, observer: Observer) { super.observe(owner, Observer { value -> if (pending.compareAndSet(true, false)) { observer.onChanged(value) diff --git a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt index 41ee808..c19f4e5 100644 --- a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt +++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt @@ -1,11 +1,11 @@ package ru.touchin.templates.viewmodel import android.app.Activity -import android.arch.lifecycle.LifecycleOwner -import android.arch.lifecycle.ViewModelProvider -import android.arch.lifecycle.ViewModelProviders -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController object LifecycleViewModelProviders { diff --git a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt index 8061ba6..ee96770 100644 --- a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt +++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt @@ -1,7 +1,7 @@ package ru.touchin.templates.viewmodel -import android.arch.lifecycle.ViewModel -import android.arch.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider import javax.inject.Inject import javax.inject.Provider diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle index aaced7b..464fdeb 100644 --- a/lifecycle-rx/build.gradle +++ b/lifecycle-rx/build.gradle @@ -15,9 +15,9 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:appcompat-v7:$versions.supportLibrary" + implementation "androidx.appcompat:appcompat:$versions.androidx" - implementation "android.arch.lifecycle:extensions:$versions.lifecycle" + implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle" implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt index dc6f5f4..f7f586e 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt @@ -1,6 +1,6 @@ package ru.touchin.livedata.dispatcher -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.MutableLiveData import io.reactivex.Completable import io.reactivex.Flowable import io.reactivex.Maybe diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt index 8ef3510..aeec92d 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt @@ -1,6 +1,6 @@ package ru.touchin.livedata.dispatcher -import android.arch.lifecycle.MutableLiveData +import androidx.lifecycle.MutableLiveData import io.reactivex.Completable import io.reactivex.Flowable import io.reactivex.Maybe diff --git a/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt index e27a860..2537677 100644 --- a/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt +++ b/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt @@ -1,7 +1,7 @@ package ru.touchin.templates.viewmodel -import android.arch.lifecycle.ViewModel -import android.support.annotation.CallSuper +import androidx.lifecycle.ViewModel +import androidx.annotation.CallSuper import ru.touchin.livedata.dispatcher.BaseLiveDataDispatcher import ru.touchin.livedata.dispatcher.LiveDataDispatcher import ru.touchin.livedata.destroyable.BaseDestroyable diff --git a/logging/build.gradle b/logging/build.gradle index 217c17b..21ed245 100644 --- a/logging/build.gradle +++ b/logging/build.gradle @@ -14,5 +14,5 @@ android { } dependencies { - implementation "com.android.support:support-annotations:$versions.supportLibrary" + implementation "androidx.annotation:annotation:$versions.androidx" } diff --git a/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java b/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java index 0c05b84..8e00787 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.log; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; /** @@ -60,4 +60,4 @@ public class ConsoleLogProcessor extends LogProcessor { } -} \ No newline at end of file +} diff --git a/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java b/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java index 3d46668..5bc99f7 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java @@ -22,8 +22,8 @@ package ru.touchin.roboswag.core.log; import android.annotation.SuppressLint; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java b/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java index 3ccf1fa..f1ea1b0 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.log; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.text.SimpleDateFormat; import java.util.Locale; diff --git a/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java b/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java index 9dbd5e5..fb72f33 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.log; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; /** diff --git a/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java b/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java index 6cb34a9..0c4c4a8 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.log; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Created by Gavriil Sitnikov on 13/11/2015. diff --git a/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java b/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java index b3f11f0..8bbed44 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by Gavriil Sitnikov on 13/11/2015. diff --git a/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java b/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java index 62cf778..8d3f1b1 100644 --- a/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java +++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Created by Gavriil Sitnikov on 13/11/2015. diff --git a/navigation/build.gradle b/navigation/build.gradle index d293abb..8d0575d 100644 --- a/navigation/build.gradle +++ b/navigation/build.gradle @@ -20,5 +20,5 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:appcompat-v7:$versions.supportLibrary" + implementation "androidx.appcompat:appcompat:$versions.androidx" } diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt index fe5e807..5c22e1d 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt @@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation import android.content.Context import android.os.Bundle -import android.support.annotation.IdRes -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentTransaction +import androidx.annotation.IdRes +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentTransaction import android.view.MenuItem import ru.touchin.roboswag.core.log.Lc diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java index 07d8b5a..6bfa863 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java @@ -2,8 +2,8 @@ package ru.touchin.roboswag.components.navigation; import android.os.Bundle; import android.os.Parcel; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java index 090f9c0..cfc0a73 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java @@ -20,11 +20,11 @@ package ru.touchin.roboswag.components.navigation; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; import android.view.MenuItem; import android.view.View; diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java index 2e09da4..86180ef 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java @@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.navigation.activities; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ArraySet; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.ArraySet; +import androidx.appcompat.app.AppCompatActivity; import java.util.Set; diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java index 5f8582a..53fe066 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java @@ -21,17 +21,17 @@ package ru.touchin.roboswag.components.navigation.fragments; import android.animation.Animator; import android.annotation.SuppressLint; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.content.Intent; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java index 09aa29a..84c5d5c 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java @@ -20,27 +20,27 @@ package ru.touchin.roboswag.components.navigation.viewcontrollers; import android.animation.Animator; -import android.arch.lifecycle.Lifecycle; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.LifecycleRegistry; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.CallSuper; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; +import androidx.annotation.CallSuper; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.content.ContextCompat; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt index a8e4b87..c4e813f 100644 --- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt +++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt @@ -21,11 +21,11 @@ package ru.touchin.roboswag.components.navigation.viewcontrollers import android.content.Context import android.os.Parcelable -import android.support.annotation.IdRes -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentActivity -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentTransaction +import androidx.annotation.IdRes +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentTransaction import ru.touchin.roboswag.components.navigation.FragmentNavigation import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment diff --git a/recyclerview-adapters/build.gradle b/recyclerview-adapters/build.gradle index 47249f1..f4730f9 100644 --- a/recyclerview-adapters/build.gradle +++ b/recyclerview-adapters/build.gradle @@ -14,5 +14,5 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:recyclerview-v7:$versions.supportLibrary" + implementation "androidx.recyclerview:recyclerview:$versions.androidx" } diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java index 25be0c9..c0e4135 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java @@ -19,9 +19,9 @@ package ru.touchin.roboswag.components.adapters; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import java.util.List; diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt index e3ba14f..a26e3a8 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt @@ -1,6 +1,6 @@ package ru.touchin.roboswag.components.adapters -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.util.SparseArray import android.view.ViewGroup diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt index 094b298..3a69488 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt @@ -1,9 +1,9 @@ package ru.touchin.roboswag.components.adapters -import android.support.v7.recyclerview.extensions.AsyncDifferConfig -import android.support.v7.recyclerview.extensions.AsyncListDiffer -import android.support.v7.util.DiffUtil -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.AsyncDifferConfig +import androidx.recyclerview.widget.AsyncListDiffer +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import ru.touchin.roboswag.components.extensions.setOnRippleClickListener diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java index 324bcf4..b0d075d 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java @@ -1,7 +1,7 @@ package ru.touchin.roboswag.components.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import java.util.List; diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt index 9715eb2..3b63e29 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt @@ -1,7 +1,7 @@ package ru.touchin.roboswag.components.adapters -import android.support.v7.util.ListUpdateCallback -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.ListUpdateCallback +import androidx.recyclerview.widget.RecyclerView class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback { diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java index ada8888..e3c7d80 100644 --- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java +++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java @@ -1,7 +1,7 @@ package ru.touchin.roboswag.components.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import java.util.List; diff --git a/sample/build.gradle b/sample/build.gradle index b69b691..95ee2d2 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -24,8 +24,8 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "com.android.support:appcompat-v7:$versions.supportLibrary" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation "androidx.appcompat:appcompat:$versions.androidx" + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' } ext.buildScriptsDir = "$rootDir/BuildScripts" diff --git a/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt b/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt index ebf42b3..89dd9bb 100644 --- a/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt +++ b/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt @@ -1,6 +1,6 @@ package ru.touchin.roboswag.components -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import android.os.Bundle class MainActivity : AppCompatActivity() { diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml index 7539a01..421cf25 100644 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + diff --git a/storable/build.gradle b/storable/build.gradle index 2a6be21..d454751 100644 --- a/storable/build.gradle +++ b/storable/build.gradle @@ -17,7 +17,7 @@ dependencies { api project(":utils") api project(":logging") - implementation "com.android.support:support-annotations:$versions.supportLibrary" + implementation "androidx.annotation:annotation:$versions.androidx" implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava" implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid" diff --git a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java index 3349dc9..cd02321 100644 --- a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java +++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java @@ -20,8 +20,8 @@ package ru.touchin.roboswag.components.utils.storables; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; diff --git a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java index b9e9883..9b87a51 100644 --- a/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java +++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java @@ -20,8 +20,8 @@ package ru.touchin.roboswag.components.utils.storables; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java index 6217204..2a47535 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java @@ -13,8 +13,8 @@ package ru.touchin.roboswag.core.observables; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java index 7b721b4..82b6801 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; import java.util.concurrent.Executors; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java index 5991932..e797083 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java index 62397f2..c465978 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; import java.util.List; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java index 41a3c53..b384a07 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import io.reactivex.Single; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java index 3373ae6..bb6d465 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.concurrent.TimeUnit; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java index 9bfa228..83ae497 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java @@ -1,7 +1,7 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java index b891c0c..b5e2d79 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; import java.util.concurrent.TimeUnit; diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java index ad31c4d..86825a6 100644 --- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java +++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.observables.storable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.reflect.Type; diff --git a/templates/build.gradle b/templates/build.gradle index 69449aa..19913e2 100644 --- a/templates/build.gradle +++ b/templates/build.gradle @@ -19,11 +19,11 @@ dependencies { api project(":api-logansquare") api project(":navigation") - api 'com.android.support:multidex:1.0.3' + api 'androidx.multidex:multidex:2.0.0' api 'net.danlew:android.joda:2.9.9.4' - implementation "com.android.support:appcompat-v7:$versions.supportLibrary" + implementation "androidx.appcompat:appcompat:$versions.androidx" implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") { transitive = true diff --git a/templates/src/main/java/ru/touchin/templates/TouchinActivity.java b/templates/src/main/java/ru/touchin/templates/TouchinActivity.java index 41b2e28..4cf5c85 100644 --- a/templates/src/main/java/ru/touchin/templates/TouchinActivity.java +++ b/templates/src/main/java/ru/touchin/templates/TouchinActivity.java @@ -24,11 +24,11 @@ import android.content.Intent; import android.graphics.drawable.BitmapDrawable; import android.os.Build; import android.os.Bundle; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import ru.touchin.roboswag.components.navigation.activities.BaseActivity; import ru.touchin.roboswag.core.log.Lc; diff --git a/templates/src/main/java/ru/touchin/templates/TouchinApp.java b/templates/src/main/java/ru/touchin/templates/TouchinApp.java index 8d33cb0..54ca007 100644 --- a/templates/src/main/java/ru/touchin/templates/TouchinApp.java +++ b/templates/src/main/java/ru/touchin/templates/TouchinApp.java @@ -22,9 +22,9 @@ package ru.touchin.templates; import android.app.Application; import android.content.Context; import android.os.StrictMode; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.multidex.MultiDex; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.multidex.MultiDex; import android.util.Log; import com.crashlytics.android.Crashlytics; diff --git a/utils/build.gradle b/utils/build.gradle index 217c17b..21ed245 100644 --- a/utils/build.gradle +++ b/utils/build.gradle @@ -14,5 +14,5 @@ android { } dependencies { - implementation "com.android.support:support-annotations:$versions.supportLibrary" + implementation "androidx.annotation:annotation:$versions.androidx" } diff --git a/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java b/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java index 563c518..f69859b 100644 --- a/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java +++ b/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java @@ -1,6 +1,6 @@ package ru.touchin.defaults; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.TextWatcher; diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java index a80ee72..269faba 100644 --- a/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java +++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java @@ -25,8 +25,8 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.os.Build; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.Display; diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java index 6e815e0..c484f91 100644 --- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java +++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.components.utils.spans; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.URLSpan; diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java index b350912..2140230 100644 --- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java +++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java @@ -3,7 +3,7 @@ package ru.touchin.roboswag.components.utils.spans; import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.URLSpan; import android.view.View; diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java index a8b13ff..690eaad 100644 --- a/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java +++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java @@ -21,7 +21,7 @@ package ru.touchin.roboswag.components.utils.spans; import android.graphics.Paint; import android.graphics.Typeface; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; @@ -52,4 +52,4 @@ public class TypefaceSpan extends MetricAffectingSpan { textPaint.setFlags(textPaint.getFlags() | Paint.SUBPIXEL_TEXT_FLAG); } -} \ No newline at end of file +} diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java index a8c2baf..2bfcff7 100644 --- a/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java +++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java @@ -19,8 +19,8 @@ package ru.touchin.roboswag.core.utils; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; import java.util.Collection; diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java index 86a8493..9a7496f 100644 --- a/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java +++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.utils; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.io.Serializable; diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java index 82f8acf..5257fd4 100644 --- a/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java +++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java @@ -21,8 +21,8 @@ package ru.touchin.roboswag.core.utils; import android.app.Service; import android.os.Binder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Created by Gavriil Sitnikov on 03/10/2015. diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java index 639a5ab..9768287 100644 --- a/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java +++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java @@ -19,7 +19,7 @@ package ru.touchin.roboswag.core.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java index 8a7e1fb..4a48f10 100644 --- a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java +++ b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java @@ -26,7 +26,7 @@ import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Process; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.TelephonyManager; /** diff --git a/views/build.gradle b/views/build.gradle index 72bfdc4..601188a 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -17,5 +17,5 @@ dependencies { api project(":utils") api project(":logging") - implementation "com.android.support:design:$versions.supportLibrary" + implementation 'com.google.android.material:material:1.0.0' } diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java index c3b88ef..36dbfcb 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java +++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java @@ -22,10 +22,10 @@ package ru.touchin.roboswag.components.views; import android.content.Context; import android.content.res.TypedArray; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import android.util.TypedValue; diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java index a152cb4..daabf5c 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java +++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java @@ -30,9 +30,9 @@ import android.graphics.RectF; import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; import android.os.SystemClock; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import ru.touchin.roboswag.components.utils.UiUtils; @@ -289,4 +289,4 @@ public class MaterialProgressDrawable extends Drawable implements Runnable, Anim } -} \ No newline at end of file +} diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java index 40415e5..6730704 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java +++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java @@ -21,10 +21,10 @@ package ru.touchin.roboswag.components.views; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v7.widget.AppCompatEditText; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; +import androidx.appcompat.widget.AppCompatEditText; import android.text.InputType; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java index 0c19b4d..27b45e3 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java +++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java @@ -22,9 +22,9 @@ package ru.touchin.roboswag.components.views; import android.annotation.SuppressLint; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatTextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatTextView; import android.text.TextUtils; import android.text.method.TransformationMethod; import android.util.AttributeSet; diff --git a/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java b/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java index 0c85eac..29307a8 100644 --- a/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java +++ b/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java @@ -21,8 +21,8 @@ package ru.touchin.roboswag.components.views.internal; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.NonNull; -import android.support.annotation.StyleableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StyleableRes; import android.text.InputType; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java b/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java index 26b07cd..fec43c2 100644 --- a/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java +++ b/views/src/main/java/ru/touchin/roboswag/widget/Switcher.java @@ -2,14 +2,14 @@ package ru.touchin.roboswag.widget; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.transition.Fade; -import android.support.transition.Transition; -import android.support.transition.TransitionInflater; -import android.support.transition.TransitionManager; -import android.support.v4.view.ViewCompat; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.transition.Fade; +import androidx.transition.Transition; +import androidx.transition.TransitionInflater; +import androidx.transition.TransitionManager; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup;