TouchInstinct
/
RoboSwag-core
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Androidx

This commit is contained in:
Karenkov Igor 2019-06-06 00:36:03 +03:00
parent fb79dc971a
commit 9b5b676690
43 changed files with 83 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -14,7 +14,9 @@ android {
}
dependencies {
compileOnly "com.android.support:support-annotations:$supportLibraryVersion"
compileOnly "androidx.annotation:annotation:$androidx"
compileOnly "io.reactivex:rxandroid:$rxAndroidVersion"
compileOnly "io.reactivex:rxjava:$rxJavaVersion"
implementation "androidx.core:core:$androidx"
}

2
src/main/java/ru/touchin/roboswag/core/android/support/v7/util/DiffUtil.java
View File

@ -16,7 +16,7 @@
package ru.touchin.roboswag.core.android.support.v7.util;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;

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

@ -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 {
}
}
}

4
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.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;

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

@ -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;

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

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

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

@ -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.
@ -58,4 +58,4 @@ public abstract class LogProcessor {
public abstract void processLogMessage(@NonNull final LcGroup group, @NonNull final LcLevel level,
@NonNull final String tag, @NonNull final String message, @Nullable final Throwable throwable);
}
}

5
src/main/java/ru/touchin/roboswag/core/observables/BaseChangeable.java
View File

@ -19,14 +19,13 @@
package ru.touchin.roboswag.core.observables;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.utils.ObjectUtils;
import ru.touchin.roboswag.core.utils.Optional;
import rx.Observable;

6
src/main/java/ru/touchin/roboswag/core/observables/Changeable.java
View File

@ -19,8 +19,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 ru.touchin.roboswag.core.utils.Optional;
import rx.Observable;
@ -49,4 +49,4 @@ public class Changeable<T> extends BaseChangeable<T, T> {
return observeOptionalValue().map(Optional::get);
}
}
}

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

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
@ -75,4 +75,4 @@ public class NonNullChangeable<T> extends BaseChangeable<T, T> {
});
}
}
}

7
src/main/java/ru/touchin/roboswag/core/observables/OnSubscribeRefCountWithCacheTime.java
View File

@ -16,14 +16,13 @@
package ru.touchin.roboswag.core.observables;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import rx.Observable.OnSubscribe;
import rx.Scheduler;
import rx.Subscriber;
@ -210,4 +209,4 @@ public final class OnSubscribeRefCountWithCacheTime<T> implements OnSubscribe<T>
}
}
}
}

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

@ -28,8 +28,8 @@ import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.Looper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.concurrent.CountDownLatch;

5
src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableCollection.java
View File

@ -19,9 +19,6 @@
package ru.touchin.roboswag.core.observables.collections;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@ -29,6 +26,8 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.observables.collections.changes.Change;
import ru.touchin.roboswag.core.observables.collections.changes.CollectionChanges;
import rx.Emitter;

4
src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableFilteredList.java
View File

@ -1,7 +1,7 @@
package ru.touchin.roboswag.core.observables.collections;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;

4
src/main/java/ru/touchin/roboswag/core/observables/collections/ObservableList.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.collections;
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;

2
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/Change.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* Created by Gavriil Sitnikov on 23/05/16.

4
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/ChangePayloadProducer.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/**
* Functional interface for calculating change payload between two items same type.

2
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/CollectionChanges.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.Collection;
import java.util.Collections;

2
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/CollectionsChangesCalculator.java
View File

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

2
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/DefaultCollectionsChangesCalculator.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.Collection;

4
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/DiffCollectionsChangesCalculator.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;

2
src/main/java/ru/touchin/roboswag/core/observables/collections/changes/SameItemsPredicate.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.changes;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* Functional interface for determine same objects. Usually this is just the comparison by id.

4
src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/LoadedItems.java
View File

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

5
src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/LoadingMoreList.java
View File

@ -19,9 +19,6 @@
package ru.touchin.roboswag.core.observables.collections.loadable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@ -29,6 +26,8 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.concurrent.Executors;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
import ru.touchin.roboswag.core.observables.collections.ObservableList;

4
src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/MoreItemsLoader.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.loadable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import rx.Observable;
@ -42,4 +42,4 @@ public interface MoreItemsLoader<TItem, TMoreReference, TLoadedItems extends Loa
@NonNull
Observable<TLoadedItems> load(@NonNull final MoreLoadRequest<TMoreReference> moreLoadRequest);
}
}

4
src/main/java/ru/touchin/roboswag/core/observables/collections/loadable/MoreLoadRequest.java
View File

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.observables.collections.loadable;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.utils.ObjectUtils;
@ -71,4 +71,4 @@ public class MoreLoadRequest<TMoreReference> {
return nextPosition + (moreReference != null ? moreReference.hashCode() : 0);
}
}
}

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

@ -19,13 +19,12 @@
package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.lang.reflect.Type;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.log.Lc;
import ru.touchin.roboswag.core.log.LcGroup;
import ru.touchin.roboswag.core.observables.OnSubscribeRefCountWithCacheTime;

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

@ -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;

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

@ -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;

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

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

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

@ -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;
@ -24,4 +24,4 @@ public class SameTypesConverter<T> implements Converter<T, T> {
return object;
}
}
}

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

@ -19,12 +19,11 @@
package ru.touchin.roboswag.core.observables.storable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.lang.reflect.Type;
import java.util.concurrent.TimeUnit;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.observables.storable.concrete.NonNullStorable;
import ru.touchin.roboswag.core.utils.Optional;
import rx.Observable;

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

@ -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;

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

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

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

@ -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;

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

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

6
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.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.
@ -67,4 +67,4 @@ public class ServiceBinder<TService extends Service> extends Binder {
return service.hashCode();
}
}
}

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

@ -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.

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

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

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

@ -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.
@ -58,4 +58,4 @@ public class ThreadLocalValue<T> extends ThreadLocal<T> {
}
}
}

6
src/main/java/ru/touchin/roboswag/core/utils/pairs/HalfNullablePair.java
View File

@ -19,8 +19,8 @@
package ru.touchin.roboswag.core.utils.pairs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.io.Serializable;
@ -84,4 +84,4 @@ public class HalfNullablePair<TFirst, TSecond> implements Serializable {
return ObjectUtils.hashCode(first, second);
}
}
}

7
src/main/java/ru/touchin/roboswag/core/utils/pairs/NonNullPair.java
View File

@ -19,11 +19,10 @@
package ru.touchin.roboswag.core.utils.pairs;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import java.io.Serializable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.core.utils.ObjectUtils;
/**
@ -84,4 +83,4 @@ public class NonNullPair<TFirst, TSecond> implements Serializable {
return ObjectUtils.hashCode(first, second);
}
}
}

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

@ -19,7 +19,7 @@
package ru.touchin.roboswag.core.utils.pairs;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.io.Serializable;
@ -88,4 +88,4 @@ public class NullablePair<TFirst, TSecond> implements Serializable { //todo: mb
return ObjectUtils.hashCode(first, second);
}
}
}