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

Migration to androidx

This commit is contained in:
Karenkov Igor 2019-06-06 00:57:43 +03:00
parent 082f792277
commit cdad98afa7
45 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

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

2
src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
View File

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

18
src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
View File

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

2
src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
View File

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

6
src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
View File

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

2
src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
View File

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

4
src/main/java/ru/touchin/roboswag/components/deeplinks/ActivityDeepLinkController.java
View File

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

4
src/main/java/ru/touchin/roboswag/components/deeplinks/DeepLink.java
View File

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

6
src/main/java/ru/touchin/roboswag/components/deeplinks/DeepLinkController.java
View File

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

6
src/main/java/ru/touchin/roboswag/components/deeplinks/SimpleActivityDeepLinkController.java
View File

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

2
src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java
View File

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

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

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

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

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

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

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

@ -20,14 +20,14 @@
package ru.touchin.roboswag.components.navigation;
import android.animation.ValueAnimator;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.FragmentManager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.view.MenuItem;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.FragmentManager;
import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
/**
@ -245,4 +245,4 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
super.onDrawerSlide(drawerView, this.slideOffset);
}
}
}

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

@ -22,16 +22,16 @@ package ru.touchin.roboswag.components.navigation;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.support.annotation.CallSuper;
import 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 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 android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@ -511,4 +511,4 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
}
}
}

14
src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -25,8 +25,6 @@ import android.graphics.Canvas;
import android.os.Bundle;
import android.os.Parcel;
import android.os.SystemClock;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.InflateException;
import android.view.LayoutInflater;
import android.view.Menu;
@ -40,6 +38,8 @@ import java.io.Serializable;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import ru.touchin.roboswag.components.navigation.AbstractState;
import ru.touchin.roboswag.components.navigation.ViewController;
import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;

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

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

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

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

6
src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
View File

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

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

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

6
src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

10
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.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;
@ -117,4 +117,4 @@ public class MaterialLoadingBar extends AppCompatImageView {
progressDrawable.setColor(colorInt);
}
}
}

8
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.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
}
}
}

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

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

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

@ -22,9 +22,6 @@ package ru.touchin.roboswag.components.views;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.TypedArray;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.AppCompatTextView;
import android.text.TextUtils;
import android.text.method.TransformationMethod;
import android.util.AttributeSet;
@ -33,6 +30,9 @@ import android.util.TypedValue;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatTextView;
import ru.touchin.roboswag.components.R;
import ru.touchin.roboswag.components.utils.Typefaces;
import ru.touchin.roboswag.components.utils.UiUtils;

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