From fd68f1ffd426eb585dd11a7fb4e737790f5c7487 Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Mon, 17 Apr 2017 03:11:46 +0300
Subject: [PATCH 01/95] RxJava2 migration

---
 build.gradle                                  |   4 +-
 .../adapters/BindableViewHolder.java          |  94 +++++-----
 .../adapters/ObservableCollectionAdapter.java |  16 +-
 .../navigation/FragmentNavigation.java        |  46 +++--
 .../components/navigation/ViewController.java |  99 +++++------
 .../navigation/ViewControllerNavigation.java  |  34 ++--
 .../navigation/activities/BaseActivity.java   | 100 +++++------
 .../fragments/ViewControllerFragment.java     |  21 +--
 .../navigation/fragments/ViewFragment.java    |  10 +-
 .../utils/BaseLifecycleBindable.java          | 164 +++++++++---------
 .../components/utils/LifecycleBindable.java   | 156 ++++++++---------
 .../roboswag/components/utils/UiUtils.java    |  24 +--
 .../utils/audio/HeadsetStateObserver.java     |  12 +-
 .../utils/audio/VolumeController.java         |   8 +-
 .../utils/storables/PreferenceStore.java      |   4 +-
 .../utils/storables/PreferenceUtils.java      |   2 +-
 16 files changed, 386 insertions(+), 408 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ba31be..18085af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,6 @@ dependencies {
     provided 'com.android.support:appcompat-v7:25.3.1'
     provided 'com.android.support:recyclerview-v7:25.3.1'
 
-    provided 'io.reactivex:rxandroid:1.2.1'
-    provided 'io.reactivex:rxjava:1.2.9'
+    provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    provided 'io.reactivex.rxjava2:rxjava:2.0.8'
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
index 2748721..23a7454 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
@@ -31,14 +31,14 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
 
 /**
  * Created by Gavriil Sitnikov on 12/8/2016.
@@ -124,145 +124,139 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
 
     @NonNull
     @Override
-    public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
-        return baseLifecycleBindable.bind(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilStop(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilStop(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilStop(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilDestroy(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilDestroy(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilDestroy(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index 9e25e55..8a877bf 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -32,6 +32,10 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
@@ -40,10 +44,6 @@ import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
 import ru.touchin.roboswag.core.observables.collections.ObservableList;
 import ru.touchin.roboswag.core.observables.collections.loadable.LoadingMoreList;
 import ru.touchin.roboswag.core.utils.Optional;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 20/11/2015.
@@ -63,7 +63,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
 
     @NonNull
     private final BehaviorSubject<Optional<ObservableCollection<TItem>>> observableCollectionSubject
-            = BehaviorSubject.create(new Optional<>(null));
+            = BehaviorSubject.createDefault(new Optional<>(null));
     @NonNull
     private final LifecycleBindable lifecycleBindable;
     @Nullable
@@ -98,7 +98,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
                         return Observable.empty();
                     }
                     final int size = collection.size();
-                    return ((LoadingMoreList) collection).loadRange(size, size + PRE_LOADING_COUNT);
+                    return ((LoadingMoreList) collection).loadRange(size, size + PRE_LOADING_COUNT).toObservable();
                 });
     }
 
@@ -381,7 +381,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
         private static final long DELAY_BEFORE_LOADING_HISTORY = TimeUnit.SECONDS.toMillis(1);
 
         @Nullable
-        private Subscription historyPreLoadingSubscription;
+        private Disposable historyPreLoadingSubscription;
         @Nullable
         private ObservableCollectionAdapter adapter;
 
@@ -398,7 +398,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
         //unchecked: it's ok, we just need to load something more
         public void bindPosition(final int position) {
             if (historyPreLoadingSubscription != null) {
-                historyPreLoadingSubscription.unsubscribe();
+                historyPreLoadingSubscription.dispose();
                 historyPreLoadingSubscription = null;
             }
             if (adapter != null && position - adapter.getHeadersCount() > adapter.innerCollection.size() - PRE_LOADING_COUNT) {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
index db4346a..3909605 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
@@ -30,8 +30,8 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.MenuItem;
 
+import io.reactivex.functions.Function;
 import ru.touchin.roboswag.core.log.Lc;
-import rx.functions.Func1;
 
 /**
  * Created by Gavriil Sitnikov on 07/03/2016.
@@ -44,7 +44,7 @@ import rx.functions.Func1;
  * If {@link #back()} method will be called then stack will go to previous fragment.
  * Usually such logic using to set as top fragments from sidebar and show hamburger when some of them appeared;
  * 4) {@link #pushForResult} means to push fragment with target fragment. It is also adding {@link #WITH_TARGET_FRAGMENT_TAG_MARK} tag.
- * Also if such up/back navigation logic is not OK then {@link #backTo(Func1)} method could be used with any condition to back to.
+ * Also if such up/back navigation logic is not OK then {@link #backTo(Function)} method could be used with any condition to back to.
  * In that case in any stack-change method it is allowed to setup fragment transactions.
  */
 public class FragmentNavigation {
@@ -128,7 +128,7 @@ public class FragmentNavigation {
                               @Nullable final Fragment targetFragment,
                               @Nullable final Bundle args,
                               @Nullable final String backStackTag,
-                              @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                              @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         if (fragmentManager.isDestroyed()) {
             Lc.assertion("FragmentManager is destroyed");
             return;
@@ -150,7 +150,12 @@ public class FragmentNavigation {
             fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
         }
         if (transactionSetup != null) {
-            transactionSetup.call(fragmentTransaction).commit();
+            try {
+                transactionSetup.apply(fragmentTransaction).commit();
+            } catch (final Exception exception) {
+                Lc.assertion(exception);
+                fragmentTransaction.commit();
+            }
         } else {
             fragmentTransaction.commit();
         }
@@ -175,15 +180,20 @@ public class FragmentNavigation {
      * @param condition Condition of back stack entry to be satisfied;
      * @return True if it have back to some entry in stack.
      */
-    public boolean backTo(@NonNull final Func1<FragmentManager.BackStackEntry, Boolean> condition) {
+    public boolean backTo(@NonNull final Function<FragmentManager.BackStackEntry, Boolean> condition) {
         final int stackSize = fragmentManager.getBackStackEntryCount();
         Integer id = null;
-        for (int i = stackSize - 2; i >= 0; i--) {
-            final FragmentManager.BackStackEntry backStackEntry = fragmentManager.getBackStackEntryAt(i);
-            id = backStackEntry.getId();
-            if (condition.call(backStackEntry)) {
-                break;
+        try {
+            for (int i = stackSize - 2; i >= 0; i--) {
+                final FragmentManager.BackStackEntry backStackEntry = fragmentManager.getBackStackEntryAt(i);
+                id = backStackEntry.getId();
+                if (condition.apply(backStackEntry)) {
+                    break;
+                }
             }
+        } catch (final Exception exception) {
+            Lc.assertion(exception);
+            return false;
         }
         if (id != null) {
             fragmentManager.popBackStack(id, 0);
@@ -233,7 +243,7 @@ public class FragmentNavigation {
      * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
      */
     public void push(@NonNull final Class<? extends Fragment> fragmentClass,
-                     @NonNull final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                     @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, null, null, null, transactionSetup);
     }
 
@@ -246,7 +256,7 @@ public class FragmentNavigation {
      */
     public void push(@NonNull final Class<? extends Fragment> fragmentClass,
                      @Nullable final Bundle args,
-                     @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                     @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, null, args, null, transactionSetup);
     }
 
@@ -283,7 +293,7 @@ public class FragmentNavigation {
      */
     public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
                               @NonNull final Fragment targetFragment,
-                              @NonNull final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                              @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, targetFragment, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -298,7 +308,7 @@ public class FragmentNavigation {
     public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
                               @NonNull final Fragment targetFragment,
                               @Nullable final Bundle args,
-                              @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                              @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, targetFragment, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -330,7 +340,7 @@ public class FragmentNavigation {
      * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
      */
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
-                         @NonNull final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                         @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, null, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -344,7 +354,7 @@ public class FragmentNavigation {
      */
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
                          @Nullable final Bundle args,
-                         @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                         @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, null, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -375,7 +385,7 @@ public class FragmentNavigation {
      * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
      */
     public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass,
-                           @NonNull final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                           @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         setInitial(fragmentClass, null, transactionSetup);
     }
 
@@ -388,7 +398,7 @@ public class FragmentNavigation {
      */
     public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass,
                            @Nullable final Bundle args,
-                           @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                           @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         beforeSetInitialActions();
         setAsTop(fragmentClass, args, transactionSetup);
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
index 8d70cde..3fa2fc4 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
@@ -37,6 +37,12 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
 import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
@@ -44,12 +50,6 @@ import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
@@ -337,155 +337,146 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         return false;
     }
 
-    @SuppressWarnings("CPD-START")
-    //CPD: it is same as in other implementation based on BaseLifecycleBindable
     @NonNull
     @Override
-    public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
-        return baseLifecycleBindable.bind(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilStop(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilStop(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilStop(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilDestroy(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilDestroy(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilDestroy(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
     @SuppressWarnings("CPD-END")
-    //CPD: it is same as in other implementation based on BaseLifecycleBindable
-    /**
+    /*
      * Helper class to simplify constructor override.
      */
     public static class CreationContext {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
index b4196e3..58fad74 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
@@ -27,13 +27,13 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 
+import io.reactivex.functions.Function;
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.navigation.fragments.SimpleViewControllerFragment;
 import ru.touchin.roboswag.components.navigation.fragments.StatelessTargetedViewControllerFragment;
 import ru.touchin.roboswag.components.navigation.fragments.StatelessViewControllerFragment;
 import ru.touchin.roboswag.components.navigation.fragments.TargetedViewControllerFragment;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
-import rx.functions.Func1;
 
 /**
  * Created by Gavriil Sitnikov on 07/03/2016.
@@ -72,7 +72,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public <TState extends AbstractState> void push(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                     @Nullable final TState state,
-                                                    @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                                                    @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, null, ViewControllerFragment.createState(state), null, transactionSetup);
     }
 
@@ -103,7 +103,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void pushForResult(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                              @NonNull final Fragment targetFragment,
                                                              @Nullable final TState state,
-                                                             @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                                                             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(fragmentClass, targetFragment, ViewControllerFragment.createState(state),
                 fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
@@ -131,7 +131,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public <TState extends AbstractState> void setAsTop(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                         @Nullable final TState state,
-                                                        @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                                                        @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         setAsTop(fragmentClass, ViewControllerFragment.createState(state), transactionSetup);
     }
 
@@ -157,7 +157,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public <TState extends AbstractState> void setInitial(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                           @Nullable final TState state,
-                                                          @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+                                                          @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         setInitial(fragmentClass, ViewControllerFragment.createState(state), transactionSetup);
     }
 
@@ -192,7 +192,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public void pushViewController(
             @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addStatelessViewControllerToStack(viewControllerClass, null, null, transactionSetup);
     }
 
@@ -207,7 +207,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void pushViewController(
             @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
             @NonNull final TState state,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addViewControllerToStack(viewControllerClass, null, state, null, transactionSetup);
     }
 
@@ -242,7 +242,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final Class<? extends ViewController<TActivity,
                     StatelessTargetedViewControllerFragment<TTargetState, TActivity>>> viewControllerClass,
             @NonNull final TTargetFragment targetFragment,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addTargetedStatelessViewControllerToStack(viewControllerClass, targetFragment,
                 viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
@@ -288,7 +288,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
                     TargetedViewControllerFragment<TState, TTargetState, TActivity>>> viewControllerClass,
             @NonNull final TTargetFragment targetFragment,
             @NonNull final TState state,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addTargetedViewControllerToStack(viewControllerClass, targetFragment, state,
                 viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
@@ -326,7 +326,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public void setViewControllerAsTop(
             @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addStatelessViewControllerToStack(viewControllerClass, null, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -342,7 +342,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void setViewControllerAsTop(
             @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
             @NonNull final TState state,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addViewControllerToStack(viewControllerClass, null, state, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -379,7 +379,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public void setInitialViewController(
             @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         beforeSetInitialActions();
         setViewControllerAsTop(viewControllerClass, transactionSetup);
     }
@@ -396,7 +396,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void setInitialViewController(
             @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
             @NonNull final TState state,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         beforeSetInitialActions();
         setViewControllerAsTop(viewControllerClass, state, transactionSetup);
     }
@@ -413,7 +413,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final Class<? extends ViewController<TActivity, ? extends StatelessViewControllerFragment<TActivity>>> viewControllerClass,
             @Nullable final Fragment targetFragment,
             @Nullable final String backStackTag,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(StatelessViewControllerFragment.class, targetFragment,
                 StatelessViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
     }
@@ -435,7 +435,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final Fragment targetFragment,
             @NonNull final TState state,
             @Nullable final String backStackTag,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(TargetedViewControllerFragment.class, targetFragment,
                 TargetedViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
     }
@@ -454,7 +454,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
                     ? extends StatelessTargetedViewControllerFragment<TState, TActivity>>> viewControllerClass,
             @NonNull final Fragment targetFragment,
             @Nullable final String backStackTag,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(StatelessTargetedViewControllerFragment.class, targetFragment,
                 StatelessTargetedViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
     }
@@ -474,7 +474,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @Nullable final Fragment targetFragment,
             @NonNull final TState state,
             @Nullable final String backStackTag,
-            @Nullable final Func1<FragmentTransaction, FragmentTransaction> transactionSetup) {
+            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
         addToStack(SimpleViewControllerFragment.class, targetFragment,
                 SimpleViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 885e46b..b98fc23 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -35,19 +35,19 @@ import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
+import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.Optional;
 import ru.touchin.roboswag.core.utils.pairs.HalfNullablePair;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
-import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 08/03/2016.
@@ -68,7 +68,7 @@ public abstract class BaseActivity extends AppCompatActivity
 
     @NonNull
     private final BehaviorSubject<Optional<HalfNullablePair<Integer, Intent>>> lastActivityResult
-            = BehaviorSubject.create(new Optional<HalfNullablePair<Integer, Intent>>(null));
+            = BehaviorSubject.createDefault(new Optional<HalfNullablePair<Integer, Intent>>(null));
 
     /**
      * Returns if activity resumed.
@@ -254,149 +254,141 @@ public abstract class BaseActivity extends AppCompatActivity
         }
     }
 
-    @SuppressWarnings("CPD-START")
-    //CPD: it is same as in other implementation based on BaseLifecycleBindable
     @NonNull
     @Override
-    public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
-        return baseLifecycleBindable.bind(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilStop(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilStop(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilStop(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilDestroy(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilDestroy(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilDestroy(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index c86573f..561d912 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -39,6 +39,9 @@ import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;
 import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
@@ -47,10 +50,6 @@ import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.Optional;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 import ru.touchin.roboswag.core.utils.pairs.NullablePair;
-import rx.Observable;
-import rx.Subscription;
-import rx.exceptions.OnErrorThrowable;
-import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
@@ -118,7 +117,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
     private final BehaviorSubject<NullablePair<PlaceholderView, Bundle>> viewSubject = BehaviorSubject.create();
     @Nullable
     private ViewController viewController;
-    private Subscription viewControllerSubscription;
+    private Disposable viewControllerSubscription;
     private TState state;
     private boolean started;
     private boolean stateCreated;
@@ -187,8 +186,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                             return newViewController;
                         })
                 .subscribe(this::onViewControllerChanged,
-                        throwable -> Lc.cutAssertion(throwable,
-                                OnErrorThrowable.class, InvocationTargetException.class, InflateException.class));
+                        throwable -> Lc.cutAssertion(throwable, InvocationTargetException.class, InflateException.class));
     }
 
     @NonNull
@@ -196,7 +194,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                                                 @Nullable final Bundle savedInstanceState) {
 
         if (getViewControllerClass().getConstructors().length != 1) {
-            throw OnErrorThrowable.from(new ShouldNotHappenException("There should be single constructor for " + getViewControllerClass()));
+            throw new ShouldNotHappenException("There should be single constructor for " + getViewControllerClass());
         }
         final Constructor<?> constructor = getViewControllerClass().getConstructors()[0];
         final ViewController.CreationContext creationContext = new ViewController.CreationContext(activity, this, view);
@@ -208,11 +206,10 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                 case 3:
                     return (ViewController) constructor.newInstance(this, creationContext, savedInstanceState);
                 default:
-                    throw OnErrorThrowable
-                            .from(new ShouldNotHappenException("Wrong constructor parameters count: " + constructor.getParameterTypes().length));
+                    throw new ShouldNotHappenException("Wrong constructor parameters count: " + constructor.getParameterTypes().length);
             }
         } catch (final Exception exception) {
-            throw OnErrorThrowable.from(exception);
+            throw new ShouldNotHappenException(exception);
         } finally {
             checkCreationTime(creationTime);
         }
@@ -376,7 +373,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
 
     @Override
     public void onDestroy() {
-        viewControllerSubscription.unsubscribe();
+        viewControllerSubscription.dispose();
         if (viewController != null && !viewController.isDestroyed()) {
             viewController.onDestroy();
             viewController = null;
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index 8613a49..6bc2b0c 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -29,9 +29,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import io.reactivex.functions.BiConsumer;
 import ru.touchin.roboswag.components.navigation.OnFragmentStartedListener;
 import ru.touchin.roboswag.core.log.Lc;
-import rx.functions.Action2;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
@@ -111,12 +111,16 @@ public abstract class ViewFragment<TActivity extends AppCompatActivity> extends
         //do nothing
     }
 
-    private void callMethodAfterInstantiation(@NonNull final Action2<View, TActivity> action) {
+    private void callMethodAfterInstantiation(@NonNull final BiConsumer<View, TActivity> action) {
         if (getView() == null || getBaseActivity() == null) {
             Lc.assertion("View and activity shouldn't be null");
             return;
         }
-        action.call(getView(), getBaseActivity());
+        try {
+            action.accept(getView(), getBaseActivity());
+        } catch (final Exception exception) {
+            Lc.assertion(exception);
+        }
     }
 
     @Deprecated
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
index 567ef88..1858347 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
@@ -21,18 +21,17 @@ package ru.touchin.roboswag.components.utils;
 
 import android.support.annotation.NonNull;
 
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
+import io.reactivex.internal.functions.Functions;
+import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.exceptions.OnErrorThrowable;
-import rx.functions.Action0;
-import rx.functions.Action1;
-import rx.functions.Actions;
-import rx.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 18/04/16.
@@ -103,188 +102,181 @@ public class BaseLifecycleBindable implements LifecycleBindable {
 
     @NonNull
     @Override
-    public <T> Subscription bind(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return isStartedSubject.switchMap(started -> started ? observable.observeOn(AndroidSchedulers.mainThread()) : Observable.never())
-                .takeUntil(isCreatedSubject.filter(created -> !created))
-                .subscribe(onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
+        return untilStop(observable, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(observable, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Actions.empty());
+        return untilStop(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Actions.empty());
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return untilStop(observable, onNextAction, onErrorAction, Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
-        return untilStop(observable, onNextAction, onErrorAction, Actions.empty());
-    }
-
-    @NonNull
-    @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return until(observable, isStartedSubject.map(started -> !started), onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(single, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
+        return untilStop(single, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
         return untilStop(single, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
-        return until(single.toObservable(), isStartedSubject.map(started -> !started), onSuccessAction, onErrorAction, Actions.empty());
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(single.toObservable(), isStartedSubject.map(started -> !started), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(completable, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
+        return untilStop(completable, Functions.EMPTY_ACTION, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
         return untilStop(completable, onCompletedAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
-        return until(completable.toObservable(), isStartedSubject.map(started -> !started), Actions.empty(), onErrorAction, onCompletedAction);
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(completable.toObservable(), isStartedSubject.map(started -> !started),
+                Functions.emptyConsumer(), onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(observable, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Actions.empty());
+        return untilDestroy(observable, Functions.emptyConsumer(),
+                getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Actions.empty());
+        return untilDestroy(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
-        return untilDestroy(observable, onNextAction, onErrorAction, Actions.empty());
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return untilDestroy(observable, onNextAction, onErrorAction, Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return until(observable, isCreatedSubject.map(created -> !created), onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(single, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
+        return untilDestroy(single, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
         return untilDestroy(single, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
-        return until(single.toObservable(), isCreatedSubject.map(created -> !created), onSuccessAction, onErrorAction, Actions.empty());
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(single.toObservable(), isCreatedSubject.map(created -> !created), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(completable, Actions.empty(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
+        return untilDestroy(completable, Functions.EMPTY_ACTION, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         final String codePoint = Lc.getCodePoint(this, 2);
         return untilDestroy(completable, onCompletedAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
-        return until(completable.toObservable(), isCreatedSubject.map(created -> !created), Actions.empty(), onErrorAction, onCompletedAction);
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(completable.toObservable(), isCreatedSubject.map(created -> !created),
+                Functions.emptyConsumer(), onErrorAction, onCompletedAction);
     }
 
     @NonNull
-    private <T> Subscription until(@NonNull final Observable<T> observable,
-                                   @NonNull final Observable<Boolean> conditionSubject,
-                                   @NonNull final Action1<T> onNextAction,
-                                   @NonNull final Action1<Throwable> onErrorAction,
-                                   @NonNull final Action0 onCompletedAction) {
+    private <T> Disposable until(@NonNull final Observable<T> observable,
+                                 @NonNull final Observable<Boolean> conditionSubject,
+                                 @NonNull final Consumer<T> onNextAction,
+                                 @NonNull final Consumer<Throwable> onErrorAction,
+                                 @NonNull final Action onCompletedAction) {
         final Observable<T> actualObservable;
-        if (onNextAction == Actions.empty() && onErrorAction == (Action1) Actions.empty() && onCompletedAction == Actions.empty()) {
+        if (onNextAction == Functions.emptyConsumer() && onErrorAction == (Consumer) Functions.emptyConsumer()
+                && onCompletedAction == Functions.EMPTY_ACTION) {
             actualObservable = observable;
         } else {
             actualObservable = observable.observeOn(AndroidSchedulers.mainThread())
-                    .doOnCompleted(onCompletedAction)
+                    .doOnComplete(onCompletedAction)
                     .doOnNext(onNextAction)
                     .doOnError(onErrorAction);
         }
 
-        return isCreatedSubject.first()
-                .switchMap(created -> created ? actualObservable : Observable.empty())
+        return isCreatedSubject.firstOrError()
+                .flatMapObservable(created -> created ? actualObservable : Observable.empty())
                 .takeUntil(conditionSubject.filter(condition -> condition))
                 .onErrorResumeNext(throwable -> {
-                    final boolean isRxError = throwable instanceof OnErrorThrowable;
-                    if ((!isRxError && throwable instanceof RuntimeException)
-                            || (isRxError && throwable.getCause() instanceof RuntimeException)) {
+                    if (throwable instanceof RuntimeException) {
                         Lc.assertion(throwable);
                     }
                     return Observable.empty();
@@ -293,7 +285,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
     }
 
     @NonNull
-    private Action1<Throwable> getActionThrowableForAssertion(@NonNull final String codePoint, @NonNull final String method) {
+    private Consumer<Throwable> getActionThrowableForAssertion(@NonNull final String codePoint, @NonNull final String method) {
         return throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on " + method + " at " + codePoint, throwable));
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
index 95d7b2f..395fb3a 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
@@ -21,32 +21,26 @@ package ru.touchin.roboswag.components.utils;
 
 import android.support.annotation.NonNull;
 
-import rx.Completable;
-import rx.CompletableSubscriber;
-import rx.Observable;
-import rx.Single;
-import rx.SingleSubscriber;
-import rx.Subscriber;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
+import io.reactivex.Completable;
+import io.reactivex.CompletableEmitter;
+import io.reactivex.Emitter;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.SingleEmitter;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 
 /**
  * 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.)
  * to not manually manage subscriptions.
- * Use {@link #bind(Observable, Action1)} method to subscribe to observable onStart and unsubscribe onStop automatically.
  * 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.
  */
 @SuppressWarnings("PMD.TooManyMethods")
 public interface LifecycleBindable {
 
-    @NonNull
-    //do not use this method - it's not obvious method
-    @Deprecated
-    <T> Subscription bind(@NonNull Observable<T> observable, @NonNull Action1<T> onNextAction);
-
     /**
      * Method should be used to guarantee that observable won't be subscribed after onStop.
      * It is automatically subscribing to the observable.
@@ -55,10 +49,10 @@ public interface LifecycleBindable {
      *
      * @param observable {@link Observable} to subscribe until onStop;
      * @param <T>        Type of emitted by observable items;
-     * @return {@link Subscription} which will unsubscribes from observable onStop.
+     * @return {@link Disposable} which will unsubscribes from observable onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Observable<T> observable);
+    <T> Disposable untilStop(@NonNull Observable<T> observable);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onStop.
@@ -67,12 +61,12 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable   {@link Observable} to subscribe until onStop;
-     * @param onNextAction Action which will raise on every {@link Subscriber#onNext(Object)} item;
+     * @param onNextAction Action which will raise on every {@link Emitter#onNext(Object)} item;
      * @param <T>          Type of emitted by observable items;
-     * @return {@link Subscription} which will unsubscribes from observable onStop.
+     * @return {@link Disposable} which will unsubscribes from observable onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Observable<T> observable, @NonNull Action1<T> onNextAction);
+    <T> Disposable untilStop(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onStop.
@@ -81,13 +75,13 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable    {@link Observable} to subscribe until onStop;
-     * @param onNextAction  Action which will raise on every {@link Subscriber#onNext(Object)} item;
-     * @param onErrorAction Action which will raise on every {@link Subscriber#onError(Throwable)} throwable;
+     * @param onNextAction  Action which will raise on every {@link Emitter#onNext(Object)} item;
+     * @param onErrorAction Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
      * @param <T>           Type of emitted by observable items;
-     * @return {@link Subscription} which will unsubscribes from observable onStop.
+     * @return {@link Disposable} which will unsubscribes from observable onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Observable<T> observable, @NonNull Action1<T> onNextAction, @NonNull Action1<Throwable> onErrorAction);
+    <T> Disposable untilStop(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onStop.
@@ -96,15 +90,15 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable        {@link Observable} to subscribe until onStop;
-     * @param onNextAction      Action which will raise on every {@link Subscriber#onNext(Object)} item;
-     * @param onErrorAction     Action which will raise on every {@link Subscriber#onError(Throwable)} throwable;
-     * @param onCompletedAction Action which will raise at {@link Subscriber#onCompleted()} on completion of observable;
+     * @param onNextAction      Action which will raise on every {@link Emitter#onNext(Object)} item;
+     * @param onErrorAction     Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
+     * @param onCompletedAction Action which will raise at {@link Emitter#onComplete()} on completion of observable;
      * @param <T>               Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source observable to unsubscribe from it onStop.
+     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Observable<T> observable,
-                               @NonNull Action1<T> onNextAction, @NonNull Action1<Throwable> onErrorAction, @NonNull Action0 onCompletedAction);
+    <T> Disposable untilStop(@NonNull Observable<T> observable,
+                             @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction, @NonNull Action onCompletedAction);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onStop.
@@ -114,10 +108,10 @@ public interface LifecycleBindable {
      *
      * @param single {@link Single} to subscribe until onStop;
      * @param <T>    Type of emitted by single item;
-     * @return {@link Subscription} which will unsubscribes from single onStop.
+     * @return {@link Disposable} which will unsubscribes from single onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Single<T> single);
+    <T> Disposable untilStop(@NonNull Single<T> single);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onStop.
@@ -126,12 +120,12 @@ public interface LifecycleBindable {
      * Don't forget to process errors if single can emit them.
      *
      * @param single          {@link Single} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise on every {@link SingleSubscriber#onSuccess(Object)} item;
+     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
      * @param <T>             Type of emitted by single item;
-     * @return {@link Subscription} which will unsubscribes from single onStop.
+     * @return {@link Disposable} which will unsubscribes from single onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Single<T> single, @NonNull Action1<T> onSuccessAction);
+    <T> Disposable untilStop(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onStop.
@@ -140,13 +134,13 @@ public interface LifecycleBindable {
      * Don't forget to process errors if single can emit them.
      *
      * @param single          {@link Single} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise on every {@link SingleSubscriber#onSuccess(Object)} item;
-     * @param onErrorAction   Action which will raise on every {@link SingleSubscriber#onError(Throwable)} throwable;
+     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
+     * @param onErrorAction   Action which will raise on every {@link SingleEmitter#onError(Throwable)} throwable;
      * @param <T>             Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source single to unsubscribe from it onStop.
+     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onStop.
      */
     @NonNull
-    <T> Subscription untilStop(@NonNull Single<T> single, @NonNull Action1<T> onSuccessAction, @NonNull Action1<Throwable> onErrorAction);
+    <T> Disposable untilStop(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onStop.
@@ -155,10 +149,10 @@ public interface LifecycleBindable {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable {@link Completable} to subscribe until onStop;
-     * @return {@link Subscription} which will unsubscribes from completable onStop.
+     * @return {@link Disposable} which will unsubscribes from completable onStop.
      */
     @NonNull
-    Subscription untilStop(@NonNull Completable completable);
+    Disposable untilStop(@NonNull Completable completable);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onStop.
@@ -167,11 +161,11 @@ public interface LifecycleBindable {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable       {@link Completable} to subscribe until onStop;
-     * @param onCompletedAction Action which will raise at {@link CompletableSubscriber#onCompleted()} on completion of observable;
-     * @return {@link Subscription} which is wrapping source completable to unsubscribe from it onStop.
+     * @param onCompletedAction Action which will raise at {@link CompletableEmitter#onComplete()} on completion of observable;
+     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onStop.
      */
     @NonNull
-    Subscription untilStop(@NonNull Completable completable, @NonNull Action0 onCompletedAction);
+    Disposable untilStop(@NonNull Completable completable, @NonNull Action onCompletedAction);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onStop.
@@ -180,12 +174,12 @@ public interface LifecycleBindable {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable       {@link Completable} to subscribe until onStop;
-     * @param onCompletedAction Action which will raise at {@link CompletableSubscriber#onCompleted()} on completion of observable;
-     * @param onErrorAction     Action which will raise on every {@link CompletableSubscriber#onError(Throwable)} throwable;
-     * @return {@link Subscription} which is wrapping source completable to unsubscribe from it onStop.
+     * @param onCompletedAction Action which will raise at {@link CompletableEmitter#onComplete()} on completion of observable;
+     * @param onErrorAction     Action which will raise on every {@link CompletableEmitter#onError(Throwable)} throwable;
+     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onStop.
      */
     @NonNull
-    Subscription untilStop(@NonNull Completable completable, @NonNull Action0 onCompletedAction, @NonNull Action1<Throwable> onErrorAction);
+    Disposable untilStop(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
@@ -194,10 +188,10 @@ public interface LifecycleBindable {
      *
      * @param observable {@link Observable} to subscribe until onDestroy;
      * @param <T>        Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source observable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Observable<T> observable);
+    <T> Disposable untilDestroy(@NonNull Observable<T> observable);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
@@ -205,12 +199,12 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable   {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction Action which will raise on every {@link Subscriber#onNext(Object)} item;
+     * @param onNextAction Action which will raise on every {@link Emitter#onNext(Object)} item;
      * @param <T>          Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source observable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Observable<T> observable, @NonNull Action1<T> onNextAction);
+    <T> Disposable untilDestroy(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
@@ -218,13 +212,13 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable    {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction  Action which will raise on every {@link Subscriber#onNext(Object)} item;
-     * @param onErrorAction Action which will raise on every {@link Subscriber#onError(Throwable)} throwable;
+     * @param onNextAction  Action which will raise on every {@link Emitter#onNext(Object)} item;
+     * @param onErrorAction Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
      * @param <T>           Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source observable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Observable<T> observable, @NonNull Action1<T> onNextAction, @NonNull Action1<Throwable> onErrorAction);
+    <T> Disposable untilDestroy(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction);
 
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
@@ -232,15 +226,15 @@ public interface LifecycleBindable {
      * Don't forget to process errors if observable can emit them.
      *
      * @param observable        {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction      Action which will raise on every {@link Subscriber#onNext(Object)} item;
-     * @param onErrorAction     Action which will raise on every {@link Subscriber#onError(Throwable)} throwable;
-     * @param onCompletedAction Action which will raise at {@link Subscriber#onCompleted()} on completion of observable;
+     * @param onNextAction      Action which will raise on every {@link Emitter#onNext(Object)} item;
+     * @param onErrorAction     Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
+     * @param onCompletedAction Action which will raise at {@link Emitter#onComplete()} on completion of observable;
      * @param <T>               Type of emitted by observable items;
-     * @return {@link Subscription} which is wrapping source observable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Observable<T> observable,
-                                  @NonNull Action1<T> onNextAction, @NonNull Action1<Throwable> onErrorAction, @NonNull Action0 onCompletedAction);
+    <T> Disposable untilDestroy(@NonNull Observable<T> observable,
+                                @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction, @NonNull Action onCompletedAction);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onDestroy.
@@ -249,10 +243,10 @@ public interface LifecycleBindable {
      *
      * @param single {@link Single} to subscribe until onDestroy;
      * @param <T>    Type of emitted by single items;
-     * @return {@link Subscription} which is wrapping source single to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Single<T> single);
+    <T> Disposable untilDestroy(@NonNull Single<T> single);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onDestroy.
@@ -260,12 +254,12 @@ public interface LifecycleBindable {
      * Don't forget to process errors if single can emit them.
      *
      * @param single          {@link Single} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link SingleSubscriber#onSuccess(Object)} item;
+     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
      * @param <T>             Type of emitted by single items;
-     * @return {@link Subscription} which is wrapping source single to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Single<T> single, @NonNull Action1<T> onSuccessAction);
+    <T> Disposable untilDestroy(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction);
 
     /**
      * Method should be used to guarantee that single won't be subscribed after onDestroy.
@@ -273,13 +267,13 @@ public interface LifecycleBindable {
      * Don't forget to process errors if single can emit them.
      *
      * @param single          {@link Single} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link SingleSubscriber#onSuccess(Object)} item;
-     * @param onErrorAction   Action which will raise on every {@link SingleSubscriber#onError(Throwable)} throwable;
+     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
+     * @param onErrorAction   Action which will raise on every {@link SingleEmitter#onError(Throwable)} throwable;
      * @param <T>             Type of emitted by single items;
-     * @return {@link Subscription} which is wrapping source single to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
      */
     @NonNull
-    <T> Subscription untilDestroy(@NonNull Single<T> single, @NonNull Action1<T> onSuccessAction, @NonNull Action1<Throwable> onErrorAction);
+    <T> Disposable untilDestroy(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onDestroy.
@@ -287,10 +281,10 @@ public interface LifecycleBindable {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable {@link Completable} to subscribe until onDestroy;
-     * @return {@link Subscription} which is wrapping source completable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onDestroy.
      */
     @NonNull
-    Subscription untilDestroy(@NonNull Completable completable);
+    Disposable untilDestroy(@NonNull Completable completable);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onDestroy.
@@ -298,11 +292,11 @@ public interface LifecycleBindable {
      * Don't forget to process errors if single can emit them.
      *
      * @param completable       {@link Completable} to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on every {@link CompletableSubscriber#onCompleted()} item;
-     * @return {@link Subscription} which is wrapping source single to unsubscribe from it onDestroy.
+     * @param onCompletedAction Action which will raise on every {@link CompletableEmitter#onComplete()} item;
+     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
      */
     @NonNull
-    Subscription untilDestroy(@NonNull Completable completable, @NonNull Action0 onCompletedAction);
+    Disposable untilDestroy(@NonNull Completable completable, @NonNull Action onCompletedAction);
 
     /**
      * Method should be used to guarantee that completable won't be subscribed after onDestroy.
@@ -310,11 +304,11 @@ public interface LifecycleBindable {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable       {@link Completable} to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on every {@link CompletableSubscriber#onCompleted()} item;
-     * @param onErrorAction     Action which will raise on every {@link CompletableSubscriber#onError(Throwable)} throwable;
-     * @return {@link Subscription} which is wrapping source completable to unsubscribe from it onDestroy.
+     * @param onCompletedAction Action which will raise on every {@link CompletableEmitter#onComplete()} item;
+     * @param onErrorAction     Action which will raise on every {@link CompletableEmitter#onError(Throwable)} throwable;
+     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onDestroy.
      */
     @NonNull
-    Subscription untilDestroy(@NonNull Completable completable, @NonNull Action0 onCompletedAction, @NonNull Action1<Throwable> onErrorAction);
+    Disposable untilDestroy(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
 
 }
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 0bd06c8..5ad9f3d 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -43,9 +43,11 @@ import android.view.ViewGroup;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
+import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
-import rx.functions.Action0;
 
 /**
  * Created by Gavriil Sitnikov on 13/11/2015.
@@ -100,8 +102,8 @@ public final class UiUtils {
      * @param onClickListener Click listener;
      * @param delay           Delay after which click listener will be called.
      */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action0 onClickListener, final long delay) {
-        setOnRippleClickListener(targetView, onClickListener != null ? v -> onClickListener.call() : null, delay);
+    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener, final long delay) {
+        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, delay);
     }
 
     /**
@@ -110,8 +112,8 @@ public final class UiUtils {
      * @param targetView      View to set click listener to;
      * @param onClickListener Click listener.
      */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action0 onClickListener) {
-        setOnRippleClickListener(targetView, onClickListener != null ? v -> onClickListener.call() : null, RIPPLE_EFFECT_DELAY);
+    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener) {
+        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, RIPPLE_EFFECT_DELAY);
     }
 
     /**
@@ -120,7 +122,7 @@ public final class UiUtils {
      * @param targetView      View to set click listener to;
      * @param onClickListener Click listener.
      */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final View.OnClickListener onClickListener) {
+    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener) {
         setOnRippleClickListener(targetView, onClickListener, RIPPLE_EFFECT_DELAY);
     }
 
@@ -131,9 +133,7 @@ public final class UiUtils {
      * @param onClickListener Click listener;
      * @param delay           Delay after which click listener will be called.
      */
-    public static void setOnRippleClickListener(@NonNull final View targetView,
-                                                @Nullable final View.OnClickListener onClickListener,
-                                                final long delay) {
+    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener, final long delay) {
         if (onClickListener == null) {
             targetView.setOnClickListener(null);
             return;
@@ -145,7 +145,11 @@ public final class UiUtils {
                     || (targetView.getContext() instanceof BaseActivity && !((BaseActivity) targetView.getContext()).isActuallyResumed())) {
                 return;
             }
-            onClickListener.onClick(targetView);
+            try {
+                onClickListener.accept(targetView);
+            } catch (final Exception exception) {
+                Lc.assertion(exception);
+            }
         };
 
         targetView.setOnClickListener(v -> {
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java b/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
index eea069f..346e52b 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
@@ -27,8 +27,8 @@ import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.support.annotation.NonNull;
 
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
+import io.reactivex.Observable;
+import io.reactivex.subjects.BehaviorSubject;
 
 /**
  * Created by Gavriil Sitnikov on 02/11/2015.
@@ -50,12 +50,12 @@ public final class HeadsetStateObserver {
                         isConnectedReceiver.isWirelessConnectedChangedEvent,
                         (isWiredConnected, isWirelessConnected) -> isWiredConnected || isWirelessConnected)
                         .distinctUntilChanged()
-                        .doOnSubscribe(() -> {
+                        .doOnSubscribe(disposable -> {
                             final IntentFilter headsetStateIntentFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);
                             headsetStateIntentFilter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
                             context.registerReceiver(isConnectedReceiver, headsetStateIntentFilter);
                         })
-                        .doOnUnsubscribe(() -> context.unregisterReceiver(isConnectedReceiver)))
+                        .doOnDispose(() -> context.unregisterReceiver(isConnectedReceiver)))
                 .replay(1)
                 .refCount();
     }
@@ -90,8 +90,8 @@ public final class HeadsetStateObserver {
         @SuppressWarnings("deprecation")
         public IsConnectedReceiver(@NonNull final AudioManager audioManager) {
             super();
-            isWiredConnectedChangedEvent = BehaviorSubject.create(audioManager.isWiredHeadsetOn());
-            isWirelessConnectedChangedEvent = BehaviorSubject.create(audioManager.isBluetoothA2dpOn());
+            isWiredConnectedChangedEvent = BehaviorSubject.createDefault(audioManager.isWiredHeadsetOn());
+            isWirelessConnectedChangedEvent = BehaviorSubject.createDefault(audioManager.isBluetoothA2dpOn());
         }
 
         @Override
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java b/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
index 5a70c4d..c0853de 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
@@ -27,10 +27,10 @@ import android.os.Looper;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 
+import io.reactivex.Observable;
+import io.reactivex.subjects.PublishSubject;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import rx.Observable;
-import rx.subjects.PublishSubject;
 
 /**
  * Created by Gavriil Sitnikov on 02/11/2015.
@@ -58,9 +58,9 @@ public final class VolumeController {
                 .switchMap(volumeObserver -> selfVolumeChangedEvent
                         .mergeWith(volumeObserver.systemVolumeChangedEvent
                                 .map(event -> getVolume())
-                                .doOnSubscribe(() -> context.getContentResolver()
+                                .doOnSubscribe(disposable -> context.getContentResolver()
                                         .registerContentObserver(Settings.System.CONTENT_URI, true, volumeObserver))
-                                .doOnUnsubscribe(() -> context.getContentResolver()
+                                .doOnDispose(() -> context.getContentResolver()
                                         .unregisterContentObserver(volumeObserver)))
                         .startWith(getVolume()))
                 .distinctUntilChanged()
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java b/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
index d7e33a2..caa718a 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
@@ -28,8 +28,8 @@ import java.lang.reflect.Type;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.observables.storable.Store;
 import ru.touchin.roboswag.core.utils.Optional;
-import rx.Completable;
-import rx.Single;
+import io.reactivex.Completable;
+import io.reactivex.Single;
 
 
 /**
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
index 6d710b5..2ee1db9 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
@@ -28,7 +28,7 @@ import java.lang.reflect.Type;
 import ru.touchin.roboswag.core.observables.storable.Converter;
 import ru.touchin.roboswag.core.observables.storable.SameTypesConverter;
 import ru.touchin.roboswag.core.observables.storable.Storable;
-import ru.touchin.roboswag.core.observables.storable.concrete.NonNullStorable;
+import ru.touchin.roboswag.core.observables.storable.NonNullStorable;
 
 /**
  * Created by Gavriil Sitnikov on 01/09/2016.

From 68f7c73ff9c8a18af13c3f7885c4d52d1dd4fadb Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Wed, 19 Apr 2017 19:09:34 +0300
Subject: [PATCH 02/95] started empty value crash fix

---
 .../roboswag/components/utils/BaseLifecycleBindable.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
index 1858347..a44f9fa 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
@@ -59,7 +59,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onStart method.
      */
     public void onStart() {
-        if (!isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || !isStartedSubject.getValue()) {
             isStartedSubject.onNext(true);
         }
     }
@@ -70,7 +70,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * In that case onResume will be called after onSaveInstanceState so lifecycle object is becoming started.
      */
     public void onResume() {
-        if (!isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || !isStartedSubject.getValue()) {
             isStartedSubject.onNext(true);
         }
     }
@@ -79,7 +79,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onSaveInstanceState method.
      */
     public void onSaveInstanceState() {
-        if (isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || isStartedSubject.getValue()) {
             isStartedSubject.onNext(false);
         }
     }
@@ -88,7 +88,7 @@ public class BaseLifecycleBindable implements LifecycleBindable {
      * Call it on parent's onStop method.
      */
     public void onStop() {
-        if (isStartedSubject.getValue()) {
+        if (!isStartedSubject.hasValue() || isStartedSubject.getValue()) {
             isStartedSubject.onNext(false);
         }
     }

From 949025a1061a8a1f88c6631a74317d2b8ca02a5a Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Fri, 21 Apr 2017 00:10:41 +0300
Subject: [PATCH 03/95] static fixes

---
 .../components/adapters/AdapterDelegate.java  | 88 +++++++++----------
 .../adapters/BindableViewHolder.java          |  3 +
 .../navigation/activities/BaseActivity.java   |  2 +
 .../roboswag/components/utils/Logic.java      |  2 +-
 4 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index f3e29fd..99ee943 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -5,14 +5,14 @@ import android.view.ViewGroup;
 
 import java.util.List;
 
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
 
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
@@ -114,139 +114,139 @@ public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder, TI
     //CPD: it is same as in other implementation based on BaseLifecycleBindable
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         return parentLifecycleBindable.untilStop(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return parentLifecycleBindable.untilStop(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return parentLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         return parentLifecycleBindable.untilStop(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return parentLifecycleBindable.untilStop(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         return parentLifecycleBindable.untilStop(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return parentLifecycleBindable.untilStop(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         return parentLifecycleBindable.untilDestroy(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return parentLifecycleBindable.untilDestroy(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return parentLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         return parentLifecycleBindable.untilDestroy(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return parentLifecycleBindable.untilDestroy(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         return parentLifecycleBindable.untilDestroy(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return parentLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
         return parentLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
index 23a7454..7b81e8a 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
@@ -122,6 +122,8 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return ContextCompat.getDrawable(itemView.getContext(), resId);
     }
 
+    @SuppressWarnings("CPD-START")
+    //CPD: it's ok as it's LifecycleBindable
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
@@ -252,6 +254,7 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
+    @SuppressWarnings("CPD-END")
     @NonNull
     @Override
     public Disposable untilDestroy(@NonNull final Completable completable,
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index b98fc23..6fed556 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -254,6 +254,8 @@ public abstract class BaseActivity extends AppCompatActivity
         }
     }
 
+    @SuppressWarnings("CPD-START")
+    //CPD: it's ok as it's LifecycleBindable
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Observable<T> observable,
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/Logic.java b/src/main/java/ru/touchin/roboswag/components/utils/Logic.java
index cdce5c0..84c2e87 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/Logic.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/Logic.java
@@ -27,8 +27,8 @@ import java.lang.reflect.Constructor;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.reactivex.Observable;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import rx.Observable;
 
 /**
  * Created by Gavriil Sitnikov on 24/03/16.

From 5f13aefa844c52e0bc5dd24f8609fe973efb9a90 Mon Sep 17 00:00:00 2001
From: Gavriil Sitnikov <zuzuk666@gmail.com>
Date: Fri, 21 Apr 2017 00:31:26 +0300
Subject: [PATCH 04/95] viewcontroller null fixed

---
 .../navigation/fragments/ViewControllerFragment.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 561d912..0a80e5f 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -179,11 +179,11 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                             final TActivity activity = activityOptional.get();
                             final PlaceholderView container = viewInfo.getFirst();
                             if (activity == null || container == null) {
-                                return null;
+                                return new Optional<ViewController>(null);
                             }
                             final ViewController newViewController = createViewController(activity, container, viewInfo.getSecond());
                             newViewController.onCreate();
-                            return newViewController;
+                            return new Optional<>(newViewController);
                         })
                 .subscribe(this::onViewControllerChanged,
                         throwable -> Lc.cutAssertion(throwable, InvocationTargetException.class, InflateException.class));
@@ -312,11 +312,11 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         return (viewController != null && viewController.onOptionsItemSelected(item)) || super.onOptionsItemSelected(item);
     }
 
-    private void onViewControllerChanged(@Nullable final ViewController viewController) {
+    private void onViewControllerChanged(@NonNull final Optional<ViewController> viewControllerOptional) {
         if (this.viewController != null) {
             this.viewController.onDestroy();
         }
-        this.viewController = viewController;
+        this.viewController = viewControllerOptional.get();
         if (this.viewController != null) {
             if (started) {
                 this.viewController.onStart();

From d8ca0e610baa72288707bf7d1462c46ca7e215d0 Mon Sep 17 00:00:00 2001
From: Arhipov <gorodeckii@gmail.com>
Date: Wed, 26 Apr 2017 16:27:30 +0300
Subject: [PATCH 05/95] merge continued

---
 .../components/adapters/ObservableCollectionAdapter.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index c53a27c..68fb759 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -466,7 +466,9 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
      * @param positionInAdapter Position of ViewHolder (NOT item!);
      * @param item              Item returned by position (WITH HEADER OFFSET!).
      */
-    protected abstract void onBindItemToViewHolder(@NonNull TItemViewHolder holder, int positionInAdapter, @NonNull TItem item);
+    protected void onBindItemToViewHolder(@NonNull final TItemViewHolder holder, final int positionInAdapter, @NonNull final TItem item) {
+        //do nothing by default
+    }
 
     /**
      * Method to bind item (from {@link #getObservableCollection()}) to item-specific ViewHolder with payloads.
@@ -477,13 +479,9 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
      * @param item              Item returned by position (WITH HEADER OFFSET!);
      * @param payloads          Payloads.
      */
-<<<<<<< HEAD
     protected void onBindItemToViewHolder(@NonNull final TItemViewHolder holder, final int positionInAdapter, @NonNull final TItem item,
                                           @NonNull final List<Object> payloads) {
         // do nothing by default
-=======
-    protected void onBindItemToViewHolder(@NonNull final TItemViewHolder holder, final int position, @NonNull final TItem item) {
->>>>>>> master
     }
 
     @Nullable

From 5d0847370dbdce96f8e632a059d0b05101349681 Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Wed, 3 May 2017 09:26:52 +0300
Subject: [PATCH 06/95] rxjava version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 18085af..50d5575 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:25.3.1'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.0.8'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.0'
 }

From e847fcedc5277a8fc2265a666afa23e1fc971eea Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Fri, 12 May 2017 20:30:35 +0300
Subject: [PATCH 07/95] unused import

---
 .../touchin/roboswag/components/adapters/AdapterDelegate.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index 6df5095..020912a 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -3,8 +3,6 @@ package ru.touchin.roboswag.components.adapters;
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
-import java.util.List;
-
 import io.reactivex.Completable;
 import io.reactivex.Observable;
 import io.reactivex.Single;

From c57f30aca150ea3c4764fd74f6a1fbc886e5db87 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Wed, 17 May 2017 19:00:46 +0300
Subject: [PATCH 08/95] fix wrong import

---
 .../adapters/ObservableCollectionAdapter.java | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index bc4a4e3..4aaae19 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -30,8 +30,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
+
+import io.reactivex.functions.BiConsumer;
+import io.reactivex.functions.Consumer;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -423,19 +424,31 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
         for (final AdapterDelegate<?> delegate : delegates) {
             if (delegate instanceof ItemAdapterDelegate) {
                 if (positionInCollection >= 0 && viewType == delegate.getItemViewType()) {
-                    itemAdapterDelegateAction.accept((ItemAdapterDelegate) delegate, positionInCollection);
+                    try {
+                        itemAdapterDelegateAction.accept((ItemAdapterDelegate) delegate, positionInCollection);
+                    } catch (final Exception exception) {
+                        Lc.assertion(exception);
+                    }
                     return;
                 }
             } else if (delegate instanceof PositionAdapterDelegate) {
                 if (viewType == delegate.getItemViewType()) {
-                    positionAdapterDelegateAction.accept((PositionAdapterDelegate) delegate);
+                    try {
+                        positionAdapterDelegateAction.accept((PositionAdapterDelegate) delegate);
+                    } catch (final Exception exception) {
+                        Lc.assertion(exception);
+                    }
                     return;
                 }
             } else {
                 Lc.assertion("Delegate of type " + delegate.getClass());
             }
         }
-        defaultAction.accept(positionInCollection);
+        try {
+            defaultAction.accept(positionInCollection);
+        } catch (final Exception exception) {
+            Lc.assertion(exception);
+        }
     }
 
     @Override

From 88113ef0ee782f65199e4e10d5dc66b244979318 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Wed, 17 May 2017 19:06:19 +0300
Subject: [PATCH 09/95] add supress

---
 .../components/adapters/ObservableCollectionAdapter.java         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index 4aaae19..9af94e8 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -415,6 +415,7 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
         return result.value;
     }
 
+    @SuppressWarnings("PMD.CyclomaticComplexity")
     private void tryDelegateAction(final int positionInAdapter,
                                    @NonNull final BiConsumer<ItemAdapterDelegate, Integer> itemAdapterDelegateAction,
                                    @NonNull final Consumer<PositionAdapterDelegate> positionAdapterDelegateAction,

From e9f7815ca33f11aad3ef717c540e097c69bc368c Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Mon, 29 May 2017 12:34:02 +0300
Subject: [PATCH 10/95] fixed imports to rxjava-2 style

---
 .../components/views/LifecycleView.java       | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
index eafcc48..d0b6d39 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
@@ -30,12 +30,12 @@ import android.widget.FrameLayout;
 
 import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
-import rx.Completable;
-import rx.Observable;
-import rx.Single;
-import rx.Subscription;
-import rx.functions.Action0;
-import rx.functions.Action1;
+import io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Single;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
+import io.reactivex.functions.Consumer;
 
 
 /**
@@ -145,139 +145,139 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilStop(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                      @NonNull final Consumer<T> onNextAction,
+                                      @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Action1<T> onNextAction,
-                                      @NonNull final Action1<Throwable> onErrorAction,
-                                      @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
+                                      @NonNull final Consumer<T> onNextAction,
+                                      @NonNull final Consumer<Throwable> onErrorAction,
+                                      @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilStop(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Action1<T> onSuccessAction,
-                                      @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Single<T> single,
+                                      @NonNull final Consumer<T> onSuccessAction,
+                                      @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable) {
+    public Disposable untilStop(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilStop(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action0 onCompletedAction,
-                                  @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilStop(@NonNull final Completable completable,
+                                  @NonNull final Action onCompletedAction,
+                                  @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
         return baseLifecycleBindable.untilDestroy(observable);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable, @NonNull final Action1<T> onNextAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                         @NonNull final Consumer<T> onNextAction,
+                                         @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Action1<T> onNextAction,
-                                         @NonNull final Action1<Throwable> onErrorAction,
-                                         @NonNull final Action0 onCompletedAction) {
+    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
+                                         @NonNull final Consumer<T> onNextAction,
+                                         @NonNull final Consumer<Throwable> onErrorAction,
+                                         @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
         return baseLifecycleBindable.untilDestroy(single);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single, @NonNull final Action1<T> onSuccessAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
     }
 
     @NonNull
     @Override
-    public <T> Subscription untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Action1<T> onSuccessAction,
-                                         @NonNull final Action1<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
+                                         @NonNull final Consumer<T> onSuccessAction,
+                                         @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable) {
+    public Disposable untilDestroy(@NonNull final Completable completable) {
         return baseLifecycleBindable.untilDestroy(completable);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable, @NonNull final Action0 onCompletedAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
     @NonNull
     @Override
-    public Subscription untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action0 onCompletedAction,
-                                     @NonNull final Action1<Throwable> onErrorAction) {
+    public Disposable untilDestroy(@NonNull final Completable completable,
+                                     @NonNull final Action onCompletedAction,
+                                     @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 

From 06f9b1d2cc9bfe726caa6617f2ac1647eb1e70e7 Mon Sep 17 00:00:00 2001
From: Anton Domnikov <anton.domnikov@touchin.ru>
Date: Wed, 14 Jun 2017 17:51:06 +0300
Subject: [PATCH 11/95] remove retrolambda

---
 build.gradle | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index e34e77e..4a85fab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -18,8 +17,8 @@ android {
 dependencies {
     compile project(':libraries:core')
 
-    provided 'com.android.support:appcompat-v7:25.3.1'
-    provided 'com.android.support:recyclerview-v7:25.3.1'
+    provided 'com.android.support:appcompat-v7:26.0.0-beta2'
+    provided 'com.android.support:recyclerview-v7:26.0.0-beta2'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
     provided 'io.reactivex.rxjava2:rxjava:2.1.0'

From 540e573888836ee5266e5fb606b109935d5b94b1 Mon Sep 17 00:00:00 2001
From: Anton Domnikov <anton.domnikov@touchin.ru>
Date: Mon, 19 Jun 2017 18:23:27 +0300
Subject: [PATCH 12/95] revert retrolambda

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 4a85fab..7ae5a16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 26

From d3bcd8974341d7b74c390abab25807ed8e7b66cb Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Wed, 21 Jun 2017 17:05:02 +0300
Subject: [PATCH 13/95] update rxJava2 to 2.1.1

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e34e77e..7801a3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,5 +22,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:25.3.1'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.0'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.1'
 }

From 2398b4fc10af0b6b3c6146cce9d8f7d780674a53 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Thu, 29 Jun 2017 13:17:58 +0300
Subject: [PATCH 14/95] add maybe support to bindable lifecycle

---
 .../components/adapters/AdapterDelegate.java  | 41 ++++++++++
 .../adapters/BindableViewHolder.java          | 41 ++++++++++
 .../components/navigation/ViewController.java | 41 ++++++++++
 .../navigation/activities/BaseActivity.java   | 49 ++++++++++-
 .../utils/BaseLifecycleBindable.java          | 45 +++++++++++
 .../components/utils/LifecycleBindable.java   | 81 ++++++++++++++++++-
 .../components/views/LifecycleView.java       | 37 +++++++++
 7 files changed, 329 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index 6bcd61c..b9d3a0d 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -23,6 +23,7 @@ import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.disposables.Disposable;
@@ -149,6 +150,26 @@ public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> im
         return parentLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        return parentLifecycleBindable.untilStop(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return parentLifecycleBindable.untilStop(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return parentLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
@@ -218,4 +239,24 @@ public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> im
         return parentLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        return parentLifecycleBindable.untilDestroy(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return parentLifecycleBindable.untilDestroy(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return parentLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
+    }
+
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
index 7b81e8a..b57f290 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
@@ -32,6 +32,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.disposables.Disposable;
@@ -193,6 +194,26 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilStop(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
@@ -263,4 +284,24 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilDestroy(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
+    }
+
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
index 3fa2fc4..7ead71e 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
@@ -38,6 +38,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.disposables.Disposable;
@@ -406,6 +407,26 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilStop(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
@@ -475,6 +496,26 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilDestroy(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onCompletedAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onCompletedAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction, onErrorAction);
+    }
+
     @SuppressWarnings("CPD-END")
     /*
      * Helper class to simplify constructor override.
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 6fed556..d444633 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -36,6 +36,7 @@ import android.view.inputmethod.InputMethodManager;
 import java.util.ArrayList;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.disposables.Disposable;
@@ -256,6 +257,18 @@ public abstract class BaseActivity extends AppCompatActivity
 
     @SuppressWarnings("CPD-START")
     //CPD: it's ok as it's LifecycleBindable
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
+        return baseLifecycleBindable.untilStop(observable);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
+        return baseLifecycleBindable.untilStop(observable, onNextAction);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Observable<T> observable,
@@ -315,14 +328,22 @@ public abstract class BaseActivity extends AppCompatActivity
 
     @NonNull
     @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilStop(observable);
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilStop(maybe);
     }
 
     @NonNull
     @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction);
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
     }
 
     @NonNull
@@ -394,6 +415,26 @@ public abstract class BaseActivity extends AppCompatActivity
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilDestroy(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onCompletedAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onCompletedAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction, onErrorAction);
+    }
+
     @SuppressWarnings("CPD-END")
     /*
      * Interface to be implemented for someone who want to intercept device back button pressing event.
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
index a44f9fa..cfbd3fe 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
@@ -22,6 +22,7 @@ package ru.touchin.roboswag.components.utils;
 import android.support.annotation.NonNull;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -177,6 +178,28 @@ public class BaseLifecycleBindable implements LifecycleBindable {
                 Functions.emptyConsumer(), onErrorAction, onCompletedAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        final String codePoint = Lc.getCodePoint(this, 2);
+        return untilStop(maybe, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        final String codePoint = Lc.getCodePoint(this, 2);
+        return untilStop(maybe, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(maybe.toObservable(), isStartedSubject.map(started -> !started), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
@@ -255,6 +278,28 @@ public class BaseLifecycleBindable implements LifecycleBindable {
                 Functions.emptyConsumer(), onErrorAction, onCompletedAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        final String codePoint = Lc.getCodePoint(this, 2);
+        return untilDestroy(maybe, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        final String codePoint = Lc.getCodePoint(this, 2);
+        return untilDestroy(maybe, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
+        return until(maybe.toObservable(), isCreatedSubject.map(created -> !created), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
+    }
+
     @NonNull
     private <T> Disposable until(@NonNull final Observable<T> observable,
                                  @NonNull final Observable<Boolean> conditionSubject,
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
index 395fb3a..e49ddc9 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
@@ -24,6 +24,8 @@ import android.support.annotation.NonNull;
 import io.reactivex.Completable;
 import io.reactivex.CompletableEmitter;
 import io.reactivex.Emitter;
+import io.reactivex.Maybe;
+import io.reactivex.MaybeEmitter;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import io.reactivex.SingleEmitter;
@@ -181,6 +183,45 @@ public interface LifecycleBindable {
     @NonNull
     Disposable untilStop(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
 
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onStop.
+     * It is automatically subscribing to the maybe.
+     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param maybe {@link Maybe} to subscribe until onStop;
+     * @return {@link Disposable} which will unsubscribes from completable onStop.
+     */
+    @NonNull
+    <T> Disposable untilStop(@NonNull Maybe<T> maybe);
+
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onStop.
+     * It is automatically subscribing to the maybe and calls onCompletedAction on maybe item.
+     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param maybe           {@link Maybe} to subscribe until onStop;
+     * @param onSuccessAction Action which will raise at {@link MaybeEmitter#onSuccess(Object)} ()} on completion of observable;
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onStop.
+     */
+    @NonNull
+    <T> Disposable untilStop(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction);
+
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onStop.
+     * It is automatically subscribing to the maybe and calls onCompletedAction and onErrorAction on maybe item.
+     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param maybe           {@link Maybe} to subscribe until onStop;
+     * @param onSuccessAction Action which will raise at {@link MaybeEmitter#onSuccess(Object)} ()} on completion of observable;
+     * @param onErrorAction   Action which will raise on every {@link MaybeEmitter#onError(Throwable)} throwable;
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onStop.
+     */
+    @NonNull
+    <T> Disposable untilStop(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
+
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
      * It is automatically subscribing to the observable.
@@ -188,7 +229,7 @@ public interface LifecycleBindable {
      *
      * @param observable {@link Observable} to subscribe until onDestroy;
      * @param <T>        Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
      */
     @NonNull
     <T> Disposable untilDestroy(@NonNull Observable<T> observable);
@@ -289,7 +330,7 @@ public interface LifecycleBindable {
     /**
      * Method should be used to guarantee that completable won't be subscribed after onDestroy.
      * It is automatically subscribing to the completable and calls onCompletedAction on completable item.
-     * Don't forget to process errors if single can emit them.
+     * Don't forget to process errors if completable can emit them.
      *
      * @param completable       {@link Completable} to subscribe until onDestroy;
      * @param onCompletedAction Action which will raise on every {@link CompletableEmitter#onComplete()} item;
@@ -311,4 +352,40 @@ public interface LifecycleBindable {
     @NonNull
     Disposable untilDestroy(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
 
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
+     * It is automatically subscribing to the maybe.
+     * Don't forget to process errors if maybe can emit them.
+     *
+     * @param maybe {@link Maybe} to subscribe until onDestroy;
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
+     */
+    @NonNull
+    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe);
+
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
+     * It is automatically subscribing to the maybe and calls onCompletedAction on maybe item.
+     * Don't forget to process errors if maybe can emit them.
+     *
+     * @param maybe           {@link Maybe} to subscribe until onDestroy;
+     * @param onSuccessAction Action which will raise on every {@link MaybeEmitter#onSuccess(Object)} ()} item;
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
+     */
+    @NonNull
+    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction);
+
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
+     * It is automatically subscribing to the maybe and calls onSuccessAction and onErrorAction on maybe events.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param maybe           {@link Maybe} to subscribe until onDestroy;
+     * @param onSuccessAction Action which will raise on every {@link MaybeEmitter#onSuccess(Object)} ()} item;
+     * @param onErrorAction   Action which will raise on every {@link MaybeEmitter#onError(Throwable)} throwable;
+     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
+     */
+    @NonNull
+    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
+
 }
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
index d0b6d39..df91acf 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
@@ -28,6 +28,7 @@ import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
+import io.reactivex.Maybe;
 import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import io.reactivex.Completable;
@@ -212,6 +213,24 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilStop(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction, @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
+    }
+
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
@@ -281,4 +300,22 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
+        return baseLifecycleBindable.untilDestroy(maybe);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction);
+    }
+
+    @NonNull
+    @Override
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction, @NonNull final Consumer<Throwable> onErrorAction) {
+        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
+    }
+
 }

From bb7473e839a8dbd102f48441fe067767e0ddb8c4 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Thu, 29 Jun 2017 13:22:29 +0300
Subject: [PATCH 15/95] fix sA

---
 .../roboswag/components/adapters/BindableViewHolder.java  | 2 +-
 .../touchin/roboswag/components/views/LifecycleView.java  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
index b57f290..3ca1fe0 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
@@ -275,7 +275,6 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
     }
 
-    @SuppressWarnings("CPD-END")
     @NonNull
     @Override
     public Disposable untilDestroy(@NonNull final Completable completable,
@@ -296,6 +295,7 @@ public class BindableViewHolder extends RecyclerView.ViewHolder implements Lifec
         return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction);
     }
 
+    @SuppressWarnings("CPD-END")
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
diff --git a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
index df91acf..a644b3e 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
@@ -227,7 +227,9 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
 
     @NonNull
     @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction, @NonNull final Consumer<Throwable> onErrorAction) {
+    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
     }
 
@@ -314,7 +316,9 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
 
     @NonNull
     @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction, @NonNull final Consumer<Throwable> onErrorAction) {
+    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
     }
 

From c32eb4b83560b2ccc8f185aa9ba4d48a8d52e952 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 30 Jun 2017 19:32:45 +0300
Subject: [PATCH 16/95] Merge fix

---
 .../components/adapters/ObservableCollectionAdapter.java         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index 42e24b3..8de74b1 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -35,7 +35,6 @@ import io.reactivex.functions.BiConsumer;
 import io.reactivex.functions.Consumer;
 
 import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;

From a517b16334d475a28b9e5573e85a217d8a8d3042 Mon Sep 17 00:00:00 2001
From: Anton Domnikov <anton.domnikov@touchin.ru>
Date: Fri, 30 Jun 2017 20:39:49 +0300
Subject: [PATCH 17/95] added ability to push viewcontrollers without adding to
 back stack

---
 .../navigation/FragmentNavigation.java        | 32 +++++++++-------
 .../navigation/ViewControllerNavigation.java  | 38 +++++++++++++++----
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
index fbcf35d..dad6ee8 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
@@ -118,6 +118,7 @@ public class FragmentNavigation {
      *
      * @param fragmentClass    Class of {@link Fragment} to instantiate;
      * @param targetFragment   Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
+     * @param addToStack       Flag to add this transaction to the back stack;
      * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
      * @param backStackTag     Tag of {@link Fragment} in back stack;
      * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
@@ -126,6 +127,7 @@ public class FragmentNavigation {
     //CommitTransaction: it is ok as we could setup transaction before commit
     protected void addToStack(@NonNull final Class<? extends Fragment> fragmentClass,
                               @Nullable final Fragment targetFragment,
+                              final boolean addToStack,
                               @Nullable final Bundle args,
                               @Nullable final String backStackTag,
                               @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
@@ -144,8 +146,10 @@ public class FragmentNavigation {
         }
 
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction()
-                .replace(containerViewId, fragment, null)
-                .addToBackStack(backStackTag);
+                .replace(containerViewId, fragment, null);
+        if (addToStack) {
+            fragmentTransaction.addToBackStack(backStackTag);
+        }
         if (fragmentManager.getBackStackEntryCount() != 0) {
             fragmentTransaction.setTransition(getDefaultTransition());
         }
@@ -231,7 +235,7 @@ public class FragmentNavigation {
      * @param fragmentClass Class of {@link Fragment} to instantiate.
      */
     public void push(@NonNull final Class<? extends Fragment> fragmentClass) {
-        addToStack(fragmentClass, null, null, null, null);
+        addToStack(fragmentClass, null, true, null, null, null);
     }
 
     /**
@@ -242,7 +246,7 @@ public class FragmentNavigation {
      */
     public void push(@NonNull final Class<? extends Fragment> fragmentClass,
                      @NonNull final Bundle args) {
-        addToStack(fragmentClass, null, args, null, null);
+        addToStack(fragmentClass, null, true, args, null, null);
     }
 
     /**
@@ -253,7 +257,7 @@ public class FragmentNavigation {
      */
     public void push(@NonNull final Class<? extends Fragment> fragmentClass,
                      @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, null, null, transactionSetup);
+        addToStack(fragmentClass, null, true, null, null, transactionSetup);
     }
 
     /**
@@ -266,7 +270,7 @@ public class FragmentNavigation {
     public void push(@NonNull final Class<? extends Fragment> fragmentClass,
                      @Nullable final Bundle args,
                      @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, args, null, transactionSetup);
+        addToStack(fragmentClass, null, true, args, null, transactionSetup);
     }
 
     /**
@@ -277,7 +281,7 @@ public class FragmentNavigation {
      */
     public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
                               @NonNull final Fragment targetFragment) {
-        addToStack(fragmentClass, targetFragment, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
+        addToStack(fragmentClass, targetFragment, true, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
     }
 
     /**
@@ -290,7 +294,7 @@ public class FragmentNavigation {
     public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
                               @NonNull final Fragment targetFragment,
                               @NonNull final Bundle args) {
-        addToStack(fragmentClass, targetFragment, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
+        addToStack(fragmentClass, targetFragment, true, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
     }
 
     /**
@@ -303,7 +307,7 @@ public class FragmentNavigation {
     public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
                               @NonNull final Fragment targetFragment,
                               @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
+        addToStack(fragmentClass, targetFragment, true, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
     /**
@@ -318,7 +322,7 @@ public class FragmentNavigation {
                               @NonNull final Fragment targetFragment,
                               @Nullable final Bundle args,
                               @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
+        addToStack(fragmentClass, targetFragment, true, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
     /**
@@ -327,7 +331,7 @@ public class FragmentNavigation {
      * @param fragmentClass Class of {@link Fragment} to instantiate.
      */
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass) {
-        addToStack(fragmentClass, null, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
+        addToStack(fragmentClass, null, true, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
     }
 
     /**
@@ -338,7 +342,7 @@ public class FragmentNavigation {
      */
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
                          @NonNull final Bundle args) {
-        addToStack(fragmentClass, null, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
+        addToStack(fragmentClass, null, true, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
     }
 
     /**
@@ -350,7 +354,7 @@ public class FragmentNavigation {
      */
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
                          @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
+        addToStack(fragmentClass, null, true, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
     /**
@@ -364,7 +368,7 @@ public class FragmentNavigation {
     public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
                          @Nullable final Bundle args,
                          @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
+        addToStack(fragmentClass, null, true, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
index 58fad74..ab43208 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
@@ -59,7 +59,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
      */
     public <TState extends AbstractState> void push(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                     @NonNull final TState state) {
-        addToStack(fragmentClass, null, ViewControllerFragment.createState(state), null, null);
+        addToStack(fragmentClass, null, true, ViewControllerFragment.createState(state), null, null);
     }
 
     /**
@@ -73,7 +73,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void push(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                     @Nullable final TState state,
                                                     @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, ViewControllerFragment.createState(state), null, transactionSetup);
+        addToStack(fragmentClass, null, true, ViewControllerFragment.createState(state), null, transactionSetup);
     }
 
     /**
@@ -87,7 +87,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
     public <TState extends AbstractState> void pushForResult(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
                                                              @NonNull final Fragment targetFragment,
                                                              @NonNull final TState state) {
-        addToStack(fragmentClass, targetFragment, ViewControllerFragment.createState(state),
+        addToStack(fragmentClass, targetFragment, true, ViewControllerFragment.createState(state),
                 fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
     }
 
@@ -104,7 +104,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
                                                              @NonNull final Fragment targetFragment,
                                                              @Nullable final TState state,
                                                              @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, ViewControllerFragment.createState(state),
+        addToStack(fragmentClass, targetFragment, true, ViewControllerFragment.createState(state),
                 fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
     }
 
@@ -211,6 +211,28 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
         addViewControllerToStack(viewControllerClass, null, state, null, transactionSetup);
     }
 
+    /**
+     * Pushes {@link ViewController} without adding to stack.
+     *
+     * @param viewControllerClass Class of {@link ViewController} to be pushed.
+     */
+    public void pushSingleViewController(@NonNull final Class<? extends ViewController<TActivity,
+            StatelessViewControllerFragment<TActivity>>> viewControllerClass) {
+        addToStack(StatelessViewControllerFragment.class, null, false, StatelessViewControllerFragment.createState(viewControllerClass), null, null);
+    }
+
+    /**
+     * Pushes {@link ViewController} without adding to stack and with specific {@link ViewControllerFragment#getState()}.
+     *
+     * @param viewControllerClass Class of {@link ViewController} to be pushed;
+     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
+     * @param <TState>            Type of state of fragment.
+     */
+    public <TState extends AbstractState> void pushSingleViewController(@NonNull final Class<? extends ViewController<TActivity,
+            SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass, @NonNull final TState state) {
+        addToStack(SimpleViewControllerFragment.class, null, false, SimpleViewControllerFragment.createState(viewControllerClass, state), null, null);
+    }
+
     /**
      * Pushes {@link ViewController} on top of stack with specific {@link StatelessTargetedViewControllerFragment#getTarget()}.
      *
@@ -414,7 +436,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @Nullable final Fragment targetFragment,
             @Nullable final String backStackTag,
             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(StatelessViewControllerFragment.class, targetFragment,
+        addToStack(StatelessViewControllerFragment.class, targetFragment, true,
                 StatelessViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
     }
 
@@ -436,7 +458,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final TState state,
             @Nullable final String backStackTag,
             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(TargetedViewControllerFragment.class, targetFragment,
+        addToStack(TargetedViewControllerFragment.class, targetFragment, true,
                 TargetedViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
     }
 
@@ -455,7 +477,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final Fragment targetFragment,
             @Nullable final String backStackTag,
             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(StatelessTargetedViewControllerFragment.class, targetFragment,
+        addToStack(StatelessTargetedViewControllerFragment.class, targetFragment, true,
                 StatelessTargetedViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
     }
 
@@ -475,7 +497,7 @@ public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?
             @NonNull final TState state,
             @Nullable final String backStackTag,
             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(SimpleViewControllerFragment.class, targetFragment,
+        addToStack(SimpleViewControllerFragment.class, targetFragment, true,
                 SimpleViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
     }
 

From 70e6b99e795588852f6ee3301e1117822c4cd8b2 Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Mon, 24 Jul 2017 12:33:29 +0300
Subject: [PATCH 18/95] idea formatting

---
 build.gradle                                  |  2 +-
 .../adapters/ItemAdapterDelegate.java         | 20 +++++------
 .../adapters/ObservableCollectionAdapter.java |  4 +--
 .../adapters/PositionAdapterDelegate.java     |  6 ++--
 .../components/views/LifecycleView.java       | 36 +++++++++----------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index b692c81..f3d6b2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,5 +22,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:26.0.0-beta2'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.1'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.2'
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index 20bad88..033e944 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -26,7 +26,7 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
      * This item will be casted to {@link TItem} and passes to {@link #onBindViewHolder(TViewHolder, TItem, int, int)}.
      *
      * @param item                   Item to check;
-     * @param positionInAdapter        Position of item in adapter;
+     * @param positionInAdapter      Position of item in adapter;
      * @param itemCollectionPosition Position of item in collection that contains item;
      * @return True if item is processable by this delegate.
      */
@@ -35,8 +35,8 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
     /**
      * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
      *
-     * @param item                   Item to check;
-     * @param positionInAdapter        Position of item in adapter;
+     * @param item                 Item to check;
+     * @param positionInAdapter    Position of item in adapter;
      * @param positionInCollection Position of item in collection that contains item;
      * @return Unique item ID.
      */
@@ -56,9 +56,9 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
     /**
      * Binds item to created by this object ViewHolder.
      *
-     * @param holder                 ViewHolder to bind item to;
-     * @param item                   Item to check;
-     * @param positionInAdapter        Position of item in adapter;
+     * @param holder               ViewHolder to bind item to;
+     * @param item                 Item to check;
+     * @param positionInAdapter    Position of item in adapter;
      * @param positionInCollection Position of item in collection that contains item;
      */
     public abstract void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final TItem item,
@@ -67,10 +67,10 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
     /**
      * Binds item with payloads to created by this object ViewHolder.
      *
-     * @param holder                 ViewHolder to bind item to;
-     * @param item                   Item to check;
-     * @param payloads               Payloads;
-     * @param positionInAdapter        Position of item in adapter;
+     * @param holder               ViewHolder to bind item to;
+     * @param item                 Item to check;
+     * @param payloads             Payloads;
+     * @param positionInAdapter    Position of item in adapter;
      * @param positionInCollection Position of item in collection that contains item;
      */
     public void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final TItem item, @NonNull final List<Object> payloads,
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index 8de74b1..c3d5498 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -624,8 +624,8 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
     /**
      * Enable diff utils algorithm in collection changes.
      *
-     * @param detectMoves The flag that determines whether the {@link Change.Moved} changes will be generated or not;
-     * @param sameItemsPredicate Predicate for the determination of the same elements;
+     * @param detectMoves           The flag that determines whether the {@link Change.Moved} changes will be generated or not;
+     * @param sameItemsPredicate    Predicate for the determination of the same elements;
      * @param changePayloadProducer Function that calculate change payload when items the same but contents are different.
      */
     public void enableDiffUtils(final boolean detectMoves,
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
index 2bec899..a3a9f9e 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -50,7 +50,7 @@ public abstract class PositionAdapterDelegate<TViewHolder extends BindableViewHo
     /**
      * Binds position to ViewHolder.
      *
-     * @param holder          ViewHolder to bind position to;
+     * @param holder            ViewHolder to bind position to;
      * @param positionInAdapter Position of item in adapter.
      */
     public abstract void onBindViewHolder(@NonNull final TViewHolder holder, final int positionInAdapter);
@@ -58,8 +58,8 @@ public abstract class PositionAdapterDelegate<TViewHolder extends BindableViewHo
     /**
      * Binds position with payloads to ViewHolder.
      *
-     * @param holder          ViewHolder to bind position to;
-     * @param payloads        Payloads;
+     * @param holder            ViewHolder to bind position to;
+     * @param payloads          Payloads;
      * @param positionInAdapter Position of item in adapter.
      */
     public void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final List<Object> payloads, final int positionInAdapter) {
diff --git a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
index a644b3e..781d841 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
@@ -159,17 +159,17 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Consumer<T> onNextAction,
-                                      @NonNull final Consumer<Throwable> onErrorAction) {
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                      @NonNull final Consumer<T> onNextAction,
-                                      @NonNull final Consumer<Throwable> onErrorAction,
-                                      @NonNull final Action onCompletedAction) {
+                                    @NonNull final Consumer<T> onNextAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction,
+                                    @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
@@ -188,8 +188,8 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                      @NonNull final Consumer<T> onSuccessAction,
-                                      @NonNull final Consumer<Throwable> onErrorAction) {
+                                    @NonNull final Consumer<T> onSuccessAction,
+                                    @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
     }
 
@@ -208,8 +208,8 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public Disposable untilStop(@NonNull final Completable completable,
-                                  @NonNull final Action onCompletedAction,
-                                  @NonNull final Consumer<Throwable> onErrorAction) {
+                                @NonNull final Action onCompletedAction,
+                                @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
     }
 
@@ -248,17 +248,17 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Consumer<T> onNextAction,
-                                         @NonNull final Consumer<Throwable> onErrorAction) {
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
     }
 
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                         @NonNull final Consumer<T> onNextAction,
-                                         @NonNull final Consumer<Throwable> onErrorAction,
-                                         @NonNull final Action onCompletedAction) {
+                                       @NonNull final Consumer<T> onNextAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction,
+                                       @NonNull final Action onCompletedAction) {
         return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
     }
 
@@ -277,8 +277,8 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                         @NonNull final Consumer<T> onSuccessAction,
-                                         @NonNull final Consumer<Throwable> onErrorAction) {
+                                       @NonNull final Consumer<T> onSuccessAction,
+                                       @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
     }
 
@@ -297,8 +297,8 @@ public class LifecycleView extends FrameLayout implements LifecycleBindable {
     @NonNull
     @Override
     public Disposable untilDestroy(@NonNull final Completable completable,
-                                     @NonNull final Action onCompletedAction,
-                                     @NonNull final Consumer<Throwable> onErrorAction) {
+                                   @NonNull final Action onCompletedAction,
+                                   @NonNull final Consumer<Throwable> onErrorAction) {
         return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
     }
 

From 97c9a7571b7b5b517153d1a4708e7097db65e958 Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Tue, 25 Jul 2017 18:56:13 +0300
Subject: [PATCH 19/95] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20support=20design=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B5=D0=BA=D1=83,=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B2=20typefactedEditText=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0,=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20?=
 =?UTF-8?q?=D1=81=20TextInputLayout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  1 +
 .../components/views/TypefacedEditText.java   | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/build.gradle b/build.gradle
index f3d6b2c..74c0dd8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@ dependencies {
     compile project(':libraries:core')
 
     provided 'com.android.support:appcompat-v7:26.0.0-beta2'
+    provided 'com.android.support:design:26.0.0-beta2'
     provided 'com.android.support:recyclerview-v7:26.0.0-beta2'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
index 33c8493..2a057b6 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
@@ -23,6 +23,7 @@ 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 android.text.Editable;
 import android.text.InputType;
@@ -31,6 +32,10 @@ import android.text.TextWatcher;
 import android.text.method.SingleLineTransformationMethod;
 import android.text.method.TransformationMethod;
 import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewParent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -107,6 +112,21 @@ public class TypefacedEditText extends AppCompatEditText {
         }
     }
 
+    @Nullable
+    public InputConnection onCreateInputConnection(@NonNull final EditorInfo attrs) {
+        final InputConnection inputConnection = super.onCreateInputConnection(attrs);
+        if (inputConnection != null && attrs.hintText == null) {
+            for (ViewParent parent = this.getParent(); parent instanceof View; parent = parent.getParent()) {
+                if (parent instanceof TextInputLayout) {
+                    attrs.hintText = ((TextInputLayout) parent).getHint();
+                    break;
+                }
+            }
+        }
+
+        return inputConnection;
+    }
+
     private void checkAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs) {
         final List<String> errors = new ArrayList<>();
         Boolean multiline = null;

From 8405c76bf02ce23b31a545b338134c8ae794877d Mon Sep 17 00:00:00 2001
From: Alexander Bubnov <alex.bubnov@touchin.ru>
Date: Tue, 25 Jul 2017 19:08:59 +0300
Subject: [PATCH 20/95] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B9=20this?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/touchin/roboswag/components/views/TypefacedEditText.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
index 2a057b6..bc64a71 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
@@ -116,7 +116,7 @@ public class TypefacedEditText extends AppCompatEditText {
     public InputConnection onCreateInputConnection(@NonNull final EditorInfo attrs) {
         final InputConnection inputConnection = super.onCreateInputConnection(attrs);
         if (inputConnection != null && attrs.hintText == null) {
-            for (ViewParent parent = this.getParent(); parent instanceof View; parent = parent.getParent()) {
+            for (ViewParent parent = getParent(); parent instanceof View; parent = parent.getParent()) {
                 if (parent instanceof TextInputLayout) {
                     attrs.hintText = ((TextInputLayout) parent).getHint();
                     break;

From 3f8955f31b4a6583041618cf9f4362a4dcecf206 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 25 Jul 2017 19:54:06 +0300
Subject: [PATCH 21/95] Build tools update

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 74c0dd8..fedabbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    buildToolsVersion '26.0.1'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

From 0a82b7a57c5aaa595d76b49e1e80f6131d837bfa Mon Sep 17 00:00:00 2001
From: gorodeckii <gorodeckii@gmail.com>
Date: Wed, 26 Jul 2017 17:53:54 +0300
Subject: [PATCH 22/95] rxjava2 version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 04b1c5e..55b29d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,5 +22,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:25.4.0'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.1'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.2'
 }

From fda49db855cee373dc2767492d14b74674c34879 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Mon, 31 Jul 2017 16:17:33 +0300
Subject: [PATCH 23/95] Removed unnecessary setOnRippleClickListener overloads

---
 .../ru/touchin/roboswag/components/utils/UiUtils.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 7cb5df4..8ac11d9 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -106,16 +106,6 @@ public final class UiUtils {
         setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, delay);
     }
 
-    /**
-     * Sets click listener to view. On click it will call something with {@link #RIPPLE_EFFECT_DELAY}.
-     *
-     * @param targetView      View to set click listener to;
-     * @param onClickListener Click listener.
-     */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener) {
-        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, RIPPLE_EFFECT_DELAY);
-    }
-
     /**
      * Sets click listener to view. On click it will call something with {@link #RIPPLE_EFFECT_DELAY}.
      *

From dd2732c12901e818e394f05dbf836e38545163c9 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 1 Aug 2017 13:04:10 +0300
Subject: [PATCH 24/95] Function setContentView made final (#82)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

setContentView теперь final, чтобы студия не ругалась при вызове этих методов в конструкторе
---
 .../roboswag/components/navigation/ViewController.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
index 98819c2..cfd44be 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
@@ -150,7 +150,7 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      *
      * @param layoutResId Resource ID to be inflated.
      */
-    public void setContentView(@LayoutRes final int layoutResId) {
+    public final void setContentView(@LayoutRes final int layoutResId) {
         if (getContainer().getChildCount() > 0) {
             getContainer().removeAllViews();
         }
@@ -163,7 +163,7 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      *
      * @param view The desired content to display.
      */
-    public void setContentView(@NonNull final View view) {
+    public final void setContentView(@NonNull final View view) {
         setContentView(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
     }
 
@@ -174,7 +174,7 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      * @param view         The desired content to display;
      * @param layoutParams Layout parameters for the view.
      */
-    public void setContentView(@NonNull final View view, @NonNull final ViewGroup.LayoutParams layoutParams) {
+    public final void setContentView(@NonNull final View view, @NonNull final ViewGroup.LayoutParams layoutParams) {
         if (getContainer().getChildCount() > 0) {
             getContainer().removeAllViews();
         }

From 527de35579846be2603a7bacfd4edd6ef9d990a8 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 3 Aug 2017 18:21:53 +0300
Subject: [PATCH 25/95] Support lib update (#84)

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index fedabbe..5147161 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@ android {
 dependencies {
     compile project(':libraries:core')
 
-    provided 'com.android.support:appcompat-v7:26.0.0-beta2'
-    provided 'com.android.support:design:26.0.0-beta2'
-    provided 'com.android.support:recyclerview-v7:26.0.0-beta2'
+    provided 'com.android.support:appcompat-v7:26.0.0'
+    provided 'com.android.support:design:26.0.0'
+    provided 'com.android.support:recyclerview-v7:26.0.0'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
     provided 'io.reactivex.rxjava2:rxjava:2.1.2'

From 46d00ffc5fbba2825f7327dc2b54146010f1dc97 Mon Sep 17 00:00:00 2001
From: Ilia Kurtov <ilia.kurtov@touchin.ru>
Date: Wed, 9 Aug 2017 18:13:39 +0300
Subject: [PATCH 26/95] restored setOnRippleClickListener for Action and delete
 for Consumer

---
 .../touchin/roboswag/components/utils/UiUtils.java | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 8ac11d9..4489461 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -112,10 +112,20 @@ public final class UiUtils {
      * @param targetView      View to set click listener to;
      * @param onClickListener Click listener.
      */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener) {
-        setOnRippleClickListener(targetView, onClickListener, RIPPLE_EFFECT_DELAY);
+    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener) {
+        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, RIPPLE_EFFECT_DELAY);
     }
 
+//    /**
+//     * Sets click listener to view. On click it will call something with {@link #RIPPLE_EFFECT_DELAY}.
+//     *
+//     * @param targetView      View to set click listener to;
+//     * @param onClickListener Click listener.
+//     */
+//    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener) {
+//        setOnRippleClickListener(targetView, onClickListener, RIPPLE_EFFECT_DELAY);
+//    }
+
     /**
      * Sets click listener to view. On click it will call something after delay.
      *

From 37f5664187430d81df3dec3d5017cf13ae628d6b Mon Sep 17 00:00:00 2001
From: Ilia Kurtov <ilia.kurtov@touchin.ru>
Date: Wed, 9 Aug 2017 18:13:53 +0300
Subject: [PATCH 27/95] static

---
 .../ru/touchin/roboswag/components/utils/UiUtils.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 4489461..7596527 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -116,16 +116,6 @@ public final class UiUtils {
         setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, RIPPLE_EFFECT_DELAY);
     }
 
-//    /**
-//     * Sets click listener to view. On click it will call something with {@link #RIPPLE_EFFECT_DELAY}.
-//     *
-//     * @param targetView      View to set click listener to;
-//     * @param onClickListener Click listener.
-//     */
-//    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener) {
-//        setOnRippleClickListener(targetView, onClickListener, RIPPLE_EFFECT_DELAY);
-//    }
-
     /**
      * Sets click listener to view. On click it will call something after delay.
      *

From 6d0f74a97296a26ac6b236c992c32456893c27c5 Mon Sep 17 00:00:00 2001
From: Elena Bobkova <elena.bobkova@touchin.ru>
Date: Mon, 14 Aug 2017 15:32:00 +0300
Subject: [PATCH 28/95] fixed on activity result bindings for large files (#89)

---
 .../roboswag/components/navigation/activities/BaseActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index f39ee8a..611152c 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -115,7 +115,7 @@ public abstract class BaseActivity extends AppCompatActivity
     @NonNull
     public Observable<Intent> observeActivityResult(final int requestCode) {
         return lastActivityResult
-                .switchMap(optional -> {
+                .concatMap(optional -> {
                     final HalfNullablePair<Integer, Intent> activityResult = optional.get();
                     if (activityResult == null || activityResult.getFirst() != requestCode) {
                         return Observable.empty();

From d3191cd4726b92b160d608175dbeb8e5fdb0ee4e Mon Sep 17 00:00:00 2001
From: Ilia Kurtov <kurtovi@gmail.com>
Date: Mon, 14 Aug 2017 17:41:32 +0300
Subject: [PATCH 29/95] libs update (#90)

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5147161..0eae175 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,9 +18,9 @@ android {
 dependencies {
     compile project(':libraries:core')
 
-    provided 'com.android.support:appcompat-v7:26.0.0'
-    provided 'com.android.support:design:26.0.0'
-    provided 'com.android.support:recyclerview-v7:26.0.0'
+    provided 'com.android.support:appcompat-v7:26.0.1'
+    provided 'com.android.support:design:26.0.1'
+    provided 'com.android.support:recyclerview-v7:26.0.1'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
     provided 'io.reactivex.rxjava2:rxjava:2.1.2'

From bab8ceb74fa1a2ad54b5b1497449c7f90bcf9371 Mon Sep 17 00:00:00 2001
From: Ilia Kurtov <kurtovi@gmail.com>
Date: Tue, 15 Aug 2017 21:02:55 +0300
Subject: [PATCH 30/95] rxjava update (#91)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0eae175..3d98ca5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:26.0.1'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.2'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.3'
 }

From 3a3f416b8c638a1226e0065295f7426124ab0985 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 23 Aug 2017 17:05:46 +0300
Subject: [PATCH 31/95] Fonts in xml (#92)

---
 .../components/views/TypefacedEditText.java   | 22 -------------------
 .../components/views/TypefacedTextView.java   | 15 -------------
 .../views/internal/AttributesUtils.java       |  4 +---
 src/main/res/values/attrs.xml                 |  2 --
 4 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
index bc64a71..d29b60f 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
@@ -41,7 +41,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import ru.touchin.roboswag.components.R;
-import ru.touchin.roboswag.components.utils.Typefaces;
 import ru.touchin.roboswag.components.views.internal.AttributesUtils;
 import ru.touchin.roboswag.core.log.Lc;
 
@@ -101,10 +100,6 @@ public class TypefacedEditText extends AppCompatEditText {
             } else {
                 setSingleLine();
             }
-
-            if (!isInEditMode()) {
-                setTypeface(Typefaces.getFromAttributes(context, attrs, R.styleable.TypefacedEditText, R.styleable.TypefacedEditText_customTypeface));
-            }
             typedArray.recycle();
             if (inDebugMode) {
                 checkAttributes(context, attrs);
@@ -131,8 +126,6 @@ public class TypefacedEditText extends AppCompatEditText {
         final List<String> errors = new ArrayList<>();
         Boolean multiline = null;
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedEditText);
-        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedEditText_customTypeface, true,
-                "customTypeface required parameter");
         AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedEditText_isMultiline, true,
                 "isMultiline required parameter");
         if (typedArray.hasValue(R.styleable.TypefacedEditText_isMultiline)) {
@@ -159,12 +152,6 @@ public class TypefacedEditText extends AppCompatEditText {
     private void checkEditTextSpecificAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
                                                  @NonNull final List<String> errors)
             throws NoSuchFieldException, IllegalAccessException {
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_typeface"), false,
-                "remove typeface and use customTypeface");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textStyle"), false,
-                "remove textStyle and use customTypeface");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_fontFamily"), false,
-                "remove fontFamily and use customTypeface");
         AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_singleLine"), false,
                 "remove singleLine and use isMultiline");
         AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_includeFontPadding"), false,
@@ -337,15 +324,6 @@ public class TypefacedEditText extends AppCompatEditText {
         super.setInputType(type);
     }
 
-    /**
-     * Sets typeface from 'assets/fonts' folder by name.
-     *
-     * @param name Full name of typeface (without extension, e.g. 'Roboto-Regular').
-     */
-    public void setTypeface(@NonNull final String name) {
-        setTypeface(Typefaces.getByName(getContext(), name));
-    }
-
     public void setOnTextChangedListener(@Nullable final OnTextChangedListener onTextChangedListener) {
         this.onTextChangedListener = onTextChangedListener;
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
index 715e77e..b8fddb2 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import ru.touchin.roboswag.components.R;
-import ru.touchin.roboswag.components.utils.Typefaces;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.components.views.internal.AttributesUtils;
 import ru.touchin.roboswag.core.log.Lc;
@@ -93,9 +92,6 @@ public class TypefacedTextView extends AppCompatTextView {
             } else {
                 setLineStrategy(lineStrategy);
             }
-            if (!isInEditMode()) {
-                setTypeface(Typefaces.getFromAttributes(context, attrs, R.styleable.TypefacedTextView, R.styleable.TypefacedTextView_customTypeface));
-            }
             typedArray.recycle();
             if (inDebugMode) {
                 checkAttributes(context, attrs);
@@ -107,8 +103,6 @@ public class TypefacedTextView extends AppCompatTextView {
         final List<String> errors = new ArrayList<>();
         LineStrategy lineStrategy = null;
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedTextView);
-        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedTextView_customTypeface, true,
-                "customTypeface required parameter");
         AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedTextView_lineStrategy, true,
                 "lineStrategy required parameter");
         if (typedArray.hasValue(R.styleable.TypefacedTextView_lineStrategy)) {
@@ -311,15 +305,6 @@ public class TypefacedTextView extends AppCompatTextView {
         Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify ellipsize use setLineStrategy instead")));
     }
 
-    /**
-     * Sets typeface from 'assets/fonts' folder by name.
-     *
-     * @param name Full name of typeface (without extension, e.g. 'Roboto-Regular').
-     */
-    public void setTypeface(@NonNull final String name) {
-        setTypeface(Typefaces.getByName(getContext(), name));
-    }
-
     @Override
     public void setText(@Nullable final CharSequence text, @Nullable final BufferType type) {
         super.setText(text, type);
diff --git a/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java b/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
index e1e8bbe..6965e72 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
@@ -94,9 +94,7 @@ public final class AttributesUtils {
     public static void checkRegularTextViewAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
                                                       @NonNull final Collection<String> errors, @NonNull final String lineStrategyParameterName)
             throws NoSuchFieldException, IllegalAccessException {
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_typeface"), false, "remove typeface and use customTypeface");
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_textStyle"), false, "remove textStyle and use customTypeface");
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_fontFamily"), false, "remove fontFamily and use customTypeface");
+        checkAttribute(typedArray, errors, getField(androidRes, "TextView_fontFamily"), true, "fontFamily required parameter");
         checkAttribute(typedArray, errors, getField(androidRes, "TextView_includeFontPadding"), false, "includeFontPadding forbid parameter");
         checkAttribute(typedArray, errors, getField(androidRes, "TextView_singleLine"), false,
                 "remove singleLine and use " + lineStrategyParameterName);
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 263a114..8e9c7e8 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -4,7 +4,6 @@
     <attr name="customTypeface" format="string"/>
 
     <declare-styleable name="TypefacedTextView">
-        <attr name="customTypeface"/>
         <attr name="lineStrategy" format="enum">
             <enum name="singleLineEllipsize" value="0"/>
             <enum name="singleLineMarquee" value="1"/>
@@ -17,7 +16,6 @@
     </declare-styleable>
 
     <declare-styleable name="TypefacedEditText">
-        <attr name="customTypeface"/>
         <attr name="isMultiline" format="boolean"/>
     </declare-styleable>
 

From 43ad3d62d97d18e8c452f54b80011514d1f97b1f Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Mon, 28 Aug 2017 13:20:55 +0300
Subject: [PATCH 32/95] Added generic in findViewById (#93)

---
 .../navigation/activities/ViewControllerActivity.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
index b49d1a8..8af5111 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
@@ -103,8 +103,8 @@ public abstract class ViewControllerActivity<TLogic extends Logic> extends BaseA
 
     @NonNull
     @Override
-    public View findViewById(@IdRes final int id) {
-        final View viewById = super.findViewById(id);
+    public <T extends View> T findViewById(@IdRes final int id) {
+        final T viewById = super.findViewById(id);
         if (viewById == null) {
             throw new ShouldNotHappenException("No view for id=" + getResources().getResourceName(id));
         }

From 6a6ea0ec08eb439f1aa0ff86a014debd36dcedf3 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 7 Sep 2017 13:07:05 +0300
Subject: [PATCH 33/95] onActivityResult in viewControllers (#95)

---
 .../roboswag/components/navigation/ViewController.java   | 8 ++++++++
 .../navigation/fragments/ViewControllerFragment.java     | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
index e34f1ec..a56268c 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
@@ -19,6 +19,7 @@
 
 package ru.touchin.roboswag.components.navigation;
 
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.CallSuper;
@@ -330,6 +331,13 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         destroyed = true;
     }
 
+    /**
+     * Callback from parent fragment.
+     */
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        // Do nothing
+    }
+
     /**
      * Similar to {@link ViewControllerFragment#onOptionsItemSelected(MenuItem)}.
      *
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 0a80e5f..5fb4273 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -20,6 +20,7 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Parcel;
@@ -381,6 +382,14 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         super.onDestroy();
     }
 
+    @Override
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        if (viewController != null) {
+            viewController.onActivityResult(requestCode, resultCode, data);
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
     private static class PlaceholderView extends FrameLayout {
 
         @NonNull

From e3c3c957679cb222b80ad58422f93b10551ba541 Mon Sep 17 00:00:00 2001
From: Ilia Kurtov <ilia.kurtov@touchin.ru>
Date: Fri, 22 Sep 2017 16:41:17 +0300
Subject: [PATCH 34/95] update

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3d98ca5..286dba3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     provided 'com.android.support:recyclerview-v7:26.0.1'
 
     provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.3'
+    provided 'io.reactivex.rxjava2:rxjava:2.1.4'
 }

From 352ff5a8b4cb903ebad962d5db6d9785028b52d0 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 4 Oct 2017 12:29:08 +0300
Subject: [PATCH 35/95] Versions in constants (#102)

---
 build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 286dba3..9ac3bdf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    buildToolsVersion buildTools
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -18,10 +18,10 @@ android {
 dependencies {
     compile project(':libraries:core')
 
-    provided 'com.android.support:appcompat-v7:26.0.1'
-    provided 'com.android.support:design:26.0.1'
-    provided 'com.android.support:recyclerview-v7:26.0.1'
+    provided "com.android.support:appcompat-v7:$supportLibraryVersion"
+    provided "com.android.support:design:$supportLibraryVersion"
+    provided "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
-    provided 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.4'
+    provided "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
+    provided "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
 }

From 426a213a444d6484ea510cf201eb04ced01b5af7 Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Mon, 13 Nov 2017 11:58:17 +0300
Subject: [PATCH 36/95] Updating by payload fixed (#105)

---
 .../components/adapters/ObservableCollectionAdapter.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
index c3d5498..f93b2b5 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
@@ -31,10 +31,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import io.reactivex.Observable;
 import io.reactivex.functions.BiConsumer;
 import io.reactivex.functions.Consumer;
-
-import io.reactivex.Observable;
 import io.reactivex.subjects.BehaviorSubject;
 import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
@@ -104,6 +103,11 @@ public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends
         lifecycleBindable.untilDestroy(observableCollectionSubject
                 .switchMap(optional -> {
                     final ObservableCollection<TItem> collection = optional.get();
+                    if (collection instanceof ObservableList) {
+                        innerCollection.setDiffUtilsSource((ObservableList<TItem>) collection);
+                    } else {
+                        innerCollection.setDiffUtilsSource(null);
+                    }
                     return collection != null ? collection.observeItems() : Observable.just(Collections.emptyList());
                 }), innerCollection::set);
         lifecycleBindable.untilDestroy(createMoreAutoLoadingObservable());

From a3dca51488c1cf9f69644f4dfebff05461ea69fc Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 30 Nov 2017 18:02:23 +0300
Subject: [PATCH 37/95] Gradle update

---
 build.gradle | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9ac3bdf..c730fc1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,7 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion buildTools
+    compileSdkVersion compileSdk
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -16,12 +14,12 @@ android {
 }
 
 dependencies {
-    compile project(':libraries:core')
+    api project(':libraries:core')
 
-    provided "com.android.support:appcompat-v7:$supportLibraryVersion"
-    provided "com.android.support:design:$supportLibraryVersion"
-    provided "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
+    compileOnly "com.android.support:design:$supportLibraryVersion"
+    compileOnly "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
-    provided "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
-    provided "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
+    compileOnly "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
+    compileOnly "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
 }

From 8eaa50d891ab67457097fba3153d857cc0a03533 Mon Sep 17 00:00:00 2001
From: maxbach <mbachinskiyol@gmail.com>
Date: Thu, 28 Dec 2017 15:17:42 +0300
Subject: [PATCH 38/95] Add to MaterialLoadingBar method setColor (#109)

---
 .../components/views/MaterialLoadingBar.java        | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java b/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
index a951203..7c462bc 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
@@ -22,6 +22,8 @@ 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.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.AppCompatImageView;
@@ -89,7 +91,7 @@ public class MaterialLoadingBar extends AppCompatImageView {
         typedArray.recycle();
 
         progressDrawable = new MaterialProgressDrawable(context, size);
-        progressDrawable.setColor(color);
+        setColor(color);
         progressDrawable.setStrokeWidth(strokeWidth);
         setScaleType(ScaleType.CENTER);
         setImageDrawable(progressDrawable);
@@ -107,4 +109,13 @@ public class MaterialLoadingBar extends AppCompatImageView {
         super.onDetachedFromWindow();
     }
 
+    /**
+     * Set color of loader.
+     *
+     * @param colorInt Color of loader to be set.
+     */
+    public void setColor(@ColorInt final int colorInt) {
+        progressDrawable.setColor(colorInt);
+    }
+
 }
\ No newline at end of file

From 44af99f9cfbab724478ec24a66c0b8c5f9670870 Mon Sep 17 00:00:00 2001
From: maxbach <mbachinskiyol@gmail.com>
Date: Thu, 28 Dec 2017 16:32:09 +0300
Subject: [PATCH 39/95] Fix import (#112)

---
 .../ru/touchin/roboswag/components/views/MaterialLoadingBar.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java b/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
index 7c462bc..9ee131d 100644
--- a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
+++ b/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
@@ -23,7 +23,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.AppCompatImageView;

From 9b1275ceec94b80b4134c7dfa4c8086a7b91048f Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 14 Mar 2018 15:44:17 +0300
Subject: [PATCH 40/95] Migration to AAC lifecycle, simplification of some
 logic

---
 build.gradle                                  |   3 +
 .../components/adapters/AdapterDelegate.java  | 213 +-----
 .../adapters/BindableViewHolder.java          | 307 --------
 .../components/adapters/BindableViewHolder.kt |  34 +
 .../adapters/ItemAdapterDelegate.java         |  28 +-
 .../adapters/ObservableCollectionAdapter.java | 697 ------------------
 .../adapters/PositionAdapterDelegate.java     |   7 +-
 .../components/navigation/AbstractState.java  |  52 --
 .../components/navigation/ViewController.java | 322 +-------
 .../navigation/ViewControllerNavigation.java  | 504 -------------
 .../navigation/ViewControllerNavigation.kt    | 174 +++++
 .../navigation/activities/BaseActivity.java   | 265 +------
 .../activities/ViewControllerActivity.java    | 114 ---
 .../SimpleViewControllerFragment.java         |  84 ---
 ...atelessTargetedViewControllerFragment.java |  66 --
 .../StatelessViewControllerFragment.java      |  64 --
 .../TargetedViewControllerFragment.java       |  55 --
 .../fragments/ViewControllerFragment.java     | 196 ++---
 .../navigation/fragments/ViewFragment.java    |  41 +-
 .../utils/BaseLifecycleBindable.java          | 336 ---------
 .../components/utils/LifecycleBindable.java   | 391 ----------
 .../roboswag/components/utils/Logic.java      | 110 ---
 .../roboswag/components/utils/UiUtils.java    |  39 +-
 .../utils/destroyable/BaseDestroyable.kt      |  62 ++
 .../utils/destroyable/Destroyable.kt          |  94 +++
 .../views/AspectRatioFrameLayout.java         | 254 -------
 .../components/views/LifecycleView.java       | 325 --------
 src/main/res/values/attrs.xml                 |   7 +-
 28 files changed, 493 insertions(+), 4351 deletions(-)
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
 create mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
 create mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/Logic.java
 create mode 100644 src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
 create mode 100644 src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/AspectRatioFrameLayout.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java

diff --git a/build.gradle b/build.gradle
index c730fc1..0a7ccae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion compileSdk
@@ -16,6 +17,8 @@ android {
 dependencies {
     api project(':libraries:core')
 
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
     compileOnly "com.android.support:design:$supportLibraryVersion"
     compileOnly "com.android.support:recyclerview-v7:$supportLibraryVersion"
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index b9d3a0d..8b38563 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -19,46 +19,35 @@
 
 package ru.touchin.roboswag.components.adapters;
 
+import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
+import android.support.v4.view.ViewCompat;
 import android.view.ViewGroup;
 
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-import ru.touchin.roboswag.components.utils.UiUtils;
-
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
  * @param <TViewHolder> Type of {@link BindableViewHolder} of delegate.
  */
-@SuppressWarnings("PMD.TooManyMethods")
-//TooManyMethods: it's ok
-public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> implements LifecycleBindable {
+public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> {
 
+    private final int defaultItemViewType = ViewCompat.generateViewId();
     @NonNull
-    private final LifecycleBindable parentLifecycleBindable;
-    private final int defaultItemViewType;
+    private final LifecycleOwner lifecycleOwner;
 
-    public AdapterDelegate(@NonNull final LifecycleBindable parentLifecycleBindable) {
-        this.parentLifecycleBindable = parentLifecycleBindable;
-        this.defaultItemViewType = UiUtils.OfViews.generateViewId();
+    public AdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
+        this.lifecycleOwner = lifecycleOwner;
     }
 
     /**
-     * Returns parent {@link LifecycleBindable} that this delegate created from (e.g. Activity or ViewController).
+     * Returns parent {@link LifecycleOwner} that this delegate created from (e.g. Activity, Fragment or ViewController).
      *
-     * @return Parent {@link LifecycleBindable}.
+     * @return Parent {@link LifecycleOwner}.
      */
     @NonNull
-    public LifecycleBindable getParentLifecycleBindable() {
-        return parentLifecycleBindable;
+    public LifecycleOwner getLifecycleOwner() {
+        return lifecycleOwner;
     }
 
     /**
@@ -79,184 +68,4 @@ public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> im
     @NonNull
     public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
 
-    @SuppressWarnings("CPD-START")
-    //CPD: it is same as in other implementation based on BaseLifecycleBindable
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return parentLifecycleBindable.untilStop(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return parentLifecycleBindable.untilStop(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return parentLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        return parentLifecycleBindable.untilStop(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return parentLifecycleBindable.untilStop(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        return parentLifecycleBindable.untilStop(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return parentLifecycleBindable.untilStop(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        return parentLifecycleBindable.untilStop(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return parentLifecycleBindable.untilStop(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        return parentLifecycleBindable.untilDestroy(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return parentLifecycleBindable.untilDestroy(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return parentLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        return parentLifecycleBindable.untilDestroy(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return parentLifecycleBindable.untilDestroy(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        return parentLifecycleBindable.untilDestroy(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return parentLifecycleBindable.untilDestroy(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        return parentLifecycleBindable.untilDestroy(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return parentLifecycleBindable.untilDestroy(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return parentLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
-    }
-
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
deleted file mode 100644
index 3ca1fe0..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 12/8/2016.
- * ViewHolder that implements {@link LifecycleBindable} and uses parent bindable object as bridge (Activity, ViewController etc.).
- */
-@SuppressWarnings("PMD.TooManyMethods")
-public class BindableViewHolder extends RecyclerView.ViewHolder implements LifecycleBindable {
-
-    @NonNull
-    private final LifecycleBindable baseLifecycleBindable;
-
-    public BindableViewHolder(@NonNull final LifecycleBindable baseLifecycleBindable, @NonNull final View itemView) {
-        super(itemView);
-        this.baseLifecycleBindable = baseLifecycleBindable;
-    }
-
-    /**
-     * Look for a child view with the given id.  If this view has the given id, return this view.
-     *
-     * @param id The id to search for;
-     * @return The view that has the given id in the hierarchy.
-     */
-    @NonNull
-    @SuppressWarnings("unchecked")
-    public <T extends View> T findViewById(@IdRes final int id) {
-        final T viewById = (T) itemView.findViewById(id);
-        if (viewById == null) {
-            throw new ShouldNotHappenException("No view for id=" + itemView.getResources().getResourceName(id));
-        }
-        return viewById;
-    }
-
-    /**
-     * Return the string value associated with a particular resource ID.  It
-     * will be stripped of any styled text information.
-     *
-     * @param resId The resource id to search for data;
-     * @return String The string data associated with the resource.
-     */
-    @NonNull
-    public String getString(@StringRes final int resId) {
-        return itemView.getResources().getString(resId);
-    }
-
-    /**
-     * Return the string value associated with a particular resource ID.  It
-     * will be stripped of any styled text information.
-     *
-     * @param resId      The resource id to search for data;
-     * @param formatArgs The format arguments that will be used for substitution.
-     * @return String The string data associated with the resource.
-     */
-    @NonNull
-    public String getString(@StringRes final int resId, @Nullable final Object... formatArgs) {
-        return itemView.getResources().getString(resId, formatArgs);
-    }
-
-    /**
-     * Return the color value associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
-     * color will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return int A single color value in the form 0xAARRGGBB.
-     */
-    @ColorInt
-    public int getColor(@ColorRes final int resId) {
-        return ContextCompat.getColor(itemView.getContext(), resId);
-    }
-
-    /**
-     * Returns a drawable object associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the
-     * returned drawable will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return Drawable An object that can be used to draw this resource.
-     */
-    @NonNull
-    public Drawable getDrawable(@DrawableRes final int resId) {
-        return ContextCompat.getDrawable(itemView.getContext(), resId);
-    }
-
-    @SuppressWarnings("CPD-START")
-    //CPD: it's ok as it's LifecycleBindable
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilStop(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilStop(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilStop(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilStop(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilDestroy(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilDestroy(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilDestroy(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilDestroy(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction);
-    }
-
-    @SuppressWarnings("CPD-END")
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt
new file mode 100644
index 0000000..9222794
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt
@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.components.adapters
+
+import android.arch.lifecycle.LifecycleOwner
+import android.support.v7.widget.RecyclerView
+import android.view.View
+
+/**
+ * Created by Denis Karmyshakov 14.03.2018.
+ * ViewHolder that implements {@link LifecycleOwner} and uses parent lifecycle
+ * object as bridge ([android.app.Activity], [android.support.v4.app.Fragment] etc.).
+ */
+open class BindableViewHolder(
+        private val lifecycleOwner: LifecycleOwner,
+        itemView: View
+) : RecyclerView.ViewHolder(itemView), LifecycleOwner by lifecycleOwner
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index 033e944..a7f27d4 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -1,24 +1,23 @@
 package ru.touchin.roboswag.components.adapters;
 
+import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Such delegates are creating and binding ViewHolders for specific items.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link BindableViewHolder} of delegate;
- * @param <TItem>       Type of items to bind to {@link BindableViewHolder}s.
+ * @param <TViewHolder> Type of {@link LifecycleOwner} of delegate;
+ * @param <TItem>       Type of items to bind to {@link LifecycleOwner}s.
  */
 public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
 
-    public ItemAdapterDelegate(@NonNull final LifecycleBindable parentLifecycleBindable) {
-        super(parentLifecycleBindable);
+    public ItemAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
+        super(lifecycleOwner);
     }
 
     /**
@@ -61,8 +60,12 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
      * @param positionInAdapter    Position of item in adapter;
      * @param positionInCollection Position of item in collection that contains item;
      */
-    public abstract void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final TItem item,
-                                          final int positionInAdapter, final int positionInCollection);
+    public abstract void onBindViewHolder(
+            @NonNull final TViewHolder holder,
+            @NonNull final TItem item,
+            final int positionInAdapter,
+            final int positionInCollection
+    );
 
     /**
      * Binds item with payloads to created by this object ViewHolder.
@@ -73,8 +76,13 @@ public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder
      * @param positionInAdapter    Position of item in adapter;
      * @param positionInCollection Position of item in collection that contains item;
      */
-    public void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final TItem item, @NonNull final List<Object> payloads,
-                                 final int positionInAdapter, final int positionInCollection) {
+    public void onBindViewHolder(
+            @NonNull final TViewHolder holder,
+            @NonNull final TItem item,
+            @NonNull final List<Object> payloads,
+            final int positionInAdapter,
+            final int positionInCollection
+    ) {
         //do nothing by default
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java b/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
deleted file mode 100644
index f93b2b5..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ObservableCollectionAdapter.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import io.reactivex.Observable;
-import io.reactivex.functions.BiConsumer;
-import io.reactivex.functions.Consumer;
-import io.reactivex.subjects.BehaviorSubject;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-import ru.touchin.roboswag.components.utils.UiUtils;
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
-import ru.touchin.roboswag.core.observables.collections.ObservableList;
-import ru.touchin.roboswag.core.observables.collections.changes.Change;
-import ru.touchin.roboswag.core.observables.collections.changes.ChangePayloadProducer;
-import ru.touchin.roboswag.core.observables.collections.changes.CollectionChanges;
-import ru.touchin.roboswag.core.observables.collections.changes.SameItemsPredicate;
-import ru.touchin.roboswag.core.observables.collections.loadable.LoadingMoreList;
-import ru.touchin.roboswag.core.utils.Optional;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 20/11/2015.
- * Adapter based on {@link ObservableCollection} and providing some useful features like:
- * - item-based binding method;
- * - delegates by {@link AdapterDelegate} over itemViewType logic;
- * - item click listener setup by {@link #setOnItemClickListener(OnItemClickListener)};
- * - allows to inform about footers/headers by overriding base create/bind methods and {@link #getHeadersCount()} plus {@link #getFootersCount()};
- * - by default it is pre-loading items for collections like {@link ru.touchin.roboswag.core.observables.collections.loadable.LoadingMoreList}.
- *
- * @param <TItem>           Type of items to bind to ViewHolders;
- * @param <TItemViewHolder> Type of ViewHolders to show items.
- */
-@SuppressWarnings({"unchecked", "PMD.TooManyMethods"})
-//TooManyMethods: it's ok
-public abstract class ObservableCollectionAdapter<TItem, TItemViewHolder extends BindableViewHolder>
-        extends RecyclerView.Adapter<BindableViewHolder> {
-
-    private static final int PRE_LOADING_COUNT = 20;
-
-    private static boolean inDebugMode;
-
-    /**
-     * Enables debugging features like checking concurrent delegates.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
-    @NonNull
-    private final BehaviorSubject<Optional<ObservableCollection<TItem>>> observableCollectionSubject
-            = BehaviorSubject.createDefault(new Optional<>(null));
-    @NonNull
-    private final BehaviorSubject<Boolean> moreAutoLoadingRequested = BehaviorSubject.create();
-    @NonNull
-    private final LifecycleBindable lifecycleBindable;
-    @Nullable
-    private Object onItemClickListener;
-    private int lastUpdatedChangeNumber = -1;
-
-    @NonNull
-    private final ObservableList<TItem> innerCollection = new ObservableList<>();
-    private boolean anyChangeApplied;
-    private long itemClickDelayMillis;
-    @NonNull
-    private final List<RecyclerView> attachedRecyclerViews = new LinkedList<>();
-    @NonNull
-    private final List<AdapterDelegate<? extends BindableViewHolder>> delegates = new ArrayList<>();
-
-    public ObservableCollectionAdapter(@NonNull final LifecycleBindable lifecycleBindable) {
-        super();
-        this.lifecycleBindable = lifecycleBindable;
-        lifecycleBindable.untilDestroy(innerCollection.observeChanges(), this::onItemsChanged);
-        lifecycleBindable.untilDestroy(observableCollectionSubject
-                .switchMap(optional -> {
-                    final ObservableCollection<TItem> collection = optional.get();
-                    if (collection instanceof ObservableList) {
-                        innerCollection.setDiffUtilsSource((ObservableList<TItem>) collection);
-                    } else {
-                        innerCollection.setDiffUtilsSource(null);
-                    }
-                    return collection != null ? collection.observeItems() : Observable.just(Collections.emptyList());
-                }), innerCollection::set);
-        lifecycleBindable.untilDestroy(createMoreAutoLoadingObservable());
-    }
-
-    @NonNull
-    private Observable createMoreAutoLoadingObservable() {
-        return observableCollectionSubject
-                .switchMap(collectionOptional -> {
-                    final ObservableCollection<TItem> collection = collectionOptional.get();
-                    if (!(collection instanceof LoadingMoreList)) {
-                        return Observable.empty();
-                    }
-                    return moreAutoLoadingRequested
-                            .distinctUntilChanged()
-                            .switchMap(requested -> {
-                                if (!requested) {
-                                    return Observable.empty();
-                                }
-                                final int size = collection.size();
-                                return ((LoadingMoreList<?, ?, ?>) collection)
-                                        .loadRange(size, size + PRE_LOADING_COUNT)
-                                        .onErrorReturnItem(new ArrayList<>())
-                                        .toObservable()
-                                        .doOnComplete(() -> moreAutoLoadingRequested.onNext(false));
-                            });
-                });
-    }
-
-    /**
-     * Returns if any change of source collection applied to adapter.
-     * It's important to not show some footers or headers before first change have applied.
-     *
-     * @return True id any change applied.
-     */
-    public boolean isAnyChangeApplied() {
-        return anyChangeApplied;
-    }
-
-    @Override
-    public void onAttachedToRecyclerView(@NonNull final RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-        attachedRecyclerViews.add(recyclerView);
-    }
-
-    private boolean anyRecyclerViewShown() {
-        for (final RecyclerView recyclerView : attachedRecyclerViews) {
-            if (recyclerView.isShown()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void onDetachedFromRecyclerView(@NonNull final RecyclerView recyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView);
-        attachedRecyclerViews.remove(recyclerView);
-    }
-
-    /**
-     * Returns parent {@link LifecycleBindable} (Activity/ViewController etc.).
-     *
-     * @return Parent {@link LifecycleBindable}.
-     */
-    @NonNull
-    public LifecycleBindable getLifecycleBindable() {
-        return lifecycleBindable;
-    }
-
-    /**
-     * Returns {@link ObservableCollection} which provides items and it's changes.
-     *
-     * @return Inner {@link ObservableCollection}.
-     */
-    @Nullable
-    public ObservableCollection<TItem> getObservableCollection() {
-        return observableCollectionSubject.getValue().get();
-    }
-
-    /**
-     * Method to observe {@link ObservableCollection} which provides items and it's changes.
-     *
-     * @return Observable of inner {@link ObservableCollection}.
-     */
-    @NonNull
-    public Observable<Optional<ObservableCollection<TItem>>> observeObservableCollection() {
-        return observableCollectionSubject;
-    }
-
-    /**
-     * Sets {@link ObservableCollection} which will provide items and it's changes.
-     *
-     * @param observableCollection Inner {@link ObservableCollection}.
-     */
-    public void setObservableCollection(@Nullable final ObservableCollection<TItem> observableCollection) {
-        this.observableCollectionSubject.onNext(new Optional<>(observableCollection));
-    }
-
-    /**
-     * Simply sets items.
-     *
-     * @param items Items to set.
-     */
-    public void setItems(@NonNull final Collection<TItem> items) {
-        setObservableCollection(new ObservableList<>(items));
-    }
-
-    /**
-     * Calls when collection changes.
-     *
-     * @param collectionChanges Changes of collection.
-     */
-    protected void onItemsChanged(@NonNull final CollectionChanges<TItem> collectionChanges) {
-        if (Looper.myLooper() != Looper.getMainLooper()) {
-            Lc.assertion("Items changes called on not main thread");
-            return;
-        }
-        if (!anyChangeApplied || !anyRecyclerViewShown()) {
-            anyChangeApplied = true;
-            refreshUpdate();
-            return;
-        }
-        if (collectionChanges.getNumber() != innerCollection.getChangesCount()
-                || collectionChanges.getNumber() != lastUpdatedChangeNumber + 1) {
-            if (lastUpdatedChangeNumber < collectionChanges.getNumber()) {
-                refreshUpdate();
-            }
-            return;
-        }
-        notifyAboutChanges(collectionChanges.getChanges());
-        lastUpdatedChangeNumber = innerCollection.getChangesCount();
-    }
-
-    private void refreshUpdate() {
-        notifyDataSetChanged();
-        lastUpdatedChangeNumber = innerCollection.getChangesCount();
-    }
-
-    private void notifyAboutChanges(@NonNull final Collection<Change> changes) {
-        for (final Change change : changes) {
-            if (change instanceof Change.Inserted) {
-                final Change.Inserted castedChange = (Change.Inserted) change;
-                notifyItemRangeInserted(castedChange.getPosition() + getHeadersCount(), castedChange.getCount());
-            } else if (change instanceof Change.Removed) {
-                if (getItemCount() - getHeadersCount() == 0) {
-                    //TODO: bug of recyclerview?
-                    notifyDataSetChanged();
-                } else {
-                    final Change.Removed castedChange = (Change.Removed) change;
-                    notifyItemRangeRemoved(castedChange.getPosition() + getHeadersCount(), castedChange.getCount());
-                }
-            } else if (change instanceof Change.Moved) {
-                final Change.Moved castedChange = (Change.Moved) change;
-                notifyItemMoved(castedChange.getFromPosition() + getHeadersCount(), castedChange.getToPosition() + getHeadersCount());
-            } else if (change instanceof Change.Changed) {
-                final Change.Changed castedChange = (Change.Changed) change;
-                notifyItemRangeChanged(
-                        castedChange.getPosition() + getHeadersCount(),
-                        castedChange.getCount(),
-                        castedChange.getPayload());
-            } else {
-                Lc.assertion("Not supported " + change);
-            }
-        }
-    }
-
-    /**
-     * Returns headers count goes before items.
-     *
-     * @return Headers count.
-     */
-    protected int getHeadersCount() {
-        return 0;
-    }
-
-    /**
-     * Returns footers count goes after items and headers.
-     *
-     * @return Footers count.
-     */
-    protected int getFootersCount() {
-        return 0;
-    }
-
-    /**
-     * Returns list of added delegates.
-     *
-     * @return List of {@link AdapterDelegate}.
-     */
-    @NonNull
-    public List<AdapterDelegate<? extends BindableViewHolder>> getDelegates() {
-        return Collections.unmodifiableList(delegates);
-    }
-
-    /**
-     * Adds {@link ItemAdapterDelegate} to adapter.
-     *
-     * @param delegate Delegate to add.
-     */
-    public void addDelegate(@NonNull final ItemAdapterDelegate<? extends TItemViewHolder, ? extends TItem> delegate) {
-        addDelegateInternal(delegate);
-    }
-
-    /**
-     * Adds {@link PositionAdapterDelegate} to adapter.
-     *
-     * @param delegate Delegate to add.
-     */
-    public void addDelegate(@NonNull final PositionAdapterDelegate<? extends BindableViewHolder> delegate) {
-        addDelegateInternal(delegate);
-    }
-
-    private void addDelegateInternal(@NonNull final AdapterDelegate<? extends BindableViewHolder> delegate) {
-        if (inDebugMode) {
-            for (final AdapterDelegate addedDelegate : delegates) {
-                if (addedDelegate.getItemViewType() == delegate.getItemViewType()) {
-                    Lc.assertion("AdapterDelegate with viewType=" + delegate.getItemViewType() + " already added");
-                    return;
-                }
-            }
-        }
-        delegates.add(delegate);
-        notifyDataSetChanged();
-    }
-
-    /**
-     * Removes {@link AdapterDelegate} from adapter.
-     *
-     * @param delegate Delegate to remove.
-     */
-    public void removeDelegate(@NonNull final AdapterDelegate<? extends BindableViewHolder> delegate) {
-        delegates.remove(delegate);
-        notifyDataSetChanged();
-    }
-
-    private void checkDelegates(@Nullable final AdapterDelegate alreadyPickedDelegate, @NonNull final AdapterDelegate currentDelegate) {
-        if (alreadyPickedDelegate != null) {
-            throw new ShouldNotHappenException("Concurrent delegates: " + currentDelegate + " and " + alreadyPickedDelegate);
-        }
-    }
-
-    private int getItemPositionInCollection(final int positionInAdapter) {
-        final int shiftedPosition = positionInAdapter - getHeadersCount();
-        return shiftedPosition >= 0 && shiftedPosition < innerCollection.size() ? shiftedPosition : -1;
-    }
-
-    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.ModifiedCyclomaticComplexity", "PMD.StdCyclomaticComplexity", "PMD.NPathComplexity"})
-    //Complexity: because of debug code
-    @Override
-    public int getItemViewType(final int positionInAdapter) {
-        AdapterDelegate delegateOfViewType = null;
-        final int positionInCollection = getItemPositionInCollection(positionInAdapter);
-        final TItem item = positionInCollection >= 0 ? innerCollection.get(positionInCollection) : null;
-        for (final AdapterDelegate<?> delegate : delegates) {
-            if (delegate instanceof ItemAdapterDelegate) {
-                if (item != null && ((ItemAdapterDelegate) delegate).isForViewType(item, positionInAdapter, positionInCollection)) {
-                    checkDelegates(delegateOfViewType, delegate);
-                    delegateOfViewType = delegate;
-                    if (!inDebugMode) {
-                        break;
-                    }
-                }
-            } else if (delegate instanceof PositionAdapterDelegate) {
-                if (((PositionAdapterDelegate) delegate).isForViewType(positionInAdapter)) {
-                    checkDelegates(delegateOfViewType, delegate);
-                    delegateOfViewType = delegate;
-                    if (!inDebugMode) {
-                        break;
-                    }
-                }
-            } else {
-                Lc.assertion("Delegate of type " + delegate.getClass());
-            }
-        }
-
-        return delegateOfViewType != null ? delegateOfViewType.getItemViewType() : super.getItemViewType(positionInAdapter);
-    }
-
-    @Override
-    public long getItemId(final int positionInAdapter) {
-        final LongContainer result = new LongContainer();
-        tryDelegateAction(positionInAdapter,
-                (itemAdapterDelegate, positionInCollection) ->
-                        result.value = itemAdapterDelegate.getItemId(innerCollection.get(positionInCollection),
-                                positionInAdapter, positionInCollection),
-                positionAdapterDelegate -> result.value = positionAdapterDelegate.getItemId(positionInAdapter),
-                (positionInCollection) -> result.value = super.getItemId(positionInAdapter));
-        return result.value;
-    }
-
-    @SuppressWarnings("PMD.CyclomaticComplexity")
-    private void tryDelegateAction(final int positionInAdapter,
-                                   @NonNull final BiConsumer<ItemAdapterDelegate, Integer> itemAdapterDelegateAction,
-                                   @NonNull final Consumer<PositionAdapterDelegate> positionAdapterDelegateAction,
-                                   @NonNull final Consumer<Integer> defaultAction) {
-        final int viewType = getItemViewType(positionInAdapter);
-        final int positionInCollection = getItemPositionInCollection(positionInAdapter);
-        for (final AdapterDelegate<?> delegate : delegates) {
-            if (delegate instanceof ItemAdapterDelegate) {
-                if (positionInCollection >= 0 && viewType == delegate.getItemViewType()) {
-                    try {
-                        itemAdapterDelegateAction.accept((ItemAdapterDelegate) delegate, positionInCollection);
-                    } catch (final Exception exception) {
-                        Lc.assertion(exception);
-                    }
-                    return;
-                }
-            } else if (delegate instanceof PositionAdapterDelegate) {
-                if (viewType == delegate.getItemViewType()) {
-                    try {
-                        positionAdapterDelegateAction.accept((PositionAdapterDelegate) delegate);
-                    } catch (final Exception exception) {
-                        Lc.assertion(exception);
-                    }
-                    return;
-                }
-            } else {
-                Lc.assertion("Delegate of type " + delegate.getClass());
-            }
-        }
-        try {
-            defaultAction.accept(positionInCollection);
-        } catch (final Exception exception) {
-            Lc.assertion(exception);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return getHeadersCount() + innerCollection.size() + getFootersCount();
-    }
-
-    @NonNull
-    @Override
-    public BindableViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
-        for (final AdapterDelegate<?> delegate : delegates) {
-            if (delegate.getItemViewType() == viewType) {
-                return delegate.onCreateViewHolder(parent);
-            }
-        }
-        throw new ShouldNotHappenException("Add some AdapterDelegate or override this method");
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final BindableViewHolder holder, final int positionInAdapter) {
-        lastUpdatedChangeNumber = innerCollection.getChangesCount();
-
-        tryDelegateAction(positionInAdapter,
-                (itemAdapterDelegate, positionInCollection) -> {
-                    bindItemViewHolder(itemAdapterDelegate, holder, innerCollection.get(positionInCollection),
-                            null, positionInAdapter, positionInCollection);
-                    updateMoreAutoLoadingRequest(positionInCollection);
-                },
-                positionAdapterDelegate -> positionAdapterDelegate.onBindViewHolder(holder, positionInAdapter),
-                (positionInCollection) -> {
-                    if (positionInCollection >= 0) {
-                        bindItemViewHolder(null, holder, innerCollection.get(positionInCollection), null, positionInAdapter, positionInCollection);
-                    }
-                });
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull final BindableViewHolder holder, final int positionInAdapter, @NonNull final List<Object> payloads) {
-        super.onBindViewHolder(holder, positionInAdapter, payloads);
-        tryDelegateAction(positionInAdapter,
-                (itemAdapterDelegate, positionInCollection) -> {
-                    bindItemViewHolder(itemAdapterDelegate, holder, innerCollection.get(positionInCollection),
-                            payloads, positionInAdapter, positionInCollection);
-                    updateMoreAutoLoadingRequest(positionInCollection);
-                },
-                positionAdapterDelegate -> positionAdapterDelegate.onBindViewHolder(holder, positionInAdapter),
-                (positionInCollection) -> {
-                    if (positionInCollection >= 0) {
-                        bindItemViewHolder(null, holder, innerCollection.get(positionInCollection),
-                                payloads, positionInAdapter, positionInCollection);
-                    }
-                });
-    }
-
-    private void bindItemViewHolder(@Nullable final ItemAdapterDelegate<TItemViewHolder, TItem> itemAdapterDelegate,
-                                    @NonNull final BindableViewHolder holder, @NonNull final TItem item, @Nullable final List<Object> payloads,
-                                    final int positionInAdapter, final int positionInCollection) {
-        final TItemViewHolder itemViewHolder;
-        try {
-            itemViewHolder = (TItemViewHolder) holder;
-        } catch (final ClassCastException exception) {
-            Lc.assertion(exception);
-            return;
-        }
-        updateClickListener(holder, item, positionInAdapter, positionInCollection);
-        if (itemAdapterDelegate != null) {
-            if (payloads == null) {
-                itemAdapterDelegate.onBindViewHolder(itemViewHolder, item, positionInAdapter, positionInCollection);
-            } else {
-                itemAdapterDelegate.onBindViewHolder(itemViewHolder, item, payloads, positionInAdapter, positionInCollection);
-            }
-        } else {
-            if (payloads == null) {
-                onBindItemToViewHolder(itemViewHolder, positionInAdapter, item);
-            } else {
-                onBindItemToViewHolder(itemViewHolder, positionInAdapter, item, payloads);
-            }
-        }
-    }
-
-    private void updateClickListener(@NonNull final BindableViewHolder holder, @NonNull final TItem item,
-                                     final int positionInAdapter, final int positionInCollection) {
-        if (onItemClickListener != null && !isOnClickListenerDisabled(item, positionInAdapter, positionInCollection)) {
-            UiUtils.setOnRippleClickListener(holder.itemView,
-                    () -> {
-                        if (onItemClickListener instanceof OnItemClickListener) {
-                            ((OnItemClickListener) onItemClickListener).onItemClicked(item);
-                        } else if (onItemClickListener instanceof OnItemWithPositionClickListener) {
-                            ((OnItemWithPositionClickListener) onItemClickListener).onItemClicked(item, positionInAdapter, positionInCollection);
-                        } else {
-                            Lc.assertion("Unexpected onItemClickListener type " + onItemClickListener);
-                        }
-                    },
-                    itemClickDelayMillis);
-        }
-    }
-
-    private void updateMoreAutoLoadingRequest(final int positionInCollection) {
-        if (positionInCollection > innerCollection.size() - PRE_LOADING_COUNT) {
-            return;
-        }
-        moreAutoLoadingRequested.onNext(true);
-    }
-
-    /**
-     * Method to bind item (from {@link #getObservableCollection()}) to item-specific ViewHolder.
-     * It is not calling for headers and footer which counts are returned by {@link #getHeadersCount()} and @link #getFootersCount()}.
-     * You don't need to override this method if you have delegates for every view type.
-     *
-     * @param holder            ViewHolder to bind item to;
-     * @param positionInAdapter Position of ViewHolder (NOT item!);
-     * @param item              Item returned by position (WITH HEADER OFFSET!).
-     */
-    protected void onBindItemToViewHolder(@NonNull final TItemViewHolder holder, final int positionInAdapter, @NonNull final TItem item) {
-        // do nothing by default - let delegates do it
-    }
-
-    /**
-     * Method to bind item (from {@link #getObservableCollection()}) to item-specific ViewHolder with payloads.
-     * It is not calling for headers and footer which counts are returned by {@link #getHeadersCount()} and @link #getFootersCount()}.
-     *
-     * @param holder            ViewHolder to bind item to;
-     * @param positionInAdapter Position of ViewHolder in adapter (NOT item!);
-     * @param item              Item returned by position (WITH HEADER OFFSET!);
-     * @param payloads          Payloads.
-     */
-    protected void onBindItemToViewHolder(@NonNull final TItemViewHolder holder, final int positionInAdapter, @NonNull final TItem item,
-                                          @NonNull final List<Object> payloads) {
-        // do nothing by default - let delegates do it
-    }
-
-    @Nullable
-    public TItem getItem(final int positionInAdapter) {
-        final int positionInCollection = getItemPositionInCollection(positionInAdapter);
-        return positionInCollection >= 0 ? innerCollection.get(positionInCollection) : null;
-    }
-
-    /**
-     * Sets item click listener.
-     *
-     * @param onItemClickListener Item click listener.
-     */
-    public void setOnItemClickListener(@Nullable final OnItemClickListener<TItem> onItemClickListener) {
-        this.setOnItemClickListener(onItemClickListener, UiUtils.RIPPLE_EFFECT_DELAY);
-    }
-
-    /**
-     * Sets item click listener.
-     *
-     * @param onItemClickListener  Item click listener;
-     * @param itemClickDelayMillis Delay of calling click listener.
-     */
-    public void setOnItemClickListener(@Nullable final OnItemClickListener<TItem> onItemClickListener, final long itemClickDelayMillis) {
-        this.onItemClickListener = onItemClickListener;
-        this.itemClickDelayMillis = itemClickDelayMillis;
-        refreshUpdate();
-    }
-
-    /**
-     * Sets item click listener.
-     *
-     * @param onItemClickListener Item click listener.
-     */
-    public void setOnItemClickListener(@Nullable final OnItemWithPositionClickListener<TItem> onItemClickListener) {
-        this.setOnItemClickListener(onItemClickListener, UiUtils.RIPPLE_EFFECT_DELAY);
-    }
-
-    /**
-     * Sets item click listener.
-     *
-     * @param onItemClickListener  Item click listener;
-     * @param itemClickDelayMillis Delay of calling click listener.
-     */
-    public void setOnItemClickListener(@Nullable final OnItemWithPositionClickListener<TItem> onItemClickListener, final long itemClickDelayMillis) {
-        this.onItemClickListener = onItemClickListener;
-        this.itemClickDelayMillis = itemClickDelayMillis;
-        refreshUpdate();
-    }
-
-    /**
-     * Returns if click listening disabled or not for specific item.
-     *
-     * @param item                 Item to check click availability;
-     * @param positionInAdapter    Position of clicked item in adapter (with headers);
-     * @param positionInCollection Position of clicked item in inner collection;
-     * @return True if click listener enabled for such item.
-     */
-    public boolean isOnClickListenerDisabled(@NonNull final TItem item, final int positionInAdapter, final int positionInCollection) {
-        return false;
-    }
-
-    /**
-     * Enable diff utils algorithm in collection changes.
-     *
-     * @param detectMoves           The flag that determines whether the {@link Change.Moved} changes will be generated or not;
-     * @param sameItemsPredicate    Predicate for the determination of the same elements;
-     * @param changePayloadProducer Function that calculate change payload when items the same but contents are different.
-     */
-    public void enableDiffUtils(final boolean detectMoves,
-                                @NonNull final SameItemsPredicate<TItem> sameItemsPredicate,
-                                @Nullable final ChangePayloadProducer<TItem> changePayloadProducer) {
-        innerCollection.enableDiffUtils(detectMoves, sameItemsPredicate, changePayloadProducer);
-    }
-
-    /**
-     * Disable diff utils algorithm.
-     */
-    public void disableDiffUtils() {
-        innerCollection.disableDiffUtils();
-    }
-
-    /**
-     * Returns enabled flag of diff utils.
-     *
-     * @return true if diff utils is enabled.
-     */
-    public boolean diffUtilsIsEnabled() {
-        return innerCollection.diffUtilsIsEnabled();
-    }
-
-    /**
-     * Interface to simply add item click listener.
-     *
-     * @param <TItem> Type of item
-     */
-    public interface OnItemClickListener<TItem> {
-
-        /**
-         * Calls when item have clicked.
-         *
-         * @param item Clicked item.
-         */
-        void onItemClicked(@NonNull TItem item);
-
-    }
-
-    /**
-     * Interface to simply add item click listener based on item position in adapter and collection.
-     *
-     * @param <TItem> Type of item
-     */
-    public interface OnItemWithPositionClickListener<TItem> {
-
-        /**
-         * Calls when item have clicked.
-         *
-         * @param item                 Clicked item;
-         * @param positionInAdapter    Position of clicked item in adapter (with headers);
-         * @param positionInCollection Position of clicked item in inner collection.
-         */
-        void onItemClicked(@NonNull TItem item, final int positionInAdapter, final int positionInCollection);
-
-    }
-
-    private class LongContainer {
-
-        private long value;
-
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
index a3a9f9e..5fc5f4a 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -1,12 +1,11 @@
 package ru.touchin.roboswag.components.adapters;
 
+import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Such delegates are creating and binding ViewHolders by position in adapter.
@@ -16,8 +15,8 @@ import ru.touchin.roboswag.components.utils.LifecycleBindable;
  */
 public abstract class PositionAdapterDelegate<TViewHolder extends BindableViewHolder> extends AdapterDelegate<TViewHolder> {
 
-    public PositionAdapterDelegate(@NonNull final LifecycleBindable parentLifecycleBindable) {
-        super(parentLifecycleBindable);
+    public PositionAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
+        super(lifecycleOwner);
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java b/src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java
deleted file mode 100644
index d747a73..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/AbstractState.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-
-import java.io.Serializable;
-
-/**
- * Created by Ilia Kurtov on 13/04/2016.
- * Basic state of {@link ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment}.
- * This object is saving as serializable in {@link android.os.Bundle} at {@link Fragment#onSaveInstanceState(Bundle)} point.
- * Also this object is passing into {@link Fragment#getArguments()} on fragment instantiation.
- * Do NOT store such object in fields outside of it's {@link ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment}:
- * 1) it should be used as state of fragment but not state of other fragments or parts of logic;
- * 2) if you want to modify such object then you should pass it's fragment as {@link Fragment#getTargetFragment()};
- * 3) if you are using {@link ViewControllerNavigation} then just use ***ForResult methods to pass target;
- * 4) as it is serializable object then all initialization logic (like binding) should NOT be in constructor. Use {@link #onCreate()} method.
- */
-@SuppressWarnings("PMD.AbstractClassWithoutAbstractMethod")
-//AbstractClassWithoutAbstractMethod: objects of this class actually shouldn't exist
-public abstract class AbstractState implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Calls right after construction. All inner object's instantiation logic should be in this method.
-     * Do NOT do some instantiation logic in constructor except fields setup.
-     */
-    public void onCreate() {
-        // do nothing
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
index a56268c..a29f0a0 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
@@ -19,39 +19,27 @@
 
 package ru.touchin.roboswag.components.navigation;
 
+import android.arch.lifecycle.Lifecycle;
+import android.arch.lifecycle.LifecycleOwner;
+import android.arch.lifecycle.LifecycleRegistry;
 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 android.support.v4.app.FragmentActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
-import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
@@ -60,20 +48,16 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * @param <TActivity> Type of activity where such {@link ViewController} could be;
  * @param <TFragment> Type of fragment where such {@link ViewController} could be;
  */
-@SuppressWarnings({"PMD.TooManyMethods", "PMD.ExcessivePublicCount"})
-public class ViewController<TActivity extends ViewControllerActivity<?>,
-        TFragment extends ViewControllerFragment<?, TActivity>>
-        implements LifecycleBindable {
+public class ViewController<TActivity extends FragmentActivity, TFragment extends ViewControllerFragment<?, TActivity>> implements LifecycleOwner {
 
+    @NonNull
+    private final LifecycleRegistry lifecycleRegistry = new LifecycleRegistry(this);
     @NonNull
     private final TActivity activity;
     @NonNull
     private final TFragment fragment;
     @NonNull
     private final ViewGroup container;
-    @NonNull
-    private final BaseLifecycleBindable baseLifecycleBindable = new BaseLifecycleBindable();
-    private boolean destroyed;
 
     @SuppressWarnings({"unchecked", "PMD.UnusedFormalParameter"})
     //UnusedFormalParameter: savedInstanceState could be used by children
@@ -83,6 +67,12 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         this.container = creationContext.container;
     }
 
+    @NonNull
+    @Override
+    public Lifecycle getLifecycle() {
+        return lifecycleRegistry;
+    }
+
     /**
      * Returns activity where {@link ViewController} could be.
      *
@@ -114,37 +104,6 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         return container;
     }
 
-    /**
-     * Returns if {@link ViewController} destroyed or not.
-     *
-     * @return True if it is destroyed.
-     */
-    public final boolean isDestroyed() {
-        return destroyed;
-    }
-
-    /**
-     * Return a localized string from the application's package's default string table.
-     *
-     * @param resId Resource id for the string
-     */
-    @NonNull
-    public final String getString(@StringRes final int resId) {
-        return getActivity().getString(resId);
-    }
-
-    /**
-     * Return a localized formatted string from the application's package's default string table, substituting the format arguments as defined in
-     * {@link java.util.Formatter} and {@link java.lang.String#format}.
-     *
-     * @param resId      Resource id for the format string
-     * @param formatArgs The format arguments that will be used for substitution.
-     */
-    @NonNull
-    public final String getString(@StringRes final int resId, @NonNull final Object... formatArgs) {
-        return getActivity().getString(resId, formatArgs);
-    }
-
     /**
      * Set the view controller content from a layout resource.
      * This layout is placed directly into the container's ({@link #getContainer()}) view hierarchy.
@@ -189,39 +148,8 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      * @return The view that has the given id in the hierarchy.
      */
     @NonNull
-    @SuppressWarnings("unchecked")
-    public <T extends View> T findViewById(@IdRes final int id) {
-        final T viewById = (T) getContainer().findViewById(id);
-        if (viewById == null) {
-            throw new ShouldNotHappenException("No view for id=" + getActivity().getResources().getResourceName(id));
-        }
-        return viewById;
-    }
-
-    /**
-     * Return the color value associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
-     * color will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return int A single color value in the form 0xAARRGGBB.
-     */
-    @ColorInt
-    public int getColor(@ColorRes final int resId) {
-        return getActivity().getColorCompat(resId);
-    }
-
-    /**
-     * Returns a drawable object associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the
-     * returned drawable will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return Drawable An object that can be used to draw this resource.
-     */
-    @NonNull
-    public Drawable getDrawable(@DrawableRes final int resId) {
-        return getActivity().getDrawableCompat(resId);
+    public final <T extends View> T findViewById(@IdRes final int id) {
+        return getContainer().findViewById(id);
     }
 
     /**
@@ -231,28 +159,28 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      * @param menu     The options menu in which you place your items;
      * @param inflater Helper to inflate menu items.
      */
-    public void onConfigureNavigation(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
         // do nothing
     }
 
     /**
      * Calls right after construction of {@link ViewController}.
-     * Happens at {@link ViewControllerFragment#onActivityCreated(View, ViewControllerActivity, Bundle)}.
+     * Happens at {@link ViewControllerFragment#onActivityCreated(Bundle)}.
      */
     @CallSuper
     public void onCreate() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onCreate();
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
     }
 
     /**
      * Calls when {@link ViewController} have started.
-     * Happens at {@link ViewControllerFragment#onStart(View, ViewControllerActivity)}.
+     * Happens at {@link ViewControllerFragment#onStart()}.
      */
     @CallSuper
     public void onStart() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onStart();
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
     }
 
     /**
@@ -265,12 +193,12 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
 
     /**
      * Calls when {@link ViewController} have resumed.
-     * Happens at {@link ViewControllerFragment#onResume(View, ViewControllerActivity)}.
+     * Happens at {@link ViewControllerFragment#onResume()}.
      */
     @CallSuper
     public void onResume() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onResume();
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
     }
 
     /**
@@ -284,11 +212,12 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
 
     /**
      * Calls when {@link ViewController} have paused.
-     * Happens at {@link ViewControllerFragment#onPause(View, ViewControllerActivity)}.
+     * Happens at {@link ViewControllerFragment#onPause()}.
      */
     @CallSuper
     public void onPause() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE);
     }
 
     /**
@@ -298,7 +227,6 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
      */
     @CallSuper
     public void onSaveInstanceState(@NonNull final Bundle savedInstanceState) {
-        baseLifecycleBindable.onSaveInstanceState();
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
     }
 
@@ -312,30 +240,29 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
 
     /**
      * Calls when {@link ViewController} have stopped.
-     * Happens at {@link ViewControllerFragment#onStop(View, ViewControllerActivity)}.
+     * Happens at {@link ViewControllerFragment#onStop()}.
      */
     @CallSuper
     public void onStop() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onStop();
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
     }
 
     /**
      * Calls when {@link ViewController} have destroyed.
-     * Happens usually at {@link ViewControllerFragment#onDestroyView(View)}. In some cases at {@link ViewControllerFragment#onDestroy()}.
+     * Happens usually at {@link ViewControllerFragment#onDestroyView()}. In some cases at {@link ViewControllerFragment#onDestroy()}.
      */
     @CallSuper
     public void onDestroy() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onDestroy();
-        destroyed = true;
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
     }
 
     /**
      * Callback from parent fragment.
      */
     public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
-        // Do nothing
+        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
     }
 
     /**
@@ -348,200 +275,23 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
         return false;
     }
 
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilStop(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilStop(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilStop(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilStop(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilDestroy(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilDestroy(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilDestroy(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilDestroy(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onCompletedAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction, onErrorAction);
-    }
-
-    @SuppressWarnings("CPD-END")
     /*
      * Helper class to simplify constructor override.
      */
     public static class CreationContext {
 
         @NonNull
-        private final ViewControllerActivity activity;
+        private final FragmentActivity activity;
         @NonNull
         private final ViewControllerFragment fragment;
         @NonNull
         private final ViewGroup container;
 
-        public CreationContext(@NonNull final ViewControllerActivity activity,
-                               @NonNull final ViewControllerFragment fragment,
-                               @NonNull final ViewGroup container) {
+        public CreationContext(
+                @NonNull final FragmentActivity activity,
+                @NonNull final ViewControllerFragment fragment,
+                @NonNull final ViewGroup container
+        ) {
             this.activity = activity;
             this.fragment = fragment;
             this.container = container;
@@ -549,4 +299,4 @@ public class ViewController<TActivity extends ViewControllerActivity<?>,
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
deleted file mode 100644
index ab43208..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 io.reactivex.functions.Function;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
-import ru.touchin.roboswag.components.navigation.fragments.SimpleViewControllerFragment;
-import ru.touchin.roboswag.components.navigation.fragments.StatelessTargetedViewControllerFragment;
-import ru.touchin.roboswag.components.navigation.fragments.StatelessViewControllerFragment;
-import ru.touchin.roboswag.components.navigation.fragments.TargetedViewControllerFragment;
-import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
-
-/**
- * Created by Gavriil Sitnikov on 07/03/2016.
- * Navigation based on {@link ViewController}s which are creating by {@link Fragment}s.
- * So basically it is just {@link FragmentNavigation} where most of fragments should be inherited from {@link ViewControllerFragment}.
- *
- * @param <TActivity> Type of activity where {@link ViewController}s should be showed.
- */
-public class ViewControllerNavigation<TActivity extends ViewControllerActivity<?>> extends FragmentNavigation {
-
-    public ViewControllerNavigation(@NonNull final Context context,
-                                    @NonNull final FragmentManager fragmentManager,
-                                    @IdRes final int containerViewId) {
-        super(context, fragmentManager, containerViewId);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack.
-     *
-     * @param fragmentClass Class of {@link ViewControllerFragment} to instantiate;
-     * @param state         Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param <TState>      Type of state of fragment.
-     */
-    public <TState extends AbstractState> void push(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                    @NonNull final TState state) {
-        addToStack(fragmentClass, null, true, ViewControllerFragment.createState(state), null, null);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack with specific transaction setup.
-     *
-     * @param fragmentClass    Class of {@link ViewControllerFragment} to instantiate;
-     * @param state            Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>         Type of state of fragment.
-     */
-    public <TState extends AbstractState> void push(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                    @Nullable final TState state,
-                                                    @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, true, ViewControllerFragment.createState(state), null, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack with specific target fragment.
-     *
-     * @param fragmentClass  Class of {@link ViewControllerFragment} to instantiate;
-     * @param targetFragment Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param state          Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param <TState>       Type of state of fragment.
-     */
-    public <TState extends AbstractState> void pushForResult(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                             @NonNull final Fragment targetFragment,
-                                                             @NonNull final TState state) {
-        addToStack(fragmentClass, targetFragment, true, ViewControllerFragment.createState(state),
-                fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack with specific target fragment and specific transaction setup.
-     *
-     * @param fragmentClass    Class of {@link ViewControllerFragment} to instantiate;
-     * @param targetFragment   Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param state            Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>         Type of state of fragment.
-     */
-    public <TState extends AbstractState> void pushForResult(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                             @NonNull final Fragment targetFragment,
-                                                             @Nullable final TState state,
-                                                             @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, true, ViewControllerFragment.createState(state),
-                fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass Class of {@link ViewControllerFragment} to instantiate.
-     * @param state         Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param <TState>      Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setAsTop(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                        @NonNull final TState state) {
-        setAsTop(fragmentClass, ViewControllerFragment.createState(state), null);
-    }
-
-    /**
-     * Pushes {@link ViewControllerFragment} on top of stack with specific transaction setup
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass    Class of {@link ViewControllerFragment} to instantiate.
-     * @param state            Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>         Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setAsTop(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                        @Nullable final TState state,
-                                                        @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        setAsTop(fragmentClass, ViewControllerFragment.createState(state), transactionSetup);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewControllerFragment} on top of stack.
-     *
-     * @param fragmentClass Class of {@link ViewControllerFragment} to instantiate;
-     * @param state         Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param <TState>      Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setInitial(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                          @NonNull final TState state) {
-        setInitial(fragmentClass, ViewControllerFragment.createState(state), null);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewControllerFragment} on top of stack with specific transaction setup.
-     *
-     * @param fragmentClass    Class of {@link ViewControllerFragment} to instantiate;
-     * @param state            Specific {@link AbstractState} of {@link ViewControllerFragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>         Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setInitial(@NonNull final Class<? extends ViewControllerFragment<TState, TActivity>> fragmentClass,
-                                                          @Nullable final TState state,
-                                                          @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        setInitial(fragmentClass, ViewControllerFragment.createState(state), transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed.
-     */
-    public void pushViewController(@NonNull final Class<? extends ViewController<TActivity,
-            StatelessViewControllerFragment<TActivity>>> viewControllerClass) {
-        addStatelessViewControllerToStack(viewControllerClass, null, null, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link ViewControllerFragment#getState()}.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void pushViewController(@NonNull final Class<? extends ViewController<TActivity,
-            SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-                                                                  @NonNull final TState state) {
-        addViewControllerToStack(viewControllerClass, null, state, null, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;.
-     */
-    public void pushViewController(
-            @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addStatelessViewControllerToStack(viewControllerClass, null, null, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link ViewControllerFragment#getState()} and with specific transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void pushViewController(
-            @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final TState state,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addViewControllerToStack(viewControllerClass, null, state, null, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} without adding to stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed.
-     */
-    public void pushSingleViewController(@NonNull final Class<? extends ViewController<TActivity,
-            StatelessViewControllerFragment<TActivity>>> viewControllerClass) {
-        addToStack(StatelessViewControllerFragment.class, null, false, StatelessViewControllerFragment.createState(viewControllerClass), null, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} without adding to stack and with specific {@link ViewControllerFragment#getState()}.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void pushSingleViewController(@NonNull final Class<? extends ViewController<TActivity,
-            SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass, @NonNull final TState state) {
-        addToStack(SimpleViewControllerFragment.class, null, false, SimpleViewControllerFragment.createState(viewControllerClass, state), null, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link StatelessTargetedViewControllerFragment#getTarget()}.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param <TTargetState>      Type of state of target fragment. State is using to affect on that fragment;
-     * @param <TTargetFragment>   Type of target fragment.
-     */
-    public <TTargetState extends AbstractState,
-            TTargetFragment extends ViewControllerFragment<? extends TTargetState, TActivity>> void pushViewControllerForResult(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    StatelessTargetedViewControllerFragment<TTargetState, TActivity>>> viewControllerClass,
-            @NonNull final TTargetFragment targetFragment) {
-        addTargetedStatelessViewControllerToStack(viewControllerClass, targetFragment,
-                viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link StatelessTargetedViewControllerFragment#getTarget()} and transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TTargetState>      Type of state of target fragment. State is using to affect on that fragment;
-     * @param <TTargetFragment>   Type of target fragment.
-     */
-    public <TTargetState extends AbstractState,
-            TTargetFragment extends ViewControllerFragment<? extends TTargetState, TActivity>> void pushViewControllerForResult(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    StatelessTargetedViewControllerFragment<TTargetState, TActivity>>> viewControllerClass,
-            @NonNull final TTargetFragment targetFragment,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addTargetedStatelessViewControllerToStack(viewControllerClass, targetFragment,
-                viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific with specific {@link ViewControllerFragment#getState()}
-     * and with specific {@link TargetedViewControllerFragment#getTarget()}.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param <TState>            Type of state of fragment;
-     * @param <TTargetState>      Type of state of target fragment. State is using to affect on that fragment;
-     * @param <TTargetFragment>   Type of target fragment.
-     */
-    @SuppressWarnings("CPD-START")
-    public <TState extends AbstractState, TTargetState extends AbstractState,
-            TTargetFragment extends ViewControllerFragment<? extends TTargetState, TActivity>> void pushViewControllerForResult(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    TargetedViewControllerFragment<TState, TTargetState, TActivity>>> viewControllerClass,
-            @NonNull final TTargetFragment targetFragment,
-            @NonNull final TState state) {
-        addTargetedViewControllerToStack(viewControllerClass, targetFragment, state,
-                viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link ViewControllerFragment#getState()}
-     * and with specific {@link TargetedViewControllerFragment#getTarget()} and transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment;
-     * @param <TTargetState>      Type of state of target fragment. State is using to affect on that fragment;
-     * @param <TTargetFragment>   Type of target fragment.
-     */
-    @SuppressWarnings("CPD-END")
-    public <TState extends AbstractState, TTargetState extends AbstractState,
-            TTargetFragment extends ViewControllerFragment<? extends TTargetState, TActivity>> void pushViewControllerForResult(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    TargetedViewControllerFragment<TState, TTargetState, TActivity>>> viewControllerClass,
-            @NonNull final TTargetFragment targetFragment,
-            @NonNull final TState state,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addTargetedViewControllerToStack(viewControllerClass, targetFragment, state,
-                viewControllerClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed.
-     */
-    public void setViewControllerAsTop(
-            @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass) {
-        addStatelessViewControllerToStack(viewControllerClass, null, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link ViewControllerFragment#getState()}
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setViewControllerAsTop(
-            @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final TState state) {
-        addViewControllerToStack(viewControllerClass, null, state, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific transaction setup
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void setViewControllerAsTop(
-            @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addStatelessViewControllerToStack(viewControllerClass, null, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link ViewController} on top of stack with specific {@link ViewControllerFragment#getState()} and with specific transaction setup
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setViewControllerAsTop(
-            @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final TState state,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addViewControllerToStack(viewControllerClass, null, state, viewControllerClass.getName() + ' ' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewController} on top of stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     */
-    public void setInitialViewController(
-            @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass) {
-        beforeSetInitialActions();
-        setViewControllerAsTop(viewControllerClass);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewController} on top of stack
-     * with specific {@link ViewControllerFragment#getState()}.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setInitialViewController(
-            @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final TState state) {
-        setInitialViewController(viewControllerClass, state, null);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewController} on top of stack with specific transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     */
-    public void setInitialViewController(
-            @NonNull final Class<? extends ViewController<TActivity, StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        beforeSetInitialActions();
-        setViewControllerAsTop(viewControllerClass, transactionSetup);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link ViewController} on top of stack
-     * with specific {@link ViewControllerFragment#getState()} and specific transaction setup.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     */
-    public <TState extends AbstractState> void setInitialViewController(
-            @NonNull final Class<? extends ViewController<TActivity, SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final TState state,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        beforeSetInitialActions();
-        setViewControllerAsTop(viewControllerClass, state, transactionSetup);
-    }
-
-    /**
-     * Base method to push stateless {@link ViewControllerFragment} to stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param backStackTag        Tag of {@link ViewControllerFragment} in back stack;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    protected void addStatelessViewControllerToStack(
-            @NonNull final Class<? extends ViewController<TActivity, ? extends StatelessViewControllerFragment<TActivity>>> viewControllerClass,
-            @Nullable final Fragment targetFragment,
-            @Nullable final String backStackTag,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(StatelessViewControllerFragment.class, targetFragment, true,
-                StatelessViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
-    }
-
-    /**
-     * Base method to push stateful {@link ViewControllerFragment} with target to stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param backStackTag        Tag of {@link ViewControllerFragment} in back stack;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     * @param <TTargetState>      Type of state of target fragment. State is using to affect on that fragment;
-     */
-    protected <TState extends AbstractState, TTargetState extends AbstractState> void addTargetedViewControllerToStack(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    ? extends TargetedViewControllerFragment<TState, TTargetState, TActivity>>> viewControllerClass,
-            @NonNull final Fragment targetFragment,
-            @NonNull final TState state,
-            @Nullable final String backStackTag,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(TargetedViewControllerFragment.class, targetFragment, true,
-                TargetedViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
-    }
-
-    /**
-     * Base method to push stateless {@link ViewControllerFragment} with target to stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param backStackTag        Tag of {@link ViewControllerFragment} in back stack;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     */
-    protected <TState extends AbstractState> void addTargetedStatelessViewControllerToStack(
-            @NonNull final Class<? extends ViewController<TActivity,
-                    ? extends StatelessTargetedViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @NonNull final Fragment targetFragment,
-            @Nullable final String backStackTag,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(StatelessTargetedViewControllerFragment.class, targetFragment, true,
-                StatelessTargetedViewControllerFragment.createState(viewControllerClass), backStackTag, transactionSetup);
-    }
-
-    /**
-     * Base method to push stateful {@link ViewControllerFragment} to stack.
-     *
-     * @param viewControllerClass Class of {@link ViewController} to be pushed;
-     * @param targetFragment      {@link ViewControllerFragment} to be set as target;
-     * @param state               {@link AbstractState} of {@link ViewController}'s fragment;
-     * @param backStackTag        Tag of {@link ViewControllerFragment} in back stack;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param <TState>            Type of state of fragment.
-     */
-    protected <TState extends AbstractState> void addViewControllerToStack(
-            @NonNull final Class<? extends ViewController<TActivity, ? extends SimpleViewControllerFragment<TState, TActivity>>> viewControllerClass,
-            @Nullable final Fragment targetFragment,
-            @NonNull final TState state,
-            @Nullable final String backStackTag,
-            @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(SimpleViewControllerFragment.class, targetFragment, true,
-                SimpleViewControllerFragment.createState(viewControllerClass, state), backStackTag, transactionSetup);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt
new file mode 100644
index 0000000..81efec4
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt
@@ -0,0 +1,174 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.components.navigation
+
+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 io.reactivex.functions.Function
+import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
+
+/**
+ * Created by Gavriil Sitnikov on 07/03/2016.
+ * Navigation based on [ViewController]s which are creating by [Fragment]s.
+ * So basically it is just [FragmentNavigation] where most of fragments should be inherited from [ViewControllerFragment].
+ *
+ * @param TActivity Type of activity where [ViewController]s should be showed.
+ */
+open class ViewControllerNavigation<TActivity : FragmentActivity>(
+        context: Context,
+        fragmentManager: FragmentManager,
+        @IdRes containerViewId: Int
+) : FragmentNavigation(context, fragmentManager, containerViewId) {
+
+    /**
+     * Pushes [ViewController] on top of stack with specific [ViewControllerFragment.getState] and with specific transaction setup.
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
+     * @param TState              Type of state of fragment.
+     */
+    fun <TState : Parcelable> pushViewController(
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            state: TState,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+    ) {
+        addViewControllerToStack(viewControllerClass, null, true, state, null, transactionSetup)
+    }
+
+    /**
+     * Pushes [ViewController] without adding to stack and with specific [ViewControllerFragment.getState].
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param TState              Type of state of fragment.
+     */
+    fun <TState : Parcelable> pushSingleViewController(
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            state: TState,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+    ) {
+        addViewControllerToStack(viewControllerClass, null, false, state, null, transactionSetup)
+    }
+
+    /**
+     * Pushes [ViewController] on top of stack with specific [ViewControllerFragment.getState]
+     * and with specific [TTargetFragment] and transaction setup.
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param targetFragment      [ViewControllerFragment] to be set as target;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
+     * @param TState              Type of state of fragment;
+     * @param TTargetFragment     Type of target fragment.
+     */
+    fun <TState : Parcelable, TTargetFragment : Fragment> pushViewControllerForResult(
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            state: TState,
+            targetFragment: TTargetFragment,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+    ) {
+        addViewControllerToStack(
+                viewControllerClass,
+                targetFragment,
+                true,
+                state,
+                viewControllerClass.name + ';'.toString() + FragmentNavigation.WITH_TARGET_FRAGMENT_TAG_MARK,
+                transactionSetup
+        )
+    }
+
+    /**
+     * Pushes [ViewController] on top of stack with specific [ViewControllerFragment.getState] and with specific transaction setup
+     * and with [.TOP_FRAGMENT_TAG_MARK] tag used for simple up/back navigation.
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
+     * @param TState              Type of state of fragment.
+     */
+    fun <TState : Parcelable> setViewControllerAsTop(
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            state: TState,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+    ) {
+        addViewControllerToStack(
+                viewControllerClass,
+                null,
+                true,
+                state,
+                viewControllerClass.name + ';'.toString() + FragmentNavigation.TOP_FRAGMENT_TAG_MARK,
+                transactionSetup
+        )
+    }
+
+    /**
+     * Pops all [Fragment]s and places new initial [ViewController] on top of stack
+     * with specific [ViewControllerFragment.getState] and specific transaction setup.
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
+     * @param TState              Type of state of fragment.
+     */
+    fun <TState : Parcelable> setInitialViewController(
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            state: TState,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+    ) {
+        beforeSetInitialActions()
+        setViewControllerAsTop(viewControllerClass, state, transactionSetup)
+    }
+
+    /**
+     * Base method to push stateful [ViewControllerFragment] to stack.
+     *
+     * @param viewControllerClass Class of [ViewController] to be pushed;
+     * @param targetFragment      [ViewControllerFragment] to be set as target;
+     * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param backStackTag        Tag of [ViewControllerFragment] in back stack;
+     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
+     * @param TState              Type of state of fragment.
+     */
+    protected fun <TState : Parcelable> addViewControllerToStack(
+            viewControllerClass: Class<out ViewController<TActivity, out ViewControllerFragment<TState, TActivity>>>,
+            targetFragment: Fragment?,
+            addToStack: Boolean,
+            state: TState,
+            backStackTag: String?,
+            transactionSetup: Function<FragmentTransaction, FragmentTransaction>?
+    ) {
+        addToStack(
+                ViewControllerFragment::class.java,
+                targetFragment,
+                addToStack,
+                ViewControllerFragment.args(viewControllerClass, state),
+                backStackTag,
+                transactionSetup
+        )
+    }
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 611152c..762d926 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -35,130 +35,52 @@ import android.view.inputmethod.InputMethodManager;
 
 import java.util.ArrayList;
 
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.subjects.BehaviorSubject;
-import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.Optional;
-import ru.touchin.roboswag.core.utils.pairs.HalfNullablePair;
 
 /**
  * Created by Gavriil Sitnikov on 08/03/2016.
  * Base activity to use in components repository.
  */
-@SuppressWarnings("PMD.TooManyMethods")
-public abstract class BaseActivity extends AppCompatActivity
-        implements LifecycleBindable {
-
-    private static final String ACTIVITY_RESULT_CODE_EXTRA = "ACTIVITY_RESULT_CODE_EXTRA";
-    private static final String ACTIVITY_RESULT_DATA_EXTRA = "ACTIVITY_RESULT_DATA_EXTRA";
+public abstract class BaseActivity extends AppCompatActivity {
 
     @NonNull
     private final ArrayList<OnBackPressedListener> onBackPressedListeners = new ArrayList<>();
-    @NonNull
-    private final BaseLifecycleBindable baseLifecycleBindable = new BaseLifecycleBindable();
-    private boolean resumed;
-
-    @NonNull
-    private final BehaviorSubject<Optional<HalfNullablePair<Integer, Intent>>> lastActivityResult
-            = BehaviorSubject.createDefault(new Optional<HalfNullablePair<Integer, Intent>>(null));
-
-    /**
-     * Returns if activity resumed.
-     *
-     * @return True if resumed.
-     */
-    public boolean isActuallyResumed() {
-        return resumed;
-    }
 
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onCreate();
-        restoreLastActivityResult(savedInstanceState);
-    }
-
-    private void restoreLastActivityResult(@Nullable final Bundle savedInstanceState) {
-        if (savedInstanceState == null) {
-            return;
-        }
-
-        lastActivityResult.onNext(new Optional<>(new HalfNullablePair<>(savedInstanceState.getInt(ACTIVITY_RESULT_CODE_EXTRA),
-                savedInstanceState.getParcelable(ACTIVITY_RESULT_DATA_EXTRA))));
     }
 
     @Override
     protected void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this) + " requestCode: " + requestCode + "; resultCode: " + resultCode);
-        if (resultCode == RESULT_OK) {
-            lastActivityResult.onNext(new Optional<>(new HalfNullablePair<>(requestCode, data)));
-        }
-    }
-
-    /**
-     * Observes activity result by request code coming from {@link #onActivityResult(int, int, Intent)}
-     *
-     * @param requestCode Unique code to identify activity result;
-     * @return {@link Observable} which will emit data (Intents) from other activities (endlessly).
-     */
-    @NonNull
-    public Observable<Intent> observeActivityResult(final int requestCode) {
-        return lastActivityResult
-                .concatMap(optional -> {
-                    final HalfNullablePair<Integer, Intent> activityResult = optional.get();
-                    if (activityResult == null || activityResult.getFirst() != requestCode) {
-                        return Observable.empty();
-                    }
-                    return Observable.just(activityResult.getSecond() != null ? activityResult.getSecond() : new Intent())
-                            .doOnNext(result -> lastActivityResult.onNext(new Optional<>(null)));
-                });
     }
 
     @Override
     protected void onStart() {
         super.onStart();
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onStart();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        resumed = true;
-        baseLifecycleBindable.onResume();
     }
 
     @Override
     protected void onPause() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        resumed = false;
         super.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle stateToSave) {
         super.onSaveInstanceState(stateToSave);
-        baseLifecycleBindable.onSaveInstanceState();
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        final HalfNullablePair<Integer, Intent> activityResult = lastActivityResult.getValue().get();
-        if (activityResult != null) {
-            stateToSave.putInt(ACTIVITY_RESULT_CODE_EXTRA, activityResult.getFirst());
-            if (activityResult.getSecond() != null) {
-                stateToSave.putParcelable(ACTIVITY_RESULT_DATA_EXTRA, activityResult.getSecond());
-            }
-        }
     }
 
     @Override
@@ -170,14 +92,12 @@ public abstract class BaseActivity extends AppCompatActivity
     @Override
     protected void onStop() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onStop();
         super.onStop();
     }
 
     @Override
     protected void onDestroy() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
-        baseLifecycleBindable.onDestroy();
         super.onDestroy();
     }
 
@@ -229,7 +149,7 @@ public abstract class BaseActivity extends AppCompatActivity
      * @param resId The resource id to search for data;
      * @return Drawable An object that can be used to draw this resource.
      */
-    @NonNull
+    @Nullable
     public Drawable getDrawableCompat(@DrawableRes final int resId) {
         return ContextCompat.getDrawable(this, resId);
     }
@@ -257,187 +177,6 @@ public abstract class BaseActivity extends AppCompatActivity
         }
     }
 
-    @SuppressWarnings("CPD-START")
-    //CPD: it's ok as it's LifecycleBindable
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilStop(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilStop(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilStop(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilStop(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilDestroy(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilDestroy(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilDestroy(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilDestroy(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onCompletedAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onCompletedAction, onErrorAction);
-    }
-
-    @SuppressWarnings("CPD-END")
     /*
      * Interface to be implemented for someone who want to intercept device back button pressing event.
      */
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
deleted file mode 100644
index 8af5111..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/ViewControllerActivity.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.activities;
-
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.view.Menu;
-import android.view.View;
-
-import ru.touchin.roboswag.components.utils.Logic;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 07/03/2016.
- * Activity which is containing specific {@link Logic}
- * to support navigation based on {@link ru.touchin.roboswag.components.navigation.ViewController}s.
- *
- * @param <TLogic> Type of application's {@link Logic}.
- */
-public abstract class ViewControllerActivity<TLogic extends Logic> extends BaseActivity {
-
-    //it is needed to hold strong reference to logic
-    private TLogic reference;
-
-    /**
-     * It should return specific class where all logic will be.
-     *
-     * @return Returns class of specific {@link Logic}.
-     */
-    @NonNull
-    protected abstract Class<TLogic> getLogicClass();
-
-    /**
-     * Returns (and creates if needed) application's logic.
-     *
-     * @return Object which represents application's logic.
-     */
-    @NonNull
-    public TLogic getLogic() {
-        synchronized (ViewControllerActivity.class) {
-            if (reference == null) {
-                reference = Logic.getInstance(this, getLogicClass());
-            }
-        }
-        return reference;
-    }
-
-    @Override
-    @Deprecated
-    // use {@link #reconfigureNavigation}
-    public void invalidateOptionsMenu() {
-        super.invalidateOptionsMenu();
-    }
-
-    @Override
-    @Deprecated
-    // use {@link #reconfigureNavigation}
-    public void supportInvalidateOptionsMenu() {
-        super.supportInvalidateOptionsMenu();
-    }
-
-    /**
-     * Invalidates navigation and calls {@link #onConfigureNavigation} for all navigation elements.
-     */
-    public void reconfigureNavigation() {
-        super.supportInvalidateOptionsMenu();
-    }
-
-    @Override
-    @Deprecated
-    // use {@link #onConfigureNavigation}
-    public boolean onCreateOptionsMenu(@NonNull final Menu menu) {
-        onConfigureNavigation(menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    /**
-     * Calls when activity configuring ActionBar, Toolbar, Sidebar, AppBar etc.
-     * It is calling before it's {@link ru.touchin.roboswag.components.navigation.ViewController}'s.
-     *
-     * @param menu The options menu in which you place your menu items.
-     */
-    public void onConfigureNavigation(@NonNull final Menu menu) {
-        // do nothing
-    }
-
-    @NonNull
-    @Override
-    public <T extends View> T findViewById(@IdRes final int id) {
-        final T viewById = super.findViewById(id);
-        if (viewById == null) {
-            throw new ShouldNotHappenException("No view for id=" + getResources().getResourceName(id));
-        }
-        return viewById;
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
deleted file mode 100644
index 900804d..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/SimpleViewControllerFragment.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.fragments;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import ru.touchin.roboswag.components.navigation.AbstractState;
-import ru.touchin.roboswag.components.navigation.ViewController;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
-
-/**
- * Created by Gavriil Sitnikov on 07/03/2016.
- * Simple {@link ViewControllerFragment} which is using by {@link ru.touchin.roboswag.components.navigation.ViewControllerNavigation}.
- *
- * @param <TState>    Type of object which is representing it's fragment state;
- * @param <TActivity> Type of {@link ViewControllerActivity} where fragment could be attached to.
- */
-public class SimpleViewControllerFragment<TState extends AbstractState, TActivity extends ViewControllerActivity<?>>
-        extends ViewControllerFragment<TState, TActivity> {
-
-    private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
-
-    /**
-     * Creates {@link Bundle} which will store state and {@link ViewController}'s class.
-     *
-     * @param viewControllerClass Class of {@link ViewController} which will be instantiated inside this fragment;
-     * @param state               State to use into {@link ViewController};
-     * @return Returns {@link Bundle} with state inside.
-     */
-    @NonNull
-    public static Bundle createState(@NonNull final Class<? extends ViewController> viewControllerClass,
-                                     @NonNull final AbstractState state) {
-        final Bundle result = createState(state);
-        result.putSerializable(VIEW_CONTROLLER_CLASS_EXTRA, viewControllerClass);
-        return result;
-    }
-
-    private Class<? extends ViewController<TActivity,
-            ? extends ViewControllerFragment<TState, TActivity>>> viewControllerClass;
-
-    @NonNull
-    @Override
-    public Class<? extends ViewController<TActivity,
-            ? extends ViewControllerFragment<TState, TActivity>>> getViewControllerClass() {
-        return viewControllerClass;
-    }
-
-    @Override
-    protected boolean isStateRequired() {
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        viewControllerClass = (Class<? extends ViewController<TActivity,
-                ? extends ViewControllerFragment<TState, TActivity>>>) getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
-    }
-
-    protected static class DefaultState extends AbstractState {
-        // just default implementation
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
deleted file mode 100644
index bc5421a..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessTargetedViewControllerFragment.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.fragments;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-
-import ru.touchin.roboswag.components.navigation.AbstractState;
-import ru.touchin.roboswag.components.navigation.ViewController;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
-import ru.touchin.roboswag.core.log.Lc;
-
-/**
- * Created by Gavriil Sitnikov on 11/04/2016.
- * Simple {@link ViewControllerFragment} with no state and with attached {@link #getTargetFragment()}
- * which is using by {@link ru.touchin.roboswag.components.navigation.ViewControllerNavigation}.
- *
- * @param <TActivity> Type of {@link ViewControllerActivity} where fragment could be attached to.
- */
-@SuppressWarnings("PMD.UseUtilityClass")
-//UseUtilityClass: PMD bug
-public class StatelessTargetedViewControllerFragment<TTargetState extends AbstractState,
-        TActivity extends ViewControllerActivity<?>>
-        extends TargetedViewControllerFragment<AbstractState, TTargetState, TActivity> {
-
-    /**
-     * Creates {@link Bundle} which will store state and {@link ViewController}'s class.
-     *
-     * @param viewControllerClass Class of {@link ViewController} which will be instantiated inside this fragment;
-     * @return Returns {@link Bundle} with state inside.
-     */
-    @NonNull
-    public static Bundle createState(@NonNull final Class<? extends ViewController> viewControllerClass) {
-        return createState(viewControllerClass, new DefaultState());
-    }
-
-    @Override
-    protected boolean isStateRequired() {
-        return false;
-    }
-
-    @NonNull
-    @Override
-    public AbstractState getState() {
-        Lc.assertion("Trying to access to state of stateless fragment of " + getViewControllerClass());
-        return super.getState();
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
deleted file mode 100644
index f463ae6..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/StatelessViewControllerFragment.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.fragments;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-
-import ru.touchin.roboswag.components.navigation.AbstractState;
-import ru.touchin.roboswag.components.navigation.ViewController;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
-import ru.touchin.roboswag.core.log.Lc;
-
-/**
- * Created by Gavriil Sitnikov on 12/03/2016.
- * Simple {@link ViewControllerFragment} with no state which is using by {@link ru.touchin.roboswag.components.navigation.ViewControllerNavigation}.
- *
- * @param <TActivity> Type of {@link ViewControllerActivity} where fragment could be attached to.
- */
-@SuppressWarnings("PMD.UseUtilityClass")
-//UseUtilityClass: PMD bug
-public class StatelessViewControllerFragment<TActivity extends ViewControllerActivity<?>>
-        extends SimpleViewControllerFragment<AbstractState, TActivity> {
-
-    /**
-     * Creates {@link Bundle} which will store state and {@link ViewController}'s class.
-     *
-     * @param viewControllerClass Class of {@link ViewController} which will be instantiated inside this fragment;
-     * @return Returns {@link Bundle} with state inside.
-     */
-    @NonNull
-    public static Bundle createState(@NonNull final Class<? extends ViewController> viewControllerClass) {
-        return createState(viewControllerClass, new DefaultState());
-    }
-
-    @NonNull
-    @Override
-    public AbstractState getState() {
-        Lc.assertion("Trying to access to state of stateless fragment of " + getViewControllerClass());
-        return super.getState();
-    }
-
-    @Override
-    protected boolean isStateRequired() {
-        return false;
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java
deleted file mode 100644
index 5f5f676..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/TargetedViewControllerFragment.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.fragments;
-
-import android.support.annotation.NonNull;
-
-import ru.touchin.roboswag.components.navigation.AbstractState;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 11/04/2016.
- * Simple {@link ViewControllerFragment} with attached {@link #getTargetFragment()}
- * which is using by {@link ru.touchin.roboswag.components.navigation.ViewControllerNavigation}.
- *
- * @param <TState>    Type of object which is representing it's fragment state;
- * @param <TActivity> Type of {@link ViewControllerActivity} where fragment could be attached to.
- */
-public class TargetedViewControllerFragment<TState extends AbstractState,
-        TTargetState extends AbstractState,
-        TActivity extends ViewControllerActivity<?>>
-        extends SimpleViewControllerFragment<TState, TActivity> {
-
-    /**
-     * Returns specific {@link ViewControllerFragment} which is attached to this fragment as {@link #getTargetFragment()}.
-     *
-     * @return Target fragment.
-     */
-    @SuppressWarnings("unchecked")
-    @NonNull
-    public ViewControllerFragment<TTargetState, TActivity> getTarget() {
-        if (!(getTargetFragment() instanceof ViewControllerFragment)) {
-            throw new ShouldNotHappenException();
-        }
-        return (ViewControllerFragment<TTargetState, TActivity>) getTargetFragment();
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 5fb4273..977cd29 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -24,10 +24,11 @@ import android.content.Intent;
 import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Parcel;
+import android.os.Parcelable;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.view.InflateException;
+import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -36,33 +37,23 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import java.io.Serializable;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.subjects.BehaviorSubject;
-import ru.touchin.roboswag.components.navigation.AbstractState;
 import ru.touchin.roboswag.components.navigation.ViewController;
-import ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.Optional;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-import ru.touchin.roboswag.core.utils.pairs.NullablePair;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
  * Fragment instantiated in specific activity of {@link TActivity} type that is holding {@link ViewController} inside.
  *
  * @param <TState>    Type of object which is representing it's fragment state;
- * @param <TActivity> Type of {@link ViewControllerActivity} where fragment could be attached to.
+ * @param <TActivity> Type of {@link FragmentActivity} where fragment could be attached to.
  */
-@SuppressWarnings("PMD.TooManyMethods")
-public abstract class ViewControllerFragment<TState extends AbstractState, TActivity extends ViewControllerActivity<?>>
-        extends ViewFragment<TActivity> {
+public abstract class ViewControllerFragment<TState extends Parcelable, TActivity extends FragmentActivity> extends ViewFragment<TActivity> {
 
+    private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
     private static final String VIEW_CONTROLLER_STATE_EXTRA = "VIEW_CONTROLLER_STATE_EXTRA";
 
     private static boolean inDebugMode;
@@ -84,17 +75,16 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         ViewControllerFragment.acceptableUiCalculationTime = acceptableUiCalculationTime;
     }
 
-    @SuppressWarnings("unchecked")
     @NonNull
-    private static <T extends Serializable> T reserialize(@NonNull final T serializable) {
+    private static <T extends Parcelable> T reserialize(@NonNull final T parcelable) {
         Parcel parcel = Parcel.obtain();
-        parcel.writeSerializable(serializable);
+        parcel.writeParcelable(parcelable, 0);
         final byte[] serializableBytes = parcel.marshall();
         parcel.recycle();
         parcel = Parcel.obtain();
         parcel.unmarshall(serializableBytes, 0, serializableBytes.length);
         parcel.setDataPosition(0);
-        final T result = (T) parcel.readSerializable();
+        final T result = parcel.readParcelable(parcelable.getClass().getClassLoader());
         parcel.recycle();
         return result;
     }
@@ -106,32 +96,20 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
      * @return Returns bundle with state inside.
      */
     @NonNull
-    public static Bundle createState(@Nullable final AbstractState state) {
+    public static Bundle args(@NonNull final Class<? extends ViewController> viewControllerClass, @Nullable final Parcelable state) {
         final Bundle result = new Bundle();
-        result.putSerializable(VIEW_CONTROLLER_STATE_EXTRA, state);
+        result.putSerializable(VIEW_CONTROLLER_CLASS_EXTRA, viewControllerClass);
+        result.putParcelable(VIEW_CONTROLLER_STATE_EXTRA, state);
         return result;
     }
 
-    @NonNull
-    private final BehaviorSubject<Optional<TActivity>> activitySubject = BehaviorSubject.create();
-    @NonNull
-    private final BehaviorSubject<NullablePair<PlaceholderView, Bundle>> viewSubject = BehaviorSubject.create();
     @Nullable
     private ViewController viewController;
-    private Disposable viewControllerSubscription;
+    private Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>>> viewControllerClass;
     private TState state;
-    private boolean started;
-    private boolean stateCreated;
-
-    private void tryCreateState(@Nullable final Context context) {
-        if (!stateCreated && state != null && context != null) {
-            state.onCreate();
-            stateCreated = true;
-        }
-    }
 
     /**
-     * Returns specific {@link AbstractState} which contains state of fragment and it's {@link ViewController}.
+     * Returns specific {@link Parcelable} which contains state of fragment and it's {@link ViewController}.
      *
      * @return Object represents state.
      */
@@ -140,64 +118,37 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         return state;
     }
 
-    /**
-     * It should return specific {@link ViewController} class to control instantiated view by logic after activity creation.
-     *
-     * @return Returns class of specific {@link ViewController}.
-     */
-    @NonNull
-    public abstract Class<? extends ViewController<TActivity,
-            ? extends ViewControllerFragment<TState, TActivity>>> getViewControllerClass();
-
-    /**
-     * Returns if ViewControllerFragment requires state or not.
-     *
-     * @return true if state is required
-     */
-    protected abstract boolean isStateRequired();
-
-    @SuppressWarnings("unchecked")
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setHasOptionsMenu(!isChildFragment());
 
+        //noinspection unchecked
+        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>)
+                getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
         state = savedInstanceState != null
-                ? (TState) savedInstanceState.getSerializable(VIEW_CONTROLLER_STATE_EXTRA)
-                : (getArguments() != null ? (TState) getArguments().getSerializable(VIEW_CONTROLLER_STATE_EXTRA) : null);
+                ? savedInstanceState.getParcelable(VIEW_CONTROLLER_STATE_EXTRA)
+                : (getArguments() != null ? getArguments().getParcelable(VIEW_CONTROLLER_STATE_EXTRA) : null);
         if (state != null) {
             if (inDebugMode) {
                 state = reserialize(state);
             }
-            tryCreateState(getContext());
-        } else if (isStateRequired()) {
+        } else {
             Lc.assertion("State is required and null");
         }
-        viewControllerSubscription = Observable
-                .combineLatest(activitySubject.distinctUntilChanged(), viewSubject.distinctUntilChanged(),
-                        (activityOptional, viewInfo) -> {
-                            final TActivity activity = activityOptional.get();
-                            final PlaceholderView container = viewInfo.getFirst();
-                            if (activity == null || container == null) {
-                                return new Optional<ViewController>(null);
-                            }
-                            final ViewController newViewController = createViewController(activity, container, viewInfo.getSecond());
-                            newViewController.onCreate();
-                            return new Optional<>(newViewController);
-                        })
-                .subscribe(this::onViewControllerChanged,
-                        throwable -> Lc.cutAssertion(throwable, InvocationTargetException.class, InflateException.class));
     }
 
     @NonNull
-    private ViewController createViewController(@NonNull final TActivity activity, @NonNull final PlaceholderView view,
-                                                @Nullable final Bundle savedInstanceState) {
-
-        if (getViewControllerClass().getConstructors().length != 1) {
-            throw new ShouldNotHappenException("There should be single constructor for " + getViewControllerClass());
+    private ViewController createViewController(
+            @NonNull final FragmentActivity activity,
+            @NonNull final PlaceholderView view,
+            @Nullable final Bundle savedInstanceState
+    ) {
+        if (viewControllerClass.getConstructors().length != 1) {
+            throw new ShouldNotHappenException("There should be single constructor for " + viewControllerClass);
         }
-        final Constructor<?> constructor = getViewControllerClass().getConstructors()[0];
+        final Constructor<?> constructor = viewControllerClass.getConstructors()[0];
         final ViewController.CreationContext creationContext = new ViewController.CreationContext(activity, this, view);
         final long creationTime = inDebugMode ? SystemClock.elapsedRealtime() : 0;
         try {
@@ -209,7 +160,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
                 default:
                     throw new ShouldNotHappenException("Wrong constructor parameters count: " + constructor.getParameterTypes().length);
             }
-        } catch (final Exception exception) {
+        } catch (@NonNull final Exception exception) {
             throw new ShouldNotHappenException(exception);
         } finally {
             checkCreationTime(creationTime);
@@ -220,46 +171,33 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         if (inDebugMode) {
             final long creationPeriod = SystemClock.elapsedRealtime() - creationTime;
             if (creationPeriod > acceptableUiCalculationTime) {
-                UiUtils.UI_METRICS_LC_GROUP.w("Creation of %s took too much: %dms", getViewControllerClass(), creationPeriod);
+                UiUtils.UI_METRICS_LC_GROUP.w("Creation of %s took too much: %dms", viewControllerClass, creationPeriod);
             }
         }
     }
 
-    @Override
-    public void onAttach(@NonNull final Context context) {
-        super.onAttach(context);
-        tryCreateState(context);
-    }
-
-    @Deprecated
     @NonNull
     @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-                             @Nullable final ViewGroup container,
-                             @Nullable final Bundle savedInstanceState) {
-        return new PlaceholderView(inflater.getContext(), getViewControllerClass().getName());
+    public final View onCreateView(
+            @NonNull final LayoutInflater inflater,
+            @Nullable final ViewGroup container,
+            @Nullable final Bundle savedInstanceState
+    ) {
+        return new PlaceholderView(inflater.getContext(), viewControllerClass.getName());
     }
 
     @Override
-    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (view instanceof PlaceholderView) {
-            viewSubject.onNext(new NullablePair<>((PlaceholderView) view, savedInstanceState));
-        } else {
-            Lc.assertion("View should be instanceof PlaceholderView");
-        }
-    }
-
-    @Override
-    public void onActivityCreated(@NonNull final View view, @NonNull final TActivity activity, @Nullable final Bundle savedInstanceState) {
-        super.onActivityCreated(view, activity, savedInstanceState);
-        activitySubject.onNext(new Optional<>(activity));
+    public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        //noinspection ConstantConditions
+        viewController = createViewController(requireActivity(), (PlaceholderView) getView(), savedInstanceState);
+        viewController.onCreate();
+        requireActivity().invalidateOptionsMenu();
     }
 
     @Override
     protected void onStart(@NonNull final View view, @NonNull final TActivity activity) {
         super.onStart(view, activity);
-        started = true;
         if (viewController != null) {
             viewController.onStart();
         }
@@ -289,23 +227,12 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         }
     }
 
-    /**
-     * Calls when activity configuring ActionBar, Toolbar, Sidebar etc.
-     * If it will be called or not depends on {@link #hasOptionsMenu()} and {@link #isMenuVisible()}.
-     *
-     * @param menu     The options menu in which you place your items;
-     * @param inflater Helper to inflate menu items.
-     */
-    protected void onConfigureNavigation(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
-        if (viewController != null) {
-            viewController.onConfigureNavigation(menu, inflater);
-        }
-    }
-
     @Override
     public void onCreateOptionsMenu(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        onConfigureNavigation(menu, inflater);
+        if (viewController != null) {
+            viewController.onCreateOptionsMenu(menu, inflater);
+        }
     }
 
     @Override
@@ -313,19 +240,6 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         return (viewController != null && viewController.onOptionsItemSelected(item)) || super.onOptionsItemSelected(item);
     }
 
-    private void onViewControllerChanged(@NonNull final Optional<ViewController> viewControllerOptional) {
-        if (this.viewController != null) {
-            this.viewController.onDestroy();
-        }
-        this.viewController = viewControllerOptional.get();
-        if (this.viewController != null) {
-            if (started) {
-                this.viewController.onStart();
-            }
-            this.viewController.getActivity().reconfigureNavigation();
-        }
-    }
-
     @Override
     protected void onPause(@NonNull final View view, @NonNull final TActivity activity) {
         super.onPause(view, activity);
@@ -340,7 +254,7 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
         if (viewController != null) {
             viewController.onSaveInstanceState(savedInstanceState);
         }
-        savedInstanceState.putSerializable(VIEW_CONTROLLER_STATE_EXTRA, state);
+        savedInstanceState.putParcelable(VIEW_CONTROLLER_STATE_EXTRA, state);
     }
 
     @Override
@@ -353,7 +267,6 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
 
     @Override
     protected void onStop(@NonNull final View view, @NonNull final TActivity activity) {
-        started = false;
         if (viewController != null) {
             viewController.onStop();
         }
@@ -361,25 +274,12 @@ public abstract class ViewControllerFragment<TState extends AbstractState, TActi
     }
 
     @Override
-    protected void onDestroyView(@NonNull final View view) {
-        viewSubject.onNext(new NullablePair<>(null, null));
-        super.onDestroyView(view);
-    }
-
-    @Override
-    public void onDetach() {
-        activitySubject.onNext(new Optional<>(null));
-        super.onDetach();
-    }
-
-    @Override
-    public void onDestroy() {
-        viewControllerSubscription.dispose();
-        if (viewController != null && !viewController.isDestroyed()) {
+    public void onDestroyView() {
+        if (viewController != null) {
             viewController.onDestroy();
             viewController = null;
         }
-        super.onDestroy();
+        super.onDestroyView();
     }
 
     @Override
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index 6bc2b0c..54c9cf6 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -24,7 +24,7 @@ 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 android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,8 +39,7 @@ import ru.touchin.roboswag.core.log.Lc;
  *
  * @param <TActivity> Type of activity which to such fragment could be attached.
  */
-public abstract class ViewFragment<TActivity extends AppCompatActivity> extends Fragment
-        implements OnFragmentStartedListener {
+public abstract class ViewFragment<TActivity extends FragmentActivity> extends Fragment implements OnFragmentStartedListener {
 
     private boolean appeared;
     private boolean started;
@@ -88,27 +87,12 @@ public abstract class ViewFragment<TActivity extends AppCompatActivity> extends
         //do nothing
     }
 
-    @Deprecated
     @Override
     public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (getView() == null || getBaseActivity() == null) {
             Lc.assertion("View and activity shouldn't be null");
-            return;
         }
-        onActivityCreated(getView(), getBaseActivity(), savedInstanceState);
-    }
-
-    /**
-     * Replacement of {@link #onActivityCreated} with non null activity as first parameter.
-     *
-     * @param view               Instantiated view.
-     * @param activity           Activity which fragment attached to.
-     * @param savedInstanceState If the fragment is being re-created from a previous saved state, this is the state.
-     */
-    @CallSuper
-    public void onActivityCreated(@NonNull final View view, @NonNull final TActivity activity, @Nullable final Bundle savedInstanceState) {
-        //do nothing
     }
 
     private void callMethodAfterInstantiation(@NonNull final BiConsumer<View, TActivity> action) {
@@ -243,25 +227,4 @@ public abstract class ViewFragment<TActivity extends AppCompatActivity> extends
         }
     }
 
-    @Deprecated
-    @Override
-    public void onDestroyView() {
-        if (getView() == null) {
-            Lc.assertion("View shouldn't be null");
-            return;
-        }
-        onDestroyView(getView());
-        super.onDestroyView();
-    }
-
-    /**
-     * Replacement of {@link #onDestroyView} with non null activity as first parameter.
-     *
-     * @param view Instantiated view.
-     */
-    @CallSuper
-    protected void onDestroyView(@NonNull final View view) {
-        //do nothing
-    }
-
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
deleted file mode 100644
index 15645da..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/BaseLifecycleBindable.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils;
-
-import android.support.annotation.NonNull;
-
-import io.reactivex.Completable;
-import io.reactivex.Maybe;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.internal.functions.Functions;
-import io.reactivex.subjects.BehaviorSubject;
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 18/04/16.
- * Simple implementation of {@link LifecycleBindable}. Could be used to not implement interface but use such object inside.
- */
-@SuppressWarnings("PMD.TooManyMethods")
-public class BaseLifecycleBindable implements LifecycleBindable {
-
-    private static final String UNTIL_DESTROY_METHOD = "untilDestroy";
-    private static final String UNTIL_STOP_METHOD = "untilStop";
-
-    @NonNull
-    private final BehaviorSubject<Boolean> isCreatedSubject = BehaviorSubject.create();
-    @NonNull
-    private final BehaviorSubject<Boolean> isStartedSubject = BehaviorSubject.create();
-    @NonNull
-    private final BehaviorSubject<Boolean> isInAfterSaving = BehaviorSubject.createDefault(false);
-
-    /**
-     * Call it on parent's onCreate method.
-     */
-    public void onCreate() {
-        isCreatedSubject.onNext(true);
-    }
-
-    /**
-     * Call it on parent's onStart method.
-     */
-    public void onStart() {
-        isStartedSubject.onNext(true);
-    }
-
-    /**
-     * Call it on parent's onResume method.
-     * It is needed as sometimes onSaveInstanceState() calling after onPause() with no onStop call. So lifecycle object going in stopped state.
-     * In that case onResume will be called after onSaveInstanceState so lifecycle object is becoming started.
-     */
-    public void onResume() {
-        isInAfterSaving.onNext(false);
-    }
-
-    /**
-     * Call it on parent's onSaveInstanceState method.
-     */
-    public void onSaveInstanceState() {
-        isInAfterSaving.onNext(true);
-    }
-
-    /**
-     * Call it on parent's onStop method.
-     */
-    public void onStop() {
-        isStartedSubject.onNext(false);
-    }
-
-    /**
-     * Call it on parent's onDestroy method.
-     */
-    public void onDestroy() {
-        isCreatedSubject.onNext(false);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(observable, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD), Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return untilStop(observable, onNextAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return until(observable, isStartedSubject.map(started -> !started)
-                        .delay(item -> isInAfterSaving.filter(inAfterSaving -> !inAfterSaving)),
-                onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(single, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(single, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(single.toObservable(), isStartedSubject.map(started -> !started)
-                        .delay(item -> isInAfterSaving.filter(inAfterSaving -> !inAfterSaving)),
-                onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(completable, Functions.EMPTY_ACTION, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(completable, onCompletedAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(completable.toObservable(), isStartedSubject.map(started -> !started)
-                        .delay(item -> isInAfterSaving.filter(inAfterSaving -> !inAfterSaving)),
-                Functions.emptyConsumer(), onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(maybe, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilStop(maybe, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_STOP_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(maybe.toObservable(), isStartedSubject.map(started -> !started), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(observable, Functions.emptyConsumer(),
-                getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(observable, onNextAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD), Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return untilDestroy(observable, onNextAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return until(observable, isCreatedSubject.map(created -> !created), onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(single, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(single, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(single.toObservable(), isCreatedSubject.map(created -> !created), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(completable, Functions.EMPTY_ACTION, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(completable, onCompletedAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(completable.toObservable(), isCreatedSubject.map(created -> !created),
-                Functions.emptyConsumer(), onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(maybe, Functions.emptyConsumer(), getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        final String codePoint = Lc.getCodePoint(this, 2);
-        return untilDestroy(maybe, onSuccessAction, getActionThrowableForAssertion(codePoint, UNTIL_DESTROY_METHOD));
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return until(maybe.toObservable(), isCreatedSubject.map(created -> !created), onSuccessAction, onErrorAction, Functions.EMPTY_ACTION);
-    }
-
-    @NonNull
-    private <T> Disposable until(@NonNull final Observable<T> observable,
-                                 @NonNull final Observable<Boolean> conditionSubject,
-                                 @NonNull final Consumer<T> onNextAction,
-                                 @NonNull final Consumer<Throwable> onErrorAction,
-                                 @NonNull final Action onCompletedAction) {
-        final Observable<T> actualObservable;
-        if (onNextAction == Functions.emptyConsumer() && onErrorAction == (Consumer) Functions.emptyConsumer()
-                && onCompletedAction == Functions.EMPTY_ACTION) {
-            actualObservable = observable;
-        } else {
-            actualObservable = observable.observeOn(AndroidSchedulers.mainThread())
-                    .doOnComplete(onCompletedAction)
-                    .doOnNext(onNextAction)
-                    .doOnError(onErrorAction);
-        }
-
-        return isCreatedSubject.firstOrError()
-                .flatMapObservable(created -> created ? actualObservable : Observable.empty())
-                .takeUntil(conditionSubject.filter(condition -> condition))
-                .onErrorResumeNext(throwable -> {
-                    if (throwable instanceof RuntimeException) {
-                        Lc.assertion(throwable);
-                    }
-                    return Observable.empty();
-                })
-                .subscribe();
-    }
-
-    @NonNull
-    private Consumer<Throwable> getActionThrowableForAssertion(@NonNull final String codePoint, @NonNull final String method) {
-        return throwable -> Lc.assertion(new ShouldNotHappenException("Unexpected error on " + method + " at " + codePoint, throwable));
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java b/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
deleted file mode 100644
index e49ddc9..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/LifecycleBindable.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils;
-
-import android.support.annotation.NonNull;
-
-import io.reactivex.Completable;
-import io.reactivex.CompletableEmitter;
-import io.reactivex.Emitter;
-import io.reactivex.Maybe;
-import io.reactivex.MaybeEmitter;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.SingleEmitter;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-
-/**
- * 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.)
- * 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.
- */
-@SuppressWarnings("PMD.TooManyMethods")
-public interface LifecycleBindable {
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onStop.
-     * It is automatically subscribing to the observable.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable {@link Observable} to subscribe until onStop;
-     * @param <T>        Type of emitted by observable items;
-     * @return {@link Disposable} which will unsubscribes from observable onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Observable<T> observable);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onStop.
-     * It is automatically subscribing to the observable and calls onNextAction on every emitted item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable   {@link Observable} to subscribe until onStop;
-     * @param onNextAction Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param <T>          Type of emitted by observable items;
-     * @return {@link Disposable} which will unsubscribes from observable onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onStop.
-     * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable    {@link Observable} to subscribe until onStop;
-     * @param onNextAction  Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param onErrorAction Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
-     * @param <T>           Type of emitted by observable items;
-     * @return {@link Disposable} which will unsubscribes from observable onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onStop.
-     * It is automatically subscribing to the observable and calls onNextAction, onErrorAction and onCompletedAction on observable events.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable        {@link Observable} to subscribe until onStop;
-     * @param onNextAction      Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param onErrorAction     Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
-     * @param onCompletedAction Action which will raise at {@link Emitter#onComplete()} on completion of observable;
-     * @param <T>               Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Observable<T> observable,
-                             @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction, @NonNull Action onCompletedAction);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onStop.
-     * It is automatically subscribing to the single.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single {@link Single} to subscribe until onStop;
-     * @param <T>    Type of emitted by single item;
-     * @return {@link Disposable} which will unsubscribes from single onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Single<T> single);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onStop.
-     * It is automatically subscribing to the single and calls onSuccessAction on the emitted item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single          {@link Single} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
-     * @param <T>             Type of emitted by single item;
-     * @return {@link Disposable} which will unsubscribes from single onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onStop.
-     * It is automatically subscribing to the single and calls onSuccessAction and onErrorAction on single events.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single          {@link Single} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
-     * @param onErrorAction   Action which will raise on every {@link SingleEmitter#onError(Throwable)} throwable;
-     * @param <T>             Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onStop.
-     * It is automatically subscribing to the completable.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable {@link Completable} to subscribe until onStop;
-     * @return {@link Disposable} which will unsubscribes from completable onStop.
-     */
-    @NonNull
-    Disposable untilStop(@NonNull Completable completable);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onStop.
-     * It is automatically subscribing to the completable and calls onCompletedAction on completable item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable       {@link Completable} to subscribe until onStop;
-     * @param onCompletedAction Action which will raise at {@link CompletableEmitter#onComplete()} on completion of observable;
-     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onStop.
-     */
-    @NonNull
-    Disposable untilStop(@NonNull Completable completable, @NonNull Action onCompletedAction);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onStop.
-     * It is automatically subscribing to the completable and calls onCompletedAction and onErrorAction on completable item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable       {@link Completable} to subscribe until onStop;
-     * @param onCompletedAction Action which will raise at {@link CompletableEmitter#onComplete()} on completion of observable;
-     * @param onErrorAction     Action which will raise on every {@link CompletableEmitter#onError(Throwable)} throwable;
-     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onStop.
-     */
-    @NonNull
-    Disposable untilStop(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onStop.
-     * It is automatically subscribing to the maybe.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param maybe {@link Maybe} to subscribe until onStop;
-     * @return {@link Disposable} which will unsubscribes from completable onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Maybe<T> maybe);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onStop.
-     * It is automatically subscribing to the maybe and calls onCompletedAction on maybe item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param maybe           {@link Maybe} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise at {@link MaybeEmitter#onSuccess(Object)} ()} on completion of observable;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onStop.
-     * It is automatically subscribing to the maybe and calls onCompletedAction and onErrorAction on maybe item.
-     * Usually it is using to stop requests/execution while element is off or to not do illegal actions after onStop like fragment's stack changing.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param maybe           {@link Maybe} to subscribe until onStop;
-     * @param onSuccessAction Action which will raise at {@link MaybeEmitter#onSuccess(Object)} ()} on completion of observable;
-     * @param onErrorAction   Action which will raise on every {@link MaybeEmitter#onError(Throwable)} throwable;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onStop.
-     */
-    @NonNull
-    <T> Disposable untilStop(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the observable.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable {@link Observable} to subscribe until onDestroy;
-     * @param <T>        Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Observable<T> observable);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the observable and calls onNextAction on every emitted item.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable   {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param <T>          Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable    {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction  Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param onErrorAction Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
-     * @param <T>           Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Observable<T> observable, @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the observable and calls onNextAction, onErrorAction and onCompletedAction on observable events.
-     * Don't forget to process errors if observable can emit them.
-     *
-     * @param observable        {@link Observable} to subscribe until onDestroy;
-     * @param onNextAction      Action which will raise on every {@link Emitter#onNext(Object)} item;
-     * @param onErrorAction     Action which will raise on every {@link Emitter#onError(Throwable)} throwable;
-     * @param onCompletedAction Action which will raise at {@link Emitter#onComplete()} on completion of observable;
-     * @param <T>               Type of emitted by observable items;
-     * @return {@link Disposable} which is wrapping source observable to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Observable<T> observable,
-                                @NonNull Consumer<T> onNextAction, @NonNull Consumer<Throwable> onErrorAction, @NonNull Action onCompletedAction);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onDestroy.
-     * It is automatically subscribing to the single.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single {@link Single} to subscribe until onDestroy;
-     * @param <T>    Type of emitted by single items;
-     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Single<T> single);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onDestroy.
-     * It is automatically subscribing to the single and calls onSuccessAction on every emitted item.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single          {@link Single} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
-     * @param <T>             Type of emitted by single items;
-     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction);
-
-    /**
-     * Method should be used to guarantee that single won't be subscribed after onDestroy.
-     * It is automatically subscribing to the single and calls onSuccessAction and onErrorAction on single events.
-     * Don't forget to process errors if single can emit them.
-     *
-     * @param single          {@link Single} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link SingleEmitter#onSuccess(Object)} item;
-     * @param onErrorAction   Action which will raise on every {@link SingleEmitter#onError(Throwable)} throwable;
-     * @param <T>             Type of emitted by single items;
-     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Single<T> single, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the completable.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable {@link Completable} to subscribe until onDestroy;
-     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    Disposable untilDestroy(@NonNull Completable completable);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the completable and calls onCompletedAction on completable item.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable       {@link Completable} to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on every {@link CompletableEmitter#onComplete()} item;
-     * @return {@link Disposable} which is wrapping source single to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    Disposable untilDestroy(@NonNull Completable completable, @NonNull Action onCompletedAction);
-
-    /**
-     * Method should be used to guarantee that completable won't be subscribed after onDestroy.
-     * It is automatically subscribing to the completable and calls onCompletedAction and onErrorAction on completable events.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param completable       {@link Completable} to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on every {@link CompletableEmitter#onComplete()} item;
-     * @param onErrorAction     Action which will raise on every {@link CompletableEmitter#onError(Throwable)} throwable;
-     * @return {@link Disposable} which is wrapping source completable to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    Disposable untilDestroy(@NonNull Completable completable, @NonNull Action onCompletedAction, @NonNull Consumer<Throwable> onErrorAction);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
-     * It is automatically subscribing to the maybe.
-     * Don't forget to process errors if maybe can emit them.
-     *
-     * @param maybe {@link Maybe} to subscribe until onDestroy;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
-     * It is automatically subscribing to the maybe and calls onCompletedAction on maybe item.
-     * Don't forget to process errors if maybe can emit them.
-     *
-     * @param maybe           {@link Maybe} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link MaybeEmitter#onSuccess(Object)} ()} item;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction);
-
-    /**
-     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
-     * It is automatically subscribing to the maybe and calls onSuccessAction and onErrorAction on maybe events.
-     * Don't forget to process errors if completable can emit them.
-     *
-     * @param maybe           {@link Maybe} to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every {@link MaybeEmitter#onSuccess(Object)} ()} item;
-     * @param onErrorAction   Action which will raise on every {@link MaybeEmitter#onError(Throwable)} throwable;
-     * @return {@link Disposable} which is wrapping source maybe to unsubscribe from it onDestroy.
-     */
-    @NonNull
-    <T> Disposable untilDestroy(@NonNull Maybe<T> maybe, @NonNull Consumer<T> onSuccessAction, @NonNull Consumer<Throwable> onErrorAction);
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/Logic.java b/src/main/java/ru/touchin/roboswag/components/utils/Logic.java
deleted file mode 100644
index 84c2e87..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/Logic.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils;
-
-import android.content.Context;
-import android.support.annotation.NonNull;
-
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Map;
-
-import io.reactivex.Observable;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 24/03/16.
- * Base class representing application's logic.
- * In specific application it should be child of it (usually one) which contains all methods/objects related to logic.
- * It should contains interface to work with API/preferences/database/file system/system parameters etc.
- * Be sure that all objects/instances/services created to represents logic are not getting a lot of time to be instantiated, if they take a lot time
- * for instantiation then it is wrong logic and it should be moved into asynchronous operations via {@link Observable} or so.
- * Also it shouldn't create massive data objects and a lot of objects instantly. Basically it should just create bunch of interfaces inside
- * which will allows to access to some logic methods.
- * In fact it is similar to dependency injection pattern but with full control of instantiation and only one single instance of {@link Logic} per app.
- * If you want to use it then just create getter in {@link android.app.Service}/{@link android.app.Activity}/{@link android.content.BroadcastReceiver}
- * or any else context-based elements and do not forget to store reference to {@link Logic} into field because else it will be consumed by GC.
- * Sample of {@link Logic} using is in {@link ru.touchin.roboswag.components.navigation.activities.ViewControllerActivity}.
- * NOTE: Ideally creation of logic should be asynchronous and stored in specific {@link android.app.Service} so it should be accessed
- * asynchronously via {@link Observable} or so. But in fact it requires {@link android.app.Service} plus more complex methods to access to logic.
- * So currently it is more simple to access via simple bridge based on singletons stored into {@link WeakReference} because anyway instantiation of
- * logic have to be as fast as it can. If it's not then it is just a bug and problem of optimization.
- */
-public class Logic {
-
-    private static final Map<Class<? extends Logic>, WeakReference<Logic>> LOGIC_INSTANCES = new HashMap<>();
-
-    /**
-     * Returns instance of {@link Logic} depends on class. There should be no more than one instance per class.
-     *
-     * @param context    Context of application where this {@link Logic} related to;
-     * @param logicClass Class of {@link Logic};
-     * @param <T>        Type of class of {@link Logic};
-     * @return Instance of {@link Logic}.
-     */
-    @SuppressWarnings({"unchecked", "PMD.SingletonClassReturningNewInstance"})
-    //SingletonClassReturningNewInstance: it is OK to create instance every time if WeakReference have died
-    @NonNull
-    public static <T extends Logic> T getInstance(@NonNull final Context context, @NonNull final Class<T> logicClass) {
-        T result;
-        synchronized (LOGIC_INSTANCES) {
-            final WeakReference<Logic> reference = LOGIC_INSTANCES.get(logicClass);
-            result = reference != null ? (T) reference.get() : null;
-            if (result == null) {
-                result = constructLogic(context.getApplicationContext(), logicClass);
-                LOGIC_INSTANCES.put(logicClass, new WeakReference<>(result));
-            }
-        }
-        return result;
-    }
-
-    @NonNull
-    @SuppressWarnings("unchecked")
-    private static <T extends Logic> T constructLogic(@NonNull final Context context, @NonNull final Class<T> logicClass) {
-        if (logicClass.getConstructors().length != 1 || logicClass.getConstructors()[0].getParameterTypes().length != 1) {
-            throw new ShouldNotHappenException("There should be only one public constructor(Context) for class " + logicClass);
-        }
-        final Constructor<?> constructor = logicClass.getConstructors()[0];
-        try {
-            return (T) constructor.newInstance(context);
-        } catch (final Exception exception) {
-            throw new ShouldNotHappenException(exception);
-        }
-    }
-
-    @NonNull
-    private final Context context;
-
-    public Logic(@NonNull final Context context) {
-        this.context = context;
-    }
-
-    /**
-     * Returns {@link android.app.Application}'s context.
-     *
-     * @return Context (possibly application).
-     */
-    @NonNull
-    public Context getContext() {
-        return context;
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 7596527..985e9e2 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -21,13 +21,14 @@ package ru.touchin.roboswag.components.utils;
 
 import android.app.Activity;
 import android.app.Application;
+import android.arch.lifecycle.Lifecycle;
+import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 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;
@@ -41,11 +42,8 @@ import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import io.reactivex.functions.Action;
 import io.reactivex.functions.Consumer;
-import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
 
@@ -130,9 +128,11 @@ public final class UiUtils {
         }
 
         final Runnable runnable = () -> {
+            final Context context = targetView.getContext();
             if (targetView.getWindowVisibility() != View.VISIBLE
                     || !targetView.hasWindowFocus()
-                    || (targetView.getContext() instanceof BaseActivity && !((BaseActivity) targetView.getContext()).isActuallyResumed())) {
+                    || (context instanceof LifecycleOwner
+                    && !((LifecycleOwner) context).getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))) {
                 return;
             }
             try {
@@ -292,35 +292,6 @@ public final class UiUtils {
      */
     public static class OfViews {
 
-        private static final int GENERATED_ID_THRESHOLD = 0x00FFFFFF;
-        private static final AtomicInteger NEXT_GENERATED_ID = new AtomicInteger(1);
-
-        /**
-         * Generates unique ID for view. See android {@link View#generateViewId()}.
-         *
-         * @return Unique ID.
-         */
-        @IdRes
-        public static int generateViewId() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                return View.generateViewId();
-            }
-            int result = 0;
-            boolean isGenerated = false;
-            while (!isGenerated) {
-                result = NEXT_GENERATED_ID.get();
-                // aapt-generated IDs have the high byte nonzero; clamp to the range under that.
-                int newValue = result + 1;
-                if (newValue > GENERATED_ID_THRESHOLD) {
-                    newValue = 1; // Roll over to 1, not 0.
-                }
-                if (NEXT_GENERATED_ID.compareAndSet(result, newValue)) {
-                    isGenerated = true;
-                }
-            }
-            return result;
-        }
-
         /**
          * Returns string representation of {@link View}'s ID.
          *
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
new file mode 100644
index 0000000..dae5cd3
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
@@ -0,0 +1,62 @@
+package ru.touchin.roboswag.components.utils.destroyable
+
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+
+/**
+ * Created by Oksana Pokrovskaya on 7/03/18.
+ * Simple implementation of [Destroyable]. Could be used to not implement interface but use such object inside.
+ */
+open class BaseDestroyable : Destroyable {
+
+    private val subscriptions = CompositeDisposable()
+
+    /**
+     * Call it on parent's onDestroy method.
+     */
+    fun onDestroy() = subscriptions.dispose()
+
+    override fun <T> untilDestroy(
+            observable: Observable<T>,
+            onNextAction: (T) -> Unit,
+            onErrorAction: (Throwable) -> Unit,
+            onCompletedAction: () -> Unit
+    ): Disposable = observable
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(onNextAction, onErrorAction, onCompletedAction)
+            .also { subscriptions.add(it) }
+
+    override fun <T> untilDestroy(
+            single: Single<T>,
+            onSuccessAction: (T) -> Unit,
+            onErrorAction: (Throwable) -> Unit
+    ): Disposable = single
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(onSuccessAction, onErrorAction)
+            .also { subscriptions.add(it) }
+
+    override fun untilDestroy(
+            completable: Completable,
+            onCompletedAction: () -> Unit,
+            onErrorAction: (Throwable) -> Unit
+    ): Disposable = completable
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(onCompletedAction, onErrorAction)
+            .also { subscriptions.add(it) }
+
+    override fun <T> untilDestroy(
+            maybe: Maybe<T>,
+            onSuccessAction: (T) -> Unit,
+            onErrorAction: (Throwable) -> Unit,
+            onCompletedAction: () -> Unit
+    ): Disposable = maybe
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(onSuccessAction, onErrorAction, onCompletedAction)
+            .also { subscriptions.add(it) }
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
new file mode 100644
index 0000000..ea2e1eb
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
@@ -0,0 +1,94 @@
+package ru.touchin.roboswag.components.utils.destroyable
+
+import io.reactivex.Completable
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.disposables.Disposable
+import io.reactivex.internal.functions.Functions
+import ru.touchin.roboswag.core.log.Lc
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException
+
+/**
+ * Created by Oksana Pokrovskaya on 7/03/18.
+ * Interface that should be implemented by ([android.arch.lifecycle.ViewModel] etc.)
+ * to not manually manage subscriptions.
+ * Use [.untilDestroy] method to subscribe to observable where you want and unsubscribe onDestroy.
+ */
+interface Destroyable {
+
+    companion object {
+        private fun getActionThrowableForAssertion(codePoint: String, method: String = "untilDestroy"): (Throwable) -> Unit = { throwable ->
+            Lc.assertion(ShouldNotHappenException("Unexpected error on $method at $codePoint", throwable))
+        }
+    }
+
+    /**
+     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
+     * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
+     * Don't forget to process errors if observable can emit them.
+     *
+     * @param observable    [Observable] to subscribe until onDestroy;
+     * @param onNextAction  Action which will raise on every [io.reactivex.Emitter.onNext] item;
+     * @param onErrorAction Action which will raise on every [io.reactivex.Emitter.onError] throwable;
+     * @param T             Type of emitted by observable items;
+     * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
+     */
+    fun <T> untilDestroy(
+            observable: Observable<T>,
+            onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+    ): Disposable
+
+    /**
+     * Method should be used to guarantee that single won't be subscribed after onDestroy.
+     * It is automatically subscribing to the single and calls onSuccessAction and onErrorAction on single events.
+     * Don't forget to process errors if single can emit them.
+     *
+     * @param single          [Single] to subscribe until onDestroy;
+     * @param onSuccessAction Action which will raise on every [io.reactivex.SingleEmitter.onSuccess] item;
+     * @param onErrorAction   Action which will raise on every [io.reactivex.SingleEmitter.onError] throwable;
+     * @param T               Type of emitted by single items;
+     * @return [Disposable] which is wrapping source single to unsubscribe from it onDestroy.
+     */
+    fun <T> untilDestroy(
+            single: Single<T>,
+            onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
+    ): Disposable
+
+    /**
+     * Method should be used to guarantee that completable won't be subscribed after onDestroy.
+     * It is automatically subscribing to the completable and calls onCompletedAction and onErrorAction on completable events.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param completable       [Completable] to subscribe until onDestroy;
+     * @param onCompletedAction Action which will raise on every [io.reactivex.CompletableEmitter.onComplete] item;
+     * @param onErrorAction     Action which will raise on every [io.reactivex.CompletableEmitter.onError] throwable;
+     * @return [Disposable] which is wrapping source completable to unsubscribe from it onDestroy.
+     */
+    fun untilDestroy(
+            completable: Completable,
+            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run,
+            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
+    ): Disposable
+
+    /**
+     * Method should be used to guarantee that maybe won't be subscribed after onDestroy.
+     * It is automatically subscribing to the maybe and calls onSuccessAction and onErrorAction on maybe events.
+     * Don't forget to process errors if completable can emit them.
+     *
+     * @param maybe           [Maybe] to subscribe until onDestroy;
+     * @param onSuccessAction Action which will raise on every [io.reactivex.MaybeEmitter.onSuccess] ()} item;
+     * @param onErrorAction   Action which will raise on every [io.reactivex.MaybeEmitter.onError] throwable;
+     * @return [Disposable] which is wrapping source maybe to unsubscribe from it onDestroy.
+     */
+    fun <T> untilDestroy(
+            maybe: Maybe<T>,
+            onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+    ): Disposable
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/views/AspectRatioFrameLayout.java b/src/main/java/ru/touchin/roboswag/components/views/AspectRatioFrameLayout.java
deleted file mode 100644
index 3291bbe..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/AspectRatioFrameLayout.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import ru.touchin.roboswag.components.R;
-
-
-/**
- * Created by Gavriil Sitnikov on 01/07/14.
- * FrameLayout that holds specific aspect ratio sizes.
- * For example if aspect ratio equals 1.0 then this view will layout as square.
- */
-public class AspectRatioFrameLayout extends FrameLayout {
-
-    private static final float DEFAULT_ASPECT_RATIO = 1.0f;
-    private static final float EPSILON = 0.0000001f;
-
-    private float aspectRatio;
-    private boolean wrapToContent;
-
-    public AspectRatioFrameLayout(@NonNull final Context context) {
-        this(context, null);
-    }
-
-    public AspectRatioFrameLayout(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public AspectRatioFrameLayout(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
-        super(context, attrs, defStyle);
-
-        if (attrs == null) {
-            wrapToContent = false;
-            aspectRatio = DEFAULT_ASPECT_RATIO;
-        } else {
-            final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AspectRatioFrameLayout);
-            wrapToContent = typedArray.getBoolean(R.styleable.AspectRatioFrameLayout_wrapToContent, false);
-            aspectRatio = typedArray.getFloat(R.styleable.AspectRatioFrameLayout_aspectRatio, DEFAULT_ASPECT_RATIO);
-            typedArray.recycle();
-        }
-    }
-
-    /* Returns aspect ratio of layout */
-    public float getAspectRatio() {
-        return aspectRatio;
-    }
-
-    /* Sets aspect ratio of layout */
-    public void setAspectRatio(final float aspectRatio) {
-        if (Math.abs(aspectRatio - this.aspectRatio) < EPSILON) {
-            return;
-        }
-
-        this.aspectRatio = aspectRatio;
-        requestLayout();
-    }
-
-    /* Returns if layout is wrapping to content but holds aspect ratio */
-
-    /**
-     * Returns if layout is wrapping to content but holds aspect ratio.
-     * If it is true it means that minimum size of view will equals to maximum size of it's child (biggest width or height) depends on aspect ratio.
-     * Else maximum size of view will equals to minimum available size which parent could give to this view depends on aspect ratio.
-     *
-     * @return True if wrapping to content.
-     */
-    public boolean isWrapToContent() {
-        return wrapToContent;
-    }
-
-    /**
-     * Sets if layout is wrapping to content but holds aspect ratio.
-     *
-     * @param wrapToContent True if wrapping to content.
-     */
-    public void setWrapToContent(final boolean wrapToContent) {
-        if (wrapToContent == this.wrapToContent) {
-            return;
-        }
-
-        this.wrapToContent = wrapToContent;
-        requestLayout();
-    }
-
-    private void setMeasuredDimensionWithAspectOfLesser(final int measuredWidth, final int measuredHeight) {
-        final float heightBasedOnMw = measuredWidth / aspectRatio;
-        if (heightBasedOnMw > measuredHeight) {
-            setMeasuredDimension((int) (measuredHeight * aspectRatio), measuredHeight);
-        } else {
-            setMeasuredDimension(measuredWidth, (int) heightBasedOnMw);
-        }
-    }
-
-    private void setMeasuredDimensionWithAspectOfHigher(final int measuredWidth, final int measuredHeight) {
-        final float heightBasedOnMw = measuredWidth / aspectRatio;
-        if (heightBasedOnMw < measuredHeight) {
-            setMeasuredDimension((int) (measuredHeight * aspectRatio), measuredHeight);
-        } else {
-            setMeasuredDimension(measuredWidth, (int) heightBasedOnMw);
-        }
-    }
-
-    @NonNull
-    private Point measureWrapChildren(final int widthMeasureSpec, final int heightMeasureSpec) {
-        final Point result = new Point();
-        for (int i = 0; i < getChildCount(); i++) {
-            final View child = getChildAt(i);
-            child.measure(widthMeasureSpec, heightMeasureSpec);
-            if (result.x < child.getMeasuredWidth()) {
-                result.x = child.getMeasuredWidth();
-            }
-            if (result.y < child.getMeasuredHeight()) {
-                result.y = child.getMeasuredHeight();
-            }
-        }
-        return result;
-    }
-
-    @Override
-    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        int width = MeasureSpec.getSize(widthMeasureSpec);
-        int height = MeasureSpec.getSize(heightMeasureSpec);
-        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        if (wrapToContent) {
-            final Point bounds = measureWrapChildren(widthMeasureSpec, heightMeasureSpec);
-            width = widthMode == MeasureSpec.UNSPECIFIED ? bounds.x : Math.min(bounds.x, width);
-            height = heightMode == MeasureSpec.UNSPECIFIED ? bounds.y : Math.min(bounds.y, height);
-        }
-
-        if (widthMode == MeasureSpec.UNSPECIFIED) {
-            if (heightMode == MeasureSpec.UNSPECIFIED) {
-                measureBothUnspecified(width, height);
-            } else {
-                measureOnlyUnspecifiedWidth(width, height);
-            }
-        } else if (heightMode == MeasureSpec.UNSPECIFIED) {
-            measureOnlyUnspecifiedHeight(width, height);
-        } else {
-            measureBothSpecified(width, height);
-        }
-    }
-
-    private void measureBothSpecified(final int width, final int height) {
-        if (wrapToContent) {
-            setMeasuredDimensionWithAspectOfHigher(width, height);
-        } else {
-            setMeasuredDimensionWithAspectOfLesser(width, height);
-        }
-    }
-
-    private void measureOnlyUnspecifiedHeight(final int width, final int height) {
-        if (wrapToContent) {
-            measureWrapToContent(width, height);
-        } else {
-            setMeasuredDimension(width, (int) (width / aspectRatio));
-        }
-    }
-
-    private void measureWrapToContent(final int width, final int height) {
-        if (width < (int) (height * aspectRatio)) {
-            setMeasuredDimension((int) (height * aspectRatio), height);
-        } else {
-            setMeasuredDimension(width, (int) (width / aspectRatio));
-        }
-    }
-
-    private void measureOnlyUnspecifiedWidth(final int width, final int height) {
-        if (wrapToContent) {
-            measureWrapToContent(width, height);
-        } else {
-            setMeasuredDimension((int) (height * aspectRatio), height);
-        }
-    }
-
-    private void measureBothUnspecified(final int width, final int height) {
-        if (wrapToContent) {
-            setMeasuredDimensionWithAspectOfHigher(width, height);
-        } else {
-            final DisplayMetrics metrics = getResources().getDisplayMetrics();
-            setMeasuredDimensionWithAspectOfLesser(metrics.widthPixels, metrics.heightPixels);
-        }
-    }
-
-    @Override
-    protected void onLayout(final boolean changed, final int left, final int top, final int right, final int bottom) {
-        for (int i = 0; i < getChildCount(); i++) {
-            final View child = getChildAt(i);
-            final ViewGroup.LayoutParams lp = child.getLayoutParams();
-            final int widthMeasureSpec;
-            final int heightMeasureSpec;
-            final int width = getMeasuredWidth() - getPaddingLeft() - getPaddingRight();
-            final int height = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
-            switch (lp.width) {
-                case ViewGroup.LayoutParams.MATCH_PARENT:
-                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);
-                    break;
-                case ViewGroup.LayoutParams.WRAP_CONTENT:
-                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
-                    break;
-                default:
-                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(lp.width, MeasureSpec.EXACTLY);
-                    break;
-            }
-
-            switch (lp.height) {
-                case ViewGroup.LayoutParams.MATCH_PARENT:
-                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-                    break;
-                case ViewGroup.LayoutParams.WRAP_CONTENT:
-                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.AT_MOST);
-                    break;
-                default:
-                    heightMeasureSpec = MeasureSpec.makeMeasureSpec(lp.height, MeasureSpec.EXACTLY);
-                    break;
-            }
-
-            getChildAt(i).measure(widthMeasureSpec, heightMeasureSpec);
-        }
-
-        super.onLayout(changed, left, top, right, bottom);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java b/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
deleted file mode 100644
index 781d841..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/LifecycleView.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- *  Copyright (c) 2017 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-import io.reactivex.Maybe;
-import ru.touchin.roboswag.components.utils.BaseLifecycleBindable;
-import ru.touchin.roboswag.components.utils.LifecycleBindable;
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.Single;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-
-
-/**
- * Created by Gavriil Sitnikov on 18/05/17.
- * FrameLayout that realizes LifecycleBindable interface.
- */
-@SuppressWarnings({"CPD-START", "PMD.TooManyMethods"})
-public class LifecycleView extends FrameLayout implements LifecycleBindable {
-
-    @NonNull
-    private final BaseLifecycleBindable baseLifecycleBindable;
-    private boolean created;
-    private boolean started;
-
-    public LifecycleView(@NonNull final Context context) {
-        super(context);
-        baseLifecycleBindable = new BaseLifecycleBindable();
-    }
-
-    public LifecycleView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        super(context, attrs);
-        baseLifecycleBindable = new BaseLifecycleBindable();
-    }
-
-    public LifecycleView(@NonNull final Context context, @Nullable final AttributeSet attrs, @AttrRes final int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        baseLifecycleBindable = new BaseLifecycleBindable();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        onCreate();
-        if (!started && getWindowSystemUiVisibility() == VISIBLE) {
-            onStart();
-        }
-    }
-
-    /**
-     * Calls when view attached to window and ready to use.
-     */
-    protected void onCreate() {
-        created = true;
-        baseLifecycleBindable.onCreate();
-    }
-
-    /**
-     * Calls when view's window showed or state restored.
-     */
-    protected void onStart() {
-        started = true;
-        baseLifecycleBindable.onStart();
-    }
-
-    @Override
-    protected void onRestoreInstanceState(@NonNull final Parcelable state) {
-        super.onRestoreInstanceState(state);
-        if (created && !started) {
-            onStart();
-        }
-    }
-
-    @NonNull
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        started = false;
-        baseLifecycleBindable.onSaveInstanceState();
-        return super.onSaveInstanceState();
-    }
-
-    /**
-     * Calls when view's window hided or state saved.
-     */
-    protected void onStop() {
-        started = false;
-        baseLifecycleBindable.onStop();
-    }
-
-    /**
-     * Calls when view detached from window.
-     */
-    protected void onDestroy() {
-        if (started) {
-            onStop();
-        }
-        created = false;
-        baseLifecycleBindable.onDestroy();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        onDestroy();
-        super.onDetachedFromWindow();
-    }
-
-    @Override
-    protected void onWindowVisibilityChanged(final int visibility) {
-        super.onWindowVisibilityChanged(visibility);
-        if (visibility == VISIBLE) {
-            if (created && !started) {
-                baseLifecycleBindable.onStart();
-            }
-        } else if (started) {
-            baseLifecycleBindable.onStop();
-        }
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilStop(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Observable<T> observable,
-                                    @NonNull final Consumer<T> onNextAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction,
-                                    @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilStop(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Single<T> single,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilStop(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilStop(@NonNull final Completable completable,
-                                @NonNull final Action onCompletedAction,
-                                @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilStop(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilStop(@NonNull final Maybe<T> maybe,
-                                    @NonNull final Consumer<T> onSuccessAction,
-                                    @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilStop(maybe, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable) {
-        return baseLifecycleBindable.untilDestroy(observable);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable, @NonNull final Consumer<T> onNextAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Observable<T> observable,
-                                       @NonNull final Consumer<T> onNextAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction,
-                                       @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(observable, onNextAction, onErrorAction, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single) {
-        return baseLifecycleBindable.untilDestroy(single);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Single<T> single,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(single, onSuccessAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable) {
-        return baseLifecycleBindable.untilDestroy(completable);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable, @NonNull final Action onCompletedAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction);
-    }
-
-    @NonNull
-    @Override
-    public Disposable untilDestroy(@NonNull final Completable completable,
-                                   @NonNull final Action onCompletedAction,
-                                   @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(completable, onCompletedAction, onErrorAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe) {
-        return baseLifecycleBindable.untilDestroy(maybe);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe, @NonNull final Consumer<T> onSuccessAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction);
-    }
-
-    @NonNull
-    @Override
-    public <T> Disposable untilDestroy(@NonNull final Maybe<T> maybe,
-                                       @NonNull final Consumer<T> onSuccessAction,
-                                       @NonNull final Consumer<Throwable> onErrorAction) {
-        return baseLifecycleBindable.untilDestroy(maybe, onSuccessAction, onErrorAction);
-    }
-
-}
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 8e9c7e8..7320080 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -19,11 +19,6 @@
         <attr name="isMultiline" format="boolean"/>
     </declare-styleable>
 
-    <declare-styleable name="AspectRatioFrameLayout">
-        <attr name="aspectRatio" format="float" />
-        <attr name="wrapToContent" format="boolean" />
-    </declare-styleable>
-
     <declare-styleable name="MaterialLoadingBar">
         <attr name="strokeWidth" format="dimension"/>
         <attr name="color" format="color"/>
@@ -31,4 +26,4 @@
         <attr name="materialLoadingBarStyle" format="reference"/>
     </declare-styleable>
 
-</resources>
\ No newline at end of file
+</resources>

From dc87783252de7d2512abc9728d8587fa6957981a Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 14 Mar 2018 16:25:06 +0300
Subject: [PATCH 41/95] Renaming BindableViewHolder to LifecycleViewHolder

---
 .../roboswag/components/adapters/AdapterDelegate.java       | 4 ++--
 .../roboswag/components/adapters/ItemAdapterDelegate.java   | 6 +++---
 .../{BindableViewHolder.kt => LifecycleViewHolder.kt}       | 2 +-
 .../components/adapters/PositionAdapterDelegate.java        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/java/ru/touchin/roboswag/components/adapters/{BindableViewHolder.kt => LifecycleViewHolder.kt} (97%)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index 8b38563..3c70482 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -28,9 +28,9 @@ import android.view.ViewGroup;
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link BindableViewHolder} of delegate.
+ * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate.
  */
-public abstract class AdapterDelegate<TViewHolder extends BindableViewHolder> {
+public abstract class AdapterDelegate<TViewHolder extends LifecycleViewHolder> {
 
     private final int defaultItemViewType = ViewCompat.generateViewId();
     @NonNull
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index a7f27d4..4618479 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -11,10 +11,10 @@ import java.util.List;
  * Such delegates are creating and binding ViewHolders for specific items.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link LifecycleOwner} of delegate;
- * @param <TItem>       Type of items to bind to {@link LifecycleOwner}s.
+ * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate;
+ * @param <TItem>       Type of items to bind to {@link LifecycleViewHolder}s.
  */
-public abstract class ItemAdapterDelegate<TViewHolder extends BindableViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
+public abstract class ItemAdapterDelegate<TViewHolder extends LifecycleViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
 
     public ItemAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
         super(lifecycleOwner);
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt
similarity index 97%
rename from src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt
rename to src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt
index 9222794..42b4931 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/BindableViewHolder.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt
@@ -28,7 +28,7 @@ import android.view.View
  * ViewHolder that implements {@link LifecycleOwner} and uses parent lifecycle
  * object as bridge ([android.app.Activity], [android.support.v4.app.Fragment] etc.).
  */
-open class BindableViewHolder(
+open class LifecycleViewHolder(
         private val lifecycleOwner: LifecycleOwner,
         itemView: View
 ) : RecyclerView.ViewHolder(itemView), LifecycleOwner by lifecycleOwner
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
index 5fc5f4a..1271d82 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -11,9 +11,9 @@ import java.util.List;
  * Such delegates are creating and binding ViewHolders by position in adapter.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link BindableViewHolder} of delegate.
+ * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate.
  */
-public abstract class PositionAdapterDelegate<TViewHolder extends BindableViewHolder> extends AdapterDelegate<TViewHolder> {
+public abstract class PositionAdapterDelegate<TViewHolder extends LifecycleViewHolder> extends AdapterDelegate<TViewHolder> {
 
     public PositionAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
         super(lifecycleOwner);

From b64e1c9e3593d4d4be81184f257d9d32917c5e49 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 14 Mar 2018 19:58:18 +0300
Subject: [PATCH 42/95] Added empty Parcelable state and state getter in
 ViewController class

---
 .../fragments/ViewControllerFragment.java     |  8 ++++----
 .../navigation/viewcontrollers/EmptyState.kt  | 19 +++++++++++++++++++
 .../{ => viewcontrollers}/ViewController.java | 18 ++++++++++++++++--
 .../ViewControllerNavigation.kt               | 19 ++++++++++---------
 4 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
 rename src/main/java/ru/touchin/roboswag/components/navigation/{ => viewcontrollers}/ViewController.java (95%)
 rename src/main/java/ru/touchin/roboswag/components/navigation/{ => viewcontrollers}/ViewControllerNavigation.kt (92%)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 977cd29..a63a0be 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -39,7 +39,7 @@ import android.widget.FrameLayout;
 
 import java.lang.reflect.Constructor;
 
-import ru.touchin.roboswag.components.navigation.ViewController;
+import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
@@ -51,7 +51,7 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * @param <TState>    Type of object which is representing it's fragment state;
  * @param <TActivity> Type of {@link FragmentActivity} where fragment could be attached to.
  */
-public abstract class ViewControllerFragment<TState extends Parcelable, TActivity extends FragmentActivity> extends ViewFragment<TActivity> {
+public class ViewControllerFragment<TState extends Parcelable, TActivity extends FragmentActivity> extends ViewFragment<TActivity> {
 
     private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
     private static final String VIEW_CONTROLLER_STATE_EXTRA = "VIEW_CONTROLLER_STATE_EXTRA";
@@ -105,7 +105,7 @@ public abstract class ViewControllerFragment<TState extends Parcelable, TActivit
 
     @Nullable
     private ViewController viewController;
-    private Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>>> viewControllerClass;
+    private Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>> viewControllerClass;
     private TState state;
 
     /**
@@ -125,7 +125,7 @@ public abstract class ViewControllerFragment<TState extends Parcelable, TActivit
         setHasOptionsMenu(!isChildFragment());
 
         //noinspection unchecked
-        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>)
+        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>)
                 getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
         state = savedInstanceState != null
                 ? savedInstanceState.getParcelable(VIEW_CONTROLLER_STATE_EXTRA)
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
new file mode 100644
index 0000000..12424bc
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
@@ -0,0 +1,19 @@
+package ru.touchin.roboswag.components.navigation.viewcontrollers
+
+import android.os.Parcel
+import android.os.Parcelable
+
+object EmptyState : Parcelable {
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) = Unit
+
+    override fun describeContents() = 0
+
+    @JvmField
+    val CREATOR = object : Parcelable.Creator<EmptyState> {
+        override fun createFromParcel(parcel: Parcel) = EmptyState
+
+        override fun newArray(size: Int): Array<EmptyState?> = arrayOfNulls(size)
+    }
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
similarity index 95%
rename from src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
rename to src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index a29f0a0..ab3a618 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -17,13 +17,14 @@
  *
  */
 
-package ru.touchin.roboswag.components.navigation;
+package ru.touchin.roboswag.components.navigation.viewcontrollers;
 
 import android.arch.lifecycle.Lifecycle;
 import android.arch.lifecycle.LifecycleOwner;
 import android.arch.lifecycle.LifecycleRegistry;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.CallSuper;
 import android.support.annotation.IdRes;
 import android.support.annotation.LayoutRes;
@@ -48,7 +49,10 @@ import ru.touchin.roboswag.core.log.Lc;
  * @param <TActivity> Type of activity where such {@link ViewController} could be;
  * @param <TFragment> Type of fragment where such {@link ViewController} could be;
  */
-public class ViewController<TActivity extends FragmentActivity, TFragment extends ViewControllerFragment<?, TActivity>> implements LifecycleOwner {
+public class ViewController<
+        TActivity extends FragmentActivity,
+        TFragment extends ViewControllerFragment<TState, TActivity>,
+        TState extends Parcelable> implements LifecycleOwner {
 
     @NonNull
     private final LifecycleRegistry lifecycleRegistry = new LifecycleRegistry(this);
@@ -83,6 +87,16 @@ public class ViewController<TActivity extends FragmentActivity, TFragment extend
         return activity;
     }
 
+    /**
+     * Returns state from fragment.
+     *
+     * @return Returns state.
+     */
+    @NonNull
+    public final TState getState() {
+        return fragment.getState();
+    }
+
     /**
      * Returns fragment where {@link ViewController} could be.
      *
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
similarity index 92%
rename from src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt
rename to src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index 81efec4..ba67da9 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -17,7 +17,7 @@
  *
  */
 
-package ru.touchin.roboswag.components.navigation
+package ru.touchin.roboswag.components.navigation.viewcontrollers
 
 import android.content.Context
 import android.os.Parcelable
@@ -28,6 +28,7 @@ import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentTransaction
 
 import io.reactivex.functions.Function
+import ru.touchin.roboswag.components.navigation.FragmentNavigation
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
 
 /**
@@ -52,7 +53,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
     ) {
@@ -67,7 +68,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushSingleViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
     ) {
@@ -86,7 +87,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TTargetFragment     Type of target fragment.
      */
     fun <TState : Parcelable, TTargetFragment : Fragment> pushViewControllerForResult(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             targetFragment: TTargetFragment,
             transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
@@ -96,7 +97,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
                 targetFragment,
                 true,
                 state,
-                viewControllerClass.name + ';'.toString() + FragmentNavigation.WITH_TARGET_FRAGMENT_TAG_MARK,
+                viewControllerClass.name + ';'.toString() + WITH_TARGET_FRAGMENT_TAG_MARK,
                 transactionSetup
         )
     }
@@ -111,7 +112,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setViewControllerAsTop(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
     ) {
@@ -120,7 +121,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
                 null,
                 true,
                 state,
-                viewControllerClass.name + ';'.toString() + FragmentNavigation.TOP_FRAGMENT_TAG_MARK,
+                viewControllerClass.name + ';'.toString() + TOP_FRAGMENT_TAG_MARK,
                 transactionSetup
         )
     }
@@ -135,7 +136,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setInitialViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
     ) {
@@ -154,7 +155,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     protected fun <TState : Parcelable> addViewControllerToStack(
-            viewControllerClass: Class<out ViewController<TActivity, out ViewControllerFragment<TState, TActivity>>>,
+            viewControllerClass: Class<out ViewController<TActivity, out ViewControllerFragment<TState, TActivity>, TState>>,
             targetFragment: Fragment?,
             addToStack: Boolean,
             state: TState,

From e3e978b7f7ed18befad97d6d30a2c826fa0140de Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 15 Mar 2018 11:26:38 +0300
Subject: [PATCH 43/95] LifecycleViewHolder removed

---
 .../components/adapters/AdapterDelegate.java  | 22 ++----------
 .../adapters/ItemAdapterDelegate.java         | 12 +++----
 .../adapters/LifecycleViewHolder.kt           | 34 -------------------
 .../adapters/PositionAdapterDelegate.java     | 10 ++----
 4 files changed, 10 insertions(+), 68 deletions(-)
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index 3c70482..ee6155c 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -19,36 +19,20 @@
 
 package ru.touchin.roboswag.components.adapters;
 
-import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
 import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate.
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
  */
-public abstract class AdapterDelegate<TViewHolder extends LifecycleViewHolder> {
+public abstract class AdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> {
 
     private final int defaultItemViewType = ViewCompat.generateViewId();
-    @NonNull
-    private final LifecycleOwner lifecycleOwner;
-
-    public AdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
-        this.lifecycleOwner = lifecycleOwner;
-    }
-
-    /**
-     * Returns parent {@link LifecycleOwner} that this delegate created from (e.g. Activity, Fragment or ViewController).
-     *
-     * @return Parent {@link LifecycleOwner}.
-     */
-    @NonNull
-    public LifecycleOwner getLifecycleOwner() {
-        return lifecycleOwner;
-    }
 
     /**
      * Unique ID of AdapterDelegate.
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index 4618479..b7a3a44 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -1,7 +1,7 @@
 package ru.touchin.roboswag.components.adapters;
 
-import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import java.util.List;
@@ -11,14 +11,10 @@ import java.util.List;
  * Such delegates are creating and binding ViewHolders for specific items.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate;
- * @param <TItem>       Type of items to bind to {@link LifecycleViewHolder}s.
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate;
+ * @param <TItem>       Type of items to bind to {@link RecyclerView.ViewHolder}s.
  */
-public abstract class ItemAdapterDelegate<TViewHolder extends LifecycleViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
-
-    public ItemAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
-        super(lifecycleOwner);
-    }
+public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
 
     /**
      * Returns if object is processable by this delegate.
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt
deleted file mode 100644
index 42b4931..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/LifecycleViewHolder.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.adapters
-
-import android.arch.lifecycle.LifecycleOwner
-import android.support.v7.widget.RecyclerView
-import android.view.View
-
-/**
- * Created by Denis Karmyshakov 14.03.2018.
- * ViewHolder that implements {@link LifecycleOwner} and uses parent lifecycle
- * object as bridge ([android.app.Activity], [android.support.v4.app.Fragment] etc.).
- */
-open class LifecycleViewHolder(
-        private val lifecycleOwner: LifecycleOwner,
-        itemView: View
-) : RecyclerView.ViewHolder(itemView), LifecycleOwner by lifecycleOwner
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
index 1271d82..ac83c51 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -1,7 +1,7 @@
 package ru.touchin.roboswag.components.adapters;
 
-import android.arch.lifecycle.LifecycleOwner;
 import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
 import java.util.List;
@@ -11,13 +11,9 @@ import java.util.List;
  * Such delegates are creating and binding ViewHolders by position in adapter.
  * Default {@link #getItemViewType} is generating on construction of object.
  *
- * @param <TViewHolder> Type of {@link LifecycleViewHolder} of delegate.
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
  */
-public abstract class PositionAdapterDelegate<TViewHolder extends LifecycleViewHolder> extends AdapterDelegate<TViewHolder> {
-
-    public PositionAdapterDelegate(@NonNull final LifecycleOwner lifecycleOwner) {
-        super(lifecycleOwner);
-    }
+public abstract class PositionAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> extends AdapterDelegate<TViewHolder> {
 
     /**
      * Returns if object is processable by this delegate.

From 69f1c9af4a914314bfa9c6281adbaa8f12160cfe Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 16 Mar 2018 17:54:36 +0300
Subject: [PATCH 44/95] Added DelegationListAdapter, small refactor of
 delegates

---
 .../components/adapters/AdapterDelegate.java  |  41 +++++++
 .../components/adapters/DelegatesManager.kt   |  60 ++++++++++
 .../adapters/DelegationListAdapter.kt         |  82 ++++++++++++++
 .../adapters/ItemAdapterDelegate.java         |  86 +++++++-------
 .../adapters/OffsetAdapterUpdateCallback.kt   |  24 ++++
 .../adapters/PositionAdapterDelegate.java     |  52 +++++----
 .../roboswag/components/utils/Typefaces.java  | 105 ------------------
 7 files changed, 278 insertions(+), 172 deletions(-)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
 create mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
 create mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
index ee6155c..25be0c9 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -24,6 +24,8 @@ import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import java.util.List;
+
 /**
  * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
  * Default {@link #getItemViewType} is generating on construction of object.
@@ -43,6 +45,28 @@ public abstract class AdapterDelegate<TViewHolder extends RecyclerView.ViewHolde
         return defaultItemViewType;
     }
 
+    /**
+     * Returns if object is processable by this delegate.
+     *
+     * @param items                  Items to check;
+     * @param adapterPosition        Position of item in adapter;
+     * @param collectionPosition     Position of item in collection;
+     * @return True if item is processable by this delegate.
+     */
+    public abstract boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition);
+
+    /**
+     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
+     *
+     * @param items                Items in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection;
+     * @return Unique item ID.
+     */
+    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return 0;
+    }
+
     /**
      * Creates ViewHolder to bind item to it later.
      *
@@ -52,4 +76,21 @@ public abstract class AdapterDelegate<TViewHolder extends RecyclerView.ViewHolde
     @NonNull
     public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
 
+    /**
+     * Binds item to created by this object ViewHolder.
+     *
+     * @param holder               ViewHolder to bind item to;
+     * @param items                Items in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
+     * @param payloads             Payloads;
+     */
+    public abstract void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    );
+
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
new file mode 100644
index 0000000..bb70eb3
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
@@ -0,0 +1,60 @@
+package ru.touchin.roboswag.components.adapters
+
+import android.support.v7.widget.RecyclerView
+import android.util.SparseArray
+import android.view.ViewGroup
+
+/**
+ * Manager for delegation callbacks from [RecyclerView.Adapter] to delegates.
+ */
+class DelegatesManager {
+
+    private val delegates = SparseArray<AdapterDelegate<*>>()
+
+    fun getItemViewType(items: List<*>, adapterPosition: Int, collectionPosition: Int): Int {
+        for (index in 0 until delegates.size()) {
+            val delegate = delegates.valueAt(index)
+            if (delegate.isForViewType(items, adapterPosition, collectionPosition)) {
+                return delegate.itemViewType
+            }
+        }
+        throw IllegalStateException("Delegate not found")
+    }
+
+    fun getItemId(items: List<*>, adapterPosition: Int, collectionPosition: Int): Long {
+        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
+        return delegate.getItemId(items, adapterPosition, collectionPosition)
+    }
+
+    fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = getDelegate(viewType).onCreateViewHolder(parent)
+
+    fun onBindViewHolder(holder: RecyclerView.ViewHolder, items: List<*>, adapterPosition: Int, collectionPosition: Int, payloads: List<Any>) {
+        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
+        delegate.onBindViewHolder(holder, items, adapterPosition, collectionPosition, payloads)
+    }
+
+    /**
+     * Adds [ItemAdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: ItemAdapterDelegate<*, *>) = delegates.put(delegate.itemViewType, delegate)
+
+    /**
+     * Adds [PositionAdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: PositionAdapterDelegate<*>) = delegates.put(delegate.itemViewType, delegate)
+
+    /**
+     * Removes [AdapterDelegate] from adapter.
+     *
+     * @param delegate Delegate to remove.
+     */
+    fun removeDelegate(delegate: AdapterDelegate<*>) = delegates.remove(delegate.itemViewType)
+
+    private fun getDelegate(viewType: Int): AdapterDelegate<*> =
+            delegates[viewType] ?: throw IllegalStateException("No AdapterDelegate added for view type: $viewType")
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
new file mode 100644
index 0000000..24e56fb
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -0,0 +1,82 @@
+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 android.view.ViewGroup
+
+/**
+ * Base adapter with delegation and diff computing on background thread.
+ */
+open class DelegationListAdapter<TItem>(diffCallback: DiffUtil.ItemCallback<TItem>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    var itemClickListener: ((TItem, RecyclerView.ViewHolder) -> Unit)? = null
+
+    private val delegatesManager = DelegatesManager()
+    private var differ = AsyncListDiffer(OffsetAdapterUpdateCallback(this, ::getHeadersCount), AsyncDifferConfig.Builder<TItem>(diffCallback).build())
+
+    open fun getHeadersCount(): Int = 0
+
+    open fun getFootersCount(): Int = 0
+
+    override fun getItemCount(): Int = getHeadersCount() + differ.currentList.size + getFootersCount()
+
+    override fun getItemViewType(position: Int): Int = delegatesManager.getItemViewType(getList(), position, getCollectionPosition(position))
+
+    override fun getItemId(position: Int): Long = delegatesManager.getItemId(getList(), position, getCollectionPosition(position))
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = delegatesManager.onCreateViewHolder(parent, viewType)
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any>) {
+        val collectionPosition = getCollectionPosition(position)
+        if (itemClickListener != null && collectionPosition in 0 until getList().size) {
+            holder.itemView.setOnClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
+        } else {
+            holder.itemView.setOnClickListener(null)
+        }
+        delegatesManager.onBindViewHolder(holder, getList(), position, collectionPosition, payloads)
+    }
+
+    final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) = Unit
+
+    /**
+     * Adds [ItemAdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: ItemAdapterDelegate<*, *>) = delegatesManager.addDelegate(delegate)
+
+    /**
+     * Adds [PositionAdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: PositionAdapterDelegate<*>) = delegatesManager.addDelegate(delegate)
+
+    /**
+     * Submits a new list to be diffed, and displayed.
+     *
+     * If a list is already being displayed, a diff will be computed on a background thread, which
+     * will dispatch Adapter.notifyItem events on the main thread.
+     *
+     * @param list The new list to be displayed.
+     */
+    fun submitList(list: List<TItem>) = differ.submitList(list)
+
+    /**
+     * Get the current List - any diffing to present this list has already been computed and
+     * dispatched via the ListUpdateCallback.
+     * <p>
+     * If a <code>null</code> List, or no List has been submitted, an empty list will be returned.
+     * <p>
+     * The returned list may not be mutated - mutations to content must be done through
+     * {@link #submitList(List)}.
+     *
+     * @return current List.
+     */
+    fun getList(): List<TItem> = differ.currentList
+
+    fun getCollectionPosition(adapterPosition: Int): Int = adapterPosition - getHeadersCount()
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index b7a3a44..44a9902 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -2,7 +2,6 @@ package ru.touchin.roboswag.components.adapters;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.view.ViewGroup;
 
 import java.util.List;
 
@@ -14,72 +13,73 @@ import java.util.List;
  * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate;
  * @param <TItem>       Type of items to bind to {@link RecyclerView.ViewHolder}s.
  */
+@SuppressWarnings("unchecked")
 public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
 
+    @Override
+    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return collectionPosition >= 0
+                && collectionPosition < items.size()
+                && isForViewType(items.get(collectionPosition), adapterPosition, collectionPosition);
+    }
+
     /**
      * Returns if object is processable by this delegate.
-     * This item will be casted to {@link TItem} and passes to {@link #onBindViewHolder(TViewHolder, TItem, int, int)}.
+     * This item will be casted to {@link TItem} and passes to {@link #onBindViewHolder(TViewHolder, TItem, int, int, List)}.
      *
-     * @param item                   Item to check;
-     * @param positionInAdapter      Position of item in adapter;
-     * @param itemCollectionPosition Position of item in collection that contains item;
+     * @param item                  Item to check;
+     * @param adapterPosition       Position of item in adapter;
+     * @param collectionPosition    Position of item in collection that contains item;
      * @return True if item is processable by this delegate.
      */
-    public abstract boolean isForViewType(@NonNull final Object item, final int positionInAdapter, final int itemCollectionPosition);
+    public boolean isForViewType(@NonNull final Object item, final int adapterPosition, final int collectionPosition) {
+        return true;
+    }
+
+    @Override
+    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return getItemId((TItem) items.get(collectionPosition), adapterPosition, collectionPosition);
+    }
 
     /**
      * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
      *
-     * @param item                 Item to check;
-     * @param positionInAdapter    Position of item in adapter;
-     * @param positionInCollection Position of item in collection that contains item;
+     * @param item                 Item in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
      * @return Unique item ID.
      */
-    public long getItemId(@NonNull final TItem item, final int positionInAdapter, final int positionInCollection) {
+    public long getItemId(@NonNull final TItem item, final int adapterPosition, final int collectionPosition) {
         return 0;
     }
 
-    /**
-     * Creates ViewHolder to bind item to it later.
-     *
-     * @param parent Container of ViewHolder's view.
-     * @return New ViewHolder.
-     */
-    @NonNull
-    public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
-
-    /**
-     * Binds item to created by this object ViewHolder.
-     *
-     * @param holder               ViewHolder to bind item to;
-     * @param item                 Item to check;
-     * @param positionInAdapter    Position of item in adapter;
-     * @param positionInCollection Position of item in collection that contains item;
-     */
-    public abstract void onBindViewHolder(
-            @NonNull final TViewHolder holder,
-            @NonNull final TItem item,
-            final int positionInAdapter,
-            final int positionInCollection
-    );
+    @Override
+    public void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    ) {
+        //noinspection unchecked
+        onBindViewHolder((TViewHolder) holder, (TItem) items.get(collectionPosition), adapterPosition, collectionPosition, payloads);
+    }
 
     /**
      * Binds item with payloads to created by this object ViewHolder.
      *
      * @param holder               ViewHolder to bind item to;
-     * @param item                 Item to check;
+     * @param item                 Item in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
      * @param payloads             Payloads;
-     * @param positionInAdapter    Position of item in adapter;
-     * @param positionInCollection Position of item in collection that contains item;
      */
-    public void onBindViewHolder(
+    public abstract void onBindViewHolder(
             @NonNull final TViewHolder holder,
             @NonNull final TItem item,
-            @NonNull final List<Object> payloads,
-            final int positionInAdapter,
-            final int positionInCollection
-    ) {
-        //do nothing by default
-    }
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    );
 
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt b/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
new file mode 100644
index 0000000..73bc999
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
@@ -0,0 +1,24 @@
+package ru.touchin.roboswag.components.adapters
+
+import android.support.v7.util.ListUpdateCallback
+import android.support.v7.widget.RecyclerView
+
+class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback  {
+
+    override fun onInserted(position: Int, count: Int) {
+        adapter.notifyItemInserted(position + offsetProvider())
+    }
+
+    override fun onRemoved(position: Int, count: Int) {
+        adapter.notifyItemRangeRemoved(position + offsetProvider(), count)
+    }
+
+    override fun onMoved(fromPosition: Int, toPosition: Int) {
+        adapter.notifyItemMoved(fromPosition + offsetProvider(), toPosition + offsetProvider())
+    }
+
+    override fun onChanged(position: Int, count: Int, payload: Any?) {
+        adapter.notifyItemRangeChanged(position + offsetProvider(), count, payload)
+    }
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
index ac83c51..ada8888 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -2,7 +2,6 @@ package ru.touchin.roboswag.components.adapters;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.view.ViewGroup;
 
 import java.util.List;
 
@@ -15,49 +14,54 @@ import java.util.List;
  */
 public abstract class PositionAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> extends AdapterDelegate<TViewHolder> {
 
+    @Override
+    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return isForViewType(adapterPosition);
+    }
+
     /**
      * Returns if object is processable by this delegate.
      *
-     * @param positionInAdapter Position of item in adapter;
+     * @param adapterPosition Position of item in adapter;
      * @return True if item is processable by this delegate.
      */
-    public abstract boolean isForViewType(final int positionInAdapter);
+    public abstract boolean isForViewType(final int adapterPosition);
+
+    @Override
+    public long getItemId(@NonNull final List<Object> objects, final int adapterPosition, final int itemsOffset) {
+        return getItemId(adapterPosition);
+    }
 
     /**
      * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
      *
-     * @param positionInAdapter Position of item in adapter;
+     * @param adapterPosition Position of item in adapter;
      * @return Unique item ID.
      */
-    public long getItemId(final int positionInAdapter) {
+    public long getItemId(final int adapterPosition) {
         return 0;
     }
 
-    /**
-     * Creates ViewHolder to bind position to it later.
-     *
-     * @param parent Container of ViewHolder's view.
-     * @return New ViewHolder.
-     */
-    @NonNull
-    public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
-
-    /**
-     * Binds position to ViewHolder.
-     *
-     * @param holder            ViewHolder to bind position to;
-     * @param positionInAdapter Position of item in adapter.
-     */
-    public abstract void onBindViewHolder(@NonNull final TViewHolder holder, final int positionInAdapter);
+    @Override
+    public void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    ) {
+        //noinspection unchecked
+        onBindViewHolder((TViewHolder) holder, adapterPosition, payloads);
+    }
 
     /**
      * Binds position with payloads to ViewHolder.
      *
      * @param holder            ViewHolder to bind position to;
-     * @param payloads          Payloads;
-     * @param positionInAdapter Position of item in adapter.
+     * @param adapterPosition   Position of item in adapter;
+     * @param payloads          Payloads.
      */
-    public void onBindViewHolder(@NonNull final TViewHolder holder, @NonNull final List<Object> payloads, final int positionInAdapter) {
+    public void onBindViewHolder(@NonNull final TViewHolder holder, final int adapterPosition, @NonNull final List<Object> payloads) {
         //do nothing by default
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java b/src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java
deleted file mode 100644
index d8be010..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/Typefaces.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils;
-
-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 android.util.AttributeSet;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 18/07/2014.
- * Manager for typefaces stored in 'assets/fonts' folder.
- */
-public final class Typefaces {
-
-    private static final Map<String, Typeface> TYPEFACES_MAP = new HashMap<>();
-
-    /**
-     * Returns {@link Typeface} by name from assets 'fonts' folder.
-     *
-     * @param context Context of assets where typeface file stored in;
-     * @param name    Full name of typeface (without extension, e.g. 'Roboto-Regular');
-     * @return {@link Typeface} from assets.
-     */
-    @NonNull
-    public static Typeface getByName(@NonNull final Context context, @NonNull final String name) {
-        synchronized (TYPEFACES_MAP) {
-            Typeface result = TYPEFACES_MAP.get(name);
-            if (result == null) {
-                final AssetManager assetManager = context.getAssets();
-                result = Typeface.DEFAULT;
-                try {
-                    final List<String> fonts = Arrays.asList(assetManager.list("fonts"));
-                    if (fonts.contains(name + ".ttf")) {
-                        result = Typeface.createFromAsset(assetManager, "fonts/" + name + ".ttf");
-                    } else if (fonts.contains(name + ".otf")) {
-                        result = Typeface.createFromAsset(assetManager, "fonts/" + name + ".otf");
-                    } else {
-                        Lc.assertion("Can't find .otf or .ttf file in assets folder 'fonts' with name: " + name);
-                    }
-                } catch (final IOException exception) {
-                    Lc.assertion(new ShouldNotHappenException("Can't get font " + name + '.'
-                            + "Did you forget to create assets folder named 'fonts'?", exception));
-                }
-                TYPEFACES_MAP.put(name, result);
-            }
-            return result;
-        }
-    }
-
-    /**
-     * Returns {@link Typeface} by name from assets 'fonts' folder.
-     *
-     * @param context     Context of assets where typeface file stored in;
-     * @param attrs       Attributes of view to get font from;
-     * @param styleableId Id of attribute set;
-     * @param attributeId Id of attribute;
-     * @return {@link Typeface} from assets.
-     */
-    @NonNull
-    public static Typeface getFromAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs,
-                                             @NonNull @StyleableRes final int[] styleableId, @StyleableRes final int attributeId) {
-        final TypedArray typedArray = context.obtainStyledAttributes(attrs, styleableId);
-        final String customTypeface = typedArray.getString(attributeId);
-        typedArray.recycle();
-        if (customTypeface != null) {
-            return getByName(context, customTypeface);
-        }
-        Lc.w("Couldn't find custom typeface. Returns default");
-        return Typeface.DEFAULT;
-    }
-
-    private Typefaces() {
-    }
-
-}
\ No newline at end of file

From 5f6152050b6148851acbeddbfd1db6ea36495ad6 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Mon, 19 Mar 2018 12:29:25 +0300
Subject: [PATCH 45/95] Navigation refactor, DelegationListAdapter fix

---
 .../components/adapters/DelegatesManager.kt   |  11 +-
 .../adapters/DelegationListAdapter.kt         |  10 +-
 .../navigation/FragmentNavigation.java        | 433 ------------------
 .../navigation/FragmentNavigation.kt          | 261 +++++++++++
 .../fragments/ViewControllerFragment.java     |  22 +-
 .../navigation/fragments/ViewFragment.java    |   5 +-
 .../ViewControllerNavigation.kt               |  84 ++--
 7 files changed, 318 insertions(+), 508 deletions(-)
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
 create mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
index bb70eb3..1da1498 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
@@ -18,7 +18,7 @@ class DelegatesManager {
                 return delegate.itemViewType
             }
         }
-        throw IllegalStateException("Delegate not found")
+        throw IllegalStateException("Delegate not found for adapterPosition: $adapterPosition")
     }
 
     fun getItemId(items: List<*>, adapterPosition: Int, collectionPosition: Int): Long {
@@ -33,19 +33,12 @@ class DelegatesManager {
         delegate.onBindViewHolder(holder, items, adapterPosition, collectionPosition, payloads)
     }
 
-    /**
-     * Adds [ItemAdapterDelegate] to adapter.
-     *
-     * @param delegate Delegate to add.
-     */
-    fun addDelegate(delegate: ItemAdapterDelegate<*, *>) = delegates.put(delegate.itemViewType, delegate)
-
     /**
      * Adds [PositionAdapterDelegate] to adapter.
      *
      * @param delegate Delegate to add.
      */
-    fun addDelegate(delegate: PositionAdapterDelegate<*>) = delegates.put(delegate.itemViewType, delegate)
+    fun addDelegate(delegate: AdapterDelegate<*>) = delegates.put(delegate.itemViewType, delegate)
 
     /**
      * Removes [AdapterDelegate] from adapter.
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
index 24e56fb..edf4707 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -41,18 +41,18 @@ open class DelegationListAdapter<TItem>(diffCallback: DiffUtil.ItemCallback<TIte
     final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) = Unit
 
     /**
-     * Adds [ItemAdapterDelegate] to adapter.
+     * Adds [AdapterDelegate] to adapter.
      *
      * @param delegate Delegate to add.
      */
-    fun addDelegate(delegate: ItemAdapterDelegate<*, *>) = delegatesManager.addDelegate(delegate)
+    fun addDelegate(delegate: AdapterDelegate<*>) = delegatesManager.addDelegate(delegate)
 
     /**
-     * Adds [PositionAdapterDelegate] to adapter.
+     * Removes [AdapterDelegate] from adapter.
      *
-     * @param delegate Delegate to add.
+     * @param delegate Delegate to remove.
      */
-    fun addDelegate(delegate: PositionAdapterDelegate<*>) = delegatesManager.addDelegate(delegate)
+    fun removeDelegate(delegate: AdapterDelegate<*>) = delegatesManager.removeDelegate(delegate)
 
     /**
      * Submits a new list to be diffed, and displayed.
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
deleted file mode 100644
index dad6ee8..0000000
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.view.MenuItem;
-
-import io.reactivex.functions.Function;
-import ru.touchin.roboswag.core.log.Lc;
-
-/**
- * Created by Gavriil Sitnikov on 07/03/2016.
- * Navigation which is controlling fragments on activity using {@link android.support.v4.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;
- * 3) {@link #setAsTop} means to push fragment on top of the stack with specific {@link #TOP_FRAGMENT_TAG_MARK} tag.
- * It is useful to realize up/back navigation: if {@link #up()} method will be called then stack will go to nearest fragment with TOP tag.
- * If {@link #back()} method will be called then stack will go to previous fragment.
- * Usually such logic using to set as top fragments from sidebar and show hamburger when some of them appeared;
- * 4) {@link #pushForResult} means to push fragment with target fragment. It is also adding {@link #WITH_TARGET_FRAGMENT_TAG_MARK} tag.
- * Also if such up/back navigation logic is not OK then {@link #backTo(Function)} method could be used with any condition to back to.
- * In that case in any stack-change method it is allowed to setup fragment transactions.
- */
-public class FragmentNavigation {
-
-    protected static final String TOP_FRAGMENT_TAG_MARK = "TOP_FRAGMENT";
-    protected static final String WITH_TARGET_FRAGMENT_TAG_MARK = "FRAGMENT_WITH_TARGET";
-
-    @NonNull
-    private final Context context;
-    @NonNull
-    private final FragmentManager fragmentManager;
-    @IdRes
-    private final int containerViewId;
-
-    public FragmentNavigation(@NonNull final Context context, @NonNull final FragmentManager fragmentManager, @IdRes final int containerViewId) {
-        this.context = context;
-        this.fragmentManager = fragmentManager;
-        this.containerViewId = containerViewId;
-    }
-
-    /**
-     * Returns {@link Context} that is using to instantiate fragments.
-     *
-     * @return {@link Context}.
-     */
-    @NonNull
-    public Context getContext() {
-        return context;
-    }
-
-    /**
-     * Returns {@link FragmentManager} using for navigation.
-     *
-     * @return {@link FragmentManager}.
-     */
-    @NonNull
-    public FragmentManager getFragmentManager() {
-        return fragmentManager;
-    }
-
-    /**
-     * Returns if last fragment in stack is top (added by {@link #setAsTop} or {@link #setInitial}) like fragment from sidebar menu.
-     *
-     * @return True if last fragment on stack has TOP_FRAGMENT_TAG_MARK.
-     */
-    public boolean isCurrentFragmentTop() {
-        if (fragmentManager.getBackStackEntryCount() == 0) {
-            return true;
-        }
-
-        final String topFragmentTag = fragmentManager
-                .getBackStackEntryAt(fragmentManager.getBackStackEntryCount() - 1)
-                .getName();
-        return topFragmentTag != null && topFragmentTag.contains(TOP_FRAGMENT_TAG_MARK);
-    }
-
-    /**
-     * Allowed to react on {@link android.app.Activity}'s menu item selection.
-     *
-     * @param item Selected menu item;
-     * @return True if reaction fired.
-     */
-    @SuppressLint("InlinedApi")
-    //InlinedApi: it is ok as android.R.id.home contains in latest SDK
-    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
-        return item.getItemId() == android.R.id.home && back();
-    }
-
-    /**
-     * Base method which is adding fragment to stack.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param targetFragment   Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param addToStack       Flag to add this transaction to the back stack;
-     * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
-     * @param backStackTag     Tag of {@link Fragment} in back stack;
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    @SuppressLint("CommitTransaction")
-    //CommitTransaction: it is ok as we could setup transaction before commit
-    protected void addToStack(@NonNull final Class<? extends Fragment> fragmentClass,
-                              @Nullable final Fragment targetFragment,
-                              final boolean addToStack,
-                              @Nullable final Bundle args,
-                              @Nullable final String backStackTag,
-                              @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        if (fragmentManager.isDestroyed()) {
-            Lc.assertion("FragmentManager is destroyed");
-            return;
-        }
-
-        final Fragment fragment = Fragment.instantiate(context, fragmentClass.getName(), args);
-        if (targetFragment != null) {
-            if (fragmentManager != targetFragment.getFragmentManager()) {
-                Lc.assertion("FragmentManager of target is differ then of creating fragment. Target will be lost after restoring activity. "
-                        + targetFragment.getFragmentManager() + " != " + fragmentManager);
-            }
-            fragment.setTargetFragment(targetFragment, 0);
-        }
-
-        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction()
-                .replace(containerViewId, fragment, null);
-        if (addToStack) {
-            fragmentTransaction.addToBackStack(backStackTag);
-        }
-        if (fragmentManager.getBackStackEntryCount() != 0) {
-            fragmentTransaction.setTransition(getDefaultTransition());
-        }
-        if (transactionSetup != null) {
-            try {
-                transactionSetup.apply(fragmentTransaction).commit();
-            } catch (final Exception exception) {
-                Lc.assertion(exception);
-                fragmentTransaction.commit();
-            }
-        } else {
-            fragmentTransaction.commit();
-        }
-    }
-
-    /**
-     * Returns default transition animation.
-     *
-     * @return {@link FragmentTransaction#TRANSIT_FRAGMENT_OPEN}.
-     */
-    protected int getDefaultTransition() {
-        return FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
-    }
-
-    /**
-     * Simply calls {@link FragmentManager#popBackStack()}.
-     *
-     * @return True if it have back to some entry in stack.
-     */
-    public boolean back() {
-        if (fragmentManager.getBackStackEntryCount() > 1) {
-            fragmentManager.popBackStack();
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Backs to fragment which back stack's entry satisfy to specific condition.
-     *
-     * @param condition Condition of back stack entry to be satisfied;
-     * @return True if it have back to some entry in stack.
-     */
-    public boolean backTo(@NonNull final Function<FragmentManager.BackStackEntry, Boolean> condition) {
-        final int stackSize = fragmentManager.getBackStackEntryCount();
-        Integer id = null;
-        try {
-            for (int i = stackSize - 2; i >= 0; i--) {
-                final FragmentManager.BackStackEntry backStackEntry = fragmentManager.getBackStackEntryAt(i);
-                id = backStackEntry.getId();
-                if (condition.apply(backStackEntry)) {
-                    break;
-                }
-            }
-        } catch (final Exception exception) {
-            Lc.assertion(exception);
-            return false;
-        }
-        if (id != null) {
-            fragmentManager.popBackStack(id, 0);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Backs to fragment with specific {@link #TOP_FRAGMENT_TAG_MARK} tag.
-     * This tag is adding if fragment added to stack via {@link #setInitial} or {@link #setAsTop(Class)} methods.
-     * It can be used to create simple up/back navigation.
-     *
-     * @return True if it have back to some entry in stack.
-     */
-    @SuppressWarnings("PMD.ShortMethodName")
-    //ShortMethodName: it is ok because method name is good!
-    public boolean up() {
-        return backTo(backStackEntry ->
-                backStackEntry.getName() != null && backStackEntry.getName().endsWith(TOP_FRAGMENT_TAG_MARK));
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate.
-     */
-    public void push(@NonNull final Class<? extends Fragment> fragmentClass) {
-        addToStack(fragmentClass, null, true, null, null, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific arguments.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate;
-     * @param args          Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment}.
-     */
-    public void push(@NonNull final Class<? extends Fragment> fragmentClass,
-                     @NonNull final Bundle args) {
-        addToStack(fragmentClass, null, true, args, null, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific transaction setup.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void push(@NonNull final Class<? extends Fragment> fragmentClass,
-                     @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, true, null, null, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific arguments and transaction setup.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void push(@NonNull final Class<? extends Fragment> fragmentClass,
-                     @Nullable final Bundle args,
-                     @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, true, args, null, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific target fragment.
-     *
-     * @param fragmentClass  Class of {@link Fragment} to instantiate;
-     * @param targetFragment Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment}.
-     */
-    public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
-                              @NonNull final Fragment targetFragment) {
-        addToStack(fragmentClass, targetFragment, true, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific target fragment and arguments.
-     *
-     * @param fragmentClass  Class of {@link Fragment} to instantiate;
-     * @param targetFragment Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param args           Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment}.
-     */
-    public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
-                              @NonNull final Fragment targetFragment,
-                              @NonNull final Bundle args) {
-        addToStack(fragmentClass, targetFragment, true, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific target fragment and transaction setup.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param targetFragment   Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
-                              @NonNull final Fragment targetFragment,
-                              @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, true, null, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific target fragment, arguments and transaction setup.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param targetFragment   Target fragment to be set as {@link Fragment#getTargetFragment()} of instantiated {@link Fragment};
-     * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void pushForResult(@NonNull final Class<? extends Fragment> fragmentClass,
-                              @NonNull final Fragment targetFragment,
-                              @Nullable final Bundle args,
-                              @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, targetFragment, true, args, fragmentClass.getName() + ';' + WITH_TARGET_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate.
-     */
-    public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass) {
-        addToStack(fragmentClass, null, true, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific arguments and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate;
-     * @param args          Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment}.
-     */
-    public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
-                         @NonNull final Bundle args) {
-        addToStack(fragmentClass, null, true, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, null);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific transaction setup
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
-                         @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, true, null, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pushes {@link Fragment} on top of stack with specific transaction setup, arguments
-     * and with {@link #TOP_FRAGMENT_TAG_MARK} tag used for simple up/back navigation.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void setAsTop(@NonNull final Class<? extends Fragment> fragmentClass,
-                         @Nullable final Bundle args,
-                         @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        addToStack(fragmentClass, null, true, args, fragmentClass.getName() + ';' + TOP_FRAGMENT_TAG_MARK, transactionSetup);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link Fragment} on top of stack.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate.
-     */
-    public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass) {
-        setInitial(fragmentClass, null, null);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link Fragment} on top of stack with specific arguments.
-     *
-     * @param fragmentClass Class of {@link Fragment} to instantiate;
-     * @param args          Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment}.
-     */
-    public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass,
-                           @NonNull final Bundle args) {
-        setInitial(fragmentClass, args, null);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link Fragment} on top of stack with specific transaction setup.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass,
-                           @NonNull final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        setInitial(fragmentClass, null, transactionSetup);
-    }
-
-    /**
-     * Pops all {@link Fragment}s and places new initial {@link Fragment} on top of stack with specific transaction setup and arguments.
-     *
-     * @param fragmentClass    Class of {@link Fragment} to instantiate;
-     * @param args             Bundle to be set as {@link Fragment#getArguments()} of instantiated {@link Fragment};
-     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
-     */
-    public void setInitial(@NonNull final Class<? extends Fragment> fragmentClass,
-                           @Nullable final Bundle args,
-                           @Nullable final Function<FragmentTransaction, FragmentTransaction> transactionSetup) {
-        beforeSetInitialActions();
-        setAsTop(fragmentClass, args, transactionSetup);
-    }
-
-    /**
-     * Method calls every time before initial {@link Fragment} will be placed.
-     */
-    protected void beforeSetInitialActions() {
-        if (fragmentManager.isDestroyed()) {
-            Lc.assertion("FragmentManager is destroyed");
-            return;
-        }
-
-        if (fragmentManager.getBackStackEntryCount() > 0) {
-            fragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-        }
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
new file mode 100644
index 0000000..fe63d34
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -0,0 +1,261 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.view.MenuItem
+
+import ru.touchin.roboswag.core.log.Lc
+
+/**
+ * Created by Gavriil Sitnikov on 07/03/2016.
+ * Navigation which is controlling fragments on activity using [android.support.v4.app.FragmentManager].
+ * Basically there are 4 main actions to add fragments to activity.
+ * 1) [.setInitial] means to set fragment on top and remove all previously added fragments from stack;
+ * 2) [.push] means to simply add fragment on top of the stack;
+ * 3) [.setAsTop] means to push fragment on top of the stack with specific [.TOP_FRAGMENT_TAG_MARK] tag.
+ * It is useful to realize up/back navigation: if [.up] method will be called then stack will go to nearest fragment with TOP tag.
+ * If [.back] method will be called then stack will go to previous fragment.
+ * Usually such logic using to set as top fragments from sidebar and show hamburger when some of them appeared;
+ * 4) [.pushForResult] means to push fragment with target fragment. It is also adding [.WITH_TARGET_FRAGMENT_TAG_MARK] tag.
+ * Also if such up/back navigation logic is not OK then [.backTo] method could be used with any condition to back to.
+ * In that case in any stack-change method it is allowed to setup fragment transactions.
+ */
+open class FragmentNavigation(
+        private val context: Context,
+        private val fragmentManager: FragmentManager,
+        @IdRes private val containerViewId: Int,
+        private val transition: Int = FragmentTransaction.TRANSIT_FRAGMENT_OPEN
+) {
+
+    companion object {
+        const val TOP_FRAGMENT_TAG_MARK = "TOP_FRAGMENT"
+        const val WITH_TARGET_FRAGMENT_TAG_MARK = "FRAGMENT_WITH_TARGET"
+    }
+
+    /**
+     * Returns if last fragment in stack is top (added by [.setAsTop] or [.setInitial]) like fragment from sidebar menu.
+     *
+     * @return True if last fragment on stack has TOP_FRAGMENT_TAG_MARK.
+     */
+    fun isCurrentFragmentTop(): Boolean {
+        if (fragmentManager.backStackEntryCount == 0) {
+            return true
+        }
+        val topFragmentTag = fragmentManager
+                .getBackStackEntryAt(fragmentManager.backStackEntryCount - 1)
+                .name
+        return topFragmentTag != null && topFragmentTag.contains(TOP_FRAGMENT_TAG_MARK)
+    }
+
+    /**
+     * Allowed to react on [android.app.Activity]'s menu item selection.
+     *
+     * @param item Selected menu item;
+     * @return True if reaction fired.
+     */
+    fun onOptionsItemSelected(item: MenuItem): Boolean = item.itemId == android.R.id.home && back()
+
+    /**
+     * Base method which is adding fragment to stack.
+     *
+     * @param fragmentClass    Class of [Fragment] to instantiate;
+     * @param targetFragment   Target fragment to be set as [Fragment.getTargetFragment] of instantiated [Fragment];
+     * @param addToStack       Flag to add this transaction to the back stack;
+     * @param args             Bundle to be set as [Fragment.getArguments] of instantiated [Fragment];
+     * @param backStackTag     Tag of [Fragment] in back stack;
+     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
+     */
+    fun addToStack(
+            fragmentClass: Class<out Fragment>,
+            targetFragment: Fragment?,
+            targetRequestCode: Int,
+            addToStack: Boolean,
+            args: Bundle?,
+            backStackTag: String?,
+            transactionSetup: ((FragmentTransaction) -> Unit)?
+    ) {
+        if (fragmentManager.isDestroyed) {
+            Lc.assertion("FragmentManager is destroyed")
+            return
+        }
+
+        val fragment = Fragment.instantiate(context, fragmentClass.name, args)
+        if (targetFragment != null) {
+            if (fragmentManager !== targetFragment.fragmentManager) {
+                Lc.assertion("FragmentManager of target is differ then of creating fragment. Target will be lost after restoring activity. "
+                        + targetFragment.fragmentManager + " != " + fragmentManager)
+            }
+            fragment.setTargetFragment(targetFragment, targetRequestCode)
+        }
+
+        val fragmentTransaction = fragmentManager.beginTransaction()
+                .replace(containerViewId, fragment, null)
+        if (addToStack) {
+            fragmentTransaction.addToBackStack(backStackTag)
+        }
+        if (fragmentManager.backStackEntryCount != 0) {
+            fragmentTransaction.setTransition(transition)
+        }
+        transactionSetup?.invoke(fragmentTransaction)
+        fragmentTransaction.commit()
+    }
+
+    /**
+     * Simply calls [FragmentManager.popBackStack].
+     *
+     * @return True if it have back to some entry in stack.
+     */
+    fun back(): Boolean {
+        if (fragmentManager.backStackEntryCount > 1) {
+            fragmentManager.popBackStack()
+            return true
+        }
+        return false
+    }
+
+    /**
+     * Backs to fragment which back stack's entry satisfy to specific condition.
+     *
+     * @param condition Condition of back stack entry to be satisfied;
+     * @return True if it have back to some entry in stack.
+     */
+    fun backTo(condition: (FragmentManager.BackStackEntry) -> Boolean): Boolean {
+        val stackSize = fragmentManager.backStackEntryCount
+        var id: Int? = null
+        for (i in stackSize - 2 downTo 0) {
+            val backStackEntry = fragmentManager.getBackStackEntryAt(i)
+            if (condition(backStackEntry)) {
+                id = backStackEntry.id
+                break
+            }
+        }
+        if (id != null) {
+            fragmentManager.popBackStack(id, 0)
+            return true
+        }
+        return false
+    }
+
+    /**
+     * Backs to fragment with specific [.TOP_FRAGMENT_TAG_MARK] tag.
+     * This tag is adding if fragment added to stack via [.setInitial] or [.setAsTop] methods.
+     * It can be used to create simple up/back navigation.
+     *
+     * @return True if it have back to some entry in stack.
+     */
+    //ShortMethodName: it is ok because method name is good!
+    fun up(): Boolean = backTo { backStackEntry -> backStackEntry.name != null && backStackEntry.name.endsWith(TOP_FRAGMENT_TAG_MARK) }
+
+    /**
+     * Pushes [Fragment] on top of stack with specific arguments and transaction setup.
+     *
+     * @param fragmentClass    Class of [Fragment] to instantiate;
+     * @param args             Bundle to be set as [Fragment.getArguments] of instantiated [Fragment];
+     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
+     */
+    fun push(
+            fragmentClass: Class<out Fragment>,
+            args: Bundle? = null,
+            addToStack: Boolean = true,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
+    ) {
+        addToStack(fragmentClass, null, 0, addToStack, args, null, transactionSetup)
+    }
+
+    /**
+     * Pushes [Fragment] on top of stack with specific target fragment, arguments and transaction setup.
+     *
+     * @param fragmentClass    Class of [Fragment] to instantiate;
+     * @param targetFragment   Target fragment to be set as [Fragment.getTargetFragment] of instantiated [Fragment];
+     * @param args             Bundle to be set as [Fragment.getArguments] of instantiated [Fragment];
+     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
+     */
+    fun pushForResult(
+            fragmentClass: Class<out Fragment>,
+            targetFragment: Fragment,
+            targetRequestCode: Int,
+            args: Bundle? = null,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
+    ) {
+        addToStack(
+                fragmentClass,
+                targetFragment,
+                targetRequestCode,
+                true,
+                args,
+                fragmentClass.name + ';'.toString() + WITH_TARGET_FRAGMENT_TAG_MARK,
+                transactionSetup
+        )
+    }
+
+    /**
+     * Pushes [Fragment] on top of stack with specific transaction setup, arguments
+     * and with [.TOP_FRAGMENT_TAG_MARK] tag used for simple up/back navigation.
+     *
+     * @param fragmentClass    Class of [Fragment] to instantiate;
+     * @param args             Bundle to be set as [Fragment.getArguments] of instantiated [Fragment];
+     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
+     */
+    fun setAsTop(
+            fragmentClass: Class<out Fragment>,
+            args: Bundle? = null,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
+    ) {
+        addToStack(fragmentClass, null, 0, true, args, fragmentClass.name + ';'.toString() + TOP_FRAGMENT_TAG_MARK, transactionSetup)
+    }
+
+    /**
+     * Pops all [Fragment]s and places new initial [Fragment] on top of stack with specific transaction setup and arguments.
+     *
+     * @param fragmentClass    Class of [Fragment] to instantiate;
+     * @param args             Bundle to be set as [Fragment.getArguments] of instantiated [Fragment];
+     * @param transactionSetup Function to setup transaction before commit. It is useful to specify transition animations or additional info.
+     */
+    @JvmOverloads
+    fun setInitial(
+            fragmentClass: Class<out Fragment>,
+            args: Bundle? = null,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
+    ) {
+        beforeSetInitialActions()
+        setAsTop(fragmentClass, args, transactionSetup)
+    }
+
+    /**
+     * Method calls every time before initial [Fragment] will be placed.
+     */
+    protected fun beforeSetInitialActions() {
+        if (fragmentManager.isDestroyed) {
+            Lc.assertion("FragmentManager is destroyed")
+            return
+        }
+
+        if (fragmentManager.backStackEntryCount > 0) {
+            fragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+        }
+    }
+
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index a63a0be..91e4c87 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -107,6 +107,8 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
     private ViewController viewController;
     private Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>> viewControllerClass;
     private TState state;
+    @Nullable
+    private ActivityResult pendingActivityResult;
 
     /**
      * Returns specific {@link Parcelable} which contains state of fragment and it's {@link ViewController}.
@@ -192,6 +194,10 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
         //noinspection ConstantConditions
         viewController = createViewController(requireActivity(), (PlaceholderView) getView(), savedInstanceState);
         viewController.onCreate();
+        if (pendingActivityResult != null) {
+            viewController.onActivityResult(pendingActivityResult.requestCode, pendingActivityResult.resultCode, pendingActivityResult.data);
+            pendingActivityResult = null;
+        }
         requireActivity().invalidateOptionsMenu();
     }
 
@@ -286,8 +292,9 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
     public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
         if (viewController != null) {
             viewController.onActivityResult(requestCode, resultCode, data);
+        } else {
+            pendingActivityResult = new ActivityResult(requestCode, resultCode, data);
         }
-        super.onActivityResult(requestCode, resultCode, data);
     }
 
     private static class PlaceholderView extends FrameLayout {
@@ -323,4 +330,17 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
 
     }
 
+    private static class ActivityResult {
+        final int requestCode;
+        final int resultCode;
+        @Nullable
+        final Intent data;
+
+        ActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+            this.requestCode = requestCode;
+            this.resultCode = resultCode;
+            this.data = data;
+        }
+    }
+
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index 54c9cf6..5cd873f 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -19,6 +19,7 @@
 
 package ru.touchin.roboswag.components.navigation.fragments;
 
+import android.arch.lifecycle.Lifecycle;
 import android.os.Bundle;
 import android.support.annotation.CallSuper;
 import android.support.annotation.NonNull;
@@ -42,7 +43,6 @@ import ru.touchin.roboswag.core.log.Lc;
 public abstract class ViewFragment<TActivity extends FragmentActivity> extends Fragment implements OnFragmentStartedListener {
 
     private boolean appeared;
-    private boolean started;
 
     /**
      * Returns if fragment have parent fragment.
@@ -111,7 +111,6 @@ public abstract class ViewFragment<TActivity extends FragmentActivity> extends F
     @Override
     public void onStart() {
         super.onStart();
-        started = true;
         callMethodAfterInstantiation(this::onStart);
     }
 
@@ -168,6 +167,7 @@ public abstract class ViewFragment<TActivity extends FragmentActivity> extends F
     public void setMenuVisibility(final boolean menuVisible) {
         super.setMenuVisibility(menuVisible);
         if (getBaseActivity() != null && getView() != null) {
+            final boolean started = getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
             if (!appeared && menuVisible && started) {
                 onAppear(getView(), getBaseActivity());
             }
@@ -209,7 +209,6 @@ public abstract class ViewFragment<TActivity extends FragmentActivity> extends F
     @Deprecated
     @Override
     public void onStop() {
-        started = false;
         callMethodAfterInstantiation(this::onStop);
         super.onStop();
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index ba67da9..dde03c9 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -27,7 +27,6 @@ import android.support.v4.app.FragmentActivity
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentTransaction
 
-import io.reactivex.functions.Function
 import ru.touchin.roboswag.components.navigation.FragmentNavigation
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
 
@@ -41,38 +40,34 @@ import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragmen
 open class ViewControllerNavigation<TActivity : FragmentActivity>(
         context: Context,
         fragmentManager: FragmentManager,
-        @IdRes containerViewId: Int
-) : FragmentNavigation(context, fragmentManager, containerViewId) {
+        @IdRes containerViewId: Int,
+        transition: Int = FragmentTransaction.TRANSIT_FRAGMENT_OPEN
+) : FragmentNavigation(context, fragmentManager, containerViewId, transition) {
 
     /**
      * Pushes [ViewController] on top of stack with specific [ViewControllerFragment.getState] and with specific transaction setup.
      *
      * @param viewControllerClass Class of [ViewController] to be pushed;
      * @param state               [Parcelable] of [ViewController]'s fragment;
+     * @param addToStack          Flag to add this transaction to the back stack;
      * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushViewController(
             viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+            addToStack: Boolean = true,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
-        addViewControllerToStack(viewControllerClass, null, true, state, null, transactionSetup)
-    }
-
-    /**
-     * Pushes [ViewController] without adding to stack and with specific [ViewControllerFragment.getState].
-     *
-     * @param viewControllerClass Class of [ViewController] to be pushed;
-     * @param state               [Parcelable] of [ViewController]'s fragment;
-     * @param TState              Type of state of fragment.
-     */
-    fun <TState : Parcelable> pushSingleViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
-            state: TState,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
-    ) {
-        addViewControllerToStack(viewControllerClass, null, false, state, null, transactionSetup)
+        addToStack(
+                ViewControllerFragment::class.java,
+                null,
+                0,
+                addToStack,
+                ViewControllerFragment.args(viewControllerClass, state),
+                null,
+                transactionSetup
+        )
     }
 
     /**
@@ -90,13 +85,15 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
             viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
             targetFragment: TTargetFragment,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+            targetRequestCode: Int,
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
-        addViewControllerToStack(
-                viewControllerClass,
+        addToStack(
+                ViewControllerFragment::class.java,
                 targetFragment,
+                targetRequestCode,
                 true,
-                state,
+                ViewControllerFragment.args(viewControllerClass, state),
                 viewControllerClass.name + ';'.toString() + WITH_TARGET_FRAGMENT_TAG_MARK,
                 transactionSetup
         )
@@ -114,13 +111,14 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
     fun <TState : Parcelable> setViewControllerAsTop(
             viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
-        addViewControllerToStack(
-                viewControllerClass,
+        addToStack(
+                ViewControllerFragment::class.java,
                 null,
+                0,
                 true,
-                state,
+                ViewControllerFragment.args(viewControllerClass, state),
                 viewControllerClass.name + ';'.toString() + TOP_FRAGMENT_TAG_MARK,
                 transactionSetup
         )
@@ -138,38 +136,10 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
     fun <TState : Parcelable> setInitialViewController(
             viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
             state: TState,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>? = null
+            transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
         beforeSetInitialActions()
         setViewControllerAsTop(viewControllerClass, state, transactionSetup)
     }
 
-    /**
-     * Base method to push stateful [ViewControllerFragment] to stack.
-     *
-     * @param viewControllerClass Class of [ViewController] to be pushed;
-     * @param targetFragment      [ViewControllerFragment] to be set as target;
-     * @param state               [Parcelable] of [ViewController]'s fragment;
-     * @param backStackTag        Tag of [ViewControllerFragment] in back stack;
-     * @param transactionSetup    Function to setup transaction before commit. It is useful to specify transition animations or additional info;
-     * @param TState              Type of state of fragment.
-     */
-    protected fun <TState : Parcelable> addViewControllerToStack(
-            viewControllerClass: Class<out ViewController<TActivity, out ViewControllerFragment<TState, TActivity>, TState>>,
-            targetFragment: Fragment?,
-            addToStack: Boolean,
-            state: TState,
-            backStackTag: String?,
-            transactionSetup: Function<FragmentTransaction, FragmentTransaction>?
-    ) {
-        addToStack(
-                ViewControllerFragment::class.java,
-                targetFragment,
-                addToStack,
-                ViewControllerFragment.args(viewControllerClass, state),
-                backStackTag,
-                transactionSetup
-        )
-    }
-
 }

From 7e35087c0aed34f7d049203637a319071e603281 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 20 Mar 2018 18:05:28 +0300
Subject: [PATCH 46/95] Diff config for DelegationListAdapter, added
 DefaultViewController

---
 .../components/adapters/DelegatesManager.kt   |  3 +-
 .../adapters/DelegationListAdapter.kt         | 30 +++++++++++--------
 .../adapters/ItemAdapterDelegate.java         |  2 +-
 .../viewcontrollers/DefaultViewController.kt  | 22 ++++++++++++++
 4 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
index 1da1498..e3ba14f 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
@@ -47,7 +47,6 @@ class DelegatesManager {
      */
     fun removeDelegate(delegate: AdapterDelegate<*>) = delegates.remove(delegate.itemViewType)
 
-    private fun getDelegate(viewType: Int): AdapterDelegate<*> =
-            delegates[viewType] ?: throw IllegalStateException("No AdapterDelegate added for view type: $viewType")
+    private fun getDelegate(viewType: Int) = delegates[viewType] ?: throw IllegalStateException("No AdapterDelegate added for view type: $viewType")
 
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
index edf4707..8f22d28 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -9,31 +9,35 @@ import android.view.ViewGroup
 /**
  * Base adapter with delegation and diff computing on background thread.
  */
-open class DelegationListAdapter<TItem>(diffCallback: DiffUtil.ItemCallback<TItem>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+open class DelegationListAdapter<TItem>(config: AsyncDifferConfig<TItem>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    constructor(diffCallback: DiffUtil.ItemCallback<TItem>) : this(AsyncDifferConfig.Builder<TItem>(diffCallback).build())
 
     var itemClickListener: ((TItem, RecyclerView.ViewHolder) -> Unit)? = null
 
     private val delegatesManager = DelegatesManager()
-    private var differ = AsyncListDiffer(OffsetAdapterUpdateCallback(this, ::getHeadersCount), AsyncDifferConfig.Builder<TItem>(diffCallback).build())
+    private var differ = AsyncListDiffer(OffsetAdapterUpdateCallback(this, ::getHeadersCount), config)
 
-    open fun getHeadersCount(): Int = 0
+    open fun getHeadersCount() = 0
 
-    open fun getFootersCount(): Int = 0
+    open fun getFootersCount() = 0
 
-    override fun getItemCount(): Int = getHeadersCount() + differ.currentList.size + getFootersCount()
+    override fun getItemCount() = getHeadersCount() + getList().size + getFootersCount()
 
-    override fun getItemViewType(position: Int): Int = delegatesManager.getItemViewType(getList(), position, getCollectionPosition(position))
+    override fun getItemViewType(position: Int) = delegatesManager.getItemViewType(getList(), position, getCollectionPosition(position))
 
-    override fun getItemId(position: Int): Long = delegatesManager.getItemId(getList(), position, getCollectionPosition(position))
+    override fun getItemId(position: Int) = delegatesManager.getItemId(getList(), position, getCollectionPosition(position))
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = delegatesManager.onCreateViewHolder(parent, viewType)
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = delegatesManager.onCreateViewHolder(parent, viewType)
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any>) {
         val collectionPosition = getCollectionPosition(position)
-        if (itemClickListener != null && collectionPosition in 0 until getList().size) {
-            holder.itemView.setOnClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
-        } else {
-            holder.itemView.setOnClickListener(null)
+        if (collectionPosition in 0 until getList().size) {
+            if (itemClickListener != null) {
+                holder.itemView.setOnClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
+            } else {
+                holder.itemView.setOnClickListener(null)
+            }
         }
         delegatesManager.onBindViewHolder(holder, getList(), position, collectionPosition, payloads)
     }
@@ -77,6 +81,6 @@ open class DelegationListAdapter<TItem>(diffCallback: DiffUtil.ItemCallback<TIte
      */
     fun getList(): List<TItem> = differ.currentList
 
-    fun getCollectionPosition(adapterPosition: Int): Int = adapterPosition - getHeadersCount()
+    fun getCollectionPosition(adapterPosition: Int) = adapterPosition - getHeadersCount()
 
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
index 44a9902..324bcf4 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -13,7 +13,6 @@ import java.util.List;
  * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate;
  * @param <TItem>       Type of items to bind to {@link RecyclerView.ViewHolder}s.
  */
-@SuppressWarnings("unchecked")
 public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
 
     @Override
@@ -38,6 +37,7 @@ public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewH
 
     @Override
     public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        //noinspection unchecked
         return getItemId((TItem) items.get(collectionPosition), adapterPosition, collectionPosition);
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
new file mode 100644
index 0000000..41326ba
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
@@ -0,0 +1,22 @@
+package ru.touchin.roboswag.components.navigation.viewcontrollers
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.support.annotation.LayoutRes
+import android.support.v4.app.FragmentActivity
+import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
+
+abstract class DefaultViewController<TActivity : FragmentActivity, TState : Parcelable>(
+        @LayoutRes layoutRes: Int,
+        creationContext: CreationContext,
+        savedInstanceState: Bundle?
+) : ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>(
+        creationContext,
+        savedInstanceState
+) {
+
+    init {
+        setContentView(layoutRes)
+    }
+
+}

From bbc73d3d129892dff885b0a06ee91a8646a1bb56 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 21 Mar 2018 16:51:31 +0300
Subject: [PATCH 47/95] SoftInput method moved to UiUtils

---
 .../SimpleActionBarDrawerToggle.java          |  9 ++-
 .../navigation/activities/BaseActivity.java   | 73 +------------------
 .../fragments/ViewControllerFragment.java     |  6 +-
 .../viewcontrollers/DefaultViewController.kt  |  2 +-
 .../viewcontrollers/ViewController.java       |  4 +-
 .../ViewControllerNavigation.kt               |  8 +-
 .../roboswag/components/utils/UiUtils.java    | 37 ++++++++++
 7 files changed, 56 insertions(+), 83 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
index 423fc98..e2d88f6 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
@@ -29,6 +29,7 @@ import android.view.MenuItem;
 import android.view.View;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
+import ru.touchin.roboswag.components.utils.UiUtils;
 
 /**
  * Created by Gavriil Sitnikov on 11/03/16.
@@ -206,7 +207,7 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
     @Override
     public void onDrawerClosed(@NonNull final View view) {
         if (isInvalidateOptionsMenuSupported) {
-            activity.supportInvalidateOptionsMenu();
+            activity.invalidateOptionsMenu();
         }
     }
 
@@ -221,9 +222,9 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
 
     @Override
     public void onDrawerOpened(@NonNull final View drawerView) {
-        activity.hideSoftInput();
+        UiUtils.OfViews.hideSoftInput(activity);
         if (isInvalidateOptionsMenuSupported) {
-            activity.supportInvalidateOptionsMenu();
+            activity.invalidateOptionsMenu();
         }
     }
 
@@ -245,4 +246,4 @@ public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
         super.onDrawerSlide(drawerView, this.slideOffset);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 762d926..974fa46 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -19,21 +19,14 @@
 
 package ru.touchin.roboswag.components.navigation.activities;
 
-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.v4.util.ArraySet;
 import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 
-import java.util.ArrayList;
+import java.util.Set;
 
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
@@ -45,7 +38,7 @@ import ru.touchin.roboswag.core.log.Lc;
 public abstract class BaseActivity extends AppCompatActivity {
 
     @NonNull
-    private final ArrayList<OnBackPressedListener> onBackPressedListeners = new ArrayList<>();
+    private final Set<OnBackPressedListener> onBackPressedListeners = new ArraySet<>();
 
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
@@ -101,59 +94,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onDestroy();
     }
 
-    /**
-     * Hides device keyboard that is showing over {@link Activity}.
-     * Do NOT use it if keyboard is over {@link android.app.Dialog} - it won't work as they have different {@link Activity#getWindow()}.
-     */
-    public void hideSoftInput() {
-        if (getCurrentFocus() == null) {
-            return;
-        }
-        final InputMethodManager inputManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-        inputManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
-        getWindow().getDecorView().requestFocus();
-    }
-
-    /**
-     * Shows device keyboard over {@link Activity} and focuses {@link View}.
-     * Do NOT use it if keyboard is over {@link android.app.Dialog} - it won't work as they have different {@link Activity#getWindow()}.
-     * Do NOT use it if you are not sure that view is already added on screen.
-     * Better use it onStart of element if view is part of it or onConfigureNavigation if view is part of navigation.
-     *
-     * @param view View to get focus for input from keyboard.
-     */
-    public void showSoftInput(@NonNull final View view) {
-        view.requestFocus();
-        final InputMethodManager inputManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-        inputManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-    }
-
-    /**
-     * Return the color value associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
-     * color will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return int A single color value in the form 0xAARRGGBB.
-     */
-    @ColorInt
-    public int getColorCompat(@ColorRes final int resId) {
-        return ContextCompat.getColor(this, resId);
-    }
-
-    /**
-     * Returns a drawable object associated with a particular resource ID.
-     * Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the
-     * returned drawable will be styled for the specified Context's theme.
-     *
-     * @param resId The resource id to search for data;
-     * @return Drawable An object that can be used to draw this resource.
-     */
-    @Nullable
-    public Drawable getDrawableCompat(@DrawableRes final int resId) {
-        return ContextCompat.getDrawable(this, resId);
-    }
-
     public void addOnBackPressedListener(@NonNull final OnBackPressedListener onBackPressedListener) {
         onBackPressedListeners.add(onBackPressedListener);
     }
@@ -169,12 +109,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                 return;
             }
         }
-
-        if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
-            supportFinishAfterTransition();
-        } else {
-            getSupportFragmentManager().popBackStack();
-        }
+        super.onBackPressed();
     }
 
     /*
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 91e4c87..68f9be0 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -51,7 +51,7 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * @param <TState>    Type of object which is representing it's fragment state;
  * @param <TActivity> Type of {@link FragmentActivity} where fragment could be attached to.
  */
-public class ViewControllerFragment<TState extends Parcelable, TActivity extends FragmentActivity> extends ViewFragment<TActivity> {
+public class ViewControllerFragment<TActivity extends FragmentActivity, TState extends Parcelable> extends ViewFragment<TActivity> {
 
     private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
     private static final String VIEW_CONTROLLER_STATE_EXTRA = "VIEW_CONTROLLER_STATE_EXTRA";
@@ -105,7 +105,7 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
 
     @Nullable
     private ViewController viewController;
-    private Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>> viewControllerClass;
+    private Class<ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>> viewControllerClass;
     private TState state;
     @Nullable
     private ActivityResult pendingActivityResult;
@@ -127,7 +127,7 @@ public class ViewControllerFragment<TState extends Parcelable, TActivity extends
         setHasOptionsMenu(!isChildFragment());
 
         //noinspection unchecked
-        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>)
+        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>)
                 getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
         state = savedInstanceState != null
                 ? savedInstanceState.getParcelable(VIEW_CONTROLLER_STATE_EXTRA)
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
index 41326ba..6b5014b 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
@@ -10,7 +10,7 @@ abstract class DefaultViewController<TActivity : FragmentActivity, TState : Parc
         @LayoutRes layoutRes: Int,
         creationContext: CreationContext,
         savedInstanceState: Bundle?
-) : ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>(
+) : ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>(
         creationContext,
         savedInstanceState
 ) {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index ab3a618..42ecaf5 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -51,7 +51,7 @@ import ru.touchin.roboswag.core.log.Lc;
  */
 public class ViewController<
         TActivity extends FragmentActivity,
-        TFragment extends ViewControllerFragment<TState, TActivity>,
+        TFragment extends ViewControllerFragment<TActivity, TState>,
         TState extends Parcelable> implements LifecycleOwner {
 
     @NonNull
@@ -276,7 +276,7 @@ public class ViewController<
      * Callback from parent fragment.
      */
     public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        // do nothing
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index dde03c9..103c9f7 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -54,7 +54,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
             state: TState,
             addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
@@ -82,7 +82,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TTargetFragment     Type of target fragment.
      */
     fun <TState : Parcelable, TTargetFragment : Fragment> pushViewControllerForResult(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
             state: TState,
             targetFragment: TTargetFragment,
             targetRequestCode: Int,
@@ -109,7 +109,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setViewControllerAsTop(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
             state: TState,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
@@ -134,7 +134,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setInitialViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TState, TActivity>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
             state: TState,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 985e9e2..9343d00 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -41,6 +41,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 
 import io.reactivex.functions.Action;
 import io.reactivex.functions.Consumer;
@@ -307,6 +308,42 @@ public final class UiUtils {
             }
         }
 
+        /**
+         * Hides device keyboard for target activity.
+         */
+        public static void hideSoftInput(@NonNull final Activity activity) {
+            final View focusedView = activity.getCurrentFocus();
+            if (focusedView != null) {
+                hideSoftInput(focusedView);
+            }
+        }
+
+        /**
+         * Hides device keyboard for target view.
+         */
+        public static void hideSoftInput(@NonNull final View view) {
+            view.clearFocus();
+            final InputMethodManager inputManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (inputManager != null) {
+                inputManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+            }
+        }
+
+        /**
+         * Shows device keyboard over {@link Activity} and focuses {@link View}.
+         * Do NOT use it if keyboard is over {@link android.app.Dialog} - it won't work as they have different {@link Activity#getWindow()}.
+         * Do NOT use it if you are not sure that view is already added on screen.
+         *
+         * @param view View to get focus for input from keyboard.
+         */
+        public static void showSoftInput(@NonNull final View view) {
+            view.requestFocus();
+            final InputMethodManager inputManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (inputManager != null) {
+                inputManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+            }
+        }
+
         private OfViews() {
         }
 

From cd9db1203a6206fcdeb98d85d93c76e5fc7952ed Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 27 Mar 2018 17:40:34 +0300
Subject: [PATCH 48/95] Flowable handling

---
 .../utils/destroyable/BaseDestroyable.kt      | 11 +++++++++++
 .../utils/destroyable/Destroyable.kt          | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
index dae5cd3..f2a47a9 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
@@ -1,6 +1,7 @@
 package ru.touchin.roboswag.components.utils.destroyable
 
 import io.reactivex.Completable
+import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -21,6 +22,16 @@ open class BaseDestroyable : Destroyable {
      */
     fun onDestroy() = subscriptions.dispose()
 
+    override fun <T> untilDestroy(
+            flowable: Flowable<T>,
+            onNextAction: (T) -> Unit,
+            onErrorAction: (Throwable) -> Unit,
+            onCompletedAction: () -> Unit
+    ): Disposable = flowable
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(onNextAction, onErrorAction, onCompletedAction)
+            .also { subscriptions.add(it) }
+
     override fun <T> untilDestroy(
             observable: Observable<T>,
             onNextAction: (T) -> Unit,
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
index ea2e1eb..6d2aea7 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
@@ -1,6 +1,7 @@
 package ru.touchin.roboswag.components.utils.destroyable
 
 import io.reactivex.Completable
+import io.reactivex.Flowable
 import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
@@ -23,6 +24,24 @@ interface Destroyable {
         }
     }
 
+    /**
+     * Method should be used to guarantee that observable won't be subscribed after onDestroy.
+     * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
+     * Don't forget to process errors if observable can emit them.
+     *
+     * @param flowable      [Flowable] to subscribe until onDestroy;
+     * @param onNextAction  Action which will raise on every [io.reactivex.Emitter.onNext] item;
+     * @param onErrorAction Action which will raise on every [io.reactivex.Emitter.onError] throwable;
+     * @param T             Type of emitted by observable items;
+     * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
+     */
+    fun <T> untilDestroy(
+            flowable: Flowable<T>,
+            onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+    ): Disposable
+
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
      * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.

From 496abde610653ebb5d6553c6b95a042db8d0d868 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 30 Mar 2018 15:25:22 +0300
Subject: [PATCH 49/95] setOnRippleClickListener moved to extension

---
 .../adapters/DelegationListAdapter.kt         |  3 +-
 .../roboswag/components/extensions/View.kt    | 23 +++++++
 .../roboswag/components/utils/UiUtils.java    | 69 -------------------
 3 files changed, 25 insertions(+), 70 deletions(-)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/View.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
index 8f22d28..b8115d1 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -5,6 +5,7 @@ import android.support.v7.recyclerview.extensions.AsyncListDiffer
 import android.support.v7.util.DiffUtil
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
+import ru.touchin.roboswag.components.extensions.setOnRippleClickListener
 
 /**
  * Base adapter with delegation and diff computing on background thread.
@@ -34,7 +35,7 @@ open class DelegationListAdapter<TItem>(config: AsyncDifferConfig<TItem>) : Recy
         val collectionPosition = getCollectionPosition(position)
         if (collectionPosition in 0 until getList().size) {
             if (itemClickListener != null) {
-                holder.itemView.setOnClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
+                holder.itemView.setOnRippleClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
             } else {
                 holder.itemView.setOnClickListener(null)
             }
diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/View.kt b/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
new file mode 100644
index 0000000..89744f6
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
@@ -0,0 +1,23 @@
+package ru.touchin.roboswag.components.extensions
+
+import android.os.Build
+import android.view.View
+
+private const val RIPPLE_EFFECT_DELAY = 150L
+
+/**
+ * Sets click listener to view. On click it will call something after delay.
+ *
+ * @param delay     Delay after which click listener will be called;
+ * @param listener  Click listener.
+ */
+fun View.setOnRippleClickListener(delay: Long = RIPPLE_EFFECT_DELAY, listener: (View) -> Unit) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        setOnClickListener { view ->
+            handler?.removeCallbacksAndMessages(null)
+            postDelayed({ if (hasWindowFocus()) listener(view) }, delay)
+        }
+    } else {
+        setOnClickListener(listener)
+    }
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index 9343d00..b6eb724 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -21,17 +21,12 @@ package ru.touchin.roboswag.components.utils;
 
 import android.app.Activity;
 import android.app.Application;
-import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.Display;
@@ -43,9 +38,6 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
 
 /**
@@ -62,12 +54,6 @@ public final class UiUtils {
      * Logging group to log UI lifecycle (onCreate, onStart, onResume etc.).
      */
     public static final LcGroup UI_LIFECYCLE_LC_GROUP = new LcGroup("UI_LIFECYCLE");
-    /**
-     * Delay to let user view ripple effect before screen changed.
-     */
-    public static final long RIPPLE_EFFECT_DELAY = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? 150 : 0;
-
-    private static final Handler RIPPLE_HANDLER = new Handler(Looper.getMainLooper());
 
     /**
      * Method to inflate view with right layout parameters based on container and add inflated view as a child to it.
@@ -94,61 +80,6 @@ public final class UiUtils {
         return LayoutInflater.from(parent.getContext()).inflate(layoutId, parent, false);
     }
 
-    /**
-     * Sets click listener to view. On click it will call something after delay.
-     *
-     * @param targetView      View to set click listener to;
-     * @param onClickListener Click listener;
-     * @param delay           Delay after which click listener will be called.
-     */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener, final long delay) {
-        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, delay);
-    }
-
-    /**
-     * Sets click listener to view. On click it will call something with {@link #RIPPLE_EFFECT_DELAY}.
-     *
-     * @param targetView      View to set click listener to;
-     * @param onClickListener Click listener.
-     */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Action onClickListener) {
-        setOnRippleClickListener(targetView, onClickListener != null ? view -> onClickListener.run() : null, RIPPLE_EFFECT_DELAY);
-    }
-
-    /**
-     * Sets click listener to view. On click it will call something after delay.
-     *
-     * @param targetView      View to set click listener to;
-     * @param onClickListener Click listener;
-     * @param delay           Delay after which click listener will be called.
-     */
-    public static void setOnRippleClickListener(@NonNull final View targetView, @Nullable final Consumer<View> onClickListener, final long delay) {
-        if (onClickListener == null) {
-            targetView.setOnClickListener(null);
-            return;
-        }
-
-        final Runnable runnable = () -> {
-            final Context context = targetView.getContext();
-            if (targetView.getWindowVisibility() != View.VISIBLE
-                    || !targetView.hasWindowFocus()
-                    || (context instanceof LifecycleOwner
-                    && !((LifecycleOwner) context).getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))) {
-                return;
-            }
-            try {
-                onClickListener.accept(targetView);
-            } catch (final Exception exception) {
-                Lc.assertion(exception);
-            }
-        };
-
-        targetView.setOnClickListener(v -> {
-            RIPPLE_HANDLER.removeCallbacksAndMessages(null);
-            RIPPLE_HANDLER.postDelayed(runnable, delay);
-        });
-    }
-
     private UiUtils() {
     }
 

From 399ec7d7f5bc6b32c71cf5972787ec1ae4a5b54b Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 30 Mar 2018 16:24:27 +0300
Subject: [PATCH 50/95] Getters for compat resources

---
 .../viewcontrollers/ViewController.java       | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 42ecaf5..0a627f0 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -23,15 +23,22 @@ import android.arch.lifecycle.Lifecycle;
 import android.arch.lifecycle.LifecycleOwner;
 import android.arch.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.content.ContextCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -166,6 +173,72 @@ public class ViewController<
         return getContainer().findViewById(id);
     }
 
+    /**
+     * Return a localized string from the application's package's default string table.
+     *
+     * @param resId Resource id for the string
+     */
+    @NonNull
+    public final String getString(@StringRes final int resId) {
+        return getActivity().getString(resId);
+    }
+
+    /**
+     * Return a localized formatted string from the application's package's default string table, substituting the format arguments as defined in
+     * {@link java.util.Formatter} and {@link java.lang.String#format}.
+     *
+     * @param resId      Resource id for the format string
+     * @param formatArgs The format arguments that will be used for substitution.
+     */
+    @NonNull
+    public final String getString(@StringRes final int resId, @NonNull final Object... formatArgs) {
+        return getActivity().getString(resId, formatArgs);
+    }
+
+    /**
+     * Return the color value associated with a particular resource ID.
+     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
+     * color will be styled for the specified Context's theme.
+     *
+     * @param resId The resource id to search for data;
+     * @return int A single color value in the form 0xAARRGGBB.
+     */
+    @ColorInt
+    public final int getColor(@ColorRes final int resId) {
+        return ContextCompat.getColor(activity, resId);
+    }
+
+    /**
+     * Returns a color state list associated with a particular resource ID.
+     * <p>
+     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
+     * color state list will be styled for the specified Context's theme.
+     *
+     * @param resId The desired resource identifier, as generated by the aapt
+     *              tool. This integer encodes the package, type, and resource
+     *              entry. The value 0 is an invalid identifier.
+     * @return A color state list, or {@code null} if the resource could not be resolved.
+     * @throws android.content.res.Resources.NotFoundException if the given ID
+     *                                                         does not exist.
+     */
+    @Nullable
+    public final ColorStateList getColorStateList(@ColorRes final int resId) {
+        return ContextCompat.getColorStateList(getActivity(), resId);
+    }
+
+    /**
+     * Returns a drawable object associated with a particular resource ID.
+     * Starting in {@link android.os.Build.VERSION_CODES#LOLLIPOP}, the
+     * returned drawable will be styled for the specified Context's theme.
+     *
+     * @param resId The resource id to search for data;
+     * @return Drawable An object that can be used to draw this resource.
+     */
+    @Nullable
+    public final Drawable getDrawable(@DrawableRes final int resId) {
+        return ContextCompat.getDrawable(getActivity(), resId);
+    }
+
     /**
      * Calls when activity configuring ActionBar, Toolbar, Sidebar etc.
      * If it will be called or not depends on {@link Fragment#hasOptionsMenu()} and {@link Fragment#isMenuVisible()}.

From 0cbf55d81bdff72e13b73caa85bbe105c27f8553 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 30 Mar 2018 18:19:11 +0300
Subject: [PATCH 51/95] ViewHolder extensions

---
 .../components/extensions/ViewHolder.kt       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
new file mode 100644
index 0000000..f3601c7
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@@ -0,0 +1,26 @@
+package ru.touchin.roboswag.components.extensions
+
+import android.content.res.ColorStateList
+import android.graphics.drawable.Drawable
+import android.support.annotation.ColorInt
+import android.support.annotation.ColorRes
+import android.support.annotation.IdRes
+import android.support.annotation.StringRes
+import android.support.v4.content.ContextCompat
+import android.support.v7.widget.RecyclerView
+import android.view.View
+
+fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)
+
+fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = itemView.context.getText(resId)
+
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = itemView.context.getString(resId)
+
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = itemView.context.getString(resId, args)
+
+@ColorInt
+fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(itemView.context, resId)
+
+fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(itemView.context, resId)
+
+fun RecyclerView.ViewHolder.getDrawable(@ColorRes resId: Int): Drawable? = ContextCompat.getDrawable(itemView.context, resId)

From b06a1232b715e185686f309c913ce4521446b8ed Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 30 Mar 2018 18:25:42 +0300
Subject: [PATCH 52/95] getText in ViewController

---
 .../components/extensions/ViewHolder.kt       |  3 ++-
 .../viewcontrollers/ViewController.java       | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
index f3601c7..e1ea239 100644
--- a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@@ -4,6 +4,7 @@ import android.content.res.ColorStateList
 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.StringRes
 import android.support.v4.content.ContextCompat
@@ -23,4 +24,4 @@ fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.
 
 fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(itemView.context, resId)
 
-fun RecyclerView.ViewHolder.getDrawable(@ColorRes resId: Int): Drawable? = ContextCompat.getDrawable(itemView.context, resId)
+fun RecyclerView.ViewHolder.getDrawable(@DrawableRes resId: Int): Drawable? = ContextCompat.getDrawable(itemView.context, resId)
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 0a627f0..7111d99 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -173,6 +173,17 @@ public class ViewController<
         return getContainer().findViewById(id);
     }
 
+    /**
+     * Return a localized, styled CharSequence from the application's package's
+     * default string table.
+     *
+     * @param resId Resource id for the CharSequence text
+     */
+    @NonNull
+    public final CharSequence getText(@StringRes final int resId) {
+        return activity.getText(resId);
+    }
+
     /**
      * Return a localized string from the application's package's default string table.
      *
@@ -180,7 +191,7 @@ public class ViewController<
      */
     @NonNull
     public final String getString(@StringRes final int resId) {
-        return getActivity().getString(resId);
+        return activity.getString(resId);
     }
 
     /**
@@ -192,7 +203,7 @@ public class ViewController<
      */
     @NonNull
     public final String getString(@StringRes final int resId, @NonNull final Object... formatArgs) {
-        return getActivity().getString(resId, formatArgs);
+        return activity.getString(resId, formatArgs);
     }
 
     /**
@@ -223,7 +234,7 @@ public class ViewController<
      */
     @Nullable
     public final ColorStateList getColorStateList(@ColorRes final int resId) {
-        return ContextCompat.getColorStateList(getActivity(), resId);
+        return ContextCompat.getColorStateList(activity, resId);
     }
 
     /**
@@ -236,7 +247,7 @@ public class ViewController<
      */
     @Nullable
     public final Drawable getDrawable(@DrawableRes final int resId) {
-        return ContextCompat.getDrawable(getActivity(), resId);
+        return ContextCompat.getDrawable(activity, resId);
     }
 
     /**

From ed7cd8bd42878a096618545a4cdf0596485b62c7 Mon Sep 17 00:00:00 2001
From: nbnbbs <alex.bubnov@touchin.ru>
Date: Tue, 3 Apr 2018 13:09:52 +0300
Subject: [PATCH 53/95] small sA fixes (#122)

* small sA fixes

* small fixes

* remove suppress
---
 .../navigation/fragments/ViewControllerFragment.java      | 8 ++++----
 .../navigation/viewcontrollers/ViewController.java        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 68f9be0..c75fc1d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -84,7 +84,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         parcel = Parcel.obtain();
         parcel.unmarshall(serializableBytes, 0, serializableBytes.length);
         parcel.setDataPosition(0);
-        final T result = parcel.readParcelable(parcelable.getClass().getClassLoader());
+        final T result = parcel.readParcelable(Thread.currentThread().getContextClassLoader());
         parcel.recycle();
         return result;
     }
@@ -331,10 +331,10 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     }
 
     private static class ActivityResult {
-        final int requestCode;
-        final int resultCode;
+        public final int requestCode;
+        public final int resultCode;
         @Nullable
-        final Intent data;
+        public final Intent data;
 
         ActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
             this.requestCode = requestCode;
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 7111d99..91af235 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -221,8 +221,8 @@ public class ViewController<
 
     /**
      * Returns a color state list associated with a particular resource ID.
-     * <p>
-     * Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
+     *
+     * <p>Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
      * color state list will be styled for the specified Context's theme.
      *
      * @param resId The desired resource identifier, as generated by the aapt

From b64452b086d3f1a22679ff77a6fe83c86fb8e233 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 4 Apr 2018 18:55:32 +0300
Subject: [PATCH 54/95] Initial fragment fix in navigation

---
 .../roboswag/components/navigation/FragmentNavigation.kt | 8 ++++----
 .../viewcontrollers/ViewControllerNavigation.kt          | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index fe63d34..118060d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -52,7 +52,6 @@ open class FragmentNavigation(
 
     companion object {
         const val TOP_FRAGMENT_TAG_MARK = "TOP_FRAGMENT"
-        const val WITH_TARGET_FRAGMENT_TAG_MARK = "FRAGMENT_WITH_TARGET"
     }
 
     /**
@@ -206,7 +205,7 @@ open class FragmentNavigation(
                 targetRequestCode,
                 true,
                 args,
-                fragmentClass.name + ';'.toString() + WITH_TARGET_FRAGMENT_TAG_MARK,
+                null,
                 transactionSetup
         )
     }
@@ -222,9 +221,10 @@ open class FragmentNavigation(
     fun setAsTop(
             fragmentClass: Class<out Fragment>,
             args: Bundle? = null,
+            addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
-        addToStack(fragmentClass, null, 0, true, args, fragmentClass.name + ';'.toString() + TOP_FRAGMENT_TAG_MARK, transactionSetup)
+        addToStack(fragmentClass, null, 0, addToStack, args, "${fragmentClass.name};$TOP_FRAGMENT_TAG_MARK", transactionSetup)
     }
 
     /**
@@ -241,7 +241,7 @@ open class FragmentNavigation(
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
         beforeSetInitialActions()
-        setAsTop(fragmentClass, args, transactionSetup)
+        setAsTop(fragmentClass, args, false, transactionSetup)
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index 103c9f7..b6a6fba 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -94,7 +94,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
                 targetRequestCode,
                 true,
                 ViewControllerFragment.args(viewControllerClass, state),
-                viewControllerClass.name + ';'.toString() + WITH_TARGET_FRAGMENT_TAG_MARK,
+                null,
                 transactionSetup
         )
     }
@@ -111,15 +111,16 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
     fun <TState : Parcelable> setViewControllerAsTop(
             viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
             state: TState,
+            addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
         addToStack(
                 ViewControllerFragment::class.java,
                 null,
                 0,
-                true,
+                addToStack,
                 ViewControllerFragment.args(viewControllerClass, state),
-                viewControllerClass.name + ';'.toString() + TOP_FRAGMENT_TAG_MARK,
+                "${viewControllerClass.name};$TOP_FRAGMENT_TAG_MARK",
                 transactionSetup
         )
     }
@@ -139,7 +140,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {
         beforeSetInitialActions()
-        setViewControllerAsTop(viewControllerClass, state, transactionSetup)
+        setViewControllerAsTop(viewControllerClass, state, false, transactionSetup)
     }
 
 }

From 9508946b5a3dcac8bc18f304a70a7babd8a25fc3 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 11 Apr 2018 13:40:57 +0300
Subject: [PATCH 55/95] ViewHolder.context extension, ViewController
 startActivity methods

---
 .../components/extensions/ViewHolder.kt       | 16 +++++----
 .../viewcontrollers/ViewController.java       | 36 +++++++++++--------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
index e1ea239..9a42e71 100644
--- a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@@ -1,5 +1,6 @@
 package ru.touchin.roboswag.components.extensions
 
+import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
 import android.support.annotation.ColorInt
@@ -13,15 +14,18 @@ import android.view.View
 
 fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)
 
-fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = itemView.context.getText(resId)
+val RecyclerView.ViewHolder.context: Context
+    get() = itemView.context
 
-fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = itemView.context.getString(resId)
+fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = context.getText(resId)
 
-fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = itemView.context.getString(resId, args)
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = context.getString(resId)
+
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = context.getString(resId, args)
 
 @ColorInt
-fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(itemView.context, resId)
+fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(context, resId)
 
-fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(itemView.context, resId)
+fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(context, resId)
 
-fun RecyclerView.ViewHolder.getDrawable(@DrawableRes resId: Int): Drawable? = ContextCompat.getDrawable(itemView.context, resId)
+fun RecyclerView.ViewHolder.getDrawable(@DrawableRes resId: Int): Drawable? = ContextCompat.getDrawable(context, resId)
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 91af235..f01877e 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -94,16 +94,6 @@ public class ViewController<
         return activity;
     }
 
-    /**
-     * Returns state from fragment.
-     *
-     * @return Returns state.
-     */
-    @NonNull
-    public final TState getState() {
-        return fragment.getState();
-    }
-
     /**
      * Returns fragment where {@link ViewController} could be.
      *
@@ -114,6 +104,16 @@ public class ViewController<
         return fragment;
     }
 
+    /**
+     * Returns state from fragment.
+     *
+     * @return Returns state.
+     */
+    @NonNull
+    protected final TState getState() {
+        return fragment.getState();
+    }
+
     /**
      * Returns view instantiated in {@link #getFragment()} fragment attached to {@link #getActivity()} activity.
      * Use it to inflate your views into at construction of this {@link ViewController}.
@@ -121,7 +121,7 @@ public class ViewController<
      * @return Returns view.
      */
     @NonNull
-    public final ViewGroup getContainer() {
+    protected final ViewGroup getContainer() {
         return container;
     }
 
@@ -131,7 +131,7 @@ public class ViewController<
      *
      * @param layoutResId Resource ID to be inflated.
      */
-    public final void setContentView(@LayoutRes final int layoutResId) {
+    protected final void setContentView(@LayoutRes final int layoutResId) {
         if (getContainer().getChildCount() > 0) {
             getContainer().removeAllViews();
         }
@@ -144,7 +144,7 @@ public class ViewController<
      *
      * @param view The desired content to display.
      */
-    public final void setContentView(@NonNull final View view) {
+    protected final void setContentView(@NonNull final View view) {
         setContentView(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
     }
 
@@ -155,7 +155,7 @@ public class ViewController<
      * @param view         The desired content to display;
      * @param layoutParams Layout parameters for the view.
      */
-    public final void setContentView(@NonNull final View view, @NonNull final ViewGroup.LayoutParams layoutParams) {
+    protected final void setContentView(@NonNull final View view, @NonNull final ViewGroup.LayoutParams layoutParams) {
         if (getContainer().getChildCount() > 0) {
             getContainer().removeAllViews();
         }
@@ -250,6 +250,14 @@ public class ViewController<
         return ContextCompat.getDrawable(activity, resId);
     }
 
+    public final void startActivity(@NonNull final Intent intent) {
+        fragment.startActivity(intent);
+    }
+
+    public final void startActivityForResult(@NonNull final Intent intent, final int requestCode) {
+        fragment.startActivityForResult(intent, requestCode);
+    }
+
     /**
      * Calls when activity configuring ActionBar, Toolbar, Sidebar etc.
      * If it will be called or not depends on {@link Fragment#hasOptionsMenu()} and {@link Fragment#isMenuVisible()}.

From 496e0da5dae537f4782571ed9ae6b2c58800fc3d Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Sat, 21 Apr 2018 02:37:35 +0300
Subject: [PATCH 56/95] Removed TFragment generic in ViewController

---
 .../fragments/ViewControllerFragment.java         |  5 ++---
 .../viewcontrollers/DefaultViewController.kt      |  3 +--
 .../viewcontrollers/ViewController.java           | 15 ++++++---------
 .../viewcontrollers/ViewControllerNavigation.kt   |  8 ++++----
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index c75fc1d..1f63981 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -105,7 +105,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
 
     @Nullable
     private ViewController viewController;
-    private Class<ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>> viewControllerClass;
+    private Class<ViewController<TActivity, TState>> viewControllerClass;
     private TState state;
     @Nullable
     private ActivityResult pendingActivityResult;
@@ -127,8 +127,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         setHasOptionsMenu(!isChildFragment());
 
         //noinspection unchecked
-        viewControllerClass = (Class<ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>)
-                getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
+        viewControllerClass = (Class<ViewController<TActivity, TState>>) getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
         state = savedInstanceState != null
                 ? savedInstanceState.getParcelable(VIEW_CONTROLLER_STATE_EXTRA)
                 : (getArguments() != null ? getArguments().getParcelable(VIEW_CONTROLLER_STATE_EXTRA) : null);
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
index 6b5014b..0fae24f 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
@@ -4,13 +4,12 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.support.annotation.LayoutRes
 import android.support.v4.app.FragmentActivity
-import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment
 
 abstract class DefaultViewController<TActivity : FragmentActivity, TState : Parcelable>(
         @LayoutRes layoutRes: Int,
         creationContext: CreationContext,
         savedInstanceState: Bundle?
-) : ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>(
+) : ViewController<TActivity, TState>(
         creationContext,
         savedInstanceState
 ) {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index f01877e..883538c 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -54,19 +54,16 @@ import ru.touchin.roboswag.core.log.Lc;
  * Class to control view of specific fragment, activity and application by logic bridge.
  *
  * @param <TActivity> Type of activity where such {@link ViewController} could be;
- * @param <TFragment> Type of fragment where such {@link ViewController} could be;
+ * @param <TState> Type of state;
  */
-public class ViewController<
-        TActivity extends FragmentActivity,
-        TFragment extends ViewControllerFragment<TActivity, TState>,
-        TState extends Parcelable> implements LifecycleOwner {
+public class ViewController<TActivity extends FragmentActivity, TState extends Parcelable> implements LifecycleOwner {
 
     @NonNull
     private final LifecycleRegistry lifecycleRegistry = new LifecycleRegistry(this);
     @NonNull
     private final TActivity activity;
     @NonNull
-    private final TFragment fragment;
+    private final ViewControllerFragment<TActivity, TState> fragment;
     @NonNull
     private final ViewGroup container;
 
@@ -74,7 +71,7 @@ public class ViewController<
     //UnusedFormalParameter: savedInstanceState could be used by children
     public ViewController(@NonNull final CreationContext creationContext, @Nullable final Bundle savedInstanceState) {
         this.activity = (TActivity) creationContext.activity;
-        this.fragment = (TFragment) creationContext.fragment;
+        this.fragment = creationContext.fragment;
         this.container = creationContext.container;
     }
 
@@ -100,7 +97,7 @@ public class ViewController<
      * @return Returns fragment.
      */
     @NonNull
-    public final TFragment getFragment() {
+    public final ViewControllerFragment<TActivity, TState> getFragment() {
         return fragment;
     }
 
@@ -111,7 +108,7 @@ public class ViewController<
      */
     @NonNull
     protected final TState getState() {
-        return fragment.getState();
+        return fragment.getState() ;
     }
 
     /**
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index b6a6fba..9bf99dd 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -54,7 +54,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, TState>>,
             state: TState,
             addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
@@ -82,7 +82,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TTargetFragment     Type of target fragment.
      */
     fun <TState : Parcelable, TTargetFragment : Fragment> pushViewControllerForResult(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, TState>>,
             state: TState,
             targetFragment: TTargetFragment,
             targetRequestCode: Int,
@@ -109,7 +109,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setViewControllerAsTop(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, TState>>,
             state: TState,
             addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
@@ -135,7 +135,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setInitialViewController(
-            viewControllerClass: Class<out ViewController<TActivity, ViewControllerFragment<TActivity, TState>, TState>>,
+            viewControllerClass: Class<out ViewController<TActivity, TState>>,
             state: TState,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {

From 7edc1fabe18ea5fc236891bf014ea0839b20deb4 Mon Sep 17 00:00:00 2001
From: Unknown <mbachinskiyol@gmail.com>
Date: Sun, 22 Apr 2018 21:11:37 +0300
Subject: [PATCH 57/95] Fix back stack

---
 .../roboswag/components/navigation/FragmentNavigation.kt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index 118060d..384ef16 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -128,7 +128,7 @@ open class FragmentNavigation(
      * @return True if it have back to some entry in stack.
      */
     fun back(): Boolean {
-        if (fragmentManager.backStackEntryCount > 1) {
+        if (fragmentManager.backStackEntryCount >= 1) {
             fragmentManager.popBackStack()
             return true
         }

From ebdba5a90b918340946d6c73eaabeaa00c9045b1 Mon Sep 17 00:00:00 2001
From: Unknown <mbachinskiyol@gmail.com>
Date: Sun, 22 Apr 2018 21:28:44 +0300
Subject: [PATCH 58/95] Delete space betwen semicolon

---
 .../components/navigation/viewcontrollers/ViewController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 883538c..e1e7c14 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -108,7 +108,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @NonNull
     protected final TState getState() {
-        return fragment.getState() ;
+        return fragment.getState();
     }
 
     /**

From 996fefe3950011177c33514df346a9e0219c7159 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Sun, 22 Apr 2018 23:53:22 +0300
Subject: [PATCH 59/95] setOnRippleClickListener fix

---
 .../java/ru/touchin/roboswag/components/extensions/View.kt   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/View.kt b/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
index 89744f6..9f4ddca 100644
--- a/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
@@ -13,10 +13,7 @@ private const val RIPPLE_EFFECT_DELAY = 150L
  */
 fun View.setOnRippleClickListener(delay: Long = RIPPLE_EFFECT_DELAY, listener: (View) -> Unit) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        setOnClickListener { view ->
-            handler?.removeCallbacksAndMessages(null)
-            postDelayed({ if (hasWindowFocus()) listener(view) }, delay)
-        }
+        setOnClickListener { view -> postDelayed({ if (hasWindowFocus()) listener(view) }, delay) }
     } else {
         setOnClickListener(listener)
     }

From 400ae4f00dab78d754f7bc1c10e0951fcf3139e8 Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Tue, 24 Apr 2018 17:34:29 +0300
Subject: [PATCH 60/95] fix getString

---
 .../ru/touchin/roboswag/components/extensions/ViewHolder.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
index 9a42e71..db7165f 100644
--- a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@@ -21,7 +21,8 @@ fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = conte
 
 fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = context.getString(resId)
 
-fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = context.getString(resId, args)
+@SuppressWarnings("SpreadOperator") // it's OK for small arrays
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = context.getString(resId, *args)
 
 @ColorInt
 fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(context, resId)

From e2107e9990187d7aec1f6244dab9e72855c8139e Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 27 Apr 2018 14:02:29 +0300
Subject: [PATCH 61/95] Simple delegate for properties

---
 .../roboswag/components/extensions/Delegates.kt  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt b/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
new file mode 100644
index 0000000..c8e0538
--- /dev/null
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
@@ -0,0 +1,16 @@
+package ru.touchin.roboswag.components.extensions
+
+import kotlin.properties.Delegates
+import kotlin.properties.ObservableProperty
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * Simple observable delegate only for notification of new value.
+ */
+inline fun <T> Delegates.observable(
+        initialValue: T,
+        crossinline onChange: (newValue: T) -> Unit
+): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
+    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) = onChange(newValue)
+}

From 0815cdd4211f8a1f8fa2ddb65f7f49f4ebf83fe5 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Sat, 28 Apr 2018 18:07:57 +0300
Subject: [PATCH 62/95] Invalidation menu fix

---
 .../components/navigation/fragments/ViewControllerFragment.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 1f63981..d14cda0 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -197,7 +197,6 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
             viewController.onActivityResult(pendingActivityResult.requestCode, pendingActivityResult.resultCode, pendingActivityResult.data);
             pendingActivityResult = null;
         }
-        requireActivity().invalidateOptionsMenu();
     }
 
     @Override

From 89377c3fea6c15251c6495af797432d7497df884 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 4 May 2018 20:45:38 +0300
Subject: [PATCH 63/95] Added getter for viewControllerClass

---
 .../navigation/fragments/ViewControllerFragment.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index d14cda0..60038b9 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -120,6 +120,11 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         return state;
     }
 
+    @NonNull
+    public Class<ViewController<TActivity, TState>> getViewControllerClass() {
+        return viewControllerClass;
+    }
+
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

From d71938c87f26653641ced49a215b916caff2ded7 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 10 May 2018 21:24:06 +0300
Subject: [PATCH 64/95] ViewControllerNavigation: added wildcard for activity

---
 .../viewcontrollers/ViewControllerNavigation.kt           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
index 9bf99dd..a8e4b87 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
@@ -54,7 +54,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> pushViewController(
-            viewControllerClass: Class<out ViewController<TActivity, TState>>,
+            viewControllerClass: Class<out ViewController<out TActivity, TState>>,
             state: TState,
             addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
@@ -82,7 +82,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TTargetFragment     Type of target fragment.
      */
     fun <TState : Parcelable, TTargetFragment : Fragment> pushViewControllerForResult(
-            viewControllerClass: Class<out ViewController<TActivity, TState>>,
+            viewControllerClass: Class<out ViewController<out TActivity, TState>>,
             state: TState,
             targetFragment: TTargetFragment,
             targetRequestCode: Int,
@@ -109,7 +109,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setViewControllerAsTop(
-            viewControllerClass: Class<out ViewController<TActivity, TState>>,
+            viewControllerClass: Class<out ViewController<out TActivity, TState>>,
             state: TState,
             addToStack: Boolean = true,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
@@ -135,7 +135,7 @@ open class ViewControllerNavigation<TActivity : FragmentActivity>(
      * @param TState              Type of state of fragment.
      */
     fun <TState : Parcelable> setInitialViewController(
-            viewControllerClass: Class<out ViewController<TActivity, TState>>,
+            viewControllerClass: Class<out ViewController<out TActivity, TState>>,
             state: TState,
             transactionSetup: ((FragmentTransaction) -> Unit)? = null
     ) {

From 77a0160fce8b25fea5b0816b2158693783fbe6b5 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 16 May 2018 02:44:38 +0300
Subject: [PATCH 65/95] Fragment custom animations fix

---
 .../roboswag/components/navigation/FragmentNavigation.kt      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index 384ef16..ef179ab 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -111,14 +111,14 @@ open class FragmentNavigation(
         }
 
         val fragmentTransaction = fragmentManager.beginTransaction()
-                .replace(containerViewId, fragment, null)
+        transactionSetup?.invoke(fragmentTransaction)
+        fragmentTransaction.replace(containerViewId, fragment, null)
         if (addToStack) {
             fragmentTransaction.addToBackStack(backStackTag)
         }
         if (fragmentManager.backStackEntryCount != 0) {
             fragmentTransaction.setTransition(transition)
         }
-        transactionSetup?.invoke(fragmentTransaction)
         fragmentTransaction.commit()
     }
 

From a3c113125d9460bbe6dd8058063c16170b12d639 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Fri, 25 May 2018 21:08:25 +0300
Subject: [PATCH 66/95] Destroyable: added clear subscriptions method

---
 .../roboswag/components/utils/destroyable/BaseDestroyable.kt | 2 ++
 .../roboswag/components/utils/destroyable/Destroyable.kt     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
index f2a47a9..418f2c4 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
@@ -17,6 +17,8 @@ open class BaseDestroyable : Destroyable {
 
     private val subscriptions = CompositeDisposable()
 
+    override fun clearSubscriptions() = subscriptions.clear()
+
     /**
      * Call it on parent's onDestroy method.
      */
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
index 6d2aea7..b5c7c16 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
@@ -24,6 +24,11 @@ interface Destroyable {
         }
     }
 
+    /**
+     * Removes all subscriptions
+     */
+    fun clearSubscriptions()
+
     /**
      * Method should be used to guarantee that observable won't be subscribed after onDestroy.
      * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.

From 818d8aedaf05a0443f96bfb7d4c21d8a1ebc2237 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Sat, 26 May 2018 23:18:17 +0300
Subject: [PATCH 67/95] ViewController: added onCreateAnimation callbacks
 Navigation: some fixes Resources: added slide fragment transition animations

---
 .../navigation/FragmentNavigation.kt          |  6 +--
 .../navigation/activities/BaseActivity.java   | 11 +++++
 .../fragments/ViewControllerFragment.java     | 30 +++++++++++++
 .../viewcontrollers/ViewController.java       | 44 +++++++++++++++++++
 ...agment_slide_in_left_paralax_animation.xml |  6 +++
 .../fragment_slide_in_right_animation.xml     |  6 +++
 ...gment_slide_out_left_paralax_animation.xml |  6 +++
 .../fragment_slide_out_right_animation.xml    |  6 +++
 src/main/res/values/integers.xml              |  4 ++
 9 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
 create mode 100644 src/main/res/anim/fragment_slide_in_right_animation.xml
 create mode 100644 src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
 create mode 100644 src/main/res/anim/fragment_slide_out_right_animation.xml
 create mode 100644 src/main/res/values/integers.xml

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index ef179ab..39d33cc 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -111,13 +111,13 @@ open class FragmentNavigation(
         }
 
         val fragmentTransaction = fragmentManager.beginTransaction()
+                .setTransition(transition)
         transactionSetup?.invoke(fragmentTransaction)
         fragmentTransaction.replace(containerViewId, fragment, null)
         if (addToStack) {
             fragmentTransaction.addToBackStack(backStackTag)
-        }
-        if (fragmentManager.backStackEntryCount != 0) {
-            fragmentTransaction.setTransition(transition)
+        } else {
+            fragmentTransaction.setPrimaryNavigationFragment(fragment)
         }
         fragmentTransaction.commit()
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 974fa46..2343af1 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -25,6 +25,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArraySet;
 import android.support.v7.app.AppCompatActivity;
+ import android.view.MenuItem;
 
 import java.util.Set;
 
@@ -94,6 +95,16 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onDestroy();
     }
 
+    @Override
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
     public void addOnBackPressedListener(@NonNull final OnBackPressedListener onBackPressedListener) {
         onBackPressedListeners.add(onBackPressedListener);
     }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 60038b9..94655cf 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -19,6 +19,7 @@
 
 package ru.touchin.roboswag.components.navigation.fragments;
 
+import android.animation.Animator;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
@@ -29,16 +30,19 @@ import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
 import android.widget.FrameLayout;
 
 import java.lang.reflect.Constructor;
 
+import ru.touchin.roboswag.components.R;
 import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
@@ -51,6 +55,7 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * @param <TState>    Type of object which is representing it's fragment state;
  * @param <TActivity> Type of {@link FragmentActivity} where fragment could be attached to.
  */
+@SuppressWarnings("PMD.TooManyMethods")
 public class ViewControllerFragment<TActivity extends FragmentActivity, TState extends Parcelable> extends ViewFragment<TActivity> {
 
     private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
@@ -204,6 +209,31 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
+    @Nullable
+    @Override
+    public Animation onCreateAnimation(final int transit, final boolean enter, final int nextAnim) {
+        if (nextAnim == R.anim.fragment_slide_in_right_animation || nextAnim == R.anim.fragment_slide_out_right_animation) {
+            ViewCompat.setTranslationZ(getView(), 1F);
+        } else {
+            ViewCompat.setTranslationZ(getView(), 0F);
+        }
+        if (viewController != null) {
+            return viewController.onCreateAnimation(transit, enter, nextAnim);
+        } else {
+            return null;
+        }
+    }
+
+    @Nullable
+    @Override
+    public Animator onCreateAnimator(final int transit, final boolean enter, final int nextAnim) {
+        if (viewController != null) {
+            return viewController.onCreateAnimator(transit, enter, nextAnim);
+        } else {
+            return null;
+        }
+    }
+
     @Override
     protected void onStart(@NonNull final View view, @NonNull final TActivity activity) {
         super.onStart(view, activity);
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index e1e7c14..d8aa54b 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -19,6 +19,7 @@
 
 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;
@@ -38,6 +39,7 @@ 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 android.view.Menu;
 import android.view.MenuInflater;
@@ -45,6 +47,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import android.view.animation.Animation;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
@@ -276,6 +279,47 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
     }
 
+    /**
+     * Called when a fragment loads an animation. Note that if
+     * {@link FragmentTransaction#setCustomAnimations(int, int)} was called with
+     * {@link Animator} resources instead of {@link Animation} resources, {@code nextAnim}
+     * will be an animator resource.
+     *
+     * @param transit The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
+     *                set.
+     * @param enter {@code true} when the fragment is added/attached/shown or {@code false} when
+     *              the fragment is removed/detached/hidden.
+     * @param nextAnim The resource set in
+     *                 {@link FragmentTransaction#setCustomAnimations(int, int)},
+     *                 {@link FragmentTransaction#setCustomAnimations(int, int, int, int)}, or
+     *                 0 if neither was called. The value will depend on the current operation.
+     */
+    @Nullable
+    public Animation onCreateAnimation(final int transit, final boolean enter, final int nextAnim) {
+        return null;
+    }
+
+    /**
+     * Called when a fragment loads an animator. This will be called when
+     * {@link #onCreateAnimation(int, boolean, int)} returns null. Note that if
+     * {@link FragmentTransaction#setCustomAnimations(int, int)} was called with
+     * {@link Animation} resources instead of {@link Animator} resources, {@code nextAnim}
+     * will be an animation resource.
+     *
+     * @param transit The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
+     *                set.
+     * @param enter {@code true} when the fragment is added/attached/shown or {@code false} when
+     *              the fragment is removed/detached/hidden.
+     * @param nextAnim The resource set in
+     *                 {@link FragmentTransaction#setCustomAnimations(int, int)},
+     *                 {@link FragmentTransaction#setCustomAnimations(int, int, int, int)}, or
+     *                 0 if neither was called. The value will depend on the current operation.
+     */
+    @Nullable
+    public Animator onCreateAnimator(final int transit, final boolean enter, final int nextAnim) {
+        return null;
+    }
+
     /**
      * Calls when {@link ViewController} have started.
      * Happens at {@link ViewControllerFragment#onStart()}.
diff --git a/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml b/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
new file mode 100644
index 0000000..2a638ac
--- /dev/null
+++ b/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
@@ -0,0 +1,6 @@
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/fragmentTransitionTime"
+    android:fromXDelta="-50%p"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toXDelta="0"/>
diff --git a/src/main/res/anim/fragment_slide_in_right_animation.xml b/src/main/res/anim/fragment_slide_in_right_animation.xml
new file mode 100644
index 0000000..76be496
--- /dev/null
+++ b/src/main/res/anim/fragment_slide_in_right_animation.xml
@@ -0,0 +1,6 @@
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/fragmentTransitionTime"
+    android:fromXDelta="100%p"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:toXDelta="0"/>
diff --git a/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml b/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
new file mode 100644
index 0000000..67b35b0
--- /dev/null
+++ b/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
@@ -0,0 +1,6 @@
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/fragmentTransitionTime"
+    android:fromXDelta="0"
+    android:interpolator="@android:anim/decelerate_interpolator"
+    android:toXDelta="-50%p"/>
diff --git a/src/main/res/anim/fragment_slide_out_right_animation.xml b/src/main/res/anim/fragment_slide_out_right_animation.xml
new file mode 100644
index 0000000..9757e23
--- /dev/null
+++ b/src/main/res/anim/fragment_slide_out_right_animation.xml
@@ -0,0 +1,6 @@
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@integer/fragmentTransitionTime"
+    android:fromXDelta="0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:toXDelta="100%p"/>
diff --git a/src/main/res/values/integers.xml b/src/main/res/values/integers.xml
new file mode 100644
index 0000000..93ec0fc
--- /dev/null
+++ b/src/main/res/values/integers.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="fragmentTransitionTime">250</integer>
+</resources>

From b528ec185ef1374e2b804f08f21ac994c854b045 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Sun, 27 May 2018 00:03:01 +0300
Subject: [PATCH 68/95] Static analysis

---
 .../roboswag/components/navigation/activities/BaseActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 2343af1..7a3f0b7 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -25,7 +25,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArraySet;
 import android.support.v7.app.AppCompatActivity;
- import android.view.MenuItem;
+import android.view.MenuItem;
 
 import java.util.Set;
 

From 78d213abc5c7438410979000d6e994e565b050ec Mon Sep 17 00:00:00 2001
From: Unknown <mbachinskiyol@gmail.com>
Date: Mon, 28 May 2018 20:06:00 +0300
Subject: [PATCH 69/95] Add on request permissons result callback

---
 .../navigation/fragments/ViewControllerFragment.java   |  8 ++++++++
 .../components/navigation/fragments/ViewFragment.java  |  5 +++++
 .../navigation/viewcontrollers/ViewController.java     | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 94655cf..e334a04 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -321,6 +321,14 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         super.onDestroyView();
     }
 
+    @Override
+    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
+        if (viewController != null) {
+            viewController.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
     @Override
     public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
         if (viewController != null) {
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index 5cd873f..c2f1296 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -184,6 +184,11 @@ public abstract class ViewFragment<TActivity extends FragmentActivity> extends F
         super.onPause();
     }
 
+    @Override
+    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
     /**
      * Replacement of {@link #onPause} with non null activity as first parameter.
      *
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index d8aa54b..18a89e6 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -405,6 +405,16 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
     }
 
+
+    /**
+     * Calls when {@link ViewController} have requested permissions results.
+     * Happens at {@link ViewControllerFragment#onRequestPermissionsResult(int, String[], int[])} ()}.
+     */
+    @CallSuper
+    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
+
+    }
+
     /**
      * Callback from parent fragment.
      */

From dc773302f095b4ac578120f0e384d84cf47109a7 Mon Sep 17 00:00:00 2001
From: Unknown <mbachinskiyol@gmail.com>
Date: Mon, 28 May 2018 20:46:21 +0300
Subject: [PATCH 70/95] add comment

---
 .../components/navigation/viewcontrollers/ViewController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 18a89e6..ce7fa5b 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -412,7 +412,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
-
+        //do nothing
     }
 
     /**

From 2cfa07231908278d3d9eb23868118017c7f090e8 Mon Sep 17 00:00:00 2001
From: Unknown <mbachinskiyol@gmail.com>
Date: Tue, 29 May 2018 09:40:44 +0300
Subject: [PATCH 71/95] Delete method

---
 .../components/navigation/fragments/ViewFragment.java        | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index c2f1296..5cd873f 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -184,11 +184,6 @@ public abstract class ViewFragment<TActivity extends FragmentActivity> extends F
         super.onPause();
     }
 
-    @Override
-    public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
     /**
      * Replacement of {@link #onPause} with non null activity as first parameter.
      *

From a789ae9efe21a558ffb35a3737254887a4432fb6 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 29 May 2018 12:54:12 +0300
Subject: [PATCH 72/95] Static Analysis

---
 .../components/navigation/viewcontrollers/ViewController.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index ce7fa5b..a025f87 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -411,6 +411,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * Happens at {@link ViewControllerFragment#onRequestPermissionsResult(int, String[], int[])} ()}.
      */
     @CallSuper
+    @SuppressWarnings("PMD.UseVarargs")
     public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
         //do nothing
     }

From a55510f8f1f6732c0a475bf42ea9d834f60cb517 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 29 May 2018 12:58:41 +0300
Subject: [PATCH 73/95] Transition fix

---
 .../roboswag/components/navigation/FragmentNavigation.kt       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index 39d33cc..4e82491 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -111,11 +111,10 @@ open class FragmentNavigation(
         }
 
         val fragmentTransaction = fragmentManager.beginTransaction()
-                .setTransition(transition)
         transactionSetup?.invoke(fragmentTransaction)
         fragmentTransaction.replace(containerViewId, fragment, null)
         if (addToStack) {
-            fragmentTransaction.addToBackStack(backStackTag)
+            fragmentTransaction.addToBackStack(backStackTag).setTransition(transition)
         } else {
             fragmentTransaction.setPrimaryNavigationFragment(fragment)
         }

From 5b3ccdbf91955a8c4ebda46a9916e8dd78602535 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 29 May 2018 13:52:17 +0300
Subject: [PATCH 74/95] List adapter click listener fix

---
 .../roboswag/components/adapters/DelegationListAdapter.kt     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
index b8115d1..094b298 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -35,7 +35,9 @@ open class DelegationListAdapter<TItem>(config: AsyncDifferConfig<TItem>) : Recy
         val collectionPosition = getCollectionPosition(position)
         if (collectionPosition in 0 until getList().size) {
             if (itemClickListener != null) {
-                holder.itemView.setOnRippleClickListener { itemClickListener?.invoke(getList()[collectionPosition], holder) }
+                holder.itemView.setOnRippleClickListener {
+                    itemClickListener?.invoke(getList()[getCollectionPosition(holder.adapterPosition)], holder)
+                }
             } else {
                 holder.itemView.setOnClickListener(null)
             }

From f3d076aa6c046b98af38b517dfbc65e63b8b88df Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 30 May 2018 16:59:01 +0300
Subject: [PATCH 75/95] Diff computing fix

---
 .../roboswag/components/adapters/OffsetAdapterUpdateCallback.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt b/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
index 73bc999..9715eb2 100644
--- a/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
+++ b/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
@@ -6,7 +6,7 @@ import android.support.v7.widget.RecyclerView
 class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback  {
 
     override fun onInserted(position: Int, count: Int) {
-        adapter.notifyItemInserted(position + offsetProvider())
+        adapter.notifyItemRangeInserted(position + offsetProvider(), count)
     }
 
     override fun onRemoved(position: Int, count: Int) {

From 945385671345ec2a4b7533ba17e059e74eac933e Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Thu, 7 Jun 2018 18:05:02 +0300
Subject: [PATCH 76/95] Up navigation fix

---
 .../roboswag/components/navigation/FragmentNavigation.kt   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
index 4e82491..7bf87c5 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
@@ -164,8 +164,11 @@ open class FragmentNavigation(
      *
      * @return True if it have back to some entry in stack.
      */
-    //ShortMethodName: it is ok because method name is good!
-    fun up(): Boolean = backTo { backStackEntry -> backStackEntry.name != null && backStackEntry.name.endsWith(TOP_FRAGMENT_TAG_MARK) }
+    fun up() {
+        if (!backTo { backStackEntry -> backStackEntry.name != null && backStackEntry.name.endsWith(TOP_FRAGMENT_TAG_MARK) }) {
+            fragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+        }
+    }
 
     /**
      * Pushes [Fragment] on top of stack with specific arguments and transaction setup.

From 42750812ddebe7b8f6ae3085d3554957aaf00446 Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Mon, 2 Jul 2018 12:23:53 +0300
Subject: [PATCH 77/95] hide keyboard onStart ViewController

---
 .../components/navigation/viewcontrollers/ViewController.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index a025f87..436d9fa 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -328,6 +328,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
     public void onStart() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
+        UiUtils.OfViews.hideSoftInput(activity);
     }
 
     /**

From 448501aa0677fbbf20a58701500f82aac504e02b Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 3 Jul 2018 15:00:36 +0300
Subject: [PATCH 78/95] untilDestroy moved to extension

---
 .../components/extensions/Delegates.kt        |  8 +++++
 .../utils/destroyable/BaseDestroyable.kt      | 30 +++++++------------
 .../utils/destroyable/Destroyable.kt          | 15 ++++------
 3 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt b/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
index c8e0538..050bd6b 100644
--- a/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
+++ b/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
@@ -14,3 +14,11 @@ inline fun <T> Delegates.observable(
 ): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
     override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) = onChange(newValue)
 }
+
+inline fun <T> Delegates.distinctUntilChanged(
+        initialValue: T,
+        crossinline onChange: (newValue: T) -> Unit
+): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
+    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) =
+            if (newValue != null && oldValue != newValue) onChange(newValue) else Unit
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
index 418f2c4..7d7f520 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
@@ -24,51 +24,41 @@ open class BaseDestroyable : Destroyable {
      */
     fun onDestroy() = subscriptions.dispose()
 
-    override fun <T> untilDestroy(
-            flowable: Flowable<T>,
+    override fun <T> Flowable<T>.untilDestroy(
             onNextAction: (T) -> Unit,
             onErrorAction: (Throwable) -> Unit,
             onCompletedAction: () -> Unit
-    ): Disposable = flowable
-            .observeOn(AndroidSchedulers.mainThread())
+    ): Disposable = observeOn(AndroidSchedulers.mainThread())
             .subscribe(onNextAction, onErrorAction, onCompletedAction)
             .also { subscriptions.add(it) }
 
-    override fun <T> untilDestroy(
-            observable: Observable<T>,
+    override fun <T> Observable<T>.untilDestroy(
             onNextAction: (T) -> Unit,
             onErrorAction: (Throwable) -> Unit,
             onCompletedAction: () -> Unit
-    ): Disposable = observable
-            .observeOn(AndroidSchedulers.mainThread())
+    ): Disposable = observeOn(AndroidSchedulers.mainThread())
             .subscribe(onNextAction, onErrorAction, onCompletedAction)
             .also { subscriptions.add(it) }
 
-    override fun <T> untilDestroy(
-            single: Single<T>,
+    override fun <T> Single<T>.untilDestroy(
             onSuccessAction: (T) -> Unit,
             onErrorAction: (Throwable) -> Unit
-    ): Disposable = single
-            .observeOn(AndroidSchedulers.mainThread())
+    ): Disposable = observeOn(AndroidSchedulers.mainThread())
             .subscribe(onSuccessAction, onErrorAction)
             .also { subscriptions.add(it) }
 
-    override fun untilDestroy(
-            completable: Completable,
+    override fun Completable.untilDestroy(
             onCompletedAction: () -> Unit,
             onErrorAction: (Throwable) -> Unit
-    ): Disposable = completable
-            .observeOn(AndroidSchedulers.mainThread())
+    ): Disposable = observeOn(AndroidSchedulers.mainThread())
             .subscribe(onCompletedAction, onErrorAction)
             .also { subscriptions.add(it) }
 
-    override fun <T> untilDestroy(
-            maybe: Maybe<T>,
+    override fun <T> Maybe<T>.untilDestroy(
             onSuccessAction: (T) -> Unit,
             onErrorAction: (Throwable) -> Unit,
             onCompletedAction: () -> Unit
-    ): Disposable = maybe
-            .observeOn(AndroidSchedulers.mainThread())
+    ): Disposable = observeOn(AndroidSchedulers.mainThread())
             .subscribe(onSuccessAction, onErrorAction, onCompletedAction)
             .also { subscriptions.add(it) }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
index b5c7c16..270318d 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
@@ -40,8 +40,7 @@ interface Destroyable {
      * @param T             Type of emitted by observable items;
      * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
      */
-    fun <T> untilDestroy(
-            flowable: Flowable<T>,
+    fun <T> Flowable<T>.untilDestroy(
             onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
             onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
             onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
@@ -58,8 +57,7 @@ interface Destroyable {
      * @param T             Type of emitted by observable items;
      * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
      */
-    fun <T> untilDestroy(
-            observable: Observable<T>,
+    fun <T> Observable<T>.untilDestroy(
             onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
             onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
             onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
@@ -76,8 +74,7 @@ interface Destroyable {
      * @param T               Type of emitted by single items;
      * @return [Disposable] which is wrapping source single to unsubscribe from it onDestroy.
      */
-    fun <T> untilDestroy(
-            single: Single<T>,
+    fun <T> Single<T>.untilDestroy(
             onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
             onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
     ): Disposable
@@ -92,8 +89,7 @@ interface Destroyable {
      * @param onErrorAction     Action which will raise on every [io.reactivex.CompletableEmitter.onError] throwable;
      * @return [Disposable] which is wrapping source completable to unsubscribe from it onDestroy.
      */
-    fun untilDestroy(
-            completable: Completable,
+    fun Completable.untilDestroy(
             onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run,
             onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
     ): Disposable
@@ -108,8 +104,7 @@ interface Destroyable {
      * @param onErrorAction   Action which will raise on every [io.reactivex.MaybeEmitter.onError] throwable;
      * @return [Disposable] which is wrapping source maybe to unsubscribe from it onDestroy.
      */
-    fun <T> untilDestroy(
-            maybe: Maybe<T>,
+    fun <T> Maybe<T>.untilDestroy(
             onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
             onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
             onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run

From 276e697d83257bebdd910548a2dcf7fdb96cd75f Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 3 Jul 2018 15:14:21 +0300
Subject: [PATCH 79/95] untilDestroy parameters naming

---
 .../utils/destroyable/BaseDestroyable.kt      | 36 ++++++------
 .../utils/destroyable/Destroyable.kt          | 57 +++++++++----------
 2 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
index 7d7f520..fafa855 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
@@ -25,41 +25,41 @@ open class BaseDestroyable : Destroyable {
     fun onDestroy() = subscriptions.dispose()
 
     override fun <T> Flowable<T>.untilDestroy(
-            onNextAction: (T) -> Unit,
-            onErrorAction: (Throwable) -> Unit,
-            onCompletedAction: () -> Unit
+            onNext: (T) -> Unit,
+            onError: (Throwable) -> Unit,
+            onComplete: () -> Unit
     ): Disposable = observeOn(AndroidSchedulers.mainThread())
-            .subscribe(onNextAction, onErrorAction, onCompletedAction)
+            .subscribe(onNext, onError, onComplete)
             .also { subscriptions.add(it) }
 
     override fun <T> Observable<T>.untilDestroy(
-            onNextAction: (T) -> Unit,
-            onErrorAction: (Throwable) -> Unit,
-            onCompletedAction: () -> Unit
+            onNext: (T) -> Unit,
+            onError: (Throwable) -> Unit,
+            onComplete: () -> Unit
     ): Disposable = observeOn(AndroidSchedulers.mainThread())
-            .subscribe(onNextAction, onErrorAction, onCompletedAction)
+            .subscribe(onNext, onError, onComplete)
             .also { subscriptions.add(it) }
 
     override fun <T> Single<T>.untilDestroy(
-            onSuccessAction: (T) -> Unit,
-            onErrorAction: (Throwable) -> Unit
+            onSuccess: (T) -> Unit,
+            onError: (Throwable) -> Unit
     ): Disposable = observeOn(AndroidSchedulers.mainThread())
-            .subscribe(onSuccessAction, onErrorAction)
+            .subscribe(onSuccess, onError)
             .also { subscriptions.add(it) }
 
     override fun Completable.untilDestroy(
-            onCompletedAction: () -> Unit,
-            onErrorAction: (Throwable) -> Unit
+            onComplete: () -> Unit,
+            onError: (Throwable) -> Unit
     ): Disposable = observeOn(AndroidSchedulers.mainThread())
-            .subscribe(onCompletedAction, onErrorAction)
+            .subscribe(onComplete, onError)
             .also { subscriptions.add(it) }
 
     override fun <T> Maybe<T>.untilDestroy(
-            onSuccessAction: (T) -> Unit,
-            onErrorAction: (Throwable) -> Unit,
-            onCompletedAction: () -> Unit
+            onSuccess: (T) -> Unit,
+            onError: (Throwable) -> Unit,
+            onComplete: () -> Unit
     ): Disposable = observeOn(AndroidSchedulers.mainThread())
-            .subscribe(onSuccessAction, onErrorAction, onCompletedAction)
+            .subscribe(onSuccess, onError, onComplete)
             .also { subscriptions.add(it) }
 
 }
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
index 270318d..8ad3012 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
+++ b/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
@@ -34,16 +34,15 @@ interface Destroyable {
      * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
      * Don't forget to process errors if observable can emit them.
      *
-     * @param flowable      [Flowable] to subscribe until onDestroy;
-     * @param onNextAction  Action which will raise on every [io.reactivex.Emitter.onNext] item;
-     * @param onErrorAction Action which will raise on every [io.reactivex.Emitter.onError] throwable;
-     * @param T             Type of emitted by observable items;
+     * @param onNext        Action which will raise on every [io.reactivex.Emitter.onNext] item;
+     * @param onError       Action which will raise on every [io.reactivex.Emitter.onError] throwable;
+     * @param onComplete    Action which will raise on every [io.reactivex.Emitter.onComplete] item;
      * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
      */
     fun <T> Flowable<T>.untilDestroy(
-            onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
-            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
-            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+            onNext: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onError: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onComplete: () -> Unit = Functions.EMPTY_ACTION::run
     ): Disposable
 
     /**
@@ -51,16 +50,15 @@ interface Destroyable {
      * It is automatically subscribing to the observable and calls onNextAction and onErrorAction on observable events.
      * Don't forget to process errors if observable can emit them.
      *
-     * @param observable    [Observable] to subscribe until onDestroy;
-     * @param onNextAction  Action which will raise on every [io.reactivex.Emitter.onNext] item;
-     * @param onErrorAction Action which will raise on every [io.reactivex.Emitter.onError] throwable;
-     * @param T             Type of emitted by observable items;
+     * @param onNext        Action which will raise on every [io.reactivex.Emitter.onNext] item;
+     * @param onError       Action which will raise on every [io.reactivex.Emitter.onError] throwable;
+     * @param onComplete    Action which will raise on every [io.reactivex.Emitter.onComplete] item;
      * @return [Disposable] which is wrapping source observable to unsubscribe from it onDestroy.
      */
     fun <T> Observable<T>.untilDestroy(
-            onNextAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
-            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
-            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+            onNext: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onError: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onComplete: () -> Unit = Functions.EMPTY_ACTION::run
     ): Disposable
 
     /**
@@ -68,15 +66,13 @@ interface Destroyable {
      * It is automatically subscribing to the single and calls onSuccessAction and onErrorAction on single events.
      * Don't forget to process errors if single can emit them.
      *
-     * @param single          [Single] to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every [io.reactivex.SingleEmitter.onSuccess] item;
-     * @param onErrorAction   Action which will raise on every [io.reactivex.SingleEmitter.onError] throwable;
-     * @param T               Type of emitted by single items;
+     * @param onSuccess     Action which will raise on every [io.reactivex.SingleEmitter.onSuccess] item;
+     * @param onError       Action which will raise on every [io.reactivex.SingleEmitter.onError] throwable;
      * @return [Disposable] which is wrapping source single to unsubscribe from it onDestroy.
      */
     fun <T> Single<T>.untilDestroy(
-            onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
-            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
+            onSuccess: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onError: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
     ): Disposable
 
     /**
@@ -84,14 +80,13 @@ interface Destroyable {
      * It is automatically subscribing to the completable and calls onCompletedAction and onErrorAction on completable events.
      * Don't forget to process errors if completable can emit them.
      *
-     * @param completable       [Completable] to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on every [io.reactivex.CompletableEmitter.onComplete] item;
-     * @param onErrorAction     Action which will raise on every [io.reactivex.CompletableEmitter.onError] throwable;
+     * @param onComplete    Action which will raise on every [io.reactivex.CompletableEmitter.onComplete] item;
+     * @param onError       Action which will raise on every [io.reactivex.CompletableEmitter.onError] throwable;
      * @return [Disposable] which is wrapping source completable to unsubscribe from it onDestroy.
      */
     fun Completable.untilDestroy(
-            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run,
-            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
+            onComplete: () -> Unit = Functions.EMPTY_ACTION::run,
+            onError: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2))
     ): Disposable
 
     /**
@@ -99,15 +94,15 @@ interface Destroyable {
      * It is automatically subscribing to the maybe and calls onSuccessAction and onErrorAction on maybe events.
      * Don't forget to process errors if completable can emit them.
      *
-     * @param maybe           [Maybe] to subscribe until onDestroy;
-     * @param onSuccessAction Action which will raise on every [io.reactivex.MaybeEmitter.onSuccess] ()} item;
-     * @param onErrorAction   Action which will raise on every [io.reactivex.MaybeEmitter.onError] throwable;
+     * @param onSuccess     Action which will raise on every [io.reactivex.MaybeEmitter.onSuccess] ()} item;
+     * @param onError       Action which will raise on every [io.reactivex.MaybeEmitter.onError] throwable;
+     * @param onComplete    Action which will raise on every [io.reactivex.MaybeEmitter.onComplete] item;
      * @return [Disposable] which is wrapping source maybe to unsubscribe from it onDestroy.
      */
     fun <T> Maybe<T>.untilDestroy(
-            onSuccessAction: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
-            onErrorAction: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
-            onCompletedAction: () -> Unit = Functions.EMPTY_ACTION::run
+            onSuccess: (T) -> Unit = Functions.emptyConsumer<T>()::accept,
+            onError: (Throwable) -> Unit = getActionThrowableForAssertion(Lc.getCodePoint(this, 2)),
+            onComplete: () -> Unit = Functions.EMPTY_ACTION::run
     ): Disposable
 
 }

From 7d377614cb10a067b8c334f8ec2dbeb29169482f Mon Sep 17 00:00:00 2001
From: Unknown <pilotofsparrow@gmail.com>
Date: Fri, 13 Jul 2018 12:39:02 +0300
Subject: [PATCH 80/95] Added onViewStateRestored callback to viewcontroller

---
 .../navigation/fragments/ViewControllerFragment.java     | 8 ++++++++
 .../navigation/viewcontrollers/ViewController.java       | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index e334a04..aaa5496 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -234,6 +234,14 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+        if (viewController != null) {
+            viewController.onViewStateRestored(savedInstanceState);
+        }
+    }
+
     @Override
     protected void onStart(@NonNull final View view, @NonNull final TActivity activity) {
         super.onStart(view, activity);
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 436d9fa..6912025 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -320,6 +320,15 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
         return null;
     }
 
+    /**
+     * Calls when {@link ViewController} saved state has been restored into the view hierarchy.
+     * Happens at {@link ViewControllerFragment#onViewStateRestored}.
+     */
+    @CallSuper
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        // do nothing
+    }
+
     /**
      * Calls when {@link ViewController} have started.
      * Happens at {@link ViewControllerFragment#onStart()}.

From 598dad199d820af00b532fd43e56da818cc60ee7 Mon Sep 17 00:00:00 2001
From: Unknown <pilotofsparrow@gmail.com>
Date: Fri, 13 Jul 2018 13:13:04 +0300
Subject: [PATCH 81/95] fix non final Bundle

---
 .../components/navigation/fragments/ViewControllerFragment.java | 2 +-
 .../components/navigation/viewcontrollers/ViewController.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index aaa5496..74f290d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -235,7 +235,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     }
 
     @Override
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+    public void onViewStateRestored(@Nullable final Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
         if (viewController != null) {
             viewController.onViewStateRestored(savedInstanceState);
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 6912025..2679d5d 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -325,7 +325,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * Happens at {@link ViewControllerFragment#onViewStateRestored}.
      */
     @CallSuper
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+    public void onViewStateRestored(@Nullable final Bundle savedInstanceState) {
         // do nothing
     }
 

From 6ff1409d02de4334772a68603f87fed7b3dc551a Mon Sep 17 00:00:00 2001
From: Arseniy Borisov <ars.borisov@gmail.com>
Date: Tue, 31 Jul 2018 15:57:24 +0300
Subject: [PATCH 82/95] fix hideSoftInput onstart

---
 .../components/navigation/viewcontrollers/ViewController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 2679d5d..363e628 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -337,7 +337,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
     public void onStart() {
         UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
-        UiUtils.OfViews.hideSoftInput(activity);
+        UiUtils.OfViews.hideSoftInput(getContainer());
     }
 
     /**

From 3a990daa8697fcd18998f8aaa062713ce1ba306d Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Mon, 6 Aug 2018 01:39:16 +0300
Subject: [PATCH 83/95] Components refactor

---
 .gitignore                                    |  36 +-
 build.gradle                                  |  54 +-
 gradle.properties                             |  13 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 54708 bytes
 gradle/wrapper/gradle-wrapper.properties      |   6 +
 gradlew                                       | 172 +++++++
 gradlew.bat                                   |  84 ++++
 logging/.gitignore                            |   1 +
 logging/build.gradle                          |  18 +
 logging/src/main/AndroidManifest.xml          |   1 +
 .../core/log/ConsoleLogProcessor.java         |  63 +++
 .../java/ru/touchin/roboswag/core/log/Lc.java | 277 ++++++++++
 .../ru/touchin/roboswag/core/log/LcGroup.java | 237 +++++++++
 .../ru/touchin/roboswag/core/log/LcLevel.java |  63 +++
 .../roboswag/core/log/LogProcessor.java       |  61 +++
 .../core/utils/ShouldNotHappenException.java  |  49 ++
 .../roboswag/core/utils/ThreadLocalValue.java |  61 +++
 navigation/.gitignore                         |   1 +
 navigation/build.gradle                       |  23 +
 navigation/src/main/AndroidManifest.xml       |   3 +
 .../navigation/FragmentNavigation.kt          |   0
 .../navigation/OnFragmentStartedListener.java |   2 +-
 .../navigation/SerializableBundle.java        |   0
 .../SimpleActionBarDrawerToggle.java          |   0
 .../navigation/activities/BaseActivity.java   |  20 +-
 .../fragments/ViewControllerFragment.java     |  13 +-
 .../navigation/fragments/ViewFragment.java    |   2 +-
 .../viewcontrollers/DefaultViewController.kt  |   0
 .../navigation/viewcontrollers/EmptyState.kt  |   0
 .../viewcontrollers/ViewController.java       |  41 +-
 .../ViewControllerNavigation.kt               |   0
 sample/.gitignore                             |   1 +
 sample/build.gradle                           |  26 +
 sample/proguard-rules.pro                     |  21 +
 sample/src/main/AndroidManifest.xml           |  22 +
 .../roboswag/components/MainActivity.kt       |  12 +
 .../drawable-v24/ic_launcher_foreground.xml   |  35 ++
 .../res/drawable/ic_launcher_background.xml   | 171 +++++++
 sample/src/main/res/layout/activity_main.xml  |  19 +
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   6 +
 .../mipmap-anydpi-v26/ic_launcher_round.xml   |   6 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 3056 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 5024 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2096 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 2858 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4569 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 7098 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 6464 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 10676 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 9250 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 15523 bytes
 sample/src/main/res/values/colors.xml         |   6 +
 sample/src/main/res/values/strings.xml        |   3 +
 sample/src/main/res/values/styles.xml         |  11 +
 settings.gradle                               |   1 +
 src/main/AndroidManifest.xml                  |   1 -
 .../components/adapters/AdapterDelegate.java  |  96 ----
 .../components/adapters/DelegatesManager.kt   |  52 --
 .../adapters/DelegationListAdapter.kt         |  89 ----
 .../adapters/ItemAdapterDelegate.java         |  85 ----
 .../adapters/OffsetAdapterUpdateCallback.kt   |  24 -
 .../adapters/PositionAdapterDelegate.java     |  68 ---
 .../components/extensions/Delegates.kt        |  24 -
 .../roboswag/components/extensions/View.kt    |  20 -
 .../components/extensions/ViewHolder.kt       |  32 --
 .../utils/audio/HeadsetStateObserver.java     | 119 -----
 .../utils/audio/VolumeController.java         | 132 -----
 .../components/utils/images/BlurUtils.java    | 323 ------------
 .../components/views/MaterialLoadingBar.java  | 120 -----
 .../views/MaterialProgressDrawable.java       | 292 -----------
 .../components/views/TypefacedEditText.java   | 345 -------------
 .../components/views/TypefacedTextView.java   | 467 -----------------
 .../views/internal/AttributesUtils.java       | 164 ------
 ...agment_slide_in_left_paralax_animation.xml |   6 -
 .../fragment_slide_in_right_animation.xml     |   6 -
 ...gment_slide_out_left_paralax_animation.xml |   6 -
 .../fragment_slide_out_right_animation.xml    |   6 -
 .../res/anim/global_fade_in_animation.xml     |  16 -
 .../res/anim/global_fade_out_animation.xml    |  16 -
 .../anim/global_slide_in_left_animation.xml   |  17 -
 .../anim/global_slide_in_right_animation.xml  |  17 -
 .../anim/global_slide_out_left_animation.xml  |  17 -
 .../anim/global_slide_out_right_animation.xml |  17 -
 .../res/drawable-v21/global_dark_selector.xml |   9 -
 .../drawable-v21/global_light_selector.xml    |   9 -
 .../res/drawable/global_dark_selector.xml     |   4 -
 .../res/drawable/global_light_selector.xml    |   4 -
 src/main/res/values/attrs.xml                 |  29 --
 src/main/res/values/integers.xml              |   4 -
 storable/.gitignore                           |   1 +
 storable/build.gradle                         |  24 +
 storable/src/main/AndroidManifest.xml         |   1 +
 .../utils/storables/PreferenceStore.java      |   1 -
 .../utils/storables/PreferenceUtils.java      | 184 ++++---
 .../ObservableRefCountWithCacheTime.java      | 299 +++++++++++
 .../observables/storable/BaseStorable.java    | 472 ++++++++++++++++++
 .../core/observables/storable/Converter.java  |  74 +++
 .../core/observables/storable/Migration.java  | 165 ++++++
 .../core/observables/storable/Migrator.java   |  97 ++++
 .../observables/storable/NonNullStorable.java | 145 ++++++
 .../storable/SameTypesConverter.java          |  27 +
 .../core/observables/storable/Storable.java   | 147 ++++++
 .../core/observables/storable/Store.java      |  70 +++
 utils/.gitignore                              |   1 +
 utils/build.gradle                            |  18 +
 utils/src/main/AndroidManifest.xml            |   1 +
 .../roboswag/components/utils/UiUtils.java    |  11 -
 .../utils/destroyable/BaseDestroyable.kt      |   0
 .../utils/destroyable/Destroyable.kt          |   0
 .../utils/spans/ColoredUrlSpan.java           |   0
 .../components/utils/spans/PhoneSpan.java     |   4 +-
 .../components/utils/spans/TypefaceSpan.java  |   0
 .../roboswag/core/utils/BiConsumer.java       |  19 +
 .../roboswag/core/utils/ObjectUtils.java      | 177 +++++++
 .../touchin/roboswag/core/utils/Optional.java |  71 +++
 .../roboswag/core/utils/ServiceBinder.java    |  70 +++
 .../roboswag/core/utils/StringUtils.java      |  60 +++
 .../src}/main/res/values/common_resources.xml |   4 +-
 118 files changed, 3609 insertions(+), 2811 deletions(-)
 create mode 100644 gradle.properties
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 logging/.gitignore
 create mode 100644 logging/build.gradle
 create mode 100644 logging/src/main/AndroidManifest.xml
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java
 create mode 100644 logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java
 create mode 100644 navigation/.gitignore
 create mode 100644 navigation/build.gradle
 create mode 100644 navigation/src/main/AndroidManifest.xml
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt (100%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java (99%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java (100%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java (100%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java (83%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java (95%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java (99%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt (100%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt (100%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java (93%)
 rename {src => navigation/src}/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt (100%)
 create mode 100644 sample/.gitignore
 create mode 100644 sample/build.gradle
 create mode 100644 sample/proguard-rules.pro
 create mode 100644 sample/src/main/AndroidManifest.xml
 create mode 100644 sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
 create mode 100644 sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 sample/src/main/res/drawable/ic_launcher_background.xml
 create mode 100644 sample/src/main/res/layout/activity_main.xml
 create mode 100644 sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
 create mode 100644 sample/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 sample/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 sample/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 sample/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 sample/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 sample/src/main/res/values/colors.xml
 create mode 100644 sample/src/main/res/values/strings.xml
 create mode 100644 sample/src/main/res/values/styles.xml
 create mode 100644 settings.gradle
 delete mode 100644 src/main/AndroidManifest.xml
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/View.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/utils/images/BlurUtils.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
 delete mode 100644 src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
 delete mode 100644 src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
 delete mode 100644 src/main/res/anim/fragment_slide_in_right_animation.xml
 delete mode 100644 src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
 delete mode 100644 src/main/res/anim/fragment_slide_out_right_animation.xml
 delete mode 100644 src/main/res/anim/global_fade_in_animation.xml
 delete mode 100644 src/main/res/anim/global_fade_out_animation.xml
 delete mode 100644 src/main/res/anim/global_slide_in_left_animation.xml
 delete mode 100644 src/main/res/anim/global_slide_in_right_animation.xml
 delete mode 100644 src/main/res/anim/global_slide_out_left_animation.xml
 delete mode 100644 src/main/res/anim/global_slide_out_right_animation.xml
 delete mode 100644 src/main/res/drawable-v21/global_dark_selector.xml
 delete mode 100644 src/main/res/drawable-v21/global_light_selector.xml
 delete mode 100644 src/main/res/drawable/global_dark_selector.xml
 delete mode 100644 src/main/res/drawable/global_light_selector.xml
 delete mode 100644 src/main/res/values/attrs.xml
 delete mode 100644 src/main/res/values/integers.xml
 create mode 100644 storable/.gitignore
 create mode 100644 storable/build.gradle
 create mode 100644 storable/src/main/AndroidManifest.xml
 rename {src => storable/src}/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java (99%)
 rename {src => storable/src}/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java (61%)
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
 create mode 100644 storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java
 create mode 100644 utils/.gitignore
 create mode 100644 utils/build.gradle
 create mode 100644 utils/src/main/AndroidManifest.xml
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/UiUtils.java (96%)
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt (100%)
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt (100%)
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java (100%)
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java (93%)
 rename {src => utils/src}/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java (100%)
 create mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
 create mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java
 create mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
 create mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java
 create mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java
 rename {src => utils/src}/main/res/values/common_resources.xml (96%)

diff --git a/.gitignore b/.gitignore
index 63e899b..09b993d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,8 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-
-# Gradle files
-.gradle/
-build/
-/*/build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log Files
-*.log
-
-.gradle
-.idea
-.DS_Store
-/captures
 *.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/build.gradle b/build.gradle
index 0a7ccae..7accccb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,36 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-android {
-    compileSdkVersion compileSdk
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+buildscript {
+    ext.kotlin_version = '1.2.60'
+    repositories {
+        google()
+        jcenter()
     }
-
-    defaultConfig {
-        minSdkVersion 16
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-dependencies {
-    api project(':libraries:core')
-
-    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
-    compileOnly "com.android.support:design:$supportLibraryVersion"
-    compileOnly "com.android.support:recyclerview-v7:$supportLibraryVersion"
-
-    compileOnly "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
-    compileOnly "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+ext {
+    versions = [
+            compileSdk    : 27,
+            minSdk        : 19,
+            supportLibrary: '27.1.1',
+            navigation    : '1.0.0-alpha04',
+            lifecycle     : '1.1.1',
+            dagger        : '2.16',
+            retrofit      : '2.4.0',
+            rxJava        : '2.1.17',
+            rxAndroid     : '2.0.2'
+    ]
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..e30af81
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,13 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+org.gradle.parallel=true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7a3265ee94c0ab25cf079ac8ccdf87f41d455d42
GIT binary patch
literal 54708
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
Zc_R%5SO@)xU1S1!2k^J>_x$+l{{cH8$W#CT

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..190eeaa
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sun Aug 05 23:37:20 MSK 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/logging/.gitignore b/logging/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/logging/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/logging/build.gradle b/logging/build.gradle
new file mode 100644
index 0000000..217c17b
--- /dev/null
+++ b/logging/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+}
diff --git a/logging/src/main/AndroidManifest.xml b/logging/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8ce26b3
--- /dev/null
+++ b/logging/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="ru.touchin.roboswag.core.log" />
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
new file mode 100644
index 0000000..0c05b84
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/ConsoleLogProcessor.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.log;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+/**
+ * Created by Gavriil Sitnikov on 13/11/2015.
+ * Simple {@link LogProcessor} implementation which is logging messages to console (logcat).
+ */
+public class ConsoleLogProcessor extends LogProcessor {
+
+    private static final int MAX_LOG_LENGTH = 4000;
+
+    public ConsoleLogProcessor(@NonNull final LcLevel lclevel) {
+        super(lclevel);
+    }
+
+    @NonNull
+    private String normalize(@NonNull final String message) {
+        return message.replace("\r\n", "\n").replace("\0", "");
+    }
+
+    @Override
+    @SuppressWarnings({"WrongConstant", "LogConditional"})
+    //WrongConstant, LogConditional: level.getPriority() is not wrong constant!
+    public void processLogMessage(@NonNull final LcGroup group, @NonNull final LcLevel level,
+                                  @NonNull final String tag, @NonNull final String message, @Nullable final Throwable throwable) {
+        final String messageToLog = normalize(message + (throwable != null ? '\n' + Log.getStackTraceString(throwable) : ""));
+        final int length = messageToLog.length();
+        for (int i = 0; i < length; i++) {
+            int newline = messageToLog.indexOf('\n', i);
+            newline = newline != -1 ? newline : length;
+            do {
+                final int end = Math.min(newline, i + MAX_LOG_LENGTH);
+                Log.println(level.getPriority(), tag, messageToLog.substring(i, end));
+                i = end;
+            }
+            while (i < newline);
+        }
+
+    }
+
+}
\ 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
new file mode 100644
index 0000000..3d46668
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/Lc.java
@@ -0,0 +1,277 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.text.TextUtils;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov on 13/11/2015.
+ * General logging utility of RoboSwag library.
+ * You can initialize {@link LogProcessor} to intercept log messages and make decision how to show them.
+ * Also you can specify assertions behavior to manually make application more stable in production but intercept illegal states in some
+ * third-party tool to fix them later but not crash in production.
+ */
+@SuppressWarnings({"checkstyle:methodname", "PMD.ShortMethodName", "PMD.ShortClassName"})
+//MethodNameCheck,ShortMethodName: log methods better be 1-symbol
+public final class Lc {
+
+    public static final LcGroup GENERAL_LC_GROUP = new LcGroup("GENERAL");
+
+    public static final int STACK_TRACE_CODE_DEPTH;
+
+    private static boolean crashOnAssertions = true;
+    @NonNull
+    private static LogProcessor logProcessor = new ConsoleLogProcessor(LcLevel.ERROR);
+
+    static {
+        final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+        int stackDepth;
+        for (stackDepth = 0; stackDepth < stackTrace.length; stackDepth++) {
+            if (stackTrace[stackDepth].getClassName().equals(Lc.class.getName())) {
+                break;
+            }
+        }
+        STACK_TRACE_CODE_DEPTH = stackDepth + 1;
+    }
+
+    /**
+     * Flag to crash application or pass it to {@link LogProcessor#processLogMessage(LcGroup, LcLevel, String, String, Throwable)}
+     * on specific {@link LcGroup#assertion(Throwable)} points of code.
+     *
+     * @return True if application should crash on assertion.
+     */
+    public static boolean isCrashOnAssertions() {
+        return crashOnAssertions;
+    }
+
+    /**
+     * Returns {@link LogProcessor} object to intercept incoming log messages (by default it returns {@link ConsoleLogProcessor}).
+     *
+     * @return Specific {@link LogProcessor}.
+     */
+    @NonNull
+    public static LogProcessor getLogProcessor() {
+        return logProcessor;
+    }
+
+    /**
+     * Initialize general logging behavior.
+     *
+     * @param logProcessor      {@link LogProcessor} to intercept all log messages;
+     * @param crashOnAssertions Flag to crash application
+     *                          or pass it to {@link LogProcessor#processLogMessage(LcGroup, LcLevel, String, String, Throwable)}
+     *                          on specific {@link LcGroup#assertion(Throwable)} points of code.
+     */
+    public static void initialize(@NonNull final LogProcessor logProcessor, final boolean crashOnAssertions) {
+        Lc.crashOnAssertions = crashOnAssertions;
+        Lc.logProcessor = logProcessor;
+    }
+
+    /**
+     * Logs debug message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public static void d(@NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.d(message, args);
+    }
+
+    /**
+     * Logs debug message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public static void d(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.d(throwable, message, args);
+    }
+
+    /**
+     * Logs info message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public static void i(@NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.i(message, args);
+    }
+
+    /**
+     * Logs info message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public static void i(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.i(throwable, message, args);
+    }
+
+    /**
+     * Logs warning message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public static void w(@NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.w(message, args);
+    }
+
+    /**
+     * Logs warning message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public static void w(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.w(throwable, message, args);
+    }
+
+    /**
+     * Logs error message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public static void e(@NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.e(message, args);
+    }
+
+    /**
+     * Logs error message via {@link #GENERAL_LC_GROUP}.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public static void e(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        GENERAL_LC_GROUP.e(throwable, message, args);
+    }
+
+    /**
+     * Processes assertion. Normally it will throw {@link ShouldNotHappenException} and crash app.
+     * If it should crash or not is specified at {@link Lc#isCrashOnAssertions()}.
+     * In some cases crash on assertions should be switched off and assertion should be processed in {@link LogProcessor}.
+     * It is useful for example to not crash but log it as handled crash in Crashlitycs in production build.
+     *
+     * @param message Message that is describing assertion.
+     */
+    public static void assertion(@NonNull final String message) {
+        GENERAL_LC_GROUP.assertion(message);
+    }
+
+    /**
+     * Processes assertion. Normally it will throw {@link ShouldNotHappenException} and crash app.
+     * If it should crash or not is specified at {@link Lc#isCrashOnAssertions()}.
+     * In some cases crash on assertions should be switched off and assertion should be processed in {@link LogProcessor}.
+     * It is useful for example to not crash but log it as handled crash in Crashlitycs in production build.
+     *
+     * @param throwable Exception that is describing assertion.
+     */
+    public static void assertion(@NonNull final Throwable throwable) {
+        GENERAL_LC_GROUP.assertion(throwable);
+    }
+
+    /**
+     * Throws assertion on main thread (to avoid Rx exceptions e.g.) and cuts top causes by type of exception class.
+     *
+     * @param assertion              Source throwable;
+     * @param exceptionsClassesToCut Classes which will be cut from top of causes stack of source throwable.
+     */
+    @SafeVarargs
+    public static void cutAssertion(@NonNull final Throwable assertion, @NonNull final Class<? extends Throwable>... exceptionsClassesToCut) {
+        new Handler(Looper.getMainLooper()).post(() -> {
+            final List<Throwable> processedExceptions = new ArrayList<>();
+            Throwable result = assertion;
+            boolean exceptionAssignableFromIgnores;
+            do {
+                exceptionAssignableFromIgnores = false;
+                processedExceptions.add(result);
+                for (final Class exceptionClass : exceptionsClassesToCut) {
+                    if (result.getClass().isAssignableFrom(exceptionClass)) {
+                        exceptionAssignableFromIgnores = true;
+                        result = result.getCause();
+                        break;
+                    }
+                }
+            }
+            while (exceptionAssignableFromIgnores && result != null && !processedExceptions.contains(result));
+            Lc.assertion(result != null ? result : assertion);
+        });
+    }
+
+    /**
+     * Returns line of code from where this method called.
+     *
+     * @param caller Object who is calling for code point;
+     * @return String represents code point.
+     */
+    @NonNull
+    public static String getCodePoint(@Nullable final Object caller) {
+        return getCodePoint(caller, 1);
+    }
+
+    /**
+     * Returns line of code from where this method called.
+     *
+     * @param caller     Object who is calling for code point;
+     * @param stackShift caller Shift of stack (e.g. 2 means two elements deeper);
+     * @return String represents code point.
+     */
+    @NonNull
+    public static String getCodePoint(@Nullable final Object caller, final int stackShift) {
+        final StackTraceElement traceElement = Thread.currentThread().getStackTrace()[STACK_TRACE_CODE_DEPTH + stackShift];
+        return traceElement.getMethodName() + '(' + traceElement.getFileName() + ':' + traceElement.getLineNumber() + ')'
+                + (caller != null ? " of object " + caller.getClass().getSimpleName() + '(' + Integer.toHexString(caller.hashCode()) + ')' : "");
+    }
+
+    /**
+     * Prints stacktrace in log with specified tag.
+     *
+     * @param tag Tag to be shown in logs.
+     */
+
+    @SuppressLint("LogConditional")
+    public static void printStackTrace(@NonNull final String tag) {
+        final StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
+        if (Log.isLoggable(tag, Log.DEBUG)) {
+            Log.d(tag, TextUtils.join("\n", Arrays.copyOfRange(stackTrace, STACK_TRACE_CODE_DEPTH, stackTrace.length)));
+        }
+    }
+
+    private Lc() {
+    }
+
+}
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
new file mode 100644
index 0000000..3ccf1fa
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcGroup.java
@@ -0,0 +1,237 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.log;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+import ru.touchin.roboswag.core.utils.ThreadLocalValue;
+
+/**
+ * Created by Gavriil Sitnikov on 14/05/2016.
+ * Group of log messages with specific tag prefix (name of group).
+ * It could be used in specific {@link LogProcessor} to filter messages by group.
+ */
+@SuppressWarnings({"checkstyle:methodname", "PMD.ShortMethodName"})
+//MethodNameCheck,ShortMethodName: log methods better be 1-symbol
+public class LcGroup {
+
+    /**
+     * Logging group to log UI metrics (like inflation or layout time etc.).
+     */
+    public static final LcGroup UI_METRICS = new LcGroup("UI_METRICS");
+    /**
+     * Logging group to log UI lifecycle (onCreate, onStart, onResume etc.).
+     */
+    public static final LcGroup UI_LIFECYCLE = new LcGroup("UI_LIFECYCLE");
+
+    private static final ThreadLocalValue<SimpleDateFormat> DATE_TIME_FORMATTER
+            = new ThreadLocalValue<>(() -> new SimpleDateFormat("HH:mm:ss.SSS", Locale.getDefault()));
+
+    @NonNull
+    private final String name;
+    private boolean disabled;
+
+    public LcGroup(@NonNull final String name) {
+        this.name = name;
+    }
+
+    /**
+     * Disables logging of this group.
+     */
+    public void disable() {
+        disabled = true;
+    }
+
+    /**
+     * Enables logging of this group.
+     */
+    public void enable() {
+        disabled = false;
+    }
+
+    @NonNull
+    private String createLogTag() {
+        final StackTraceElement trace = Thread.currentThread().getStackTrace()[Lc.STACK_TRACE_CODE_DEPTH + 3];
+        return trace.getFileName() + ':' + trace.getLineNumber();
+    }
+
+    @SuppressWarnings("PMD.AvoidCatchingThrowable")
+    //AvoidCatchingThrowable: it is needed to safety format message
+    @Nullable
+    private String createFormattedMessage(@Nullable final String message, @NonNull final Object... args) {
+        try {
+            if (args.length > 0 && message == null) {
+                throw new ShouldNotHappenException("Args are not empty but format message is null");
+            }
+            return message != null ? (args.length > 0 ? String.format(message, args) : message) : null;
+        } catch (final Throwable formattingException) {
+            Lc.assertion(formattingException);
+            return null;
+        }
+    }
+
+    @NonNull
+    private String createLogMessage(@Nullable final String formattedMessage) {
+        return DATE_TIME_FORMATTER.get().format(System.currentTimeMillis())
+                + ' ' + Thread.currentThread().getName()
+                + ' ' + name
+                + (formattedMessage != null ? (' ' + formattedMessage) : "");
+    }
+
+    private void logMessage(@NonNull final LcLevel logLevel, @Nullable final String message,
+                            @Nullable final Throwable throwable, @NonNull final Object... args) {
+        if (disabled || logLevel.lessThan(Lc.getLogProcessor().getMinLogLevel())) {
+            return;
+        }
+
+        if (throwable == null && args.length > 0 && args[0] instanceof Throwable) {
+            Lc.w("Maybe you've misplaced exception with first format arg? format: %s; arg: %s", message, args[0]);
+        }
+
+        final String formattedMessage = createFormattedMessage(message, args);
+        if (logLevel == LcLevel.ASSERT && Lc.isCrashOnAssertions()) {
+            throw createAssertion(formattedMessage, throwable);
+        }
+
+        Lc.getLogProcessor().processLogMessage(this, logLevel, createLogTag(), createLogMessage(formattedMessage), throwable);
+    }
+
+    @NonNull
+    private ShouldNotHappenException createAssertion(@Nullable final String message, @Nullable final Throwable exception) {
+        return exception != null
+                ? (message != null ? new ShouldNotHappenException(message, exception)
+                : (exception instanceof ShouldNotHappenException ? (ShouldNotHappenException) exception : new ShouldNotHappenException(exception)))
+                : (message != null ? new ShouldNotHappenException(message) : new ShouldNotHappenException());
+    }
+
+    /**
+     * Logs debug message.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public void d(@NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.DEBUG, message, null, args);
+    }
+
+    /**
+     * Logs debug message.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public void d(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.DEBUG, message, throwable, args);
+    }
+
+    /**
+     * Logs info message.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public void i(@NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.INFO, message, null, args);
+    }
+
+    /**
+     * Logs info message.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public void i(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.INFO, message, throwable, args);
+    }
+
+    /**
+     * Logs warning message.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public void w(@NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.WARN, message, null, args);
+    }
+
+    /**
+     * Logs warning message.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public void w(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.WARN, message, throwable, args);
+    }
+
+    /**
+     * Logs error message.
+     *
+     * @param message Message or format of message to log;
+     * @param args    Arguments of formatted message.
+     */
+    public void e(@NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.ERROR, message, null, args);
+    }
+
+    /**
+     * Logs error message.
+     *
+     * @param throwable Exception to log;
+     * @param message   Message or format of message to log;
+     * @param args      Arguments of formatted message.
+     */
+    public void e(@NonNull final Throwable throwable, @NonNull final String message, @NonNull final Object... args) {
+        logMessage(LcLevel.ERROR, message, throwable, args);
+    }
+
+    /**
+     * Processes assertion. Normally it will throw {@link ShouldNotHappenException} and crash app.
+     * If it should crash or not is specified at {@link Lc#isCrashOnAssertions()}.
+     * In some cases crash on assertions should be switched off and assertion should be processed in {@link LogProcessor}.
+     * It is useful for example to not crash but log it as handled crash in Crashlitycs in production build.
+     *
+     * @param message Message that is describing assertion.
+     */
+    public void assertion(@NonNull final String message) {
+        logMessage(LcLevel.ASSERT, "Assertion appears at %s with message: %s", null, Lc.getCodePoint(null, 2), message);
+    }
+
+    /**
+     * Processes assertion. Normally it will throw {@link ShouldNotHappenException} and crash app.
+     * If it should crash or not is specified at {@link Lc#isCrashOnAssertions()}.
+     * In some cases crash on assertions should be switched off and assertion should be processed in {@link LogProcessor}.
+     * It is useful for example to not crash but log it as handled crash in Crashlitycs in production build.
+     *
+     * @param throwable Exception that is describing assertion.
+     */
+    public void assertion(@NonNull final Throwable throwable) {
+        logMessage(LcLevel.ASSERT, "Assertion appears at %s", throwable, Lc.getCodePoint(null, 2));
+    }
+
+}
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
new file mode 100644
index 0000000..9dbd5e5
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LcLevel.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.log;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+/**
+ * Created by Gavriil Sitnikov on 14/05/2016.
+ * Level of log message.
+ */
+public enum LcLevel {
+
+    VERBOSE(Log.VERBOSE),
+    DEBUG(Log.DEBUG),
+    INFO(Log.INFO),
+    WARN(Log.WARN),
+    ERROR(Log.ERROR),
+    ASSERT(Log.ASSERT);
+
+    private final int priority;
+
+    LcLevel(final int priority) {
+        this.priority = priority;
+    }
+
+    /**
+     * Standard {@link Log} integer value of level represents priority of message.
+     *
+     * @return Integer level.
+     */
+    public int getPriority() {
+        return priority;
+    }
+
+    /**
+     * Compares priorities of LcLevels and returns if current is less than another.
+     *
+     * @param logLevel {@link LcLevel} to compare priority with;
+     * @return True if current level priority less than level passed as parameter.
+     */
+    public boolean lessThan(@NonNull final LcLevel logLevel) {
+        return this.priority < logLevel.priority;
+    }
+
+}
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
new file mode 100644
index 0000000..6cb34a9
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/log/LogProcessor.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.log;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+/**
+ * Created by Gavriil Sitnikov on 13/11/2015.
+ * Abstract object to intercept log messages coming from {@link LcGroup} and {@link Lc} log methods.
+ */
+public abstract class LogProcessor {
+
+    @NonNull
+    private final LcLevel minLogLevel;
+
+    public LogProcessor(@NonNull final LcLevel minLogLevel) {
+        this.minLogLevel = minLogLevel;
+    }
+
+    /**
+     * Minimum logging level.
+     * Any messages with lower priority won't be passed into {@link #processLogMessage(LcGroup, LcLevel, String, String, Throwable)}.
+     *
+     * @return Minimum log level represented by {@link LcLevel} object.
+     */
+    @NonNull
+    public LcLevel getMinLogLevel() {
+        return minLogLevel;
+    }
+
+    /**
+     * Core method to process any incoming log messages from {@link LcGroup} and {@link Lc} with level higher or equals {@link #getMinLogLevel()}.
+     *
+     * @param group     {@link LcGroup} where log message came from;
+     * @param level     {@link LcLevel} level (priority) of message;
+     * @param tag       String mark of message;
+     * @param message   Message to log;
+     * @param throwable Exception to log.
+     */
+    public abstract void processLogMessage(@NonNull final LcGroup group, @NonNull final LcLevel level,
+                                           @NonNull final String tag, @NonNull final String message, @Nullable final Throwable throwable);
+
+}
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
new file mode 100644
index 0000000..b3f11f0
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ShouldNotHappenException.java
@@ -0,0 +1,49 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by Gavriil Sitnikov on 13/11/2015.
+ * Exception that should be threw when some unexpected code reached.
+ * E.g. if some value null but it is not legal or in default case in switch if all specific cases should be processed.
+ */
+public class ShouldNotHappenException extends RuntimeException {
+
+    private static final long serialVersionUID = 0;
+
+    public ShouldNotHappenException() {
+        super();
+    }
+
+    public ShouldNotHappenException(@NonNull final String detailMessage) {
+        super(detailMessage);
+    }
+
+    public ShouldNotHappenException(@NonNull final String detailMessage, @NonNull final Throwable throwable) {
+        super(detailMessage, throwable);
+    }
+
+    public ShouldNotHappenException(@NonNull final Throwable throwable) {
+        super(throwable);
+    }
+
+}
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
new file mode 100644
index 0000000..62cf778
--- /dev/null
+++ b/logging/src/main/java/ru/touchin/roboswag/core/utils/ThreadLocalValue.java
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by Gavriil Sitnikov on 13/11/2015.
+ * Thread local value with specified creator of value per thread.
+ */
+public class ThreadLocalValue<T> extends ThreadLocal<T> {
+
+    @NonNull
+    private final Fabric<T> fabric;
+
+    public ThreadLocalValue(@NonNull final Fabric<T> fabric) {
+        super();
+        this.fabric = fabric;
+    }
+
+    @NonNull
+    @Override
+    protected T initialValue() {
+        return fabric.create();
+    }
+
+    /**
+     * Fabric of thread-local objects.
+     *
+     * @param <T> Type of objects.
+     */
+    public interface Fabric<T> {
+
+        /**
+         * Creates object.
+         *
+         * @return new instance of object.
+         */
+        @NonNull
+        T create();
+
+    }
+
+}
diff --git a/navigation/.gitignore b/navigation/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/navigation/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/navigation/build.gradle b/navigation/build.gradle
new file mode 100644
index 0000000..26d4258
--- /dev/null
+++ b/navigation/build.gradle
@@ -0,0 +1,23 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(":utils")
+    api project(":logging")
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+}
diff --git a/navigation/src/main/AndroidManifest.xml b/navigation/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..bd2d3ee
--- /dev/null
+++ b/navigation/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.touchin.roboswag.components.navigation"/>
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/FragmentNavigation.kt
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
similarity index 99%
rename from src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
index 2dfb580..8d68057 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
@@ -36,4 +36,4 @@ public interface OnFragmentStartedListener {
      */
     void onFragmentStarted(@NonNull Fragment fragment);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/SerializableBundle.java
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/SimpleActionBarDrawerToggle.java
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
similarity index 83%
rename from src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
index 7a3f0b7..ee39486 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/BaseActivity.java
@@ -29,8 +29,8 @@ import android.view.MenuItem;
 
 import java.util.Set;
 
-import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.log.LcGroup;
 
 /**
  * Created by Gavriil Sitnikov on 08/03/2016.
@@ -44,54 +44,54 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     @Override
     protected void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this) + " requestCode: " + requestCode + "; resultCode: " + resultCode);
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this) + " requestCode: " + requestCode + "; resultCode: " + resultCode);
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     @Override
     protected void onPause() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         super.onPause();
     }
 
     @Override
     protected void onSaveInstanceState(@NonNull final Bundle stateToSave) {
         super.onSaveInstanceState(stateToSave);
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     @Override
     protected void onStop() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         super.onStop();
     }
 
     @Override
     protected void onDestroy() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         super.onDestroy();
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
similarity index 95%
rename from src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
index 74f290d..065f06b 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewControllerFragment.java
@@ -30,7 +30,6 @@ import android.os.SystemClock;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewCompat;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -42,10 +41,9 @@ import android.widget.FrameLayout;
 
 import java.lang.reflect.Constructor;
 
-import ru.touchin.roboswag.components.R;
 import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController;
-import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.log.LcGroup;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 
 /**
@@ -182,7 +180,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         if (inDebugMode) {
             final long creationPeriod = SystemClock.elapsedRealtime() - creationTime;
             if (creationPeriod > acceptableUiCalculationTime) {
-                UiUtils.UI_METRICS_LC_GROUP.w("Creation of %s took too much: %dms", viewControllerClass, creationPeriod);
+                LcGroup.UI_METRICS.w("Creation of %s took too much: %dms", viewControllerClass, creationPeriod);
             }
         }
     }
@@ -212,11 +210,6 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     @Nullable
     @Override
     public Animation onCreateAnimation(final int transit, final boolean enter, final int nextAnim) {
-        if (nextAnim == R.anim.fragment_slide_in_right_animation || nextAnim == R.anim.fragment_slide_out_right_animation) {
-            ViewCompat.setTranslationZ(getView(), 1F);
-        } else {
-            ViewCompat.setTranslationZ(getView(), 0F);
-        }
         if (viewController != null) {
             return viewController.onCreateAnimation(transit, enter, nextAnim);
         } else {
@@ -371,7 +364,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
             if (inDebugMode && lastMeasureTime > 0) {
                 final long layoutTime = SystemClock.uptimeMillis() - lastMeasureTime;
                 if (layoutTime > acceptableUiCalculationTime) {
-                    UiUtils.UI_METRICS_LC_GROUP.w("Measure and layout of %s took too much: %dms", tagName, layoutTime);
+                    LcGroup.UI_METRICS.w("Measure and layout of %s took too much: %dms", tagName, layoutTime);
                 }
                 lastMeasureTime = 0;
             }
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
similarity index 99%
rename from src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
index 5cd873f..bca1f28 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
@@ -30,9 +30,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import io.reactivex.functions.BiConsumer;
 import ru.touchin.roboswag.components.navigation.OnFragmentStartedListener;
 import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.utils.BiConsumer;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/DefaultViewController.kt
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/EmptyState.kt
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
similarity index 93%
rename from src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
index 363e628..8e4c7d0 100644
--- a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewController.java
@@ -46,18 +46,19 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-
 import android.view.animation.Animation;
+
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.log.LcGroup;
 
 /**
  * Created by Gavriil Sitnikov on 21/10/2015.
  * Class to control view of specific fragment, activity and application by logic bridge.
  *
  * @param <TActivity> Type of activity where such {@link ViewController} could be;
- * @param <TState> Type of state;
+ * @param <TState>    Type of state;
  */
 public class ViewController<TActivity extends FragmentActivity, TState extends Parcelable> implements LifecycleOwner {
 
@@ -221,7 +222,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
 
     /**
      * Returns a color state list associated with a particular resource ID.
-     *
+     * <p>
      * <p>Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
      * color state list will be styled for the specified Context's theme.
      *
@@ -275,7 +276,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onCreate() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
     }
 
@@ -285,10 +286,10 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * {@link Animator} resources instead of {@link Animation} resources, {@code nextAnim}
      * will be an animator resource.
      *
-     * @param transit The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
-     *                set.
-     * @param enter {@code true} when the fragment is added/attached/shown or {@code false} when
-     *              the fragment is removed/detached/hidden.
+     * @param transit  The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
+     *                 set.
+     * @param enter    {@code true} when the fragment is added/attached/shown or {@code false} when
+     *                 the fragment is removed/detached/hidden.
      * @param nextAnim The resource set in
      *                 {@link FragmentTransaction#setCustomAnimations(int, int)},
      *                 {@link FragmentTransaction#setCustomAnimations(int, int, int, int)}, or
@@ -306,10 +307,10 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * {@link Animation} resources instead of {@link Animator} resources, {@code nextAnim}
      * will be an animation resource.
      *
-     * @param transit The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
-     *                set.
-     * @param enter {@code true} when the fragment is added/attached/shown or {@code false} when
-     *              the fragment is removed/detached/hidden.
+     * @param transit  The value set in {@link FragmentTransaction#setTransition(int)} or 0 if not
+     *                 set.
+     * @param enter    {@code true} when the fragment is added/attached/shown or {@code false} when
+     *                 the fragment is removed/detached/hidden.
      * @param nextAnim The resource set in
      *                 {@link FragmentTransaction#setCustomAnimations(int, int)},
      *                 {@link FragmentTransaction#setCustomAnimations(int, int, int, int)}, or
@@ -335,7 +336,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onStart() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
         UiUtils.OfViews.hideSoftInput(getContainer());
     }
@@ -345,7 +346,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
      */
     public void onAppear() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     /**
@@ -354,7 +355,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onResume() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
     }
 
@@ -373,7 +374,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onPause() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE);
     }
 
@@ -384,7 +385,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onSaveInstanceState(@NonNull final Bundle savedInstanceState) {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     /**
@@ -392,7 +393,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
      */
     public void onDisappear() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
     }
 
     /**
@@ -401,7 +402,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onStop() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
     }
 
@@ -411,7 +412,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
      */
     @CallSuper
     public void onDestroy() {
-        UiUtils.UI_LIFECYCLE_LC_GROUP.i(Lc.getCodePoint(this));
+        LcGroup.UI_LIFECYCLE.i(Lc.getCodePoint(this));
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
rename to navigation/src/main/java/ru/touchin/roboswag/components/navigation/viewcontrollers/ViewControllerNavigation.kt
diff --git a/sample/.gitignore b/sample/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/sample/build.gradle b/sample/build.gradle
new file mode 100644
index 0000000..65044a9
--- /dev/null
+++ b/sample/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "ru.touchin.roboswag.components"
+        minSdkVersion 16
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+}
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/sample/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..515c1fc
--- /dev/null
+++ b/sample/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.touchin.roboswag.components">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt b/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
new file mode 100644
index 0000000..ebf42b3
--- /dev/null
+++ b/sample/src/main/java/ru/touchin/roboswag/components/MainActivity.kt
@@ -0,0 +1,12 @@
+package ru.touchin.roboswag.components
+
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+}
diff --git a/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..3e810c0
--- /dev/null
+++ b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,35 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0"/>
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1"/>
+</vector>
diff --git a/sample/src/main/res/drawable/ic_launcher_background.xml b/sample/src/main/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..5713f34
--- /dev/null
+++ b/sample/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8"/>
+</vector>
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..7539a01
--- /dev/null
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..f4bc9d9
--- /dev/null
+++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..f4bc9d9
--- /dev/null
+++ b/sample/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2f5908281d070150700378b64a84c7db1f97aa1
GIT binary patch
literal 3056
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

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b523998081149a985cef0cdf89045b9ed29964a
GIT binary patch
literal 5024
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

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/sample/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff10afd6e182edb2b1a63c8f984e9070d9f950ba
GIT binary patch
literal 2096
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
axPAxe%7rDusX+w*0000<MNUMnLSTa3f$up0

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..115a4c768a20c9e13185c17043f4c4d12dd4632a
GIT binary patch
literal 2858
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
IM6N<$f{l1_%m4rY

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcd3cd8083358269d6ed7894726283bb9bcbbfea
GIT binary patch
literal 4569
zcmV;~5hm`5P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000r7Nkl<Zc-rk<
z32+qGnU-T`z44kNc92cLu9!sVKEN0((8+z<*jSQ*7;q9F$u3!&R6=4G6}+ybcFVh7
zjL<bBX-1kuGoz748XZX729}L+h>gh-ObE_muwxq><dH%wsq^xGZw_^j`jD&vbo8tG
zO0DUC{_g(1_x|_(_quzcqV%E{z34?RdeMts^rDv$RJLvVQk2VevmEjQh#CL}V|Sx{
zD%ygJ>sEpX)ywtgCHKIATY}p&%F4bRV>R9rYpeWbT(xnE7}?(HDXFgNDdC^@gUdK&
zk=MolYT3>rpR*$Ell<Xa2kJ95%qOlL9Ds{Hj<(%$O~}s+s5{ML`f8G+{H0`v@i_hc
zn9xDE68Ot8*IU!^V10Fm_%k`AxhgvrH#<90oE4h3Sq;{XOpjI5F2(8h3Ex__>2!`c
zjrIZftl&PUxlH2EgV+3VfQy&FjhL&5*Zg&R8xrSx?WgB?YuLO-JDaP3jr*I~qiywy
z`-52A<YdntY-0<&4o%y&dm7o}yBjs_7B)G!&qYnzK3CH@ZrInXX*Zv)7e1FXI~8r_
zaoA2Ts;^ECj}}9ZZB&xVU%hjFqy61@yMe{o4WGx^OM7DNhF&?WYOU+d_E>wB_6L#X
ztms{{yRkRfQLbsb#Ov%`)acN(OCewI3Ex__xed17hg#g4c1blx?sK}UQg%PM@N;5d
zsg{y6(|`H1Xfbz@5x{1688tu7TGkzFEBhOPDdFK(H_NQIFf|(>)ltFd!WdnkrY&mp
z0y@5yU2;u1_enx%+U9tyY-LNWrd<LN3!l@R6>4^Wi?x<^r`QbaLBngWL`HzX@G550
zrdyNjhPTknrrJn#jT0WD0<aisS#K)Y%&sgt8J(MZyO_fv)&6h1^752KyYUiYU97cC
z&;^jkR7<Il>Z)WJRi&3FKJ#Sa&|883%QxM-?S<r|8iP+4V1NQx44o67+Bg&3MM8it
z-LvKS6kUM92vF*qxPI*{a2E*yZl1h(Q<^ToAOxr`>%4niK{~k81<(c11sLk|!_7%s
zH>c$`*nP-wA8Dx-K(HE~JG_@Yxxa;J+2yr+*iVlh;2Eiw?e`D1vu6*qY1+XTe8RVu
z?RV%L|Mk!wO}j^S)p4H%?G37StD0Rx{_Y00%3a+V^SyOkfV@ZuFlEc;v<KZ)K1?rU
z)>R9r-D>cYU&plUkXL|M%1AYBQ3DI;;<W6jqHv$^tz`>hF%_X@m*cT<pJ;(<c5~cS
z0;W|K*O)pdZ;XHddI-|{09^oG09^oG09^oG09^oG09}AFEWnmcX{pX~AJ%YFYRUx=
zrv_x9^BQYp_odNA6rOmKo&NL^vz<Q4e(-ubo8dAsEuSE2d5cTa4!+h?ay7Ho%m#9v
z2QK`Pox1!9d->QAMZ4+FO74@AQB{A*_HtoXT@}l=8awaa7{RHC>07s?E%G{iSeRbh
z?h#NM)bP`z`zdp5lij!N*df;4+sgz&U_JEr?N9#1{+UG3^11oQUOvU4W%tD1Cie3;
z4zcz0SIrK-PG0(mp9gTYr(4ngx;<X*b0dkM=5uYEN7%5xndN(|oeAID7{N@KT0n}!
z=tG*FXg3N78EU|M45k<4_I-DMYv`hbBJBF(S(a6ARrR^7*~OMn3)DLHG^(xN-s@%e
zQz%ffK`1@)!Fkpjb{;FJmC4zocEjfb)T-2uonSKvGsq^(Vu(x&xE6f?V)MZZ|KIQ8
zo6r58H*u{#0C#0fCvssMoP)tOKEpn(J^=Rn&YxqwfmRqizWeO&`1i*|Cp^2ZnjOA)
zz8?uK@BN;~Zm}(D7JO}?ux9?<3D$J(4ExoG7uh?Xe8kTD`7#H#@fr4QfBP8w#hXWX
z3rq~_+~?47_rL$1<hTfjjemHT3pl1mK_KG@L=bxWg(GyN2qjPL-^IK{>ieH{NLq{*
z;Pd=vS6KZYPV?DLbo^)~2dTpiKVBOh?|v2XNA)li)4V6B6PA!iq#XV5eO{{vL%OmU
z0z3ZE2kcEkZ`kK(g^#s)#&#Zn5zw!R93cW^4+g0D=ydf&j4o_ti<@2WbzC>{(QhCL
z(=%Zb;Ax8U=sdec9pkk|cW)1Ko;gK{-575HsDZ!w@WOQ^Up)GGorc38cGxe<$8O!6
zmQ`=@;TG{FjWq(s<Z8hBDNb0;CcoXoJHehCK)$5I|KNRoE^6nxwAsm?r%e1Is#t1v
ziyQ3%Y*x6;o%cm@Q9gFd=CsT@ix2nbFKVz0NQl&cyBDy4uCyP`{;iKcjL0Y_5~C!X
z3(iUDd>0eBn5I~vVgoE}un8+#YuR$Asq?<!yeR+g$B*8Su%i}^a86^Q4_MmlVjX|I
zI&8=f0_U{E>lobvVAO-`SBs3!&;QEKT>gZ0T)jG^Foo~J2YkV&mi-axlvC}-(J4S2
z;opuO)+FIV#}&4;wwisb>{XU+FJ~tyK7UaG@ZD^C1^brazu7Xkh5Od}&P)GufW=u#
zMxOwfWJ3a^MZha>9OmQ)@!Y;v*4@+dg~s~NQ;q@hV~l>lw`P)d`4XF9rE?aEFe(JV
zI>11}Ny%^CkO=VN>wCV?P!-?VdT3vWe4zBLV*?6XPqsC%n93bQXvydh0Mo+tXHO4^
zxQ{x0?CG{fmToCyYny7>*-tNh;Sh9=THLzkS~lBiV9)IKa^C~_p8MVZWAUb)Btjt<
zVZ;l7?_KnLHelj>)M1|Q_%pk5b?Bod_&86o-#36xIEag%b+8<lnYV%%Qz1*RmfrY9
z`4mUF4-Y{n*^L5Loz&o8lC+2ZfAN104vVB~Fr%jz4)0?L<|2-i>JqlDy@B^*YS*1;
zGYT`@5nPgt)S^6Ap@b160C4d9do0iE;wYdn_Tr(vY{MS!ja!t*Z7G=Vz-=j5Z&ic;
zwiG+x#%j}{0gU~J8;<|!B1@-XaB@{KORFwrYg_8rOv({b0EO#DbeQRm;B6_9=mXGf
z-x|VL{zd`)#@yN}HkCSJbjbNlE|zL3Wm9Q8HY`sV)}3%pgN>cL^67{Z;PPL(*wT8N
zUjXU{@|*hvm}({wsAC=x0^ok0%UAz0;sogW{B!nDqk|JJ5x~4NfTDgP49^zeu`<Kk
zZ?bY3nBO_hyfo&nJn?JU{bIOIy~CWRPOx&=22ddb6MUXI#mpyvL;oN5;~ja_kk5KL
zzS902grJZBwJg<I8X`Xku?WL9513k2#HR$r87`1i{u+C<&dTDA+xzVc$6V?Va|qmz
zXnMhq?I9#o6tc$}YFH8yDe@mv5sn=pWY$!$rF49r^&;sK1ED5>csl?5mY@JdQdISc
zFs!E{<U|;h07O<$044Id0F@#ERLBSEK>^grmkLnUk9<Fhxd_94Iyzj00SiFi2@0S_
zK5D$O08;XU0xS!3v`XY7<oE?}O9iM3Lv=BsWcV-0h(#EX0D+JL0dge*^e0~;fO)4X
z`CI@;rBnbJ^8Er7O9hZ6znI0Civ+wcDDsQ)TQ;YqyQ_SdV#uzy2*G=5lz=DD@es7q
z{%n_-Wzfas+KlYG&2CCu3~UaKFr+AxAkSlGs|guon_&~fC_xU9`czv3%XOMqCJB~V
z6GVj+WVeb&IZw3Ku`Jroa*APMS*|{yGk$h&Gh0BFDhqc%i$RH35E(9$u%N-tAJmS>
zny~m)1vws@5BFI<-0Tuo2JWX(0v`W|t(wg;s--L47WTvTMz-8l#TL^=OJNRS2?_Qj
z3AKT+gvbyBi#H*-tJ%tWD|>EV3wy|8qxfzS!5RW;Jpl5*zo&^UBU=fG#2}UvRyNkK
zA06Dy9;K1ca@r2T>yThYgI!ont$(G{6q#2QT<iOSQmErvO+@qyL4mL%?r`T(EzPBx
zD;IXeqn!i_9gk7XPNGmD7k0$)9yK3?%Y_|rXX_6^bu29qLd9XH4<!_WiiH$vZ5ig`
zk#lDpVrx7Rs7Ai505aqU1;`T%pg=wsz!@fh4EbCDBDkPcB!CS0996|as$+x+fLX*u
zONoSdxuK>+00r_x0(b)gsE`lBB?2gr55gq^D3Fi&p%E(p9>U<GBZMM_alT)GN>%bv
z<NX3SSyEMzD)|xtRLGYIU^gg|FA<=sbYwoJiiE~bc>kg1Jco(RbyTX7FDHOnl7-O@
zI$AaIl?9NJKPm(WiBP`1-#CB1QzU>&hKm)fpa5DKE{2$X0hGz-0uZ?cyTk(YC!Y&|
zL=1VrNERSA5NA2jq7FACfX4JfPyj5XXl1yv0>~s;eF7L2$>&oMqeTFT2m$y7FlkON
z_yurD1yIOvA;5C6016pyxBznGUt0kJ&k5r#;&>Jow`r)sp9R~PmK~lz$3xH%LT*1U
zJdOyABZ3!FvNoR*vN$5ykHS8f`jA4zV+|L}i1C4`<PfUFDCQaNN*c0a8*yF&I(86A
zl(nyE^RWAAjE_4cB*1+`0mNHM1w3t;73rynNIoeq#`=B!r`qulw2}=vKO|QFLK*81
zc6<3Y#`zd(BGgFXVrwW{e&O{!Y%S#%SVqJ`iXXLnM$->B2c{R0;UdYxaU|H)2avz@
z=mEYc|2S<+(B2Tj+FkX+2D+yFI!k9lWMA61DJ{)e;lum$(;O87?vGJJe!KtK04+N_
zI*P~t@dUb>9Xh{dbyl{-ZQ(UMgz7$|QfL5XSPkskt^NgctYC#;4WcZB1@%@wy@2t3
z2z0DI7&%b$*Aw~abe?GxE`ez@+6hOh-6*8fHRV{1os$EL@}uUZeG4h1&Be`98q*7j
z=3-v+lhIjfWVo12!<>%V^a6lTgW3+_#W6n|p*~==zOH7z$0{LSZk(Tpd7EaD04hnA
zL;#fxS0aD{`5^&D`}>0Uq?byDD-l2=!wm_bLcUl4gc(%<L@)1-tN=fLZrX5qVH0kc
zRZ6n_0@Si(ONnNN%LSm$T#ftz3lO#@eAoIlvm++J#7)m6CfW^`htnIgBqE5$_=(lU
ze5B(SKt037B8pT1`6LTNOpJ0A1qiz<Vvec!(+PR2W(-{b|IcsSe0xkxG+o$lhucq>
za1p|itVANvFF>hghAS07Im1;IK;|b*W)}VDyI;BIp2=K*yu2a)j?B|f<44NI$NbmJ
z#dE0>jI$fMr&@>4kN8MLFb4&2O9fEKaQg%(QO$4_1rVQywG^CmBLh#}_7gKW3vd?|
z2?1^&KWq8}8I^_S0|)MowU_pw$q@nl@Nkn$z>BQq_KA^9<K{KHJOW*yrtRVeyMX6#
z<@Uu?6$#WSb0nCHgnX|{puT|qFBD=-VKDCu0c*HeM#N$|2_r>yaR`(R3u{{Ig;cwt
z@AJ^{ODQCm^neroM9nKNUAXi9RCK`OsP_LuR0PUR(YZ<ZMWD&|<*g`)fAtp^u-Jj7
zhIl83eEyKOLveo)c)=ZR=f-Qkv~2kk=&iNNHn>CCX5dNF6VzcoK&=b^r`W?ltt|*F
zpkoae%ZT{C1h~EcFui~b7fF`vb<<~j_VquuUA$}QqIKYELPp#;{u?q8Dz}WAG-(3;
zjrm$i%7UbyZMM(Y{>!uJ#vNB?R~B{6Htp=>e*<{fQQ5W7V(1coCWlOON!MzZxhum|
ztZBQ<R^GMLYE-u?FYKCQ+|l)jwY)2Xwr3k(6JbXf3cD6om3FOwPuK=gv9ljC$oFce
zsVj@lH*~DPHK&*F=l~Z<TYgw`XL9@^aCG~`iTEM6i2kM|l)Uw}d+(iu0}xWba>pGR
z;~#ur^&PockKdV{Q6R>o`Pl{0x!DEbpZ7y9Y;*ZvE!*gU`V1W3znva{f=?WO5I&>B
z&hw6}tjECtaghm5z|C#<P5?)@MzZz?3r0l$7<JcOcSnsMKZUlZ5)ufBV;l*b3vdE%
zz>%M;Yf_*pI^}<g8aM81QPI&8qb5xFI$@F+w*?S201U?NM*Ebp{W|9WT!0flH#bFH
zhjJ4i<ND*=m&Z7632<>;h}Vl=^r9EN=tVDj86D;C$jIJ?K7VP+00000NkvXXu0mjf
D5i!M*

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..459ca609d3ae0d3943ab44cdc27feef9256dc6d7
GIT binary patch
literal 7098
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

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ca12fe024be86e868d14e91120a6902f8e88ac6
GIT binary patch
literal 6464
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
B0*L?s

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e19b410a1b15ff180f3dacac19395fe3046cdec
GIT binary patch
literal 10676
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
a9sdtN6eHRrdyqB&0000<MNUMnLSTYHIB(_v

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b824ebdd48db917eea2e67a82260a100371f8a24
GIT binary patch
literal 9250
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

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/sample/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c19a13c239cb67b8a2134ddd5f325db1d2d5bee
GIT binary patch
literal 15523
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
BIP(Ai

literal 0
HcmV?d00001

diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
new file mode 100644
index 0000000..3ab3e9c
--- /dev/null
+++ b/sample/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f6470ae
--- /dev/null
+++ b/sample/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Components</string>
+</resources>
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
new file mode 100644
index 0000000..5885930
--- /dev/null
+++ b/sample/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..9e1f446
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':sample', ':utils', ':logging', ':navigation', ':storable'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
deleted file mode 100644
index c76023c..0000000
--- a/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="ru.touchin.roboswag.components"/>
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
deleted file mode 100644
index 25be0c9..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *  Copyright (c) 2017 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.adapters;
-
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.ViewGroup;
-
-import java.util.List;
-
-/**
- * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
- * Default {@link #getItemViewType} is generating on construction of object.
- *
- * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
- */
-public abstract class AdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> {
-
-    private final int defaultItemViewType = ViewCompat.generateViewId();
-
-    /**
-     * Unique ID of AdapterDelegate.
-     *
-     * @return Unique ID.
-     */
-    public int getItemViewType() {
-        return defaultItemViewType;
-    }
-
-    /**
-     * Returns if object is processable by this delegate.
-     *
-     * @param items                  Items to check;
-     * @param adapterPosition        Position of item in adapter;
-     * @param collectionPosition     Position of item in collection;
-     * @return True if item is processable by this delegate.
-     */
-    public abstract boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition);
-
-    /**
-     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
-     *
-     * @param items                Items in adapter;
-     * @param adapterPosition      Position of item in adapter;
-     * @param collectionPosition   Position of item in collection;
-     * @return Unique item ID.
-     */
-    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
-        return 0;
-    }
-
-    /**
-     * Creates ViewHolder to bind item to it later.
-     *
-     * @param parent Container of ViewHolder's view.
-     * @return New ViewHolder.
-     */
-    @NonNull
-    public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
-
-    /**
-     * Binds item to created by this object ViewHolder.
-     *
-     * @param holder               ViewHolder to bind item to;
-     * @param items                Items in adapter;
-     * @param adapterPosition      Position of item in adapter;
-     * @param collectionPosition   Position of item in collection that contains item;
-     * @param payloads             Payloads;
-     */
-    public abstract void onBindViewHolder(
-            @NonNull final RecyclerView.ViewHolder holder,
-            @NonNull final List<Object> items,
-            final int adapterPosition,
-            final int collectionPosition,
-            @NonNull final List<Object> payloads
-    );
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
deleted file mode 100644
index e3ba14f..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package ru.touchin.roboswag.components.adapters
-
-import android.support.v7.widget.RecyclerView
-import android.util.SparseArray
-import android.view.ViewGroup
-
-/**
- * Manager for delegation callbacks from [RecyclerView.Adapter] to delegates.
- */
-class DelegatesManager {
-
-    private val delegates = SparseArray<AdapterDelegate<*>>()
-
-    fun getItemViewType(items: List<*>, adapterPosition: Int, collectionPosition: Int): Int {
-        for (index in 0 until delegates.size()) {
-            val delegate = delegates.valueAt(index)
-            if (delegate.isForViewType(items, adapterPosition, collectionPosition)) {
-                return delegate.itemViewType
-            }
-        }
-        throw IllegalStateException("Delegate not found for adapterPosition: $adapterPosition")
-    }
-
-    fun getItemId(items: List<*>, adapterPosition: Int, collectionPosition: Int): Long {
-        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
-        return delegate.getItemId(items, adapterPosition, collectionPosition)
-    }
-
-    fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = getDelegate(viewType).onCreateViewHolder(parent)
-
-    fun onBindViewHolder(holder: RecyclerView.ViewHolder, items: List<*>, adapterPosition: Int, collectionPosition: Int, payloads: List<Any>) {
-        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
-        delegate.onBindViewHolder(holder, items, adapterPosition, collectionPosition, payloads)
-    }
-
-    /**
-     * Adds [PositionAdapterDelegate] to adapter.
-     *
-     * @param delegate Delegate to add.
-     */
-    fun addDelegate(delegate: AdapterDelegate<*>) = delegates.put(delegate.itemViewType, delegate)
-
-    /**
-     * Removes [AdapterDelegate] from adapter.
-     *
-     * @param delegate Delegate to remove.
-     */
-    fun removeDelegate(delegate: AdapterDelegate<*>) = delegates.remove(delegate.itemViewType)
-
-    private fun getDelegate(viewType: Int) = delegates[viewType] ?: throw IllegalStateException("No AdapterDelegate added for view type: $viewType")
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt b/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
deleted file mode 100644
index 094b298..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-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 android.view.ViewGroup
-import ru.touchin.roboswag.components.extensions.setOnRippleClickListener
-
-/**
- * Base adapter with delegation and diff computing on background thread.
- */
-open class DelegationListAdapter<TItem>(config: AsyncDifferConfig<TItem>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    constructor(diffCallback: DiffUtil.ItemCallback<TItem>) : this(AsyncDifferConfig.Builder<TItem>(diffCallback).build())
-
-    var itemClickListener: ((TItem, RecyclerView.ViewHolder) -> Unit)? = null
-
-    private val delegatesManager = DelegatesManager()
-    private var differ = AsyncListDiffer(OffsetAdapterUpdateCallback(this, ::getHeadersCount), config)
-
-    open fun getHeadersCount() = 0
-
-    open fun getFootersCount() = 0
-
-    override fun getItemCount() = getHeadersCount() + getList().size + getFootersCount()
-
-    override fun getItemViewType(position: Int) = delegatesManager.getItemViewType(getList(), position, getCollectionPosition(position))
-
-    override fun getItemId(position: Int) = delegatesManager.getItemId(getList(), position, getCollectionPosition(position))
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = delegatesManager.onCreateViewHolder(parent, viewType)
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any>) {
-        val collectionPosition = getCollectionPosition(position)
-        if (collectionPosition in 0 until getList().size) {
-            if (itemClickListener != null) {
-                holder.itemView.setOnRippleClickListener {
-                    itemClickListener?.invoke(getList()[getCollectionPosition(holder.adapterPosition)], holder)
-                }
-            } else {
-                holder.itemView.setOnClickListener(null)
-            }
-        }
-        delegatesManager.onBindViewHolder(holder, getList(), position, collectionPosition, payloads)
-    }
-
-    final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) = Unit
-
-    /**
-     * Adds [AdapterDelegate] to adapter.
-     *
-     * @param delegate Delegate to add.
-     */
-    fun addDelegate(delegate: AdapterDelegate<*>) = delegatesManager.addDelegate(delegate)
-
-    /**
-     * Removes [AdapterDelegate] from adapter.
-     *
-     * @param delegate Delegate to remove.
-     */
-    fun removeDelegate(delegate: AdapterDelegate<*>) = delegatesManager.removeDelegate(delegate)
-
-    /**
-     * Submits a new list to be diffed, and displayed.
-     *
-     * If a list is already being displayed, a diff will be computed on a background thread, which
-     * will dispatch Adapter.notifyItem events on the main thread.
-     *
-     * @param list The new list to be displayed.
-     */
-    fun submitList(list: List<TItem>) = differ.submitList(list)
-
-    /**
-     * Get the current List - any diffing to present this list has already been computed and
-     * dispatched via the ListUpdateCallback.
-     * <p>
-     * If a <code>null</code> List, or no List has been submitted, an empty list will be returned.
-     * <p>
-     * The returned list may not be mutated - mutations to content must be done through
-     * {@link #submitList(List)}.
-     *
-     * @return current List.
-     */
-    fun getList(): List<TItem> = differ.currentList
-
-    fun getCollectionPosition(adapterPosition: Int) = adapterPosition - getHeadersCount()
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
deleted file mode 100644
index 324bcf4..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package ru.touchin.roboswag.components.adapters;
-
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-
-import java.util.List;
-
-/**
- * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
- * Such delegates are creating and binding ViewHolders for specific items.
- * Default {@link #getItemViewType} is generating on construction of object.
- *
- * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate;
- * @param <TItem>       Type of items to bind to {@link RecyclerView.ViewHolder}s.
- */
-public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
-
-    @Override
-    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
-        return collectionPosition >= 0
-                && collectionPosition < items.size()
-                && isForViewType(items.get(collectionPosition), adapterPosition, collectionPosition);
-    }
-
-    /**
-     * Returns if object is processable by this delegate.
-     * This item will be casted to {@link TItem} and passes to {@link #onBindViewHolder(TViewHolder, TItem, int, int, List)}.
-     *
-     * @param item                  Item to check;
-     * @param adapterPosition       Position of item in adapter;
-     * @param collectionPosition    Position of item in collection that contains item;
-     * @return True if item is processable by this delegate.
-     */
-    public boolean isForViewType(@NonNull final Object item, final int adapterPosition, final int collectionPosition) {
-        return true;
-    }
-
-    @Override
-    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
-        //noinspection unchecked
-        return getItemId((TItem) items.get(collectionPosition), adapterPosition, collectionPosition);
-    }
-
-    /**
-     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
-     *
-     * @param item                 Item in adapter;
-     * @param adapterPosition      Position of item in adapter;
-     * @param collectionPosition   Position of item in collection that contains item;
-     * @return Unique item ID.
-     */
-    public long getItemId(@NonNull final TItem item, final int adapterPosition, final int collectionPosition) {
-        return 0;
-    }
-
-    @Override
-    public void onBindViewHolder(
-            @NonNull final RecyclerView.ViewHolder holder,
-            @NonNull final List<Object> items,
-            final int adapterPosition,
-            final int collectionPosition,
-            @NonNull final List<Object> payloads
-    ) {
-        //noinspection unchecked
-        onBindViewHolder((TViewHolder) holder, (TItem) items.get(collectionPosition), adapterPosition, collectionPosition, payloads);
-    }
-
-    /**
-     * Binds item with payloads to created by this object ViewHolder.
-     *
-     * @param holder               ViewHolder to bind item to;
-     * @param item                 Item in adapter;
-     * @param adapterPosition      Position of item in adapter;
-     * @param collectionPosition   Position of item in collection that contains item;
-     * @param payloads             Payloads;
-     */
-    public abstract void onBindViewHolder(
-            @NonNull final TViewHolder holder,
-            @NonNull final TItem item,
-            final int adapterPosition,
-            final int collectionPosition,
-            @NonNull final List<Object> payloads
-    );
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt b/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
deleted file mode 100644
index 9715eb2..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package ru.touchin.roboswag.components.adapters
-
-import android.support.v7.util.ListUpdateCallback
-import android.support.v7.widget.RecyclerView
-
-class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback  {
-
-    override fun onInserted(position: Int, count: Int) {
-        adapter.notifyItemRangeInserted(position + offsetProvider(), count)
-    }
-
-    override fun onRemoved(position: Int, count: Int) {
-        adapter.notifyItemRangeRemoved(position + offsetProvider(), count)
-    }
-
-    override fun onMoved(fromPosition: Int, toPosition: Int) {
-        adapter.notifyItemMoved(fromPosition + offsetProvider(), toPosition + offsetProvider())
-    }
-
-    override fun onChanged(position: Int, count: Int, payload: Any?) {
-        adapter.notifyItemRangeChanged(position + offsetProvider(), count, payload)
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java b/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
deleted file mode 100644
index ada8888..0000000
--- a/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package ru.touchin.roboswag.components.adapters;
-
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-
-import java.util.List;
-
-/**
- * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
- * Such delegates are creating and binding ViewHolders by position in adapter.
- * Default {@link #getItemViewType} is generating on construction of object.
- *
- * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
- */
-public abstract class PositionAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> extends AdapterDelegate<TViewHolder> {
-
-    @Override
-    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
-        return isForViewType(adapterPosition);
-    }
-
-    /**
-     * Returns if object is processable by this delegate.
-     *
-     * @param adapterPosition Position of item in adapter;
-     * @return True if item is processable by this delegate.
-     */
-    public abstract boolean isForViewType(final int adapterPosition);
-
-    @Override
-    public long getItemId(@NonNull final List<Object> objects, final int adapterPosition, final int itemsOffset) {
-        return getItemId(adapterPosition);
-    }
-
-    /**
-     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
-     *
-     * @param adapterPosition Position of item in adapter;
-     * @return Unique item ID.
-     */
-    public long getItemId(final int adapterPosition) {
-        return 0;
-    }
-
-    @Override
-    public void onBindViewHolder(
-            @NonNull final RecyclerView.ViewHolder holder,
-            @NonNull final List<Object> items,
-            final int adapterPosition,
-            final int collectionPosition,
-            @NonNull final List<Object> payloads
-    ) {
-        //noinspection unchecked
-        onBindViewHolder((TViewHolder) holder, adapterPosition, payloads);
-    }
-
-    /**
-     * Binds position with payloads to ViewHolder.
-     *
-     * @param holder            ViewHolder to bind position to;
-     * @param adapterPosition   Position of item in adapter;
-     * @param payloads          Payloads.
-     */
-    public void onBindViewHolder(@NonNull final TViewHolder holder, final int adapterPosition, @NonNull final List<Object> payloads) {
-        //do nothing by default
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt b/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
deleted file mode 100644
index 050bd6b..0000000
--- a/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package ru.touchin.roboswag.components.extensions
-
-import kotlin.properties.Delegates
-import kotlin.properties.ObservableProperty
-import kotlin.properties.ReadWriteProperty
-import kotlin.reflect.KProperty
-
-/**
- * Simple observable delegate only for notification of new value.
- */
-inline fun <T> Delegates.observable(
-        initialValue: T,
-        crossinline onChange: (newValue: T) -> Unit
-): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
-    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) = onChange(newValue)
-}
-
-inline fun <T> Delegates.distinctUntilChanged(
-        initialValue: T,
-        crossinline onChange: (newValue: T) -> Unit
-): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
-    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) =
-            if (newValue != null && oldValue != newValue) onChange(newValue) else Unit
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/View.kt b/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
deleted file mode 100644
index 9f4ddca..0000000
--- a/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package ru.touchin.roboswag.components.extensions
-
-import android.os.Build
-import android.view.View
-
-private const val RIPPLE_EFFECT_DELAY = 150L
-
-/**
- * Sets click listener to view. On click it will call something after delay.
- *
- * @param delay     Delay after which click listener will be called;
- * @param listener  Click listener.
- */
-fun View.setOnRippleClickListener(delay: Long = RIPPLE_EFFECT_DELAY, listener: (View) -> Unit) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        setOnClickListener { view -> postDelayed({ if (hasWindowFocus()) listener(view) }, delay) }
-    } else {
-        setOnClickListener(listener)
-    }
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
deleted file mode 100644
index db7165f..0000000
--- a/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package ru.touchin.roboswag.components.extensions
-
-import android.content.Context
-import android.content.res.ColorStateList
-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.StringRes
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
-import android.view.View
-
-fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)
-
-val RecyclerView.ViewHolder.context: Context
-    get() = itemView.context
-
-fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = context.getText(resId)
-
-fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = context.getString(resId)
-
-@SuppressWarnings("SpreadOperator") // it's OK for small arrays
-fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = context.getString(resId, *args)
-
-@ColorInt
-fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(context, resId)
-
-fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(context, resId)
-
-fun RecyclerView.ViewHolder.getDrawable(@DrawableRes resId: Int): Drawable? = ContextCompat.getDrawable(context, resId)
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java b/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
deleted file mode 100644
index 346e52b..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/audio/HeadsetStateObserver.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils.audio;
-
-import android.bluetooth.BluetoothA2dp;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
-import android.support.annotation.NonNull;
-
-import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
-
-/**
- * Created by Gavriil Sitnikov on 02/11/2015.
- * Simple observer of wired or wireless (bluetooth A2DP) headsets state (connected or not).
- * <br><font color="yellow"> You require android.permission.BLUETOOTH and API level >= 11 if want to observe wireless headset state </font>
- */
-public final class HeadsetStateObserver {
-
-    @NonNull
-    private final AudioManager audioManager;
-    @NonNull
-    private final Observable<Boolean> connectedObservable;
-
-    public HeadsetStateObserver(@NonNull final Context context) {
-        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        connectedObservable = Observable
-                .fromCallable(() -> new IsConnectedReceiver(audioManager))
-                .switchMap(isConnectedReceiver -> Observable.combineLatest(isConnectedReceiver.isWiredConnectedChangedEvent,
-                        isConnectedReceiver.isWirelessConnectedChangedEvent,
-                        (isWiredConnected, isWirelessConnected) -> isWiredConnected || isWirelessConnected)
-                        .distinctUntilChanged()
-                        .doOnSubscribe(disposable -> {
-                            final IntentFilter headsetStateIntentFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);
-                            headsetStateIntentFilter.addAction(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
-                            context.registerReceiver(isConnectedReceiver, headsetStateIntentFilter);
-                        })
-                        .doOnDispose(() -> context.unregisterReceiver(isConnectedReceiver)))
-                .replay(1)
-                .refCount();
-    }
-
-    /**
-     * Returns if wired or wireless headset is connected.
-     *
-     * @return True if headset is connected.
-     */
-    @SuppressWarnings("deprecation")
-    public boolean isConnected() {
-        return audioManager.isWiredHeadsetOn() || audioManager.isBluetoothA2dpOn();
-    }
-
-    /**
-     * Observes connection state of headset.
-     *
-     * @return Returns observable which will provide current connection state and any of it's udpdate.
-     */
-    @NonNull
-    public Observable<Boolean> observeIsConnected() {
-        return connectedObservable;
-    }
-
-    private static class IsConnectedReceiver extends BroadcastReceiver {
-
-        @NonNull
-        private final BehaviorSubject<Boolean> isWiredConnectedChangedEvent;
-        @NonNull
-        private final BehaviorSubject<Boolean> isWirelessConnectedChangedEvent;
-
-        @SuppressWarnings("deprecation")
-        public IsConnectedReceiver(@NonNull final AudioManager audioManager) {
-            super();
-            isWiredConnectedChangedEvent = BehaviorSubject.createDefault(audioManager.isWiredHeadsetOn());
-            isWirelessConnectedChangedEvent = BehaviorSubject.createDefault(audioManager.isBluetoothA2dpOn());
-        }
-
-        @Override
-        public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
-            if (Intent.ACTION_HEADSET_PLUG.equals(intent.getAction()) && !isInitialStickyBroadcast()) {
-                isWiredConnectedChangedEvent.onNext(intent.getIntExtra("state", 0) != 0);
-            }
-            if (BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED.equals(intent.getAction())) {
-                final int bluetoothState = intent.getIntExtra(BluetoothA2dp.EXTRA_STATE, BluetoothA2dp.STATE_DISCONNECTED);
-                switch (bluetoothState) {
-                    case BluetoothA2dp.STATE_DISCONNECTED:
-                        isWirelessConnectedChangedEvent.onNext(false);
-                        break;
-                    case BluetoothA2dp.STATE_CONNECTED:
-                        isWirelessConnectedChangedEvent.onNext(true);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java b/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
deleted file mode 100644
index c0853de..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/audio/VolumeController.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.utils.audio;
-
-import android.content.Context;
-import android.database.ContentObserver;
-import android.media.AudioManager;
-import android.os.Handler;
-import android.os.Looper;
-import android.provider.Settings;
-import android.support.annotation.NonNull;
-
-import io.reactivex.Observable;
-import io.reactivex.subjects.PublishSubject;
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 02/11/2015.
- * Simple class to control and observe volume of specific stream type (phone call, music etc.).
- */
-public final class VolumeController {
-
-    @NonNull
-    private final AudioManager audioManager;
-    private final int maxVolume;
-    @NonNull
-    private final Observable<Integer> volumeObservable;
-    @NonNull
-    private final PublishSubject<Integer> selfVolumeChangedEvent = PublishSubject.create();
-
-    public VolumeController(@NonNull final Context context) {
-        this(context, AudioManager.STREAM_MUSIC);
-    }
-
-    public VolumeController(@NonNull final Context context, final int streamType) {
-        audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        maxVolume = audioManager.getStreamMaxVolume(streamType);
-        volumeObservable = Observable
-                .fromCallable(VolumeObserver::new)
-                .switchMap(volumeObserver -> selfVolumeChangedEvent
-                        .mergeWith(volumeObserver.systemVolumeChangedEvent
-                                .map(event -> getVolume())
-                                .doOnSubscribe(disposable -> context.getContentResolver()
-                                        .registerContentObserver(Settings.System.CONTENT_URI, true, volumeObserver))
-                                .doOnDispose(() -> context.getContentResolver()
-                                        .unregisterContentObserver(volumeObserver)))
-                        .startWith(getVolume()))
-                .distinctUntilChanged()
-                .replay(1)
-                .refCount();
-    }
-
-    /**
-     * Max volume amount to set.
-     *
-     * @return max volume.
-     */
-    public int getMaxVolume() {
-        return maxVolume;
-    }
-
-    /**
-     * Sets volume.
-     *
-     * @param volume Volume value to set from 0 to {@link #getMaxVolume()}.
-     */
-    public void setVolume(final int volume) {
-        if (volume < 0 || volume > maxVolume) {
-            Lc.assertion(new ShouldNotHappenException("Volume: " + volume + " out of bounds [0," + maxVolume + ']'));
-            return;
-        }
-        if (getVolume() != volume) {
-            audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);
-            selfVolumeChangedEvent.onNext(volume);
-        }
-    }
-
-    /**
-     * Returns volume.
-     *
-     * @return Returns volume value from 0 to {@link #getMaxVolume()}.
-     */
-    public int getVolume() {
-        return audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
-    }
-
-    /**
-     * Observes current volume.
-     *
-     * @return Observable which will provide current volume and then it's updates.
-     */
-    @NonNull
-    public Observable<Integer> observeVolume() {
-        return volumeObservable;
-    }
-
-    private static class VolumeObserver extends ContentObserver {
-
-        @NonNull
-        private final PublishSubject<Void> systemVolumeChangedEvent = PublishSubject.create();
-
-        public VolumeObserver() {
-            super(new Handler(Looper.getMainLooper()));
-        }
-
-        @Override
-        public void onChange(final boolean selfChange) {
-            super.onChange(selfChange);
-            systemVolumeChangedEvent.onNext(null);
-        }
-
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/images/BlurUtils.java b/src/main/java/ru/touchin/roboswag/components/utils/images/BlurUtils.java
deleted file mode 100644
index 6f3837d..0000000
--- a/src/main/java/ru/touchin/roboswag/components/utils/images/BlurUtils.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * Copyright (C) 2015 Wasabeef
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ru.touchin.roboswag.components.utils.images;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.renderscript.Allocation;
-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;
-
-public final class BlurUtils {
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    @Nullable
-    public static Bitmap blurRenderscript(@NonNull final Context context, @NonNull final Bitmap bitmap, final int radius) throws RSRuntimeException {
-        RenderScript rs = null;
-        Allocation input = null;
-        Allocation output = null;
-        ScriptIntrinsicBlur blur = null;
-        try {
-            rs = RenderScript.create(context);
-            rs.setMessageHandler(new RenderScript.RSMessageHandler());
-            input = Allocation.createFromBitmap(rs, bitmap, Allocation.MipmapControl.MIPMAP_NONE,
-                    Allocation.USAGE_SCRIPT);
-            output = Allocation.createTyped(rs, input.getType());
-            blur = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs));
-
-            blur.setInput(input);
-            blur.setRadius(radius);
-            blur.forEach(output);
-            output.copyTo(bitmap);
-        } finally {
-            if (rs != null) {
-                rs.destroy();
-            }
-            if (input != null) {
-                input.destroy();
-            }
-            if (output != null) {
-                output.destroy();
-            }
-            if (blur != null) {
-                blur.destroy();
-            }
-        }
-
-        return bitmap;
-    }
-
-    @Nullable
-    @SuppressWarnings({"PMD.ExcessiveMethodLength", "PMD.CyclomaticComplexity", "PMD.ModifiedCyclomaticComplexity", "PMD.StdCyclomaticComplexity",
-            "PMD.NcssMethodCount", "PMD.NPathComplexity", "checkstyle:MethodLength", "checkstyle:LocalFinalVariableName",
-            "checkstyle:ArrayTypeStyle", "checkstyle:InnerAssignment", "checkstyle:LocalVariableName"})
-    public static Bitmap blurFast(@NonNull final Bitmap sentBitmap, final int radius, final boolean canReuseInBitmap) {
-
-        // Stack Blur v1.0 from
-        // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html
-        //
-        // Java Author: Mario Klingemann <mario at quasimondo.com>
-        // http://incubator.quasimondo.com
-        // created Feburary 29, 2004
-        // Android port : Yahel Bouaziz <yahel at kayenko.com>
-        // http://www.kayenko.com
-        // ported april 5th, 2012
-
-        // This is a compromise between Gaussian Blur and Box blur
-        // It creates much better looking blurs than Box Blur, but is
-        // 7x faster than my Gaussian Blur implementation.
-        //
-        // I called it Stack Blur because this describes best how this
-        // filter works internally: it creates a kind of moving stack
-        // of colors whilst scanning through the image. Thereby it
-        // just has to add one new block of color to the right side
-        // of the stack and remove the leftmost color. The remaining
-        // colors on the topmost layer of the stack are either added on
-        // or reduced by one, depending on if they are on the right or
-        // on the left side of the stack.
-        //
-        // If you are using this algorithm in your code please add
-        // the following line:
-        //
-        // Stack Blur Algorithm by Mario Klingemann <mario@quasimondo.com>
-
-        final Bitmap bitmap;
-        if (canReuseInBitmap) {
-            bitmap = sentBitmap;
-        } else {
-            bitmap = sentBitmap.copy(sentBitmap.getConfig(), true);
-        }
-
-        if (radius < 1) {
-            return null;
-        }
-
-        final int w = bitmap.getWidth();
-        final int h = bitmap.getHeight();
-
-        final int[] pix = new int[w * h];
-        bitmap.getPixels(pix, 0, w, 0, 0, w, h);
-
-        final int wm = w - 1;
-        final int hm = h - 1;
-        final int wh = w * h;
-        final int div = radius + radius + 1;
-
-        final int r[] = new int[wh];
-        final int g[] = new int[wh];
-        final int b[] = new int[wh];
-        int rsum;
-        int gsum;
-        int bsum;
-        int x;
-        int i;
-        int p;
-        int yp;
-        int yi;
-        int yw;
-        final int vmin[] = new int[Math.max(w, h)];
-
-        int divsum = (div + 1) >> 1;
-        divsum *= divsum;
-        final int dv[] = new int[256 * divsum];
-        for (i = 0; i < 256 * divsum; i++) {
-            dv[i] = i / divsum;
-        }
-
-        yw = yi = 0;
-
-        final int[][] stack = new int[div][3];
-        int stackpointer;
-        int stackstart;
-        int[] sir;
-        int rbs;
-        final int r1 = radius + 1;
-        int routsum;
-        int goutsum;
-        int boutsum;
-        int rinsum;
-        int ginsum;
-        int binsum;
-
-        int y;
-
-        for (y = 0; y < h; y++) {
-            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
-            for (i = -radius; i <= radius; i++) {
-                p = pix[yi + Math.min(wm, Math.max(i, 0))];
-                sir = stack[i + radius];
-                sir[0] = (p & 0xff0000) >> 16;
-                sir[1] = (p & 0x00ff00) >> 8;
-                sir[2] = p & 0x0000ff;
-                rbs = r1 - Math.abs(i);
-                rsum += sir[0] * rbs;
-                gsum += sir[1] * rbs;
-                bsum += sir[2] * rbs;
-                if (i > 0) {
-                    rinsum += sir[0];
-                    ginsum += sir[1];
-                    binsum += sir[2];
-                } else {
-                    routsum += sir[0];
-                    goutsum += sir[1];
-                    boutsum += sir[2];
-                }
-            }
-            stackpointer = radius;
-
-            for (x = 0; x < w; x++) {
-
-                r[yi] = dv[rsum];
-                g[yi] = dv[gsum];
-                b[yi] = dv[bsum];
-
-                rsum -= routsum;
-                gsum -= goutsum;
-                bsum -= boutsum;
-
-                stackstart = stackpointer - radius + div;
-                sir = stack[stackstart % div];
-
-                routsum -= sir[0];
-                goutsum -= sir[1];
-                boutsum -= sir[2];
-
-                if (y == 0) {
-                    vmin[x] = Math.min(x + radius + 1, wm);
-                }
-                p = pix[yw + vmin[x]];
-
-                sir[0] = (p & 0xff0000) >> 16;
-                sir[1] = (p & 0x00ff00) >> 8;
-                sir[2] = p & 0x0000ff;
-
-                rinsum += sir[0];
-                ginsum += sir[1];
-                binsum += sir[2];
-
-                rsum += rinsum;
-                gsum += ginsum;
-                bsum += binsum;
-
-                stackpointer = (stackpointer + 1) % div;
-                sir = stack[stackpointer % div];
-
-                routsum += sir[0];
-                goutsum += sir[1];
-                boutsum += sir[2];
-
-                rinsum -= sir[0];
-                ginsum -= sir[1];
-                binsum -= sir[2];
-
-                yi++;
-            }
-            yw += w;
-        }
-        for (x = 0; x < w; x++) {
-            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
-            yp = -radius * w;
-            for (i = -radius; i <= radius; i++) {
-                yi = Math.max(0, yp) + x;
-
-                sir = stack[i + radius];
-
-                sir[0] = r[yi];
-                sir[1] = g[yi];
-                sir[2] = b[yi];
-
-                rbs = r1 - Math.abs(i);
-
-                rsum += r[yi] * rbs;
-                gsum += g[yi] * rbs;
-                bsum += b[yi] * rbs;
-
-                if (i > 0) {
-                    rinsum += sir[0];
-                    ginsum += sir[1];
-                    binsum += sir[2];
-                } else {
-                    routsum += sir[0];
-                    goutsum += sir[1];
-                    boutsum += sir[2];
-                }
-
-                if (i < hm) {
-                    yp += w;
-                }
-            }
-            yi = x;
-            stackpointer = radius;
-            for (y = 0; y < h; y++) {
-                // Preserve alpha channel: ( 0xff000000 & pix[yi] )
-                pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
-
-                rsum -= routsum;
-                gsum -= goutsum;
-                bsum -= boutsum;
-
-                stackstart = stackpointer - radius + div;
-                sir = stack[stackstart % div];
-
-                routsum -= sir[0];
-                goutsum -= sir[1];
-                boutsum -= sir[2];
-
-                if (x == 0) {
-                    vmin[y] = Math.min(y + r1, hm) * w;
-                }
-                p = x + vmin[y];
-
-                sir[0] = r[p];
-                sir[1] = g[p];
-                sir[2] = b[p];
-
-                rinsum += sir[0];
-                ginsum += sir[1];
-                binsum += sir[2];
-
-                rsum += rinsum;
-                gsum += ginsum;
-                bsum += binsum;
-
-                stackpointer = (stackpointer + 1) % div;
-                sir = stack[stackpointer];
-
-                routsum += sir[0];
-                goutsum += sir[1];
-                boutsum += sir[2];
-
-                rinsum -= sir[0];
-                ginsum -= sir[1];
-                binsum -= sir[2];
-
-                yi += w;
-            }
-        }
-
-        bitmap.setPixels(pix, 0, w, 0, 0, w, h);
-
-        return bitmap;
-    }
-
-    private BlurUtils() {
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java b/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
deleted file mode 100644
index 9ee131d..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.util.AttributeSet;
-import android.util.TypedValue;
-
-import ru.touchin.roboswag.components.R;
-import ru.touchin.roboswag.components.utils.UiUtils;
-
-/**
- * Created by Ilia Kurtov on 07/12/2016.
- * Simple endless progress bar view in material (round circle) style.
- * It is able to setup size, stroke width and color.
- * See MaterialLoadingBar Attributes:
- * R.styleable#MaterialLoadingBar_size
- * R.styleable#MaterialLoadingBar_strokeWidth
- * R.styleable#MaterialLoadingBar_color
- * Use
- * R.styleable#MaterialLoadingBar_materialLoadingBarStyle
- * to set default style of MaterialLoadingBar in your Theme.
- * Sample:
- * <style name="MyAppLoadingBar">
- * <item name="strokeWidth">3dp</item>
- * <item name="color">@android:color/black</item>
- * <item name="size">24dp</item>
- * </style>
- * <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
- * <item name="materialLoadingBarStyle">@style/MyAppLoadingBar</item>
- * </style>
- */
-public class MaterialLoadingBar extends AppCompatImageView {
-
-    private static int getPrimaryColor(@NonNull final Context context) {
-        final int colorAttr;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            colorAttr = android.R.attr.colorPrimary;
-        } else {
-            colorAttr = context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName());
-        }
-        final TypedValue outValue = new TypedValue();
-        context.getTheme().resolveAttribute(colorAttr, outValue, true);
-        return outValue.data;
-    }
-
-    private MaterialProgressDrawable progressDrawable;
-
-    public MaterialLoadingBar(@NonNull final Context context) {
-        this(context, null);
-    }
-
-    public MaterialLoadingBar(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        this(context, attrs, R.attr.materialLoadingBarStyle);
-    }
-
-    public MaterialLoadingBar(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-
-        final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MaterialLoadingBar,
-                defStyleAttr,
-                0);
-        final int size = (int) typedArray.getDimension(R.styleable.MaterialLoadingBar_size, UiUtils.OfMetrics.dpToPixels(context, 48));
-        final int color = typedArray.getColor(R.styleable.MaterialLoadingBar_color, getPrimaryColor(context));
-        final float strokeWidth = typedArray.getDimension(R.styleable.MaterialLoadingBar_strokeWidth,
-                UiUtils.OfMetrics.dpToPixels(context, 4));
-        typedArray.recycle();
-
-        progressDrawable = new MaterialProgressDrawable(context, size);
-        setColor(color);
-        progressDrawable.setStrokeWidth(strokeWidth);
-        setScaleType(ScaleType.CENTER);
-        setImageDrawable(progressDrawable);
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        progressDrawable.start();
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        progressDrawable.stop();
-        super.onDetachedFromWindow();
-    }
-
-    /**
-     * Set color of loader.
-     *
-     * @param colorInt Color of loader to be set.
-     */
-    public void setColor(@ColorInt final int colorInt) {
-        progressDrawable.setColor(colorInt);
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java b/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
deleted file mode 100644
index a152cb4..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.views;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-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 ru.touchin.roboswag.components.utils.UiUtils;
-
-/**
- * Created by Gavriil Sitnikov on 01/03/16.
- * Simple realization of endless progress bar which is looking material-like.
- */
-public class MaterialProgressDrawable extends Drawable implements Runnable, Animatable {
-
-    private static final int UPDATE_INTERVAL = 1000 / 60;
-
-    private static final float DEFAULT_STROKE_WIDTH_DP = 4.5f;
-    private static final Parameters DEFAULT_PARAMETERS = new Parameters(20, 270, 4, 12, 4, 8);
-
-    private final int size;
-    @NonNull
-    private final Paint paint;
-    @NonNull
-    private Parameters parameters = DEFAULT_PARAMETERS;
-    @NonNull
-    private final RectF arcBounds = new RectF();
-
-    private float rotationAngle;
-    private float arcSize;
-    private boolean running;
-
-    public MaterialProgressDrawable(@NonNull final Context context) {
-        this(context, -1);
-    }
-
-    public MaterialProgressDrawable(@NonNull final Context context, final int size) {
-        super();
-
-        this.size = size;
-        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(UiUtils.OfMetrics.dpToPixels(context, DEFAULT_STROKE_WIDTH_DP));
-        paint.setColor(Color.BLACK);
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return size;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return size;
-    }
-
-    /**
-     * Returns width of arc.
-     *
-     * @return Width.
-     */
-    public float getStrokeWidth() {
-        return paint.getStrokeWidth();
-    }
-
-    /**
-     * Sets width of arc.
-     *
-     * @param strokeWidth Width.
-     */
-    public void setStrokeWidth(final float strokeWidth) {
-        paint.setStrokeWidth(strokeWidth);
-        updateArcBounds();
-        invalidateSelf();
-    }
-
-    /**
-     * Sets color of arc.
-     *
-     * @param color Color.
-     */
-    public void setColor(@ColorInt final int color) {
-        paint.setColor(color);
-        invalidateSelf();
-    }
-
-    /**
-     * Returns magic parameters of spinning.
-     *
-     * @return Parameters of spinning.
-     */
-    @NonNull
-    public Parameters getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Sets magic parameters of spinning.
-     *
-     * @param parameters Parameters of spinning.
-     */
-    public void setParameters(@NonNull final Parameters parameters) {
-        this.parameters = parameters;
-        invalidateSelf();
-    }
-
-    @Override
-    protected void onBoundsChange(@NonNull final Rect bounds) {
-        super.onBoundsChange(bounds);
-        updateArcBounds();
-    }
-
-    private void updateArcBounds() {
-        arcBounds.set(getBounds());
-        //HACK: + 1 as anti-aliasing drawing bug workaround
-        final int inset = (int) (paint.getStrokeWidth() / 2) + 1;
-        arcBounds.inset(inset, inset);
-    }
-
-    @SuppressWarnings("PMD.NPathComplexity")
-    @Override
-    public void draw(@NonNull final Canvas canvas) {
-        final boolean isGrowingCycle = (((int) (arcSize / parameters.maxAngle)) % 2) == 0;
-        final float angle = arcSize % parameters.maxAngle;
-        final float shift = (angle / parameters.maxAngle) * parameters.gapAngle;
-        canvas.drawArc(arcBounds, isGrowingCycle ? rotationAngle + shift : rotationAngle + parameters.gapAngle - shift,
-                isGrowingCycle ? angle + parameters.gapAngle : parameters.maxAngle - angle + parameters.gapAngle, false, paint);
-        //TODO: compute based on animation start time
-        rotationAngle += isGrowingCycle ? parameters.rotationMagicNumber1 : parameters.rotationMagicNumber2;
-        arcSize += isGrowingCycle ? parameters.arcMagicNumber1 : parameters.arcMagicNumber2;
-        if (arcSize < 0) {
-            arcSize = 0;
-        }
-        if (isRunning()) {
-            scheduleSelf(this, SystemClock.uptimeMillis() + UPDATE_INTERVAL);
-        }
-    }
-
-    @Override
-    public void setAlpha(final int alpha) {
-        paint.setAlpha(alpha);
-        invalidateSelf();
-    }
-
-    @Override
-    public void setColorFilter(@Nullable final ColorFilter colorFilter) {
-        paint.setColorFilter(colorFilter);
-        invalidateSelf();
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void start() {
-        if (!running) {
-            running = true;
-            run();
-        }
-    }
-
-    @Override
-    public void stop() {
-        if (running) {
-            unscheduleSelf(this);
-            running = false;
-        }
-    }
-
-    @Override
-    public boolean isRunning() {
-        return running;
-    }
-
-    @Override
-    public void run() {
-        if (running) {
-            invalidateSelf();
-        }
-    }
-
-    /**
-     * Some parameters which are using to spin progress bar.
-     */
-    public static class Parameters {
-
-        private final float gapAngle;
-        private final float maxAngle;
-        private final float rotationMagicNumber1;
-        private final float rotationMagicNumber2;
-        private final float arcMagicNumber1;
-        private final float arcMagicNumber2;
-
-        public Parameters(final float gapAngle, final float maxAngle,
-                          final float rotationMagicNumber1, final float rotationMagicNumber2,
-                          final float arcMagicNumber1, final float arcMagicNumber2) {
-            this.gapAngle = gapAngle;
-            this.maxAngle = maxAngle;
-            this.rotationMagicNumber1 = rotationMagicNumber1;
-            this.rotationMagicNumber2 = rotationMagicNumber2;
-            this.arcMagicNumber1 = arcMagicNumber1;
-            this.arcMagicNumber2 = arcMagicNumber2;
-        }
-
-        /**
-         * Returns angle of gap of arc.
-         *
-         * @return Angle of gap.
-         */
-        public float getGapAngle() {
-            return gapAngle;
-        }
-
-        /**
-         * Returns maximum angle of arc.
-         *
-         * @return Maximum angle of arc.
-         */
-        public float getMaxAngle() {
-            return maxAngle;
-        }
-
-        /**
-         * Magic parameter 1.
-         *
-         * @return Magic.
-         */
-        public float getRotationMagicNumber1() {
-            return rotationMagicNumber1;
-        }
-
-        /**
-         * Magic parameter 2.
-         *
-         * @return Magic.
-         */
-        public float getRotationMagicNumber2() {
-            return rotationMagicNumber2;
-        }
-
-        /**
-         * Magic parameter 3.
-         *
-         * @return Magic.
-         */
-        public float getArcMagicNumber1() {
-            return arcMagicNumber1;
-        }
-
-        /**
-         * Magic parameter 4.
-         *
-         * @return Magic.
-         */
-        public float getArcMagicNumber2() {
-            return arcMagicNumber2;
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
deleted file mode 100644
index d29b60f..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.text.Editable;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.text.method.SingleLineTransformationMethod;
-import android.text.method.TransformationMethod;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewParent;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import ru.touchin.roboswag.components.R;
-import ru.touchin.roboswag.components.views.internal.AttributesUtils;
-import ru.touchin.roboswag.core.log.Lc;
-
-/**
- * Created by Gavriil Sitnikov on 18/07/2014.
- * TextView that supports fonts from Typefaces class
- */
-
-/**
- * Created by Gavriil Sitnikov on 18/07/2014.
- * EditText that supports custom typeface and forces developer to specify if this view multiline or not.
- * Also in debug mode it has common checks for popular bugs.
- */
-@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
-//ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
-public class TypefacedEditText extends AppCompatEditText {
-
-    private static boolean inDebugMode;
-
-    /**
-     * Enables debugging features like checking attributes on inflation.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
-    private boolean multiline;
-    private boolean constructed;
-
-    @Nullable
-    private OnTextChangedListener onTextChangedListener;
-
-    public TypefacedEditText(@NonNull final Context context) {
-        super(context);
-        initialize(context, null);
-    }
-
-    public TypefacedEditText(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        super(context, attrs);
-        initialize(context, attrs);
-    }
-
-    public TypefacedEditText(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
-        super(context, attrs, defStyle);
-        initialize(context, attrs);
-    }
-
-    private void initialize(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        constructed = true;
-        super.setIncludeFontPadding(false);
-        initializeTextChangedListener();
-        if (attrs != null) {
-            final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedEditText);
-            final boolean multiline = typedArray.getBoolean(R.styleable.TypefacedEditText_isMultiline, false);
-            if (multiline) {
-                setMultiline(AttributesUtils.getMaxLinesFromAttrs(context, attrs));
-            } else {
-                setSingleLine();
-            }
-            typedArray.recycle();
-            if (inDebugMode) {
-                checkAttributes(context, attrs);
-            }
-        }
-    }
-
-    @Nullable
-    public InputConnection onCreateInputConnection(@NonNull final EditorInfo attrs) {
-        final InputConnection inputConnection = super.onCreateInputConnection(attrs);
-        if (inputConnection != null && attrs.hintText == null) {
-            for (ViewParent parent = getParent(); parent instanceof View; parent = parent.getParent()) {
-                if (parent instanceof TextInputLayout) {
-                    attrs.hintText = ((TextInputLayout) parent).getHint();
-                    break;
-                }
-            }
-        }
-
-        return inputConnection;
-    }
-
-    private void checkAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs) {
-        final List<String> errors = new ArrayList<>();
-        Boolean multiline = null;
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedEditText);
-        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedEditText_isMultiline, true,
-                "isMultiline required parameter");
-        if (typedArray.hasValue(R.styleable.TypefacedEditText_isMultiline)) {
-            multiline = typedArray.getBoolean(R.styleable.TypefacedEditText_isMultiline, false);
-        }
-        typedArray.recycle();
-
-        try {
-            final Class androidRes = Class.forName("com.android.internal.R$styleable");
-
-            typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
-            AttributesUtils.checkRegularTextViewAttributes(typedArray, androidRes, errors, "isMultiline");
-            checkEditTextSpecificAttributes(typedArray, androidRes, errors);
-            if (multiline != null) {
-                checkMultilineAttributes(typedArray, androidRes, errors, multiline);
-            }
-        } catch (final Exception exception) {
-            Lc.e(exception, "Error during checking attributes");
-        }
-        AttributesUtils.handleErrors(this, errors);
-        typedArray.recycle();
-    }
-
-    private void checkEditTextSpecificAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
-                                                 @NonNull final List<String> errors)
-            throws NoSuchFieldException, IllegalAccessException {
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_singleLine"), false,
-                "remove singleLine and use isMultiline");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_includeFontPadding"), false,
-                "includeFontPadding forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_ellipsize"), false,
-                "ellipsize forbid parameter");
-
-        if (typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_hint"))) {
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textColorHint"), true,
-                    "textColorHint required parameter if hint is not null");
-        }
-
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textSize"), true,
-                "textSize required parameter. If it's dynamic then use '0sp'");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_inputType"), true,
-                "inputType required parameter");
-
-        final int inputType = typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_inputType"), -1);
-        if (AttributesUtils.isNumberInputType(inputType)) {
-            errors.add("use inputType phone instead of number");
-        }
-
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeOptions"), true,
-                "imeOptions required parameter");
-    }
-
-    private void checkMultilineAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
-                                          @NonNull final List<String> errors, final boolean multiline)
-            throws NoSuchFieldException, IllegalAccessException {
-        if (multiline) {
-            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_lines"), -1) == 1) {
-                errors.add("lines should be more than 1 if isMultiline is true");
-            }
-            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), -1) == 1) {
-                errors.add("maxLines should be more than 1 if isMultiline is true");
-            }
-            if (!typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_maxLines"))
-                    && !typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_maxLength"))) {
-                errors.add("specify maxLines or maxLength if isMultiline is true");
-            }
-        } else {
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_lines"), false,
-                    "remove lines and use isMultiline");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLines"), false,
-                    "maxLines remove and use isMultiline");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_minLines"), false,
-                    "minLines remove and use isMultiline");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLength"), true,
-                    "maxLength required parameter if isMultiline is false");
-        }
-    }
-
-    private void initializeTextChangedListener() {
-        addTextChangedListener(new TextWatcher() {
-
-            @Override
-            public void beforeTextChanged(@NonNull final CharSequence oldText, final int start, final int count, final int after) {
-                //do nothing
-            }
-
-            @Override
-            public void onTextChanged(@NonNull final CharSequence inputText, final int start, final int before, final int count) {
-                if (onTextChangedListener != null) {
-                    onTextChangedListener.onTextChanged(inputText);
-                }
-            }
-
-            @Override
-            public void afterTextChanged(@NonNull final Editable editable) {
-                //do nothing
-            }
-
-        });
-    }
-
-    /**
-     * Sets if view supports multiline text alignment.
-     *
-     * @param maxLines Maximum lines to be set.
-     */
-    public void setMultiline(final int maxLines) {
-        if (maxLines <= 1) {
-            Lc.assertion("Wrong maxLines: " + maxLines);
-            return;
-        }
-        multiline = true;
-        final TransformationMethod transformationMethod = getTransformationMethod();
-        super.setSingleLine(false);
-        super.setMaxLines(maxLines);
-        if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
-            setTransformationMethod(transformationMethod);
-        }
-    }
-
-    @Override
-    public void setSingleLine(final boolean singleLine) {
-        if (singleLine) {
-            setSingleLine();
-        } else {
-            setMultiline(Integer.MAX_VALUE);
-        }
-    }
-
-    @Override
-    public void setSingleLine() {
-        final TransformationMethod transformationMethod = getTransformationMethod();
-        super.setSingleLine(true);
-        if (transformationMethod != null) {
-            /*DEBUG if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
-                Lc.w("SingleLineTransformationMethod method ignored because of previous transformation method: " + transformationMethod);
-            }*/
-            setTransformationMethod(transformationMethod);
-        }
-        setLines(1);
-        multiline = false;
-    }
-
-    @Override
-    public void setLines(final int lines) {
-        if (constructed && multiline && lines == 1) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "lines = 1 is illegal if multiline is set to true")));
-            return;
-        }
-        super.setLines(lines);
-    }
-
-    @Override
-    public void setMaxLines(final int maxLines) {
-        if (constructed && !multiline && maxLines > 1) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "maxLines > 1 is illegal if multiline is set to false")));
-            return;
-        }
-        super.setMaxLines(maxLines);
-    }
-
-    @Override
-    public void setMinLines(final int minLines) {
-        if (constructed && !multiline && minLines > 1) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "minLines > 1 is illegal if multiline is set to false")));
-            return;
-        }
-        super.setMinLines(minLines);
-    }
-
-    @Override
-    public final void setIncludeFontPadding(final boolean includeFontPadding) {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(
-                AttributesUtils.viewError(this, "Do not specify font padding as it is hard to make pixel-perfect design with such option")));
-    }
-
-    @Override
-    public void setEllipsize(@NonNull final TextUtils.TruncateAt ellipsis) {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify ellipsize for EditText")));
-    }
-
-    @Override
-    public void setInputType(final int type) {
-        if (AttributesUtils.isNumberInputType(type)) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this,
-                    "Do not specify number InputType for EditText, use phone instead")));
-            super.setInputType(InputType.TYPE_CLASS_PHONE);
-            return;
-        }
-        super.setInputType(type);
-    }
-
-    public void setOnTextChangedListener(@Nullable final OnTextChangedListener onTextChangedListener) {
-        this.onTextChangedListener = onTextChangedListener;
-    }
-
-    /**
-     * Simplified variant of {@link TextWatcher}.
-     */
-    public interface OnTextChangedListener {
-
-        /**
-         * Calls when text have changed.
-         *
-         * @param text New text.
-         */
-        void onTextChanged(@NonNull CharSequence text);
-
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java b/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
deleted file mode 100644
index b8fddb2..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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;
-import android.util.TypedValue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import ru.touchin.roboswag.components.R;
-import ru.touchin.roboswag.components.utils.UiUtils;
-import ru.touchin.roboswag.components.views.internal.AttributesUtils;
-import ru.touchin.roboswag.core.log.Lc;
-
-/**
- * Created by Gavriil Sitnikov on 18/07/2014.
- * TextView that supports custom typeface and forces developer to specify {@link LineStrategy}.
- * Also in debug mode it has common checks for popular bugs.
- */
-@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
-//ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
-public class TypefacedTextView extends AppCompatTextView {
-
-    private static final int SIZE_THRESHOLD = 10000;
-
-    private static final int UNSPECIFIED_MEASURE_SPEC = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
-    private static final int START_SCALABLE_DIFFERENCE = 4;
-
-    private static boolean inDebugMode;
-
-    /**
-     * Enables debugging features like checking attributes on inflation.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
-    private boolean constructed;
-    @NonNull
-    private LineStrategy lineStrategy = LineStrategy.SINGLE_LINE_ELLIPSIZE;
-
-    public TypefacedTextView(@NonNull final Context context) {
-        super(context);
-        initialize(context, null);
-    }
-
-    public TypefacedTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        super(context, attrs);
-        initialize(context, attrs);
-    }
-
-    public TypefacedTextView(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
-        super(context, attrs, defStyle);
-        initialize(context, attrs);
-    }
-
-    private void initialize(@NonNull final Context context, @Nullable final AttributeSet attrs) {
-        constructed = true;
-        super.setIncludeFontPadding(false);
-        if (attrs != null) {
-            final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedTextView);
-            final LineStrategy lineStrategy = LineStrategy
-                    .byResIndex(typedArray.getInt(R.styleable.TypefacedTextView_lineStrategy, LineStrategy.MULTILINE_ELLIPSIZE.ordinal()));
-            if (lineStrategy.multiline) {
-                setLineStrategy(lineStrategy, AttributesUtils.getMaxLinesFromAttrs(context, attrs));
-            } else {
-                setLineStrategy(lineStrategy);
-            }
-            typedArray.recycle();
-            if (inDebugMode) {
-                checkAttributes(context, attrs);
-            }
-        }
-    }
-
-    private void checkAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs) {
-        final List<String> errors = new ArrayList<>();
-        LineStrategy lineStrategy = null;
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedTextView);
-        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedTextView_lineStrategy, true,
-                "lineStrategy required parameter");
-        if (typedArray.hasValue(R.styleable.TypefacedTextView_lineStrategy)) {
-            lineStrategy = LineStrategy.byResIndex(typedArray.getInt(R.styleable.TypefacedTextView_lineStrategy, -1));
-        }
-        typedArray.recycle();
-
-        try {
-            final Class androidRes = Class.forName("com.android.internal.R$styleable");
-
-            typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
-            AttributesUtils.checkRegularTextViewAttributes(typedArray, androidRes, errors, "lineStrategy");
-            checkTextViewSpecificAttributes(typedArray, androidRes, errors);
-
-            if (lineStrategy != null) {
-                checkLineStrategyAttributes(typedArray, androidRes, errors, lineStrategy);
-            }
-        } catch (final Exception exception) {
-            Lc.e(exception, "Error during checking attributes");
-        }
-        AttributesUtils.handleErrors(this, errors);
-        typedArray.recycle();
-    }
-
-    private void checkTextViewSpecificAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
-                                                 @NonNull final List<String> errors)
-            throws NoSuchFieldException, IllegalAccessException {
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_phoneNumber"), false,
-                "phoneNumber forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_password"), false,
-                "password forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_numeric"), false,
-                "numeric forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_inputType"), false,
-                "inputType forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeOptions"), false,
-                "imeOptions forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeActionId"), false,
-                "imeActionId forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeActionLabel"), false,
-                "imeActionLabel forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_hint"), false,
-                "hint forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_editable"), false,
-                "editable forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_digits"), false,
-                "digits forbid parameter");
-        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_cursorVisible"), false,
-                "cursorVisible forbid parameter");
-    }
-
-    private void checkLineStrategyAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
-                                             @NonNull final List<String> errors, @NonNull final LineStrategy lineStrategy)
-            throws NoSuchFieldException, IllegalAccessException {
-        if (!lineStrategy.scalable) {
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textSize"), true,
-                    "textSize required parameter. If it's dynamic then use '0sp'");
-        }
-        if (lineStrategy.multiline) {
-            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_lines"), -1) == 1) {
-                errors.add("lines should be more than 1 if lineStrategy is true");
-            }
-            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), -1) == 1) {
-                errors.add("maxLines should be more than 1 if lineStrategy is true");
-            }
-        } else {
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_lines"), false,
-                    "remove lines and use lineStrategy");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLines"), false,
-                    "remove maxLines and use lineStrategy");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_minLines"), false,
-                    "remove minLines and use lineStrategy");
-            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textAllCaps"), false,
-                    "remove textAllCaps and use app:textAllCaps");
-        }
-    }
-
-    /**
-     * Sets behavior of text if there is no space for it in one line.
-     *
-     * @param lineStrategy Specific {@link LineStrategy}.
-     */
-    public void setLineStrategy(@NonNull final LineStrategy lineStrategy) {
-        setLineStrategy(lineStrategy, Integer.MAX_VALUE);
-    }
-
-    /**
-     * Sets behavior of text if there is no space for it in one line.
-     *
-     * @param lineStrategy Specific {@link LineStrategy};
-     * @param maxLines     Max lines if line strategy is multiline.
-     */
-    public void setLineStrategy(@NonNull final LineStrategy lineStrategy, final int maxLines) {
-        this.lineStrategy = lineStrategy;
-        final TransformationMethod transformationMethod = getTransformationMethod();
-        super.setSingleLine(!lineStrategy.multiline);
-        if (transformationMethod != null) {
-            /*DEBUG if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
-                Lc.w("SingleLineTransformationMethod method ignored because of previous transformation method: " + transformationMethod);
-            }*/
-            setTransformationMethod(transformationMethod);
-        }
-        if (lineStrategy.multiline) {
-            super.setMaxLines(maxLines);
-        }
-        switch (lineStrategy) {
-            case SINGLE_LINE_ELLIPSIZE:
-            case MULTILINE_ELLIPSIZE:
-                super.setEllipsize(TextUtils.TruncateAt.END);
-                break;
-            case SINGLE_LINE_MARQUEE:
-            case MULTILINE_MARQUEE:
-                super.setEllipsize(TextUtils.TruncateAt.MARQUEE);
-                break;
-            case SINGLE_LINE_AUTO_SCALE:
-                super.setEllipsize(null);
-                break;
-            case SINGLE_LINE_ELLIPSIZE_MIDDLE:
-            case MULTILINE_ELLIPSIZE_MIDDLE:
-                super.setEllipsize(TextUtils.TruncateAt.MIDDLE);
-                break;
-            default:
-                Lc.assertion("Unknown line strategy: " + lineStrategy);
-                break;
-        }
-        if (lineStrategy.scalable) {
-            requestLayout();
-        }
-    }
-
-    /**
-     * Returns behavior of text if there is no space for it in one line.
-     *
-     * @return Specific {@link LineStrategy}.
-     */
-    @NonNull
-    public LineStrategy getLineStrategy() {
-        return lineStrategy;
-    }
-
-    @Override
-    public void setSingleLine() {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify setSingleLine use setLineStrategy instead")));
-    }
-
-    @Override
-    public void setSingleLine(final boolean singleLine) {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify setSingleLine use setLineStrategy instead")));
-    }
-
-    @Override
-    public void setLines(final int lines) {
-        if (constructed && lineStrategy.multiline && lines == 1) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "lines = 1 is illegal if lineStrategy is multiline")));
-            return;
-        }
-        super.setLines(lines);
-    }
-
-    @Override
-    public void setMaxLines(final int maxLines) {
-        if (constructed && !lineStrategy.multiline && maxLines > 1) {
-            Lc.assertion(new IllegalStateException(
-                    AttributesUtils.viewError(this, "maxLines > 1 is illegal if lineStrategy is single line")));
-            return;
-        }
-        super.setMaxLines(maxLines);
-    }
-
-    @Override
-    public final void setIncludeFontPadding(final boolean includeFontPadding) {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(
-                AttributesUtils.viewError(this, "Do not specify font padding as it is hard to make pixel-perfect design with such option")));
-    }
-
-    @Override
-    public void setMinLines(final int minLines) {
-        if (constructed && !lineStrategy.multiline && minLines > 1) {
-            Lc.assertion(new IllegalStateException(
-                    AttributesUtils.viewError(this, "minLines > 1 is illegal if lineStrategy is single line")));
-            return;
-        }
-        super.setMinLines(minLines);
-    }
-
-    @Override
-    public void setEllipsize(@NonNull final TextUtils.TruncateAt ellipsize) {
-        if (!constructed) {
-            return;
-        }
-        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify ellipsize use setLineStrategy instead")));
-    }
-
-    @Override
-    public void setText(@Nullable final CharSequence text, @Nullable final BufferType type) {
-        super.setText(text, type);
-        if (constructed && lineStrategy.scalable) {
-            requestLayout();
-        }
-    }
-
-    @Override
-    public void setTextSize(final float size) {
-        if (constructed && lineStrategy.scalable) {
-            Lc.cutAssertion(new IllegalStateException(AttributesUtils.viewError(this, "textSize call is illegal if lineStrategy is scalable")));
-            return;
-        }
-        super.setTextSize(size);
-    }
-
-    @Override
-    public void setTextSize(final int unit, final float size) {
-        if (constructed && lineStrategy.scalable) {
-            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "textSize call is illegal if lineStrategy is scalable")));
-            return;
-        }
-        super.setTextSize(unit, size);
-    }
-
-    @SuppressLint("WrongCall")
-    //WrongCall: actually this method is always calling from onMeasure
-    private void computeScalableTextSize(final int maxWidth, final int maxHeight) {
-        final int minDifference = (int) UiUtils.OfMetrics.dpToPixels(getContext(), 1);
-        int difference = (int) UiUtils.OfMetrics.dpToPixels(getContext(), START_SCALABLE_DIFFERENCE);
-        ScaleAction scaleAction = ScaleAction.DO_NOTHING;
-        ScaleAction previousScaleAction = ScaleAction.DO_NOTHING;
-        do {
-            switch (scaleAction) {
-                case SCALE_DOWN:
-                    if (difference > minDifference) {
-                        difference -= minDifference;
-                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() - difference));
-                    } else {
-                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() - minDifference));
-                        if (previousScaleAction == ScaleAction.SCALE_UP) {
-                            return;
-                        }
-                    }
-                    break;
-                case SCALE_UP:
-                    if (difference > minDifference) {
-                        difference -= minDifference;
-                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() + difference));
-                    } else {
-                        if (previousScaleAction == ScaleAction.SCALE_DOWN) {
-                            return;
-                        }
-                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() + minDifference));
-                    }
-                    break;
-                case DO_NOTHING:
-                default:
-                    break;
-            }
-            super.onMeasure(UNSPECIFIED_MEASURE_SPEC, UNSPECIFIED_MEASURE_SPEC);
-            previousScaleAction = scaleAction;
-            scaleAction = computeScaleAction(maxWidth, maxHeight);
-        }
-        while (scaleAction != ScaleAction.DO_NOTHING);
-    }
-
-    @NonNull
-    private ScaleAction computeScaleAction(final int maxWidth, final int maxHeight) {
-        ScaleAction result = ScaleAction.DO_NOTHING;
-        if (maxWidth < getMeasuredWidth()) {
-            result = ScaleAction.SCALE_DOWN;
-        } else if (maxWidth > getMeasuredWidth()) {
-            result = ScaleAction.SCALE_UP;
-        }
-
-        if (maxHeight < getMeasuredHeight()) {
-            result = ScaleAction.SCALE_DOWN;
-        } else if (maxHeight > getMeasuredHeight() && result != ScaleAction.SCALE_DOWN) {
-            result = ScaleAction.SCALE_UP;
-        }
-        return result;
-    }
-
-    @Override
-    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
-        final int maxWidth = MeasureSpec.getSize(widthMeasureSpec);
-        final int maxHeight = MeasureSpec.getSize(heightMeasureSpec);
-        if (!constructed || !lineStrategy.scalable || (maxWidth <= 0 && maxHeight <= 0) || TextUtils.isEmpty(getText())) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-            return;
-        }
-
-        computeScalableTextSize(MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED ? maxWidth : SIZE_THRESHOLD,
-                MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.UNSPECIFIED ? maxHeight : SIZE_THRESHOLD);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-
-    private enum ScaleAction {
-        SCALE_DOWN,
-        SCALE_UP,
-        DO_NOTHING
-    }
-
-    /**
-     * Specific behavior, mostly based on combination of {@link #getEllipsize()} and {@link #getMaxLines()} to specify how view should show text
-     * if there is no space for it on one line.
-     */
-    public enum LineStrategy {
-
-        /**
-         * Not more than one line and ellipsize text with dots at the end.
-         */
-        SINGLE_LINE_ELLIPSIZE(false, false),
-        /**
-         * Not more than one line and ellipsize text with marquee at the end.
-         */
-        SINGLE_LINE_MARQUEE(false, false),
-        /**
-         * Not more than one line and scale text to maximum possible size.
-         */
-        SINGLE_LINE_AUTO_SCALE(false, true),
-        /**
-         * More than one line and ellipsize text with dots at the end.
-         */
-        MULTILINE_ELLIPSIZE(true, false),
-        /**
-         * More than one line and ellipsize text with marquee at the end.
-         */
-        MULTILINE_MARQUEE(true, false),
-        /**
-         * Not more than one line and ellipsize text with dots in the middle.
-         */
-        SINGLE_LINE_ELLIPSIZE_MIDDLE(false, false),
-        /**
-         * More than one line and ellipsize text with dots in the middle.
-         */
-        MULTILINE_ELLIPSIZE_MIDDLE(true, false);
-
-        @NonNull
-        public static LineStrategy byResIndex(final int resIndex) {
-            if (resIndex < 0 || resIndex >= values().length) {
-                Lc.assertion("Unexpected resIndex " + resIndex);
-                return MULTILINE_ELLIPSIZE;
-            }
-            return values()[resIndex];
-        }
-
-        private final boolean multiline;
-        private final boolean scalable;
-
-        LineStrategy(final boolean multiline, final boolean scalable) {
-            this.multiline = multiline;
-            this.scalable = scalable;
-        }
-
-    }
-
-}
diff --git a/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java b/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
deleted file mode 100644
index 6965e72..0000000
--- a/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-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 android.text.InputType;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-
-import ru.touchin.roboswag.components.utils.UiUtils;
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
-
-/**
- * Created by Gavriil Sitnikov on 13/06/2016.
- * Bunch of inner helper library methods to validate attributes of custom views.
- */
-public final class AttributesUtils {
-
-    /**
-     * Gets static field of class.
-     *
-     * @param resourcesClass Class to get field from;
-     * @param fieldName      name of field;
-     * @param <T>            Type of object that is stored in field;
-     * @return Field value;
-     * @throws NoSuchFieldException   Throws on reflection call;
-     * @throws IllegalAccessException Throws on reflection call.
-     */
-    @NonNull
-    @SuppressWarnings("unchecked")
-    public static <T> T getField(@NonNull final Class resourcesClass, @NonNull final String fieldName)
-            throws NoSuchFieldException, IllegalAccessException {
-        final Field field = resourcesClass.getDeclaredField(fieldName);
-        field.setAccessible(true);
-        return (T) field.get(null);
-    }
-
-    /**
-     * Checks if attribute is in array or not and collecterror if attribute missed.
-     *
-     * @param typedArray  Array of attributes;
-     * @param errors      Errors to collect into;
-     * @param resourceId  Id of attribute;
-     * @param required    Is parameter have to be in array OR it have not to be in;
-     * @param description Description of error.
-     */
-    public static void checkAttribute(@NonNull final TypedArray typedArray,
-                                      @NonNull final Collection<String> errors,
-                                      @StyleableRes final int resourceId,
-                                      final boolean required,
-                                      @NonNull final String description) {
-        if ((required && typedArray.hasValue(resourceId))
-                || (!required && !typedArray.hasValue(resourceId))) {
-            return;
-        }
-        errors.add(description);
-    }
-
-    /**
-     * Collects regular {@link android.widget.TextView} errors.
-     *
-     * @param typedArray                Array of attributes;
-     * @param androidRes                Class of styleable attributes;
-     * @param errors                    Errors to collect into;
-     * @param lineStrategyParameterName name of line strategy parameter;
-     * @throws NoSuchFieldException   Throws during getting attribute values through reflection;
-     * @throws IllegalAccessException Throws during getting attribute values through reflection.
-     */
-    public static void checkRegularTextViewAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
-                                                      @NonNull final Collection<String> errors, @NonNull final String lineStrategyParameterName)
-            throws NoSuchFieldException, IllegalAccessException {
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_fontFamily"), true, "fontFamily required parameter");
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_includeFontPadding"), false, "includeFontPadding forbid parameter");
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_singleLine"), false,
-                "remove singleLine and use " + lineStrategyParameterName);
-        checkAttribute(typedArray, errors, getField(androidRes, "TextView_ellipsize"), false,
-                "remove ellipsize and use " + lineStrategyParameterName);
-        checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textColor"), true,
-                "textColor required parameter. If it's dynamic then use 'android:color/transparent'");
-    }
-
-    /**
-     * Inner helper library method to merge errors in string and assert it.
-     *
-     * @param view   View with errors;
-     * @param errors Errors of view.
-     */
-    public static void handleErrors(@NonNull final View view, @NonNull final Collection<String> errors) {
-        if (!errors.isEmpty()) {
-            final String exceptionText = viewError(view, TextUtils.join("\n", errors));
-            Lc.cutAssertion(new ShouldNotHappenException(exceptionText));
-        }
-    }
-
-    /**
-     * Returns max lines attribute value for views extended from {@link android.widget.TextView}.
-     *
-     * @param context Context of attributes;
-     * @param attrs   TextView based attributes;
-     * @return Max lines value.
-     */
-    public static int getMaxLinesFromAttrs(@NonNull final Context context, @NonNull final AttributeSet attrs) {
-        try {
-            final Class androidRes = Class.forName("com.android.internal.R$styleable");
-            final TypedArray typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
-            final int result = typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), Integer.MAX_VALUE);
-            typedArray.recycle();
-            return result;
-        } catch (final Exception exception) {
-            return Integer.MAX_VALUE;
-        }
-    }
-
-    /**
-     * Creates readable view error.
-     *
-     * @param view      View of error;
-     * @param errorText Text of error;
-     * @return Readable error string.
-     */
-    @NonNull
-    public static String viewError(@NonNull final View view, @NonNull final String errorText) {
-        return "Errors for view id=" + UiUtils.OfViews.getViewIdString(view) + ":\n" + errorText;
-    }
-
-    /**
-     * Returns true if input type equals number input type.
-     *
-     * @param inputType Input type to check;
-     * @return true if input type equals number input type.
-     */
-    public static boolean isNumberInputType(final int inputType) {
-        return inputType == InputType.TYPE_CLASS_NUMBER || inputType == InputType.TYPE_DATETIME_VARIATION_NORMAL;
-    }
-
-    private AttributesUtils() {
-    }
-
-}
diff --git a/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml b/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
deleted file mode 100644
index 2a638ac..0000000
--- a/src/main/res/anim/fragment_slide_in_left_paralax_animation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/fragmentTransitionTime"
-    android:fromXDelta="-50%p"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toXDelta="0"/>
diff --git a/src/main/res/anim/fragment_slide_in_right_animation.xml b/src/main/res/anim/fragment_slide_in_right_animation.xml
deleted file mode 100644
index 76be496..0000000
--- a/src/main/res/anim/fragment_slide_in_right_animation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/fragmentTransitionTime"
-    android:fromXDelta="100%p"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:toXDelta="0"/>
diff --git a/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml b/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
deleted file mode 100644
index 67b35b0..0000000
--- a/src/main/res/anim/fragment_slide_out_left_paralax_animation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/fragmentTransitionTime"
-    android:fromXDelta="0"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:toXDelta="-50%p"/>
diff --git a/src/main/res/anim/fragment_slide_out_right_animation.xml b/src/main/res/anim/fragment_slide_out_right_animation.xml
deleted file mode 100644
index 9757e23..0000000
--- a/src/main/res/anim/fragment_slide_out_right_animation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@integer/fragmentTransitionTime"
-    android:fromXDelta="0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toXDelta="100%p"/>
diff --git a/src/main/res/anim/global_fade_in_animation.xml b/src/main/res/anim/global_fade_in_animation.xml
deleted file mode 100644
index 200a2bf..0000000
--- a/src/main/res/anim/global_fade_in_animation.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/decelerate_interpolator"
-       android:fromAlpha="0.0" android:toAlpha="1.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
\ No newline at end of file
diff --git a/src/main/res/anim/global_fade_out_animation.xml b/src/main/res/anim/global_fade_out_animation.xml
deleted file mode 100644
index 472546a..0000000
--- a/src/main/res/anim/global_fade_out_animation.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-       android:interpolator="@android:anim/decelerate_interpolator"
-       android:fromAlpha="1.0" android:toAlpha="0.0"
-       android:duration="@android:integer/config_mediumAnimTime" />
\ No newline at end of file
diff --git a/src/main/res/anim/global_slide_in_left_animation.xml b/src/main/res/anim/global_slide_in_left_animation.xml
deleted file mode 100644
index 9ddb859..0000000
--- a/src/main/res/anim/global_slide_in_left_animation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromXDelta="-100%p"
-    android:toXDelta="0"/>
\ No newline at end of file
diff --git a/src/main/res/anim/global_slide_in_right_animation.xml b/src/main/res/anim/global_slide_in_right_animation.xml
deleted file mode 100644
index ac7f27a..0000000
--- a/src/main/res/anim/global_slide_in_right_animation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromXDelta="100%p"
-    android:toXDelta="0"/>
\ No newline at end of file
diff --git a/src/main/res/anim/global_slide_out_left_animation.xml b/src/main/res/anim/global_slide_out_left_animation.xml
deleted file mode 100644
index 5bc1921..0000000
--- a/src/main/res/anim/global_slide_out_left_animation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromXDelta="0"
-    android:toXDelta="-100%p"/>
\ No newline at end of file
diff --git a/src/main/res/anim/global_slide_out_right_animation.xml b/src/main/res/anim/global_slide_out_right_animation.xml
deleted file mode 100644
index 0839498..0000000
--- a/src/main/res/anim/global_slide_out_right_animation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<translate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromXDelta="0"
-    android:toXDelta="100%p"/>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/global_dark_selector.xml b/src/main/res/drawable-v21/global_dark_selector.xml
deleted file mode 100644
index 847128c..0000000
--- a/src/main/res/drawable-v21/global_dark_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/global_black_25">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white"/>
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/global_light_selector.xml b/src/main/res/drawable-v21/global_light_selector.xml
deleted file mode 100644
index b0932fd..0000000
--- a/src/main/res/drawable-v21/global_light_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/global_white_25">
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white"/>
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/src/main/res/drawable/global_dark_selector.xml b/src/main/res/drawable/global_dark_selector.xml
deleted file mode 100644
index 1a825ed..0000000
--- a/src/main/res/drawable/global_dark_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/global_black_25" android:state_pressed="true"/>
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/global_light_selector.xml b/src/main/res/drawable/global_light_selector.xml
deleted file mode 100644
index 39c33f0..0000000
--- a/src/main/res/drawable/global_light_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/global_white_25" android:state_pressed="true"/>
-</selector>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
deleted file mode 100644
index 7320080..0000000
--- a/src/main/res/values/attrs.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <attr name="customTypeface" format="string"/>
-
-    <declare-styleable name="TypefacedTextView">
-        <attr name="lineStrategy" format="enum">
-            <enum name="singleLineEllipsize" value="0"/>
-            <enum name="singleLineMarquee" value="1"/>
-            <enum name="singleLineAutoScale" value="2"/>
-            <enum name="multilineEllipsize" value="3"/>
-            <enum name="multilineMarquee" value="4"/>
-            <enum name="singleLineEllipsizeMiddle" value="5"/>
-            <enum name="multilineLineEllipsizeMiddle" value="6"/>
-        </attr>
-    </declare-styleable>
-
-    <declare-styleable name="TypefacedEditText">
-        <attr name="isMultiline" format="boolean"/>
-    </declare-styleable>
-
-    <declare-styleable name="MaterialLoadingBar">
-        <attr name="strokeWidth" format="dimension"/>
-        <attr name="color" format="color"/>
-        <attr name="size" format="dimension"/>
-        <attr name="materialLoadingBarStyle" format="reference"/>
-    </declare-styleable>
-
-</resources>
diff --git a/src/main/res/values/integers.xml b/src/main/res/values/integers.xml
deleted file mode 100644
index 93ec0fc..0000000
--- a/src/main/res/values/integers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="fragmentTransitionTime">250</integer>
-</resources>
diff --git a/storable/.gitignore b/storable/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/storable/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/storable/build.gradle b/storable/build.gradle
new file mode 100644
index 0000000..2a6be21
--- /dev/null
+++ b/storable/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(":utils")
+    api project(":logging")
+
+    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+
+    implementation "io.reactivex.rxjava2:rxjava:$versions.rxJava"
+    implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"
+}
diff --git a/storable/src/main/AndroidManifest.xml b/storable/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..fd2722a
--- /dev/null
+++ b/storable/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="ru.touchin.core.observables.storable" />
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
similarity index 99%
rename from src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
rename to storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
index caa718a..73d90bf 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
+++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceStore.java
@@ -31,7 +31,6 @@ import ru.touchin.roboswag.core.utils.Optional;
 import io.reactivex.Completable;
 import io.reactivex.Single;
 
-
 /**
  * Created by Gavriil Sitnikov on 18/03/16.
  * Store based on {@link SharedPreferences} for {@link ru.touchin.roboswag.core.observables.storable.Storable}.
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
similarity index 61%
rename from src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
rename to storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
index 2ee1db9..5ae4521 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
+++ b/storable/src/main/java/ru/touchin/roboswag/components/utils/storables/PreferenceUtils.java
@@ -45,9 +45,13 @@ public final class PreferenceUtils {
      */
     @NonNull
     public static Storable<String, String, String> stringStorable(@NonNull final String name, @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, String, String>(name, String.class,
-                String.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .build();
+        return new Storable.Builder<String, String, String>(
+                name,
+                String.class,
+                String.class,
+                new PreferenceStore<String>(preferences),
+                new SameTypesConverter<>()
+        ).build();
     }
 
     /**
@@ -59,13 +63,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for string.
      */
     @NonNull
-    public static NonNullStorable<String, String, String> stringStorable(@NonNull final String name,
-                                                                         @NonNull final SharedPreferences preferences,
-                                                                         @NonNull final String defaultValue) {
-        return new Storable.Builder<String, String, String>(name, String.class,
-                String.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static NonNullStorable<String, String, String> stringStorable(
+            @NonNull final String name,
+            @NonNull final SharedPreferences preferences,
+            @NonNull final String defaultValue
+    ) {
+        return new Storable.Builder<String, String, String>(
+                name,
+                String.class,
+                String.class,
+                new PreferenceStore<String>(preferences),
+                new SameTypesConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     /**
@@ -77,9 +86,13 @@ public final class PreferenceUtils {
      */
     @NonNull
     public static Storable<String, Long, Long> longStorable(@NonNull final String name, @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, Long, Long>(name, Long.class,
-                Long.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .build();
+        return new Storable.Builder<String, Long, Long>(
+                name,
+                Long.class,
+                Long.class,
+                new PreferenceStore<Long>(preferences),
+                new SameTypesConverter<>()
+        ).build();
     }
 
     /**
@@ -91,13 +104,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for long.
      */
     @NonNull
-    public static NonNullStorable<String, Long, Long> longStorable(@NonNull final String name,
-                                                                   @NonNull final SharedPreferences preferences,
-                                                                   final long defaultValue) {
-        return new Storable.Builder<String, Long, Long>(name, Long.class,
-                Long.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static NonNullStorable<String, Long, Long> longStorable(
+            @NonNull final String name,
+            @NonNull final SharedPreferences preferences,
+            final long defaultValue
+    ) {
+        return new Storable.Builder<String, Long, Long>(
+                name,
+                Long.class,
+                Long.class,
+                new PreferenceStore<Long>(preferences),
+                new SameTypesConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     /**
@@ -109,9 +127,13 @@ public final class PreferenceUtils {
      */
     @NonNull
     public static Storable<String, Boolean, Boolean> booleanStorable(@NonNull final String name, @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, Boolean, Boolean>(name, Boolean.class,
-                Boolean.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .build();
+        return new Storable.Builder<String, Boolean, Boolean>(
+                name,
+                Boolean.class,
+                Boolean.class,
+                new PreferenceStore<Boolean>(preferences),
+                new SameTypesConverter<>()
+        ).build();
     }
 
     /**
@@ -123,13 +145,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for boolean.
      */
     @NonNull
-    public static NonNullStorable<String, Boolean, Boolean> booleanStorable(@NonNull final String name,
-                                                                            @NonNull final SharedPreferences preferences,
-                                                                            final boolean defaultValue) {
-        return new Storable.Builder<String, Boolean, Boolean>(name, Boolean.class,
-                Boolean.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static NonNullStorable<String, Boolean, Boolean> booleanStorable(
+            @NonNull final String name,
+            @NonNull final SharedPreferences preferences,
+            final boolean defaultValue
+    ) {
+        return new Storable.Builder<String, Boolean, Boolean>(
+                name,
+                Boolean.class,
+                Boolean.class,
+                new PreferenceStore<Boolean>(preferences),
+                new SameTypesConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     /**
@@ -141,9 +168,13 @@ public final class PreferenceUtils {
      */
     @NonNull
     public static Storable<String, Integer, Integer> integerStorable(@NonNull final String name, @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, Integer, Integer>(name, Integer.class,
-                Integer.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .build();
+        return new Storable.Builder<String, Integer, Integer>(
+                name,
+                Integer.class,
+                Integer.class,
+                new PreferenceStore<Integer>(preferences),
+                new SameTypesConverter<>()
+        ).build();
     }
 
     /**
@@ -155,13 +186,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for integer.
      */
     @NonNull
-    public static NonNullStorable<String, Integer, Integer> integerStorable(@NonNull final String name,
-                                                                            @NonNull final SharedPreferences preferences,
-                                                                            final int defaultValue) {
-        return new Storable.Builder<String, Integer, Integer>(name, Integer.class,
-                Integer.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static NonNullStorable<String, Integer, Integer> integerStorable(
+            @NonNull final String name,
+            @NonNull final SharedPreferences preferences,
+            final int defaultValue
+    ) {
+        return new Storable.Builder<String, Integer, Integer>(
+                name,
+                Integer.class,
+                Integer.class,
+                new PreferenceStore<Integer>(preferences),
+                new SameTypesConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     /**
@@ -173,9 +209,13 @@ public final class PreferenceUtils {
      */
     @NonNull
     public static Storable<String, Float, Float> floatStorable(@NonNull final String name, @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, Float, Float>(name, Float.class,
-                Float.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .build();
+        return new Storable.Builder<String, Float, Float>(
+                name,
+                Float.class,
+                Float.class,
+                new PreferenceStore<Float>(preferences),
+                new SameTypesConverter<>()
+        ).build();
     }
 
     /**
@@ -187,13 +227,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for float.
      */
     @NonNull
-    public static NonNullStorable<String, Float, Float> floatStorable(@NonNull final String name,
-                                                                      @NonNull final SharedPreferences preferences,
-                                                                      final float defaultValue) {
-        return new Storable.Builder<String, Float, Float>(name, Float.class,
-                Float.class, new PreferenceStore<>(preferences), new SameTypesConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static NonNullStorable<String, Float, Float> floatStorable(
+            @NonNull final String name,
+            @NonNull final SharedPreferences preferences,
+            final float defaultValue
+    ) {
+        return new Storable.Builder<String, Float, Float>(
+                name,
+                Float.class,
+                Float.class,
+                new PreferenceStore<Float>(preferences),
+                new SameTypesConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     /**
@@ -204,12 +249,18 @@ public final class PreferenceUtils {
      * @return {@link Storable} for enum.
      */
     @NonNull
-    public static <T extends Enum<T>> Storable<String, T, String> enumStorable(@NonNull final String name,
-                                                                               @NonNull final Class<T> enumClass,
-                                                                               @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<String, T, String>(name, enumClass,
-                String.class, new PreferenceStore<>(preferences), new EnumToStringConverter<>())
-                .build();
+    public static <T extends Enum<T>> Storable<String, T, String> enumStorable(
+            @NonNull final String name,
+            @NonNull final Class<T> enumClass,
+            @NonNull final SharedPreferences preferences
+    ) {
+        return new Storable.Builder<String, T, String>(
+                name,
+                enumClass,
+                String.class,
+                new PreferenceStore<String>(preferences),
+                new EnumToStringConverter<>()
+        ).build();
     }
 
     /**
@@ -221,14 +272,19 @@ public final class PreferenceUtils {
      * @return {@link Storable} for enum.
      */
     @NonNull
-    public static <T extends Enum<T>> NonNullStorable<String, T, String> enumStorable(@NonNull final String name,
-                                                                                      @NonNull final Class<T> enumClass,
-                                                                                      @NonNull final SharedPreferences preferences,
-                                                                                      @NonNull final T defaultValue) {
-        return new Storable.Builder<String, T, String>(name, enumClass,
-                String.class, new PreferenceStore<>(preferences), new EnumToStringConverter<>())
-                .setDefaultValue(defaultValue)
-                .build();
+    public static <T extends Enum<T>> NonNullStorable<String, T, String> enumStorable(
+            @NonNull final String name,
+            @NonNull final Class<T> enumClass,
+            @NonNull final SharedPreferences preferences,
+            @NonNull final T defaultValue
+    ) {
+        return new Storable.Builder<String, T, String>(
+                name,
+                enumClass,
+                String.class,
+                new PreferenceStore<String>(preferences),
+                new EnumToStringConverter<>()
+        ).setDefaultValue(defaultValue).build();
     }
 
     private PreferenceUtils() {
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
new file mode 100644
index 0000000..6217204
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/ObservableRefCountWithCacheTime.java
@@ -0,0 +1,299 @@
+/*
+  Copyright (c) 2016-present, RxJava Contributors.
+  <p>
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+  compliance with the License. You may obtain a copy of the License at
+  <p>
+  http://www.apache.org/licenses/LICENSE-2.0
+  <p>
+  Unless required by applicable law or agreed to in writing, software distributed under the License is
+  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+  the License for the specific language governing permissions and limitations under the License.
+ */
+
+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.atomic.AtomicReference;
+import java.util.concurrent.locks.ReentrantLock;
+
+import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.Observer;
+import io.reactivex.Scheduler;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.disposables.Disposables;
+import io.reactivex.functions.Consumer;
+import io.reactivex.internal.disposables.DisposableHelper;
+import io.reactivex.internal.fuseable.HasUpstreamObservableSource;
+import io.reactivex.observables.ConnectableObservable;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * Returns an observable sequence that stays connected to the source as long as
+ * there is at least one subscription to the observable sequence.
+ *
+ * @param <T> the value type
+ */
+@SuppressWarnings({"PMD.CompareObjectsWithEquals", "PMD.AvoidUsingVolatile"})
+//AvoidUsingVolatile: it's RxJava code
+public final class ObservableRefCountWithCacheTime<T> extends Observable<T> implements HasUpstreamObservableSource<T> {
+
+    @NonNull
+    private final ConnectableObservable<? extends T> connectableSource;
+    @NonNull
+    private final ObservableSource<T> actualSource;
+
+    @NonNull
+    private volatile CompositeDisposable baseDisposable = new CompositeDisposable();
+
+    @NonNull
+    private final AtomicInteger subscriptionCount = new AtomicInteger();
+
+    /**
+     * Use this lock for every subscription and disconnect action.
+     */
+    @NonNull
+    private final ReentrantLock lock = new ReentrantLock();
+
+    @NonNull
+    private final Scheduler scheduler = Schedulers.computation();
+    private final long cacheTime;
+    @NonNull
+    private final TimeUnit cacheTimeUnit;
+    @Nullable
+    private Scheduler.Worker worker;
+
+    /**
+     * Constructor.
+     *
+     * @param source observable to apply ref count to
+     */
+    public ObservableRefCountWithCacheTime(@NonNull final ConnectableObservable<T> source,
+                                           final long cacheTime, @NonNull final TimeUnit cacheTimeUnit) {
+        super();
+        this.connectableSource = source;
+        this.actualSource = source;
+        this.cacheTime = cacheTime;
+        this.cacheTimeUnit = cacheTimeUnit;
+    }
+
+    @NonNull
+    public ObservableSource<T> source() {
+        return actualSource;
+    }
+
+    private void cleanupWorker() {
+        if (worker != null) {
+            worker.dispose();
+            worker = null;
+        }
+    }
+
+    @Override
+    public void subscribeActual(@NonNull final Observer<? super T> subscriber) {
+
+        lock.lock();
+        if (subscriptionCount.incrementAndGet() == 1) {
+            cleanupWorker();
+            final AtomicBoolean writeLocked = new AtomicBoolean(true);
+
+            try {
+                // need to use this overload of connect to ensure that
+                // baseDisposable is set in the case that source is a
+                // synchronous Observable
+                connectableSource.connect(onSubscribe(subscriber, writeLocked));
+            } finally {
+                // need to cover the case where the source is subscribed to
+                // outside of this class thus preventing the Action1 passed
+                // to source.connect above being called
+                if (writeLocked.get()) {
+                    // Action1 passed to source.connect was not called
+                    lock.unlock();
+                }
+            }
+        } else {
+            try {
+                // ready to subscribe to source so do it
+                doSubscribe(subscriber, baseDisposable);
+            } finally {
+                // release the read lock
+                lock.unlock();
+            }
+        }
+
+    }
+
+    @NonNull
+    private Consumer<Disposable> onSubscribe(@NonNull final Observer<? super T> observer, @NonNull final AtomicBoolean writeLocked) {
+        return new DisposeConsumer(observer, writeLocked);
+    }
+
+    private void doSubscribe(@NonNull final Observer<? super T> observer, @NonNull final CompositeDisposable currentBase) {
+        // handle disposing from the base CompositeDisposable
+        final Disposable disposable = disconnect(currentBase);
+
+        final ConnectionObserver connectionObserver = new ConnectionObserver(observer, currentBase, disposable);
+        observer.onSubscribe(connectionObserver);
+
+        connectableSource.subscribe(connectionObserver);
+    }
+
+    @NonNull
+    private Disposable disconnect(@NonNull final CompositeDisposable current) {
+        return Disposables.fromRunnable(new DisposeTask(current));
+    }
+
+    private final class ConnectionObserver extends AtomicReference<Disposable> implements Observer<T>, Disposable {
+
+        private static final long serialVersionUID = 3813126992133394324L;
+
+        @NonNull
+        private final Observer<? super T> subscriber;
+        @NonNull
+        private final CompositeDisposable currentBase;
+        @NonNull
+        private final Disposable resource;
+
+        public ConnectionObserver(@NonNull final Observer<? super T> subscriber, @NonNull final CompositeDisposable currentBase,
+                                  @NonNull final Disposable resource) {
+            super();
+            this.subscriber = subscriber;
+            this.currentBase = currentBase;
+            this.resource = resource;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull final Disposable disposable) {
+            DisposableHelper.setOnce(this, disposable);
+        }
+
+        @Override
+        public void onError(@NonNull final Throwable throwable) {
+            cleanup();
+            subscriber.onError(throwable);
+        }
+
+        @Override
+        public void onNext(@NonNull final T item) {
+            subscriber.onNext(item);
+        }
+
+        @Override
+        public void onComplete() {
+            cleanup();
+            subscriber.onComplete();
+        }
+
+        @Override
+        public void dispose() {
+            DisposableHelper.dispose(this);
+            resource.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return DisposableHelper.isDisposed(get());
+        }
+
+        private void cleanup() {
+            // on error or completion we need to dispose the base CompositeDisposable
+            // and set the subscriptionCount to 0
+            lock.lock();
+            try {
+                if (baseDisposable == currentBase) {
+                    cleanupWorker();
+                    if (connectableSource instanceof Disposable) {
+                        ((Disposable) connectableSource).dispose();
+                    }
+
+                    baseDisposable.dispose();
+                    baseDisposable = new CompositeDisposable();
+                    subscriptionCount.set(0);
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+
+    }
+
+    private final class DisposeConsumer implements Consumer<Disposable> {
+
+        @NonNull
+        private final Observer<? super T> observer;
+        @NonNull
+        private final AtomicBoolean writeLocked;
+
+        public DisposeConsumer(@NonNull final Observer<? super T> observer, @NonNull final AtomicBoolean writeLocked) {
+            this.observer = observer;
+            this.writeLocked = writeLocked;
+        }
+
+        @Override
+        public void accept(@NonNull final Disposable subscription) {
+            try {
+                baseDisposable.add(subscription);
+                // ready to subscribe to source so do it
+                doSubscribe(observer, baseDisposable);
+            } finally {
+                // release the write lock
+                lock.unlock();
+                writeLocked.set(false);
+            }
+        }
+
+    }
+
+    private final class DisposeTask implements Runnable {
+
+        @NonNull
+        private final CompositeDisposable current;
+
+        public DisposeTask(@NonNull final CompositeDisposable current) {
+            this.current = current;
+        }
+
+        @Override
+        public void run() {
+            lock.lock();
+            try {
+                if (baseDisposable == current && subscriptionCount.decrementAndGet() == 0) {
+                    if (worker != null) {
+                        worker.dispose();
+                    } else {
+                        worker = scheduler.createWorker();
+                    }
+                    worker.schedule(() -> {
+                        lock.lock();
+                        try {
+                            if (subscriptionCount.get() == 0) {
+                                cleanupWorker();
+                                if (connectableSource instanceof Disposable) {
+                                    ((Disposable) connectableSource).dispose();
+                                }
+
+                                baseDisposable.dispose();
+                                // need a new baseDisposable because once
+                                // disposed stays that way
+                                baseDisposable = new CompositeDisposable();
+                            }
+                        } finally {
+                            lock.unlock();
+                        }
+                    }, cacheTime, cacheTimeUnit);
+                }
+            } finally {
+                lock.unlock();
+            }
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..390a024
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
@@ -0,0 +1,472 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 io.reactivex.Completable;
+import io.reactivex.Observable;
+import io.reactivex.Scheduler;
+import io.reactivex.Single;
+import io.reactivex.plugins.RxJavaPlugins;
+import io.reactivex.schedulers.Schedulers;
+import io.reactivex.subjects.PublishSubject;
+import ru.touchin.roboswag.core.log.LcGroup;
+import ru.touchin.roboswag.core.observables.ObservableRefCountWithCacheTime;
+import ru.touchin.roboswag.core.utils.ObjectUtils;
+import ru.touchin.roboswag.core.utils.Optional;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * Base class allows to async access to some store.
+ * Supports conversion between store and actual value. If it is not needed then use {@link SameTypesConverter}
+ * Supports migration from specific version to latest by {@link Migration} object.
+ * Allows to set default value which will be returned if actual value is null.
+ * Allows to declare specific {@link ObserveStrategy}.
+ * Also specific {@link Scheduler} could be specified to not create new scheduler per storable.
+ *
+ * @param <TKey>          Type of key to identify object;
+ * @param <TObject>       Type of actual object;
+ * @param <TStoreObject>  Type of store object. Could be same as {@link TObject};
+ * @param <TReturnObject> Type of actual value operating by Storable. Could be same as {@link TObject}.
+ */
+public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
+
+    public static final LcGroup STORABLE_LC_GROUP = new LcGroup("STORABLE");
+
+    private static final long DEFAULT_CACHE_TIME_MILLIS = TimeUnit.SECONDS.toMillis(5);
+
+    @NonNull
+    private static ObserveStrategy getDefaultObserveStrategyFor(@NonNull final Type objectType, @NonNull final Type storeObjectType) {
+        if (objectType instanceof Class && ObjectUtils.isSimpleClass((Class) objectType)) {
+            return ObserveStrategy.CACHE_ACTUAL_VALUE;
+        }
+        if (objectType instanceof Class && ObjectUtils.isSimpleClass((Class) storeObjectType)) {
+            return ObserveStrategy.CACHE_STORE_VALUE;
+        }
+        return ObserveStrategy.NO_CACHE;
+    }
+
+    @NonNull
+    private final TKey key;
+    @NonNull
+    private final Type objectType;
+    @NonNull
+    private final Type storeObjectType;
+    @NonNull
+    private final Store<TKey, TStoreObject> store;
+    @NonNull
+    private final Converter<TObject, TStoreObject> converter;
+    @NonNull
+    private final PublishSubject<Optional<TStoreObject>> newStoreValueEvent = PublishSubject.create();
+    @NonNull
+    private final Observable<Optional<TStoreObject>> storeValueObservable;
+    @NonNull
+    private final Observable<Optional<TObject>> valueObservable;
+    @NonNull
+    private final Scheduler scheduler;
+
+    public BaseStorable(@NonNull final BuilderCore<TKey, TObject, TStoreObject> builderCore) {
+        this(builderCore.key, builderCore.objectType, builderCore.storeObjectType,
+                builderCore.store, builderCore.converter, builderCore.observeStrategy,
+                builderCore.migration, builderCore.defaultValue, builderCore.storeScheduler, builderCore.cacheTimeMillis);
+    }
+
+    @SuppressWarnings("PMD.ExcessiveParameterList")
+    //ExcessiveParameterList: that's why we are using builder to create it
+    private BaseStorable(@NonNull final TKey key,
+                         @NonNull final Type objectType,
+                         @NonNull final Type storeObjectType,
+                         @NonNull final Store<TKey, TStoreObject> store,
+                         @NonNull final Converter<TObject, TStoreObject> converter,
+                         @Nullable final ObserveStrategy observeStrategy,
+                         @Nullable final Migration<TKey> migration,
+                         @Nullable final TObject defaultValue,
+                         @Nullable final Scheduler storeScheduler,
+                         final long cacheTimeMillis) {
+        this.key = key;
+        this.objectType = objectType;
+        this.storeObjectType = storeObjectType;
+        this.store = store;
+        this.converter = converter;
+
+        final ObserveStrategy nonNullObserveStrategy
+                = observeStrategy != null ? observeStrategy : getDefaultObserveStrategyFor(objectType, storeObjectType);
+        scheduler = storeScheduler != null ? storeScheduler : Schedulers.from(Executors.newSingleThreadExecutor());
+        storeValueObservable
+                = createStoreValueObservable(nonNullObserveStrategy, migration, defaultValue, cacheTimeMillis);
+        valueObservable = createValueObservable(storeValueObservable, nonNullObserveStrategy, cacheTimeMillis);
+    }
+
+    @Nullable
+    private Optional<TStoreObject> returnDefaultValueIfNull(@NonNull final Optional<TStoreObject> storeObject, @Nullable final TObject defaultValue)
+            throws Converter.ConversionException {
+        if (storeObject.get() != null || defaultValue == null) {
+            return storeObject;
+        }
+
+        try {
+            return new Optional<>(converter.toStoreObject(objectType, storeObjectType, defaultValue));
+        } catch (final Converter.ConversionException exception) {
+            STORABLE_LC_GROUP.w(exception, "Exception while converting default value of '%s' from '%s' from store %s",
+                    key, defaultValue, store);
+            throw exception;
+        }
+    }
+
+    @NonNull
+    private Observable<Optional<TStoreObject>> createStoreInitialLoadingObservable(@Nullable final Migration<TKey> migration) {
+        final Single<Optional<TStoreObject>> loadObservable = store.loadObject(storeObjectType, key)
+                .doOnError(throwable -> STORABLE_LC_GROUP.w(throwable, "Exception while trying to load value of '%s' from store %s", key, store));
+        return (migration != null ? migration.migrateToLatestVersion(key).andThen(loadObservable) : loadObservable)
+                .subscribeOn(scheduler)
+                .observeOn(scheduler)
+                .toObservable()
+                .replay(1)
+                .refCount()
+                .take(1);
+    }
+
+    @NonNull
+    private Observable<Optional<TStoreObject>> createStoreValueObservable(@NonNull final ObserveStrategy observeStrategy,
+                                                                          @Nullable final Migration<TKey> migration,
+                                                                          @Nullable final TObject defaultValue,
+                                                                          final long cacheTimeMillis) {
+        final Observable<Optional<TStoreObject>> storeInitialLoadingObservable = createStoreInitialLoadingObservable(migration);
+        final Observable<Optional<TStoreObject>> result = storeInitialLoadingObservable
+                .concatWith(newStoreValueEvent)
+                .map(storeObject -> returnDefaultValueIfNull(storeObject, defaultValue));
+        return observeStrategy == ObserveStrategy.CACHE_STORE_VALUE || observeStrategy == ObserveStrategy.CACHE_STORE_AND_ACTUAL_VALUE
+                ? RxJavaPlugins.onAssembly(new ObservableRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
+                : result;
+    }
+
+    @NonNull
+    private Observable<Optional<TObject>> createValueObservable(@NonNull final Observable<Optional<TStoreObject>> storeValueObservable,
+                                                                @NonNull final ObserveStrategy observeStrategy,
+                                                                final long cacheTimeMillis) {
+        final Observable<Optional<TObject>> result = storeValueObservable
+                .map(storeObject -> {
+                    try {
+                        return new Optional<>(converter.toObject(objectType, storeObjectType, storeObject.get()));
+                    } catch (final Converter.ConversionException exception) {
+                        STORABLE_LC_GROUP.w(exception, "Exception while trying to converting value of '%s' from store %s by %s",
+                                key, storeObject, store, converter);
+                        throw exception;
+                    }
+                });
+        return observeStrategy == ObserveStrategy.CACHE_ACTUAL_VALUE || observeStrategy == ObserveStrategy.CACHE_STORE_AND_ACTUAL_VALUE
+                ? RxJavaPlugins.onAssembly(new ObservableRefCountWithCacheTime<>(result.replay(1), cacheTimeMillis, TimeUnit.MILLISECONDS))
+                : result;
+    }
+
+    /**
+     * Returns key of value.
+     *
+     * @return Unique key.
+     */
+    @NonNull
+    public TKey getKey() {
+        return key;
+    }
+
+    /**
+     * Returns type of actual object.
+     *
+     * @return Type of actual object.
+     */
+    @NonNull
+    public Type getObjectType() {
+        return objectType;
+    }
+
+    /**
+     * Returns type of store object.
+     *
+     * @return Type of store object.
+     */
+    @NonNull
+    public Type getStoreObjectType() {
+        return storeObjectType;
+    }
+
+    /**
+     * Returns {@link Store} where store class representation of object is storing.
+     *
+     * @return Store.
+     */
+    @NonNull
+    public Store<TKey, TStoreObject> getStore() {
+        return store;
+    }
+
+    /**
+     * Returns {@link Converter} to convert values from store class to actual and back.
+     *
+     * @return Converter.
+     */
+    @NonNull
+    public Converter<TObject, TStoreObject> getConverter() {
+        return converter;
+    }
+
+    @NonNull
+    private Completable internalSet(@Nullable final TObject newValue, final boolean checkForEqualityBeforeSet) {
+        return (checkForEqualityBeforeSet ? storeValueObservable.firstOrError() : Single.just(new Optional<>(null)))
+                .observeOn(scheduler)
+                .flatMapCompletable(oldStoreValue -> {
+                    final TStoreObject newStoreValue;
+                    try {
+                        newStoreValue = converter.toStoreObject(objectType, storeObjectType, newValue);
+                    } catch (final Converter.ConversionException exception) {
+                        STORABLE_LC_GROUP.w(exception, "Exception while trying to store value of '%s' from store %s by %s",
+                                key, newValue, store, converter);
+                        return Completable.error(exception);
+                    }
+                    if (checkForEqualityBeforeSet && ObjectUtils.equals(newStoreValue, oldStoreValue.get())) {
+                        return Completable.complete();
+                    }
+                    return store.storeObject(storeObjectType, key, newStoreValue)
+                            .doOnError(throwable -> STORABLE_LC_GROUP.w(throwable,
+                                    "Exception while trying to store value of '%s' from store %s by %s",
+                                    key, newValue, store, converter))
+                            .observeOn(scheduler)
+                            .andThen(Completable.fromAction(() -> {
+                                newStoreValueEvent.onNext(new Optional<>(newStoreValue));
+                                if (checkForEqualityBeforeSet) {
+                                    STORABLE_LC_GROUP.i("Value of '%s' changed from '%s' to '%s'", key, oldStoreValue, newStoreValue);
+                                } else {
+                                    STORABLE_LC_GROUP.i("Value of '%s' force changed to '%s'", key, newStoreValue);
+                                }
+                            }));
+                });
+    }
+
+    /**
+     * Creates observable which is async setting value to store.
+     * It is not checking if stored value equals new value.
+     * In result it will be faster to not get value from store and compare but it will emit item to {@link #observe()} subscribers.
+     * NOTE: It could emit ONLY completed and errors events. It is not providing onNext event!
+     *
+     * @param newValue Value to set;
+     * @return Observable of setting process.
+     */
+    @NonNull
+    public Completable forceSet(@Nullable final TObject newValue) {
+        return internalSet(newValue, false);
+    }
+
+    /**
+     * Creates observable which is async setting value to store.
+     * It is checking if stored value equals new value.
+     * In result it will take time to get value from store and compare
+     * but it won't emit item to {@link #observe()} subscribers if stored value equals new value.
+     * NOTE: It could emit ONLY completed and errors events. It is not providing onNext event!
+     *
+     * @param newValue Value to set;
+     * @return Observable of setting process.
+     */
+    @NonNull
+    public Completable set(@Nullable final TObject newValue) {
+        return internalSet(newValue, true);
+    }
+
+    /**
+     * Sets value synchronously. You should NOT use this method normally. Use {@link #set(Object)} asynchronously instead.
+     *
+     * @param newValue Value to set;
+     */
+    @Deprecated
+    //deprecation: it should be used for debug only and in very rare cases.
+    public void setSync(@Nullable final TObject newValue) {
+        set(newValue).blockingAwait();
+    }
+
+    @NonNull
+    protected Observable<Optional<TObject>> observeOptionalValue() {
+        return valueObservable;
+    }
+
+    /**
+     * Returns Observable which is emitting item on subscribe and every time when someone have changed value.
+     * It could emit next and error events but not completed.
+     *
+     * @return Returns observable of value.
+     */
+    @NonNull
+    public abstract Observable<TReturnObject> observe();
+
+    /**
+     * Returns Observable which is emitting only one item on subscribe.
+     * It could emit next and error events but not completed.
+     *
+     * @return Returns observable of value.
+     */
+    @NonNull
+    public Single<TReturnObject> get() {
+        return observe().firstOrError();
+    }
+
+    /**
+     * Gets value synchronously. You should NOT use this method normally. Use {@link #get()} or {@link #observe()} asynchronously instead.
+     *
+     * @return Returns value;
+     */
+    @Deprecated
+    //deprecation: it should be used for debug only and in very rare cases.
+    @Nullable
+    public TReturnObject getSync() {
+        return get().blockingGet();
+    }
+
+    /**
+     * Enum that is representing strategy of observing item from store.
+     */
+    public enum ObserveStrategy {
+
+        /**
+         * Not caching value so on every {@link #get()} emit it will get value from {@link #getStore()} and converts it with {@link #getConverter()}.
+         */
+        NO_CACHE,
+        /**
+         * Caching only store value so on every {@link #get()} emit it will converts it with {@link #getConverter()}.
+         * Do not use such strategy if store object could be big (like byte-array of file).
+         */
+        CACHE_STORE_VALUE,
+        /**
+         * Caching value so it won't spend time for getting value from {@link #getStore()} and converts it by {@link #getConverter()}.
+         * But it will take time for getting value from {@link #getStore()} to set value.
+         * Do not use such strategy if object could be big (like Bitmap or long string).
+         * Do not use such strategy if object is mutable because multiple subscribers could then change it's state.
+         */
+        CACHE_ACTUAL_VALUE,
+        /**
+         * Caching value so it won't spend time for getting value from {@link #getStore()} and converts it by {@link #getConverter()}.
+         * It won't take time or getting value from {@link #getStore()} to set value.
+         * Do not use such strategy if store object could be big (like byte-array of file).
+         * Do not use such strategy if object could be big (like Bitmap or long string).
+         * Do not use such strategy if object is mutable because multiple subscribers could then change it's state.
+         */
+        CACHE_STORE_AND_ACTUAL_VALUE
+
+    }
+
+    /**
+     * Helper class to create various builders.
+     *
+     * @param <TKey>         Type of key to identify object;
+     * @param <TObject>      Type of actual object;
+     * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
+     */
+    public static class BuilderCore<TKey, TObject, TStoreObject> {
+
+        @NonNull
+        protected final TKey key;
+        @NonNull
+        protected final Type objectType;
+        @NonNull
+        private final Type storeObjectType;
+        @NonNull
+        private final Store<TKey, TStoreObject> store;
+        @NonNull
+        private final Converter<TObject, TStoreObject> converter;
+        @Nullable
+        private ObserveStrategy observeStrategy;
+        @Nullable
+        private Migration<TKey> migration;
+        @Nullable
+        private TObject defaultValue;
+        @Nullable
+        private Scheduler storeScheduler;
+        private long cacheTimeMillis;
+
+        protected BuilderCore(@NonNull final TKey key,
+                              @NonNull final Type objectType,
+                              @NonNull final Type storeObjectType,
+                              @NonNull final Store<TKey, TStoreObject> store,
+                              @NonNull final Converter<TObject, TStoreObject> converter) {
+            this(key, objectType, storeObjectType, store, converter, null, null, null, null, DEFAULT_CACHE_TIME_MILLIS);
+        }
+
+        protected BuilderCore(@NonNull final BuilderCore<TKey, TObject, TStoreObject> sourceBuilder) {
+            this(sourceBuilder.key, sourceBuilder.objectType, sourceBuilder.storeObjectType,
+                    sourceBuilder.store, sourceBuilder.converter, sourceBuilder.observeStrategy,
+                    sourceBuilder.migration, sourceBuilder.defaultValue, sourceBuilder.storeScheduler, sourceBuilder.cacheTimeMillis);
+        }
+
+        @SuppressWarnings({"PMD.ExcessiveParameterList", "CPD-START"})
+        //CPD: it is same code as constructor of Storable
+        //ExcessiveParameterList: that's why we are using builder to create it
+        private BuilderCore(@NonNull final TKey key,
+                            @NonNull final Type objectType,
+                            @NonNull final Type storeObjectType,
+                            @NonNull final Store<TKey, TStoreObject> store,
+                            @NonNull final Converter<TObject, TStoreObject> converter,
+                            @Nullable final ObserveStrategy observeStrategy,
+                            @Nullable final Migration<TKey> migration,
+                            @Nullable final TObject defaultValue,
+                            @Nullable final Scheduler storeScheduler,
+                            final long cacheTimeMillis) {
+            this.key = key;
+            this.objectType = objectType;
+            this.storeObjectType = storeObjectType;
+            this.store = store;
+            this.converter = converter;
+            this.observeStrategy = observeStrategy;
+            this.migration = migration;
+            this.defaultValue = defaultValue;
+            this.storeScheduler = storeScheduler;
+            this.cacheTimeMillis = cacheTimeMillis;
+        }
+
+        @SuppressWarnings("CPD-END")
+        protected void setStoreSchedulerInternal(@Nullable final Scheduler storeScheduler) {
+            this.storeScheduler = storeScheduler;
+        }
+
+        protected void setObserveStrategyInternal(@Nullable final ObserveStrategy observeStrategy) {
+            this.observeStrategy = observeStrategy;
+        }
+
+        protected void setMigrationInternal(@NonNull final Migration<TKey> migration) {
+            this.migration = migration;
+        }
+
+        protected void setCacheTimeInternal(final long cacheTime, @NonNull final TimeUnit timeUnit) {
+            this.cacheTimeMillis = timeUnit.toMillis(cacheTime);
+        }
+
+        @Nullable
+        protected TObject getDefaultValue() {
+            return defaultValue;
+        }
+
+        protected void setDefaultValueInternal(@NonNull final TObject defaultValue) {
+            this.defaultValue = defaultValue;
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..5991932
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Converter.java
@@ -0,0 +1,74 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.reflect.Type;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * Interface that is providing logic to convert value from specific type to type allowed to store in {@link Store} object and back.
+ *
+ * @param <TObject>      Type of original objects;
+ * @param <TStoreObject> Type of objects in store.
+ */
+public interface Converter<TObject, TStoreObject> {
+
+    /**
+     * Converts specific object of objectType to object of storeObjectClass allowed to store.
+     *
+     * @param objectType      Type of object;
+     * @param storeObjectType Type of store object allowed to store;
+     * @param object          Object to be converted to store object;
+     * @return Object that is allowed to store into specific {@link Store};
+     * @throws ConversionException Exception during conversion. Usually it indicates illegal state.
+     */
+    @Nullable
+    TStoreObject toStoreObject(@NonNull Type objectType, @NonNull Type storeObjectType, @Nullable TObject object)
+            throws ConversionException;
+
+    /**
+     * Converts specific store object of storeObjectClass to object of objectType.
+     *
+     * @param objectType      Type of object;
+     * @param storeObjectType Type of store object allowed to store;
+     * @param storeObject     Object from specific {@link Store};
+     * @return Object converted from store object;
+     * @throws ConversionException Exception during conversion. Usually it indicates illegal state.
+     */
+    @Nullable
+    TObject toObject(@NonNull Type objectType, @NonNull Type storeObjectType, @Nullable TStoreObject storeObject)
+            throws ConversionException;
+
+    class ConversionException extends Exception {
+
+        public ConversionException(@NonNull final String message) {
+            super(message);
+        }
+
+        public ConversionException(@NonNull final String message, @NonNull final Throwable throwable) {
+            super(message, throwable);
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..3fa2475
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migration.java
@@ -0,0 +1,165 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import io.reactivex.Completable;
+import io.reactivex.Flowable;
+import io.reactivex.Single;
+
+/**
+ * Created by Gavriil Sitnikov on 06/10/2015.
+ * Object that allows to migrate some store objects from one version to another by migrators passed into constructor.
+ * Migrating objects should have same types of store key.
+ *
+ * @param <TKey> Type of key of store objects.
+ */
+public class Migration<TKey> {
+
+    public static final long DEFAULT_VERSION = -1L;
+
+    private final long latestVersion;
+    @NonNull
+    private final Store<TKey, Long> versionsStore;
+    @NonNull
+    private final List<Migrator<TKey, ?, ?>> migrators;
+
+    @SafeVarargs
+    public Migration(@NonNull final Store<TKey, Long> versionsStore,
+                     final long latestVersion,
+                     @NonNull final Migrator<TKey, ?, ?>... migrators) {
+        this.versionsStore = versionsStore;
+        this.latestVersion = latestVersion;
+        this.migrators = Arrays.asList(migrators);
+    }
+
+    @NonNull
+    private Single<Long> loadCurrentVersion(@NonNull final TKey key) {
+        return versionsStore.loadObject(Long.class, key)
+                .map(version -> version.get() != null ? version.get() : DEFAULT_VERSION)
+                .onErrorResumeNext(throwable
+                        -> Single.error(new MigrationException(String.format("Can't get version of '%s' from %s", key, versionsStore), throwable)));
+    }
+
+    @NonNull
+    private Single<Long> makeMigrationChain(@NonNull final TKey key, @NonNull final VersionUpdater versionUpdater) {
+        Single<Long> chain = Single.fromCallable(() -> versionUpdater.initialVersion);
+        for (final Migrator<TKey, ?, ?> migrator : migrators) {
+            chain = chain.flatMap(updatedVersion ->
+                    migrator.canMigrate(key, updatedVersion)
+                            .flatMap(canMigrate -> canMigrate
+                                    ? migrator.migrate(key, updatedVersion)
+                                    .doOnSuccess(newVersion
+                                            -> versionUpdater.updateVersion(newVersion, latestVersion, migrator))
+                                    : Single.just(updatedVersion)));
+        }
+        return chain;
+    }
+
+    /**
+     * Migrates some object by key to latest version.
+     *
+     * @param key Key of object to migrate.
+     */
+    @NonNull
+    public Completable migrateToLatestVersion(@NonNull final TKey key) {
+        return loadCurrentVersion(key)
+                .flatMap(currentVersion -> {
+                    final VersionUpdater versionUpdater = new VersionUpdater<>(key, versionsStore, currentVersion);
+                    return makeMigrationChain(key, versionUpdater)
+                            .doOnSuccess(lastUpdatedVersion -> {
+                                if (lastUpdatedVersion < latestVersion) {
+                                    throw new NextLoopMigrationException();
+                                }
+                                if (versionUpdater.initialVersion == versionUpdater.oldVersion) {
+                                    throw new MigrationException(String.format("Version of '%s' not updated from %s",
+                                            key, versionUpdater.initialVersion));
+                                }
+                            })
+                            .retryWhen(attempts -> attempts
+                                    .switchMap(throwable -> throwable instanceof NextLoopMigrationException
+                                            ? Flowable.just(new Object()) : Flowable.error(throwable)));
+                })
+                .toCompletable()
+                .andThen(versionsStore.storeObject(Long.class, key, latestVersion))
+                .onErrorResumeNext(throwable -> {
+                    if (throwable instanceof MigrationException) {
+                        return Completable.error(throwable);
+                    }
+                    return Completable.error(new MigrationException(String.format("Can't migrate '%s'", key), throwable));
+                });
+    }
+
+    private static class VersionUpdater<TKey> {
+
+        @NonNull
+        private final TKey key;
+        @NonNull
+        private final Store versionsStore;
+        private long oldVersion;
+        private long initialVersion;
+
+        public VersionUpdater(@NonNull final TKey key, @NonNull final Store versionsStore, final long initialVersion) {
+            this.key = key;
+            this.versionsStore = versionsStore;
+            this.oldVersion = initialVersion;
+            this.initialVersion = initialVersion;
+        }
+
+        public void updateVersion(final long updateVersion, final long latestVersion, @NonNull final Migrator migrator) {
+            if (initialVersion > updateVersion) {
+                throw new MigrationException(String.format("Version of '%s' downgraded from %s to %s [from %s by %s]",
+                        key, initialVersion, updateVersion, versionsStore, migrator));
+            }
+            if (updateVersion > latestVersion) {
+                throw new MigrationException(
+                        String.format("Version of '%s' is %s and higher than latest version %s [from %s by %s]",
+                                key, initialVersion, updateVersion, versionsStore, migrator));
+            }
+            if (updateVersion == initialVersion) {
+                throw new MigrationException(String.format("Update version of '%s' equals current version '%s' [from %s by %s]",
+                        key, updateVersion, versionsStore, migrator));
+            }
+            oldVersion = initialVersion;
+            initialVersion = updateVersion;
+        }
+
+    }
+
+    private static class NextLoopMigrationException extends Exception {
+    }
+
+    public static class MigrationException extends RuntimeException {
+
+        public MigrationException(@NonNull final String message) {
+            super(message);
+        }
+
+        public MigrationException(@NonNull final String message, @NonNull final Throwable throwable) {
+            super(message, throwable);
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..41a3c53
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Migrator.java
@@ -0,0 +1,97 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+
+import io.reactivex.Single;
+
+/**
+ * Created by Gavriil Sitnikov on 05/10/2015.
+ * Abstract class of objects which are able to migrate some values from one version to another.
+ * Also it is able to move objects from one store to another.
+ *
+ * @param <TKey>            Type of keys of migrating values;
+ * @param <TOldStoreObject> Type of values from current store;
+ * @param <TNewStoreObject> Type of values from new store. Could be same as {@link TOldStoreObject}.
+ */
+public abstract class Migrator<TKey, TOldStoreObject, TNewStoreObject> {
+
+    @NonNull
+    private final Store<TKey, TOldStoreObject> oldStore;
+    @NonNull
+    private final Store<TKey, TNewStoreObject> newStore;
+
+    public Migrator(@NonNull final Store<TKey, TOldStoreObject> oldStore,
+                    @NonNull final Store<TKey, TNewStoreObject> newStore) {
+        this.oldStore = oldStore;
+        this.newStore = newStore;
+    }
+
+    /**
+     * Returns if this migrator can migrate from specific version to some new version.
+     *
+     * @param version Version to migrate from;
+     * @return True if migrator supports migration from this version.
+     */
+    public abstract boolean supportsMigrationFor(long version);
+
+    /**
+     * Returns {@link Single} that emits if specific object with key of specific version could be migrated by this migrator.
+     *
+     * @param key     Key of object to migrate;
+     * @param version Current version of object;
+     * @return {@link Single} that emits true if object with such key and version could be migrated.
+     */
+    @NonNull
+    public Single<Boolean> canMigrate(@NonNull final TKey key, final long version) {
+        return supportsMigrationFor(version) ? oldStore.contains(key) : Single.just(false);
+    }
+
+    /**
+     * Single that migrates object with specific key from some version to migrator's version.
+     *
+     * @param key     Key of object to migrate;
+     * @param version Current version of object;
+     * @return {@link Single} that emits new version of object after migration process.
+     */
+    @NonNull
+    public Single<Long> migrate(@NonNull final TKey key, final long version) {
+        return supportsMigrationFor(version)
+                ? migrateInternal(key, version, oldStore, newStore)
+                : Single.error(new Migration.MigrationException(String.format("Version %s of '%s' is not supported by %s", version, key, this)));
+    }
+
+    /**
+     * Single that represents internal migration logic specified by implementation.
+     *
+     * @param key      Key of object to migrate;
+     * @param version  Current version of object;
+     * @param oldStore Old store of object;
+     * @param newStore new store of object;
+     * @return {@link Single} that emits new version of object after migration process.
+     */
+    @NonNull
+    protected abstract Single<Long> migrateInternal(@NonNull TKey key,
+                                                    long version,
+                                                    @NonNull Store<TKey, TOldStoreObject> oldStore,
+                                                    @NonNull Store<TKey, TNewStoreObject> newStore);
+
+}
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
new file mode 100644
index 0000000..3373ae6
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
@@ -0,0 +1,145 @@
+/*
+ *  Copyright (c) 2016 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Observable;
+import io.reactivex.Scheduler;
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * {@link Storable} that should return not null value on get.
+ * If this rule is violated then it will throw {@link ShouldNotHappenException}.
+ *
+ * @param <TKey>         Type of key to identify object;
+ * @param <TObject>      Type of actual object;
+ * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
+ */
+public class NonNullStorable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TObject, TStoreObject, TObject> {
+
+    public NonNullStorable(@NonNull final Builder<TKey, TObject, TStoreObject> builderCore) {
+        super(builderCore);
+    }
+
+    @NonNull
+    @Override
+    public Observable<TObject> observe() {
+        return observeOptionalValue()
+                .map(optional -> {
+                    if (optional.get() == null) {
+                        throw new ShouldNotHappenException();
+                    }
+                    return optional.get();
+                });
+    }
+
+    /**
+     * Created by Gavriil Sitnikov on 15/05/2016.
+     * Builder that is already contains not null default value.
+     *
+     * @param <TKey>         Type of key to identify object;
+     * @param <TObject>      Type of actual object;
+     * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
+     */
+    @SuppressWarnings("CPD-START")
+    //CPD: it is same code as Builder of Storable because it's methods returning this and can't be inherited
+    public static class Builder<TKey, TObject, TStoreObject> extends BuilderCore<TKey, TObject, TStoreObject> {
+
+        public Builder(@NonNull final Storable.Builder<TKey, TObject, TStoreObject> sourceBuilder,
+                       @NonNull final TObject defaultValue) {
+            super(sourceBuilder);
+            if (defaultValue == null) {
+                throw new ShouldNotHappenException();
+            }
+            setDefaultValueInternal(defaultValue);
+        }
+
+        /**
+         * Sets specific {@link Scheduler} to store/load/convert values on it.
+         *
+         * @param storeScheduler Scheduler;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setStoreScheduler(@Nullable final Scheduler storeScheduler) {
+            setStoreSchedulerInternal(storeScheduler);
+            return this;
+        }
+
+        /**
+         * Sets specific {@link ObserveStrategy} to cache value in memory in specific way.
+         *
+         * @param observeStrategy ObserveStrategy;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setObserveStrategy(@Nullable final ObserveStrategy observeStrategy) {
+            setObserveStrategyInternal(observeStrategy);
+            return this;
+        }
+
+        /**
+         * Sets cache time for while value that cached by {@link #setObserveStrategy(ObserveStrategy)}
+         * will be in memory after everyone unsubscribe.
+         * It is important for example for cases when user switches between screens and hide/open app very fast.
+         *
+         * @param cacheTime Cache time value;
+         * @param timeUnit  Cache time units.
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setCacheTime(final long cacheTime, @NonNull final TimeUnit timeUnit) {
+            setCacheTimeInternal(cacheTime, timeUnit);
+            return this;
+        }
+
+        /**
+         * Sets specific {@link Migration} to migrate values from specific version to latest version.
+         *
+         * @param migration Migration;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setMigration(@NonNull final Migration<TKey> migration) {
+            setMigrationInternal(migration);
+            return this;
+        }
+
+        /**
+         * Building {@link NonNullStorable} object.
+         *
+         * @return New {@link NonNullStorable}.
+         */
+        @NonNull
+        @SuppressWarnings("CPD-END")
+        public NonNullStorable<TKey, TObject, TStoreObject> build() {
+            if (getDefaultValue() == null) {
+                throw new ShouldNotHappenException();
+            }
+            return new NonNullStorable<>(this);
+        }
+
+    }
+}
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
new file mode 100644
index 0000000..9bfa228
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/SameTypesConverter.java
@@ -0,0 +1,27 @@
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.reflect.Type;
+
+/**
+ * Simple safe converter that is doing nothing on conversion.
+ *
+ * @param <T> Same type.
+ */
+public class SameTypesConverter<T> implements Converter<T, T> {
+
+    @Nullable
+    @Override
+    public T toStoreObject(@NonNull final Type type1, @NonNull final Type type2, @Nullable final T object) {
+        return object;
+    }
+
+    @Nullable
+    @Override
+    public T toObject(@NonNull final Type type1, @NonNull final Type type2, @Nullable final T object) {
+        return object;
+    }
+
+}
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
new file mode 100644
index 0000000..b891c0c
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
@@ -0,0 +1,147 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 io.reactivex.Observable;
+import io.reactivex.Scheduler;
+import ru.touchin.roboswag.core.utils.Optional;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * Base class allows to async access to some store.
+ * Supports conversion between store and actual value. If it is not needed then use {@link SameTypesConverter}
+ * Supports migration from specific version to latest by {@link Migration} object.
+ * Allows to set default value which will be returned if actual value is null.
+ * Allows to declare specific {@link ObserveStrategy}.
+ * Also specific {@link Scheduler} could be specified to not create new scheduler per storable.
+ *
+ * @param <TKey>         Type of key to identify object;
+ * @param <TObject>      Type of actual object;
+ * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
+ */
+public class Storable<TKey, TObject, TStoreObject> extends BaseStorable<TKey, TObject, TStoreObject, Optional<TObject>> {
+
+    public Storable(@NonNull final BuilderCore<TKey, TObject, TStoreObject> builderCore) {
+        super(builderCore);
+    }
+
+    @NonNull
+    @Override
+    public Observable<Optional<TObject>> observe() {
+        return observeOptionalValue();
+    }
+
+    /**
+     * Helper class to build {@link Storable}.
+     *
+     * @param <TKey>         Type of key to identify object;
+     * @param <TObject>      Type of actual object;
+     * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
+     */
+    public static class Builder<TKey, TObject, TStoreObject> extends BuilderCore<TKey, TObject, TStoreObject> {
+
+        public Builder(@NonNull final TKey key,
+                       @NonNull final Type objectType,
+                       @NonNull final Type storeObjectType,
+                       @NonNull final Store<TKey, TStoreObject> store,
+                       @NonNull final Converter<TObject, TStoreObject> converter) {
+            super(key, objectType, storeObjectType, store, converter);
+        }
+
+        /**
+         * Sets specific {@link Scheduler} to store/load/convert values on it.
+         *
+         * @param storeScheduler Scheduler;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setStoreScheduler(@Nullable final Scheduler storeScheduler) {
+            setStoreSchedulerInternal(storeScheduler);
+            return this;
+        }
+
+        /**
+         * Sets specific {@link ObserveStrategy} to cache value in memory in specific way.
+         *
+         * @param observeStrategy ObserveStrategy;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setObserveStrategy(@Nullable final ObserveStrategy observeStrategy) {
+            setObserveStrategyInternal(observeStrategy);
+            return this;
+        }
+
+        /**
+         * Sets cache time for while value that cached by {@link #setObserveStrategy(ObserveStrategy)} will be in memory after everyone unsubscribe.
+         * It is important for example for cases when user switches between screens and hide/open app very fast.
+         *
+         * @param cacheTime Cache time value;
+         * @param timeUnit  Cache time units.
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setCacheTime(final long cacheTime, @NonNull final TimeUnit timeUnit) {
+            setCacheTimeInternal(cacheTime, timeUnit);
+            return this;
+        }
+
+        /**
+         * Sets specific {@link Migration} to migrate values from specific version to latest version.
+         *
+         * @param migration Migration;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public Builder<TKey, TObject, TStoreObject> setMigration(@NonNull final Migration<TKey> migration) {
+            setMigrationInternal(migration);
+            return this;
+        }
+
+        /**
+         * Sets value which will be returned instead of null.
+         *
+         * @param defaultValue Default value;
+         * @return Builder that allows to specify other fields.
+         */
+        @NonNull
+        public NonNullStorable.Builder<TKey, TObject, TStoreObject> setDefaultValue(@NonNull final TObject defaultValue) {
+            return new NonNullStorable.Builder<>(this, defaultValue);
+        }
+
+        /**
+         * Building {@link Storable} object.
+         *
+         * @return New {@link Storable}.
+         */
+        @NonNull
+        public Storable<TKey, TObject, TStoreObject> build() {
+            return new Storable<>(this);
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..c6c3a3b
--- /dev/null
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/Store.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.observables.storable;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.reflect.Type;
+
+import io.reactivex.Completable;
+import io.reactivex.Single;
+import ru.touchin.roboswag.core.utils.Optional;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * Interface that is providing access to abstract object which can store (e.g. in file, database, remote store)
+ * some type of objects (e.g. String, byte[], Integer) by key.
+ *
+ * @param <TKey>         Type of keys for values;
+ * @param <TStoreObject> Type of values stored in store.
+ */
+public interface Store<TKey, TStoreObject> {
+
+    /**
+     * Returns if store contains specific key related to some value.
+     *
+     * @param key Key which is finding in store;
+     * @return True if key have found in store.
+     */
+    @NonNull
+    Single<Boolean> contains(@NonNull TKey key);
+
+    /**
+     * Stores object to store with related key.
+     *
+     * @param storeObjectType Type of object to store;
+     * @param key             Key related to object;
+     * @param storeObject     Object to store;
+     */
+    @NonNull
+    Completable storeObject(@NonNull Type storeObjectType, @NonNull TKey key, @Nullable TStoreObject storeObject);
+
+    /**
+     * Loads object from store by key.
+     *
+     * @param storeObjectType Type of object to store;
+     * @param key             Key related to object;
+     * @return Object from store found by key;
+     */
+    @NonNull
+    Single<Optional<TStoreObject>> loadObject(@NonNull Type storeObjectType, @NonNull TKey key);
+
+}
diff --git a/utils/.gitignore b/utils/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/utils/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/utils/build.gradle b/utils/build.gradle
new file mode 100644
index 0000000..217c17b
--- /dev/null
+++ b/utils/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+}
diff --git a/utils/src/main/AndroidManifest.xml b/utils/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..6d76123
--- /dev/null
+++ b/utils/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="ru.touchin.roboswag.core.utils" />
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
similarity index 96%
rename from src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
index b6eb724..a80ee72 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/UiUtils.java
@@ -38,23 +38,12 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 
-import ru.touchin.roboswag.core.log.LcGroup;
-
 /**
  * Created by Gavriil Sitnikov on 13/11/2015.
  * General utilities related to UI (Inflation, Views, Metrics, Activities etc.).
  */
 public final class UiUtils {
 
-    /**
-     * Logging group to log UI metrics (like inflation or layout time etc.).
-     */
-    public static final LcGroup UI_METRICS_LC_GROUP = new LcGroup("UI_METRICS");
-    /**
-     * Logging group to log UI lifecycle (onCreate, onStart, onResume etc.).
-     */
-    public static final LcGroup UI_LIFECYCLE_LC_GROUP = new LcGroup("UI_LIFECYCLE");
-
     /**
      * Method to inflate view with right layout parameters based on container and add inflated view as a child to it.
      *
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/spans/ColoredUrlSpan.java
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
similarity index 93%
rename from src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
index 5f84f91..b350912 100644
--- a/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
+++ b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/PhoneSpan.java
@@ -8,8 +8,6 @@ import android.text.TextPaint;
 import android.text.style.URLSpan;
 import android.view.View;
 
-import ru.touchin.roboswag.core.log.Lc;
-
 /**
  * Created by Gavriil Sitnikov on 14/11/2015.
  * Span that is opening phone call intent.
@@ -28,7 +26,7 @@ public class PhoneSpan extends URLSpan {
             intent.setData(Uri.parse(getURL()));
             widget.getContext().startActivity(intent);
         } catch (final ActivityNotFoundException exception) {
-            Lc.assertion(exception);
+            // Do nothing
         }
     }
 
diff --git a/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java b/utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
similarity index 100%
rename from src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
rename to utils/src/main/java/ru/touchin/roboswag/components/utils/spans/TypefaceSpan.java
diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
new file mode 100644
index 0000000..c13ac22
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
@@ -0,0 +1,19 @@
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.Nullable;
+
+/**
+ * A functional interface (callback) that accepts two values (of possibly different types).
+ * @param <T1> the first value type
+ * @param <T2> the second value type
+ */
+public interface BiConsumer<T1, T2> {
+
+    /**
+     * Performs an operation on the given values.
+     * @param t1 the first value
+     * @param t2 the second value
+     * @throws Exception on error
+     */
+    void accept(@Nullable T1 t1, @Nullable T2 t2) throws Exception;
+}
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
new file mode 100644
index 0000000..a8c2baf
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ObjectUtils.java
@@ -0,0 +1,177 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * Created by Gavriil Sitnikov on 04/10/2015.
+ * Some utilities related to objects.
+ */
+public final class ObjectUtils {
+
+    /**
+     * Compares two objects if they are equals or not. If they are arrays then compare process same as {@link Arrays#deepEquals(Object[], Object[])}.
+     *
+     * @param object1 First object to compare;
+     * @param object2 Second object to compare;
+     * @return True if objects are equals.
+     */
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    //CompareObjectsWithEquals: we need to compare if it's same object
+    public static boolean equals(@Nullable final Object object1, @Nullable final Object object2) {
+        if (object1 == object2) {
+            return true;
+        }
+        if (object1 == null || object2 == null) {
+            return false;
+        }
+
+        final Class<?> elementType1 = object1.getClass().getComponentType();
+        final Class<?> elementType2 = object2.getClass().getComponentType();
+
+        if (!(elementType1 == null ? elementType2 == null : elementType1.equals(elementType2))) {
+            return false;
+        }
+        if (elementType1 == null) {
+            return object1.equals(object2);
+        }
+        return isArraysEquals(object1, object2, elementType1);
+    }
+
+    /**
+     * Compares two collections if their elements are equals or not.
+     *
+     * @param collection1 First object to compare;
+     * @param collection2 Second object to compare;
+     * @return True if collections are equals.
+     */
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    //CompareObjectsWithEquals: we need to compare if it's same object
+    public static boolean isCollectionsEquals(@Nullable final Collection<?> collection1, @Nullable final Collection<?> collection2) {
+        if (collection1 == collection2) {
+            return true;
+        }
+        if (collection1 == null || collection2 == null) {
+            return false;
+        }
+        if (collection1.size() != collection2.size()) {
+            return false;
+        }
+        final Iterator<?> collection2Iterator = collection2.iterator();
+        for (final Object item1 : collection1) {
+            if (!equals(item1, collection2Iterator.next())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Compares two maps if their elements are equals or not.
+     *
+     * @param map1 First object to compare;
+     * @param map2 Second object to compare;
+     * @return True if maps are equals.
+     */
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    //CompareObjectsWithEquals: we need to compare if it's same object
+    public static boolean isMapsEquals(@Nullable final Map<?, ?> map1, @Nullable final Map<?, ?> map2) {
+        return map1 == map2 || !(map1 == null || map2 == null)
+                && map1.size() == map2.size()
+                && map1.entrySet().containsAll(map2.entrySet())
+                && map2.entrySet().containsAll(map1.entrySet());
+    }
+
+    @SuppressWarnings("PMD.AvoidUsingShortType")
+    private static boolean isArraysEquals(@NonNull final Object object1, @Nullable final Object object2, @NonNull final Class<?> elementType) {
+        if (object1 instanceof Object[]) {
+            return Arrays.deepEquals((Object[]) object1, (Object[]) object2);
+        } else if (elementType == int.class) {
+            return Arrays.equals((int[]) object1, (int[]) object2);
+        } else if (elementType == char.class) {
+            return Arrays.equals((char[]) object1, (char[]) object2);
+        } else if (elementType == boolean.class) {
+            return Arrays.equals((boolean[]) object1, (boolean[]) object2);
+        } else if (elementType == byte.class) {
+            return Arrays.equals((byte[]) object1, (byte[]) object2);
+        } else if (elementType == long.class) {
+            return Arrays.equals((long[]) object1, (long[]) object2);
+        } else if (elementType == float.class) {
+            return Arrays.equals((float[]) object1, (float[]) object2);
+        } else if (elementType == double.class) {
+            return Arrays.equals((double[]) object1, (double[]) object2);
+        } else {
+            return Arrays.equals((short[]) object1, (short[]) object2);
+        }
+    }
+
+    /**
+     * Calculates hashCode() of several objects.
+     *
+     * @param objects Objects to combine hashCode() of;
+     * @return Calculated hashCode().
+     */
+    public static int hashCode(@Nullable final Object... objects) {
+        return Arrays.hashCode(objects);
+    }
+
+    /**
+     * Returns if class is simple like primitive, enum or string.
+     *
+     * @param objectClass Class to check if it's simple class;
+     * @return True if class is simple.
+     */
+    public static boolean isSimpleClass(@NonNull final Class objectClass) {
+        return objectClass.isPrimitive() || objectClass.getSuperclass() == Number.class
+                || objectClass.isEnum() || objectClass == Boolean.class
+                || objectClass == String.class || objectClass == Object.class;
+    }
+
+    /**
+     * Returns true if collection is null or empty.
+     *
+     * @param collection Collection to check;
+     * @return True if collection is null or empty.
+     */
+    public static boolean isNullOrEmpty(@Nullable final Collection<?> collection) {
+        return collection == null || collection.isEmpty();
+    }
+
+    /**
+     * Returns true if map is null or empty.
+     *
+     * @param map Map to check;
+     * @return True if map is null or empty.
+     */
+    public static boolean isNullOrEmpty(@Nullable final Map<?, ?> map) {
+        return map == null || map.isEmpty();
+    }
+
+    private ObjectUtils() {
+    }
+
+}
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
new file mode 100644
index 0000000..86a8493
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/Optional.java
@@ -0,0 +1,71 @@
+/*
+ *  Copyright (c) 2017 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.Nullable;
+
+import java.io.Serializable;
+
+/**
+ * Created by Gavriil Sitnikov on 16/04/2017.
+ * Holds nullable objects inside. It is needed to implement RxJava2 non-null emitting logic.
+ *
+ * @param <T> Type of object.
+ */
+public class Optional<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Nullable
+    private final T value;
+
+    public Optional(@Nullable final T value) {
+        this.value = value;
+    }
+
+    /**
+     * Returns holding nullable object.
+     *
+     * @return Holding object.
+     */
+    @Nullable
+    public T get() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || getClass() != object.getClass()) {
+            return false;
+        }
+
+        final Optional<?> that = (Optional<?>) object;
+        return ObjectUtils.equals(value, that.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+
+}
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
new file mode 100644
index 0000000..82f8acf
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/ServiceBinder.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.app.Service;
+import android.os.Binder;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+/**
+ * Created by Gavriil Sitnikov on 03/10/2015.
+ * Basic binding to {@link Service} which holds service object inside.
+ */
+public class ServiceBinder<TService extends Service> extends Binder {
+
+    @NonNull
+    private final TService service;
+
+    public ServiceBinder(@NonNull final TService service) {
+        super();
+        this.service = service;
+    }
+
+    /**
+     * Returns service which created this binder.
+     *
+     * @return Returns service.
+     */
+    @NonNull
+    public TService getService() {
+        return service;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || getClass() != object.getClass()) {
+            return false;
+        }
+
+        final ServiceBinder that = (ServiceBinder) object;
+
+        return ObjectUtils.equals(service, that.service);
+    }
+
+    @Override
+    public int hashCode() {
+        return service.hashCode();
+    }
+
+}
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
new file mode 100644
index 0000000..639a5ab
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/roboswag/core/utils/StringUtils.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2016 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.core.utils;
+
+import android.support.annotation.NonNull;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * Created by Gavriil Sitnikov on 29/08/2016.
+ * Utility class to providing some string-related helper methods.
+ */
+public final class StringUtils {
+
+    /**
+     * Returns MD5 of string.
+     *
+     * @param string String to get MD5 from;
+     * @return MD5 of string.
+     */
+    @NonNull
+    public static String md5(@NonNull final String string) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+        final MessageDigest digest = MessageDigest.getInstance("MD5");
+        digest.update(string.getBytes("UTF-8"));
+        final byte[] messageDigestArray = digest.digest();
+
+        final StringBuilder hexString = new StringBuilder();
+        for (final byte messageDigest : messageDigestArray) {
+            final String hex = Integer.toHexString(0xFF & messageDigest);
+            if (hex.length() == 1) {
+                hexString.append('0');
+            }
+            hexString.append(hex);
+        }
+        return hexString.toString();
+    }
+
+    private StringUtils() {
+    }
+
+}
diff --git a/src/main/res/values/common_resources.xml b/utils/src/main/res/values/common_resources.xml
similarity index 96%
rename from src/main/res/values/common_resources.xml
rename to utils/src/main/res/values/common_resources.xml
index fff1084..f0221c8 100644
--- a/src/main/res/values/common_resources.xml
+++ b/utils/src/main/res/values/common_resources.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- BLACK WITH ALPHA PALETTE -->
     <color name="global_black_5">#0D000000</color>
@@ -43,4 +43,4 @@
     <color name="global_white_90">#E6FFFFFF</color>
     <color name="global_white_95">#F3FFFFFF</color>
 
-</resources>
\ No newline at end of file
+</resources>

From 4ea6ed857b609c02ccd330e0b13ec39f7aa07d1d Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 12:17:05 +0300
Subject: [PATCH 84/95] Added modules: api-logansquare, lifecycle-common,
 lifecycle-rx

---
 api-logansquare/.gitignore                    |   1 +
 api-logansquare/build.gradle                  |  27 +++
 api-logansquare/src/main/AndroidManifest.xml  |   2 +
 .../logansquare/ConverterUtils.java           |  22 ++
 .../java/ru/touchin/templates/ApiModel.java   | 137 +++++++++++
 .../LoganSquareBigDecimalConverter.java       |  70 ++++++
 .../logansquare/LoganSquareEnum.java          |  33 +++
 .../logansquare/LoganSquareEnumConverter.java |  77 ++++++
 .../LoganSquareJodaTimeConverter.java         |  84 +++++++
 .../logansquare/LoganSquareJsonFactory.java   | 141 +++++++++++
 .../logansquare/LoganSquareJsonModel.java     |  45 ++++
 .../logansquare/LoganSquarePreferences.java   | 158 ++++++++++++
 .../retrofit/JsonRequestBodyConverter.java    |  63 +++++
 .../retrofit/JsonResponseBodyConverter.java   | 112 +++++++++
 build.gradle                                  |   6 +-
 lifecycle-common/.gitignore                   |   1 +
 lifecycle-common/build.gradle                 |  27 +++
 lifecycle-common/src/main/AndroidManifest.xml |   2 +
 .../templates/livedata/SingleLiveEvent.kt     |  25 ++
 .../viewmodel/LifecycleViewModelProviders.kt  |  49 ++++
 .../templates/viewmodel/ViewModelFactory.kt   |  17 ++
 .../viewmodel/ViewModelFactoryProvider.kt     |   7 +
 lifecycle-rx/.gitignore                       |   1 +
 lifecycle-rx/build.gradle                     |  24 ++
 lifecycle-rx/src/main/AndroidManifest.xml     |   3 +
 .../livedata}/destroyable/BaseDestroyable.kt  |   2 +-
 .../livedata}/destroyable/Destroyable.kt      |   2 +-
 .../dispatcher/BaseLiveDataDispatcher.kt      |  57 +++++
 .../livedata/dispatcher/LiveDataDispatcher.kt |  27 +++
 .../livedata/event/CompletableEvent.kt        |  14 ++
 .../ru/touchin/livedata/event/MaybeEvent.kt   |  16 ++
 .../touchin/livedata/event/ObservableEvent.kt |  16 ++
 .../ru/touchin/livedata/event/SingleEvent.kt  |  14 ++
 .../templates/viewmodel/RxViewModel.kt        |  24 ++
 lifecycle-rx/src/main/res/values/strings.xml  |   3 +
 logging/build.gradle                          |   2 +-
 navigation/build.gradle                       |   3 +-
 .../navigation/OnFragmentStartedListener.java |  39 ---
 .../SimpleActionBarDrawerToggle.java          |   3 +-
 .../navigation/activities/BaseActivity.java   |  25 +-
 .../activities/OnBackPressedListener.java     |  15 ++
 .../fragments/ViewControllerFragment.java     | 168 ++++++++-----
 .../navigation/fragments/ViewFragment.java    | 229 ------------------
 sample/build.gradle                           |  11 +-
 settings.gradle                               |   2 +-
 storable/build.gradle                         |   2 +-
 utils/build.gradle                            |   2 +-
 .../roboswag/core/utils/BiConsumer.java       |  19 --
 .../ru/touchin/templates/DeviceUtils.java     | 146 +++++++++++
 49 files changed, 1585 insertions(+), 390 deletions(-)
 create mode 100644 api-logansquare/.gitignore
 create mode 100644 api-logansquare/build.gradle
 create mode 100644 api-logansquare/src/main/AndroidManifest.xml
 create mode 100644 api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java
 create mode 100644 api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
 create mode 100644 lifecycle-common/.gitignore
 create mode 100644 lifecycle-common/build.gradle
 create mode 100644 lifecycle-common/src/main/AndroidManifest.xml
 create mode 100644 lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt
 create mode 100644 lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt
 create mode 100644 lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt
 create mode 100644 lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactoryProvider.kt
 create mode 100644 lifecycle-rx/.gitignore
 create mode 100644 lifecycle-rx/build.gradle
 create mode 100644 lifecycle-rx/src/main/AndroidManifest.xml
 rename {utils/src/main/java/ru/touchin/roboswag/components/utils => lifecycle-rx/src/main/java/ru/touchin/livedata}/destroyable/BaseDestroyable.kt (97%)
 rename {utils/src/main/java/ru/touchin/roboswag/components/utils => lifecycle-rx/src/main/java/ru/touchin/livedata}/destroyable/Destroyable.kt (99%)
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt
 create mode 100644 lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt
 create mode 100644 lifecycle-rx/src/main/res/values/strings.xml
 delete mode 100644 navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
 create mode 100644 navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/OnBackPressedListener.java
 delete mode 100644 navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
 delete mode 100644 utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
 create mode 100644 utils/src/main/java/ru/touchin/templates/DeviceUtils.java

diff --git a/api-logansquare/.gitignore b/api-logansquare/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/api-logansquare/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle
new file mode 100644
index 0000000..9daa9da
--- /dev/null
+++ b/api-logansquare/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+repositories {
+    maven { url "http://dl.bintray.com/touchin/touchin-tools" }
+}
+
+dependencies {
+    api project(":storable")
+    api 'net.danlew:android.joda:2.9.9.4'
+
+    implementation "com.android.support:support-annotations:$versions.supportLibrary"
+    implementation "com.squareup.retrofit2:retrofit:$versions.retrofit"
+    implementation 'ru.touchin:logansquare:1.4.3'
+}
diff --git a/api-logansquare/src/main/AndroidManifest.xml b/api-logansquare/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..d48ece2
--- /dev/null
+++ b/api-logansquare/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest
+    package="ru.touchin.templates.logansquare"/>
diff --git a/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java b/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
new file mode 100644
index 0000000..f8f7bba
--- /dev/null
+++ b/api-logansquare/src/main/java/com/bluelinelabs/logansquare/ConverterUtils.java
@@ -0,0 +1,22 @@
+package com.bluelinelabs.logansquare;
+
+import android.support.annotation.NonNull;
+
+import java.lang.reflect.Type;
+
+/**
+ * Utility class for the {@link ru.touchin.templates.logansquare.LoganSquareJsonFactory}. This resides in LoganSquare's
+ * main package in order to take advantage of the package-visible ConcreteParameterizedType class, which is essential
+ * to the support of generic classes in the Retrofit converter.
+ */
+public final class ConverterUtils {
+
+    @NonNull
+    public static ParameterizedType parameterizedTypeOf(@NonNull final Type type) {
+        return new ParameterizedType.ConcreteParameterizedType(type);
+    }
+
+    private ConverterUtils() {
+    }
+
+}
diff --git a/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java b/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
new file mode 100644
index 0000000..5755445
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/ApiModel.java
@@ -0,0 +1,137 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates;
+
+import android.support.annotation.CallSuper;
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+
+import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.log.LcGroup;
+
+/**
+ * Created by Gavriil Sitnikov on 11/08/2016.
+ * Just model from getting from API.
+ */
+public abstract class ApiModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Logging group to log API validation errors.
+     */
+    public static final LcGroup API_VALIDATION_LC_GROUP = new LcGroup("API_VALIDATION");
+
+    /**
+     * Validates list of objects. Use it if objects in list extends {@link ApiModel}.
+     *
+     * @param collection               Collection of items to check;
+     * @param collectionValidationRule Rule explaining what to do if invalid items found;
+     * @throws ValidationException Exception of validation.
+     */
+    @SuppressWarnings({"PMD.PreserveStackTrace", "PMD.CyclomaticComplexity"})
+    // PreserveStackTrace: it's ok - we are logging it on Lc.e()
+    public static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule)
+            throws ValidationException {
+        boolean haveValidItem = false;
+        int position = 0;
+        final Iterator iterator = collection.iterator();
+        while (iterator.hasNext()) {
+            final Object item = iterator.next();
+            if (!(item instanceof ApiModel)) {
+                if (item != null) {
+                    // let's just think that all of items are not ApiModels
+                    break;
+                }
+                continue;
+            }
+
+            try {
+                ((ApiModel) item).validate();
+                haveValidItem = true;
+            } catch (final ValidationException exception) {
+                switch (collectionValidationRule) {
+                    case EXCEPTION_IF_ANY_INVALID:
+                        throw exception;
+                    case EXCEPTION_IF_ALL_INVALID:
+                        iterator.remove();
+                        API_VALIDATION_LC_GROUP.e(exception, "Item %s is invalid at " + Lc.getCodePoint(null, 1), position);
+                        if (!iterator.hasNext() && !haveValidItem) {
+                            throw new ValidationException("Whole list is invalid at " + Lc.getCodePoint(null, 1));
+                        }
+                        break;
+                    case REMOVE_INVALID_ITEMS:
+                        iterator.remove();
+                        API_VALIDATION_LC_GROUP.e(exception, "Item %s is invalid at " + Lc.getCodePoint(null, 1), position);
+                        break;
+                    default:
+                        Lc.assertion("Unexpected rule " + collectionValidationRule);
+                        break;
+                }
+            }
+            position++;
+        }
+    }
+
+    /**
+     * Validates collection on emptiness.
+     *
+     * @param collection Collection to check;
+     * @throws ValidationException Exception of validation.
+     */
+    protected static void validateCollectionNotEmpty(@NonNull final Collection collection)
+            throws ValidationException {
+        if (collection.isEmpty()) {
+            throw new ValidationException("List is empty at " + Lc.getCodePoint(null, 1));
+        }
+    }
+
+    /**
+     * Validates this object. Override it to write your own logic.
+     *
+     * @throws ValidationException Exception of validation.
+     */
+    @CallSuper
+    public void validate() throws ValidationException {
+        //do nothing
+    }
+
+    public enum CollectionValidationRule {
+        EXCEPTION_IF_ANY_INVALID,
+        EXCEPTION_IF_ALL_INVALID,
+        REMOVE_INVALID_ITEMS,
+    }
+
+    /**
+     * Class of exceptions throws during {@link ApiModel} validation.
+     */
+    public static class ValidationException extends IOException {
+
+        public ValidationException(@NonNull final String reason) {
+            super(reason);
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..9f08d6f
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareBigDecimalConverter.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+
+import ru.touchin.roboswag.core.log.Lc;
+
+/**
+ * LoganSquare converter for java.math.BigDecimal
+ */
+@SuppressWarnings("CPD-START") // similar to LoganSquareJodaTimeConverter
+public class LoganSquareBigDecimalConverter implements TypeConverter<BigDecimal> {
+
+    @Nullable
+    @Override
+    public BigDecimal parse(@NonNull final JsonParser jsonParser) throws IOException {
+        final String dateString = jsonParser.getValueAsString();
+        if (dateString == null) {
+            return null;
+        }
+        try {
+            return new BigDecimal(dateString);
+        } catch (final RuntimeException exception) {
+            Lc.assertion(exception);
+        }
+        return null;
+    }
+
+    @Override
+    public void serialize(@Nullable final BigDecimal object,
+                          @Nullable final String fieldName,
+                          final boolean writeFieldNameForObject,
+                          @NonNull final JsonGenerator jsonGenerator)
+            throws IOException {
+        if (fieldName != null) {
+            jsonGenerator.writeStringField(fieldName, object != null ? object.toString() : null);
+        } else {
+            jsonGenerator.writeString(object != null ? object.toString() : null);
+        }
+    }
+
+}
+
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
new file mode 100644
index 0000000..a5d0963
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnum.java
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.NonNull;
+
+/**
+ * Created by Gavriil Sitnikov.
+ * LoganSquare enum base class.
+ */
+public interface LoganSquareEnum {
+
+    @NonNull
+    String getValueName();
+
+}
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
new file mode 100644
index 0000000..c274667
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.bluelinelabs.logansquare.typeconverters.StringBasedTypeConverter;
+
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov.
+ * LoganSquare converter from String to Enum.
+ */
+@SuppressWarnings("PMD.UseVarargs")
+public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends StringBasedTypeConverter<T> {
+
+    @NonNull
+    private final T[] enumValues;
+    @Nullable
+    private final T defaultValue;
+
+    public LoganSquareEnumConverter(@NonNull final T[] enumValues) {
+        this(enumValues, null);
+    }
+
+    public LoganSquareEnumConverter(@NonNull final T[] enumValues, @Nullable final T defaultValue) {
+        super();
+        this.enumValues = enumValues;
+        this.defaultValue = defaultValue;
+    }
+
+    @Nullable
+    @Override
+    public T getFromString(@Nullable final String string) {
+        if (string == null) {
+            return defaultValue;
+        }
+        for (final T value : enumValues) {
+            if (value.getValueName().equals(string)) {
+                return value;
+            }
+        }
+        if (defaultValue != null) {
+            return defaultValue;
+        }
+        throw new ShouldNotHappenException("Enum parsing exception for value: " + string);
+    }
+
+    @Nullable
+    @Override
+    public String convertToString(@Nullable final T object) {
+        if (object == null) {
+            return null;
+        }
+        return object.getValueName();
+    }
+
+}
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
new file mode 100644
index 0000000..11f52b8
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+
+import com.bluelinelabs.logansquare.typeconverters.TypeConverter;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.io.IOException;
+
+import ru.touchin.roboswag.core.log.Lc;
+
+/**
+ * LoganSquare converter for joda.time.DateTime
+ */
+public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
+
+    @Nullable
+    private final DateTimeFormatter formatter;
+
+    public LoganSquareJodaTimeConverter() {
+        this.formatter = null;
+    }
+
+    public LoganSquareJodaTimeConverter(@Nullable final DateTimeFormatter formatter) {
+        this.formatter = formatter;
+    }
+
+    @Nullable
+    @Override
+    public DateTime parse(@NonNull final JsonParser jsonParser) throws IOException {
+        final String dateString = jsonParser.getValueAsString();
+        if (dateString == null || dateString.isEmpty()) {
+            return null;
+        }
+        try {
+            return DateTime.parse(dateString);
+        } catch (final RuntimeException exception) {
+            Lc.assertion(exception);
+        }
+        return null;
+    }
+
+    @Override
+    public void serialize(
+            @Nullable final DateTime object,
+            @Nullable final String fieldName,
+            final boolean writeFieldNameForObject,
+            @NonNull final JsonGenerator jsonGenerator
+    ) throws IOException {
+        final String serializedValue = object != null ? object.toString(formatter) : null;
+        if (fieldName != null) {
+            jsonGenerator.writeStringField(fieldName, !TextUtils.isEmpty(serializedValue) ? serializedValue : null);
+        } else {
+            jsonGenerator.writeString(!TextUtils.isEmpty(serializedValue) ? serializedValue : null);
+        }
+    }
+
+}
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
new file mode 100644
index 0000000..20c5b15
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java
@@ -0,0 +1,141 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.bluelinelabs.logansquare.ConverterUtils;
+import com.bluelinelabs.logansquare.LoganSquare;
+import com.fasterxml.jackson.core.JsonGenerator;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+import ru.touchin.templates.retrofit.JsonRequestBodyConverter;
+import ru.touchin.templates.retrofit.JsonResponseBodyConverter;
+
+/**
+ * Created by Gavriil Sitnikov on 2/06/2016.
+ * LoganSquareConverter class to use with {@link Retrofit} to parse and generate models based on Logan Square library.
+ */
+public class LoganSquareJsonFactory extends Converter.Factory {
+
+    @NonNull
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(@NonNull final Type type,
+                                                            @NonNull final Annotation[] annotations,
+                                                            @NonNull final Retrofit retrofit) {
+        return new LoganSquareJsonResponseBodyConverter<>(type);
+    }
+
+    @NonNull
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(@NonNull final Type type,
+                                                          @NonNull final Annotation[] parameterAnnotations,
+                                                          @NonNull final Annotation[] methodAnnotations,
+                                                          @NonNull final Retrofit retrofit) {
+        return new LoganSquareRequestBodyConverter<>();
+    }
+
+    @Nullable
+    @Override
+    public Converter<?, String> stringConverter(@NonNull final Type type, @NonNull final Annotation[] annotations, @NonNull final Retrofit retrofit) {
+        if (type instanceof Class && ((Class) type).getSuperclass() == Enum.class) {
+            return new LoganSquareStringEnumConverter<>();
+        } else {
+            return super.stringConverter(type, annotations, retrofit);
+        }
+    }
+
+    public static class LoganSquareJsonResponseBodyConverter<T> extends JsonResponseBodyConverter<T> {
+
+        @NonNull
+        private final Type type;
+
+        public LoganSquareJsonResponseBodyConverter(@NonNull final Type type) {
+            super();
+            this.type = type;
+        }
+
+        @SuppressWarnings("unchecked")
+        @NonNull
+        @Override
+        protected T parseResponse(@NonNull final ResponseBody value) throws IOException {
+            if (type instanceof ParameterizedType) {
+                final ParameterizedType parameterizedType = (ParameterizedType) type;
+                final Type[] typeArguments = parameterizedType.getActualTypeArguments();
+                final Type firstType = typeArguments[0];
+
+                final Type rawType = parameterizedType.getRawType();
+                if (rawType == Map.class) {
+                    return (T) LoganSquare.parseMap(value.byteStream(), (Class<?>) typeArguments[1]);
+                } else if (rawType == List.class) {
+                    return (T) LoganSquare.parseList(value.byteStream(), (Class<?>) firstType);
+                } else {
+                    // Generics
+                    return (T) LoganSquare.parse(value.byteStream(), ConverterUtils.parameterizedTypeOf(type));
+                }
+            } else {
+                return (T) LoganSquare.parse(value.byteStream(), (Class) type);
+            }
+        }
+
+    }
+
+    public static class LoganSquareRequestBodyConverter<T> extends JsonRequestBodyConverter<T> {
+
+        @Override
+        protected void writeValueToByteArray(@NonNull final T value, @NonNull final ByteArrayOutputStream byteArrayOutputStream) throws IOException {
+            LoganSquare.serialize(value, byteArrayOutputStream);
+        }
+
+    }
+
+    public static class LoganSquareStringEnumConverter<T> implements Converter<T, String> {
+
+        @Nullable
+        @SuppressWarnings({"unchecked", "TryFinallyCanBeTryWithResources"})
+        @Override
+        public String convert(@NonNull final T value) throws IOException {
+            final StringWriter writer = new StringWriter();
+            try {
+                final JsonGenerator generator = LoganSquare.JSON_FACTORY.createGenerator(writer);
+                LoganSquare.typeConverterFor((Class<T>) value.getClass()).serialize(value, null, false, generator);
+                generator.close();
+                return writer.toString().replaceAll("\"", "");
+            } finally {
+                writer.close();
+            }
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..ea67fbe
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonModel.java
@@ -0,0 +1,45 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.logansquare;
+
+import android.support.annotation.Nullable;
+
+import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.templates.ApiModel;
+
+/**
+ * Created by Gavriil Sitnikov.
+ * Just model from getting from API via LoganSquare.
+ */
+public abstract class LoganSquareJsonModel extends ApiModel {
+
+    /**
+     * Throws exception if object is missed or null.
+     *
+     * @param object Value of field to check;
+     * @throws ValidationException Exception of validation.
+     */
+    protected static void validateNotNull(@Nullable final Object object) throws ValidationException {
+        if (object == null) {
+            throw new ValidationException("Not nullable object is null or missed at " + Lc.getCodePoint(null, 1));
+        }
+    }
+
+}
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
new file mode 100644
index 0000000..763ccf0
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/logansquare/LoganSquarePreferences.java
@@ -0,0 +1,158 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.logansquare;
+
+import android.content.SharedPreferences;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.bluelinelabs.logansquare.LoganSquare;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.List;
+
+import ru.touchin.roboswag.components.utils.storables.PreferenceStore;
+import ru.touchin.roboswag.core.observables.storable.Converter;
+import ru.touchin.roboswag.core.observables.storable.NonNullStorable;
+import ru.touchin.roboswag.core.observables.storable.Storable;
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov on 26/12/2016.
+ * Utility class to get {@link Storable} that is storing LoganSquare (Json) generated object into preferences.
+ */
+@SuppressWarnings("CPD-START")
+//CPD: it is same code as in GoogleJsonPreferences
+public final class LoganSquarePreferences {
+
+    @NonNull
+    public static <T> Storable<String, T, String> jsonStorable(@NonNull final String name,
+                                                               @NonNull final Class<T> jsonClass,
+                                                               @NonNull final SharedPreferences preferences) {
+        return new Storable.Builder<String, T, String>(name, jsonClass, String.class, new PreferenceStore<>(preferences), new JsonConverter<>())
+                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
+                .build();
+    }
+
+    @NonNull
+    public static <T> NonNullStorable<String, T, String> jsonStorable(@NonNull final String name,
+                                                                      @NonNull final Class<T> jsonClass,
+                                                                      @NonNull final SharedPreferences preferences,
+                                                                      @NonNull final T defaultValue) {
+        return new Storable.Builder<String, T, String>(name, jsonClass, String.class, new PreferenceStore<>(preferences), new JsonConverter<>())
+                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
+                .setDefaultValue(defaultValue)
+                .build();
+    }
+
+    @NonNull
+    public static <T> Storable<String, List<T>, String> jsonListStorable(@NonNull final String name,
+                                                                         @NonNull final Class<T> jsonListItemClass,
+                                                                         @NonNull final SharedPreferences preferences) {
+        return new Storable.Builder<>(name, List.class, String.class, new PreferenceStore<>(preferences), new JsonListConverter<>(jsonListItemClass))
+                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
+                .build();
+    }
+
+    @NonNull
+    public static <T> NonNullStorable<String, List<T>, String> jsonListStorable(@NonNull final String name,
+                                                                                @NonNull final Class<T> jsonListItemClass,
+                                                                                @NonNull final SharedPreferences preferences,
+                                                                                @NonNull final List<T> defaultValue) {
+        return new Storable.Builder<>(name, List.class, String.class, new PreferenceStore<>(preferences), new JsonListConverter<>(jsonListItemClass))
+                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
+                .setDefaultValue(defaultValue)
+                .build();
+    }
+
+    private LoganSquarePreferences() {
+    }
+
+    public static class JsonConverter<TJsonObject> implements Converter<TJsonObject, String> {
+
+        @Nullable
+        @Override
+        public String toStoreObject(@NonNull final Type jsonObjectType, @NonNull final Type stringType, @Nullable final TJsonObject object) {
+            if (object == null) {
+                return null;
+            }
+            try {
+                return LoganSquare.serialize(object);
+            } catch (final IOException exception) {
+                throw new ShouldNotHappenException(exception);
+            }
+        }
+
+        @Nullable
+        @Override
+        @SuppressWarnings("unchecked")
+        public TJsonObject toObject(@NonNull final Type jsonObjectClass, @NonNull final Type storeObjectType, @Nullable final String storeValue) {
+            if (storeValue == null) {
+                return null;
+            }
+            try {
+                return LoganSquare.parse(storeValue, (Class<TJsonObject>) jsonObjectClass);
+            } catch (final IOException exception) {
+                throw new ShouldNotHappenException(exception);
+            }
+        }
+
+    }
+
+    public static class JsonListConverter<T> implements Converter<List<T>, String> {
+
+        @NonNull
+        private final Class<T> itemClass;
+
+        public JsonListConverter(@NonNull final Class<T> itemClass) {
+            this.itemClass = itemClass;
+        }
+
+        @Nullable
+        @Override
+        @SuppressWarnings("unchecked")
+        public String toStoreObject(@NonNull final Type jsonObjectType, @NonNull final Type stringType, @Nullable final List<T> object) {
+            if (object == null) {
+                return null;
+            }
+            try {
+                return LoganSquare.serialize(object, itemClass);
+            } catch (final IOException exception) {
+                throw new ShouldNotHappenException(exception);
+            }
+        }
+
+        @Nullable
+        @Override
+        public List<T> toObject(@NonNull final Type jsonObjectType, @NonNull final Type stringType, @Nullable final String storeValue) {
+            if (storeValue == null) {
+                return null;
+            }
+            try {
+                return LoganSquare.parseList(storeValue, itemClass);
+            } catch (final IOException exception) {
+                throw new ShouldNotHappenException(exception);
+            }
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..e0ea113
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonRequestBodyConverter.java
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (c) 2017 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.retrofit;
+
+
+import android.support.annotation.NonNull;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import retrofit2.Converter;
+import ru.touchin.templates.ApiModel;
+
+/**
+ * Created by Gavriil Sitnikov on 14/02/2017.
+ * Object to serialize bodies of remote requests for Retrofit.
+ *
+ * @param <T> Type of body object.
+ */
+public abstract class JsonRequestBodyConverter<T> implements Converter<T, RequestBody> {
+
+    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json; charset=UTF-8");
+
+    @NonNull
+    @Override
+    public RequestBody convert(@NonNull final T value) throws IOException {
+        if (value instanceof ApiModel) {
+            ((ApiModel) value).validate();
+        }
+        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        writeValueToByteArray(value, byteArrayOutputStream);
+        return RequestBody.create(MEDIA_TYPE, byteArrayOutputStream.toByteArray());
+    }
+
+    /**
+     * Serializing value to byte stream.
+     *
+     * @param value                 Value to serialize;
+     * @param byteArrayOutputStream Byte stream to write serialized bytes;
+     * @throws IOException Throws on serialization.
+     */
+    protected abstract void writeValueToByteArray(@NonNull T value, @NonNull ByteArrayOutputStream byteArrayOutputStream) throws 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
new file mode 100644
index 0000000..614c8e2
--- /dev/null
+++ b/api-logansquare/src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java
@@ -0,0 +1,112 @@
+/*
+ *  Copyright (c) 2017 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates.retrofit;
+
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.SocketException;
+import java.util.Collection;
+import java.util.Map;
+
+import javax.net.ssl.SSLException;
+
+import okhttp3.ResponseBody;
+import okhttp3.internal.http2.StreamResetException;
+import retrofit2.Converter;
+import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.templates.ApiModel;
+
+/**
+ * Created by Gavriil Sitnikov on 14/02/2017.
+ * Object to deserialize responses of remote requests from Retrofit.
+ *
+ * @param <T> Type of response object.
+ */
+public abstract class JsonResponseBodyConverter<T> implements Converter<ResponseBody, T> {
+
+    @SuppressWarnings("PMD.AvoidInstanceofChecksInCatchClause")
+    //AvoidInstanceofChecksInCatchClause: we just don't need assertion on specific exceptions
+    @NonNull
+    @Override
+    public T convert(@NonNull final ResponseBody value) throws IOException {
+        final T result;
+        try {
+            result = parseResponse(value);
+        } catch (final IOException exception) {
+            if (!(exception instanceof SocketException)
+                    && !(exception instanceof InterruptedIOException)
+                    && !(exception instanceof SSLException)
+                    && !(exception instanceof StreamResetException)) {
+                Lc.assertion(exception);
+            }
+            throw exception;
+        } finally {
+            value.close();
+        }
+
+        if (result instanceof ApiModel) {
+            validateModel((ApiModel) result);
+        }
+        if (result instanceof Collection) {
+            validateCollection((Collection) result);
+        }
+        if (result instanceof Map) {
+            validateCollection(((Map) result).values());
+        }
+
+        return result;
+    }
+
+    private void validateModel(@NonNull final ApiModel result) throws IOException {
+        try {
+            result.validate();
+        } catch (final ApiModel.ValidationException validationException) {
+            Lc.assertion(validationException);
+            throw validationException;
+        }
+    }
+
+    private void validateCollection(@NonNull final Collection result) throws IOException {
+        try {
+            ApiModel.validateCollection(result, getValidateCollectionRule());
+        } catch (final ApiModel.ValidationException validationException) {
+            Lc.assertion(validationException);
+            throw validationException;
+        }
+    }
+
+    @NonNull
+    protected ApiModel.CollectionValidationRule getValidateCollectionRule() {
+        return ApiModel.CollectionValidationRule.EXCEPTION_IF_ANY_INVALID;
+    }
+
+    /**
+     * Parses response to specific object.
+     *
+     * @param value Response to parse;
+     * @return Parsed object;
+     * @throws IOException Throws during parsing.
+     */
+    @NonNull
+    protected abstract T parseResponse(@NonNull ResponseBody value) throws IOException;
+
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7accccb..d489a4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.2.60'
+    ext.kotlin_version = '1.2.61'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -24,7 +24,7 @@ task clean(type: Delete) {
 ext {
     versions = [
             compileSdk    : 27,
-            minSdk        : 19,
+            minSdk        : 16,
             supportLibrary: '27.1.1',
             navigation    : '1.0.0-alpha04',
             lifecycle     : '1.1.1',
diff --git a/lifecycle-common/.gitignore b/lifecycle-common/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/lifecycle-common/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/lifecycle-common/build.gradle b/lifecycle-common/build.gradle
new file mode 100644
index 0000000..e7ab339
--- /dev/null
+++ b/lifecycle-common/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(":navigation")
+
+    compileOnly "javax.inject:javax.inject:1"
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+
+    implementation "android.arch.lifecycle:extensions:$versions.lifecycle"
+}
diff --git a/lifecycle-common/src/main/AndroidManifest.xml b/lifecycle-common/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..f617b1f
--- /dev/null
+++ b/lifecycle-common/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest
+    package="ru.touchin.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
new file mode 100644
index 0000000..27b0a1d
--- /dev/null
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/livedata/SingleLiveEvent.kt
@@ -0,0 +1,25 @@
+package ru.touchin.templates.livedata
+
+import android.arch.lifecycle.LifecycleOwner
+import android.arch.lifecycle.MutableLiveData
+import android.arch.lifecycle.Observer
+import java.util.concurrent.atomic.AtomicBoolean
+
+class SingleLiveEvent<T> : MutableLiveData<T>() {
+
+    private val pending = AtomicBoolean(false)
+
+    override fun observe(owner: LifecycleOwner, observer: Observer<T?>) {
+        super.observe(owner, Observer { value ->
+            if (pending.compareAndSet(true, false)) {
+                observer.onChanged(value)
+            }
+        })
+    }
+
+    override fun setValue(value: T) {
+        pending.set(true)
+        super.setValue(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
new file mode 100644
index 0000000..41ee808
--- /dev/null
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/LifecycleViewModelProviders.kt
@@ -0,0 +1,49 @@
+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 ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController
+
+object LifecycleViewModelProviders {
+
+    /**
+     * Creates a {@link ViewModelProvider}, which retains ViewModels while a scope of given
+     * {@code lifecycleOwner} is alive. More detailed explanation is in {@link ViewModel}.
+     * <p>
+     * It uses the given {@link Factory} to instantiate new ViewModels.
+     *
+     * @param lifecycleOwner a lifecycle owner, in whose scope ViewModels should be retained (ViewController, Fragment, Activity)
+     * @param factory  a {@code Factory} to instantiate new ViewModels
+     * @return a ViewModelProvider instance
+     */
+    fun of(lifecycleOwner: LifecycleOwner, factory: ViewModelProvider.Factory = getViewModelFactory(lifecycleOwner)): ViewModelProvider =
+            when (lifecycleOwner) {
+                is ViewController<*, *> -> ViewModelProviders.of(lifecycleOwner.fragment, factory)
+                is Fragment -> ViewModelProviders.of(lifecycleOwner, factory)
+                is FragmentActivity -> ViewModelProviders.of(lifecycleOwner, factory)
+                else -> throw IllegalArgumentException("Not supported LifecycleOwner.")
+            }
+
+    /**
+     * Returns ViewModelProvider.Factory instance from current lifecycleOwner.
+     * Search #ViewModelFactoryProvider are produced according to priorities:
+     * 1. View controller;
+     * 2. Fragment;
+     * 3. Parent fragment recursively;
+     * 4. Activity;
+     * 5. Application.
+     */
+    fun getViewModelFactory(provider: Any): ViewModelProvider.Factory =
+            when (provider) {
+                is ViewModelFactoryProvider -> provider.viewModelFactory
+                is ViewController<*, *> -> getViewModelFactory(provider.fragment)
+                is Fragment -> getViewModelFactory(provider.parentFragment ?: provider.requireActivity())
+                is Activity -> getViewModelFactory(provider.application)
+                else -> throw IllegalArgumentException("View model factory not found.")
+            }
+
+}
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
new file mode 100644
index 0000000..8061ba6
--- /dev/null
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactory.kt
@@ -0,0 +1,17 @@
+package ru.touchin.templates.viewmodel
+
+import android.arch.lifecycle.ViewModel
+import android.arch.lifecycle.ViewModelProvider
+
+import javax.inject.Inject
+import javax.inject.Provider
+
+class ViewModelFactory @Inject constructor(
+        private val creators: Map<Class<out ViewModel>, @JvmSuppressWildcards Provider<ViewModel>>
+) : ViewModelProvider.Factory {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T
+            = (creators[modelClass]?.get() as? T) ?: throw IllegalArgumentException("Unknown model class $modelClass")
+
+}
diff --git a/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactoryProvider.kt b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactoryProvider.kt
new file mode 100644
index 0000000..b1684e2
--- /dev/null
+++ b/lifecycle-common/src/main/java/ru/touchin/templates/viewmodel/ViewModelFactoryProvider.kt
@@ -0,0 +1,7 @@
+package ru.touchin.templates.viewmodel
+
+interface ViewModelFactoryProvider {
+
+    val viewModelFactory: ViewModelFactory
+
+}
diff --git a/lifecycle-rx/.gitignore b/lifecycle-rx/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/lifecycle-rx/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle
new file mode 100644
index 0000000..0956030
--- /dev/null
+++ b/lifecycle-rx/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+}
+
+dependencies {
+    api project(":utils")
+    api project(":logging")
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+
+    implementation "android.arch.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/AndroidManifest.xml b/lifecycle-rx/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..68016e6
--- /dev/null
+++ b/lifecycle-rx/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.touchin.lifecycle"/>
diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/BaseDestroyable.kt
similarity index 97%
rename from utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
rename to lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/BaseDestroyable.kt
index fafa855..cca546b 100644
--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/BaseDestroyable.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/BaseDestroyable.kt
@@ -1,4 +1,4 @@
-package ru.touchin.roboswag.components.utils.destroyable
+package ru.touchin.livedata.destroyable
 
 import io.reactivex.Completable
 import io.reactivex.Flowable
diff --git a/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/Destroyable.kt
similarity index 99%
rename from utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
rename to lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/Destroyable.kt
index 8ad3012..93dd9b8 100644
--- a/utils/src/main/java/ru/touchin/roboswag/components/utils/destroyable/Destroyable.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/destroyable/Destroyable.kt
@@ -1,4 +1,4 @@
-package ru.touchin.roboswag.components.utils.destroyable
+package ru.touchin.livedata.destroyable
 
 import io.reactivex.Completable
 import io.reactivex.Flowable
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
new file mode 100644
index 0000000..afcc376
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/BaseLiveDataDispatcher.kt
@@ -0,0 +1,57 @@
+package ru.touchin.livedata.dispatcher
+
+import android.arch.lifecycle.MutableLiveData
+import io.reactivex.Completable
+import io.reactivex.Flowable
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.disposables.Disposable
+import ru.touchin.livedata.destroyable.BaseDestroyable
+import ru.touchin.livedata.destroyable.Destroyable
+import ru.touchin.livedata.event.CompletableEvent
+import ru.touchin.livedata.event.MaybeEvent
+import ru.touchin.livedata.event.ObservableEvent
+import ru.touchin.livedata.event.SingleEvent
+
+class BaseLiveDataDispatcher(private val destroyable: BaseDestroyable = BaseDestroyable()) : LiveDataDispatcher, Destroyable by destroyable {
+
+    override fun <T> Flowable<out T>.dispatchTo(liveData: MutableLiveData<ObservableEvent<T>>): Disposable {
+        liveData.value = ObservableEvent.Loading(liveData.value?.data)
+        return untilDestroy(
+                { data -> liveData.value = ObservableEvent.Success(data) },
+                { throwable -> liveData.value = ObservableEvent.Error(throwable, liveData.value?.data) },
+                { liveData.value = ObservableEvent.Completed(liveData.value?.data) })
+    }
+
+    override fun <T> Observable<out T>.dispatchTo(liveData: MutableLiveData<ObservableEvent<T>>): Disposable {
+        liveData.value = ObservableEvent.Loading(liveData.value?.data)
+        return untilDestroy(
+                { data -> liveData.value = ObservableEvent.Success(data) },
+                { throwable -> liveData.value = ObservableEvent.Error(throwable, liveData.value?.data) },
+                { liveData.value = ObservableEvent.Completed(liveData.value?.data) })
+    }
+
+    override fun <T> Single<out T>.dispatchTo(liveData: MutableLiveData<SingleEvent<T>>): Disposable {
+        liveData.value = SingleEvent.Loading(liveData.value?.data)
+        return untilDestroy(
+                { data -> liveData.value = SingleEvent.Success(data) },
+                { throwable -> liveData.value = SingleEvent.Error(throwable, liveData.value?.data) })
+    }
+
+    override fun Completable.dispatchTo(liveData: MutableLiveData<CompletableEvent>): Disposable {
+        liveData.value = CompletableEvent.Loading
+        return untilDestroy(
+                { liveData.value = CompletableEvent.Completed },
+                { throwable -> liveData.value = CompletableEvent.Error(throwable) })
+    }
+
+    override fun <T> Maybe<out T>.dispatchTo(liveData: MutableLiveData<MaybeEvent<T>>): Disposable {
+        liveData.value = MaybeEvent.Loading(liveData.value?.data)
+        return untilDestroy(
+                { data -> liveData.value = MaybeEvent.Success(data) },
+                { throwable -> liveData.value = MaybeEvent.Error(throwable, liveData.value?.data) },
+                { liveData.value = MaybeEvent.Completed(liveData.value?.data) })
+    }
+
+}
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
new file mode 100644
index 0000000..e1d7d8f
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/dispatcher/LiveDataDispatcher.kt
@@ -0,0 +1,27 @@
+package ru.touchin.livedata.dispatcher
+
+import android.arch.lifecycle.MutableLiveData
+import io.reactivex.Completable
+import io.reactivex.Flowable
+import io.reactivex.Maybe
+import io.reactivex.Observable
+import io.reactivex.Single
+import io.reactivex.disposables.Disposable
+import ru.touchin.livedata.event.CompletableEvent
+import ru.touchin.livedata.event.MaybeEvent
+import ru.touchin.livedata.event.ObservableEvent
+import ru.touchin.livedata.event.SingleEvent
+
+interface LiveDataDispatcher {
+
+    fun <T> Flowable<out T>.dispatchTo(liveData: MutableLiveData<ObservableEvent<T>>): Disposable
+
+    fun <T> Observable<out T>.dispatchTo(liveData: MutableLiveData<ObservableEvent<T>>): Disposable
+
+    fun <T> Single<out T>.dispatchTo(liveData: MutableLiveData<SingleEvent<T>>): Disposable
+
+    fun Completable.dispatchTo(liveData: MutableLiveData<CompletableEvent>): Disposable
+
+    fun <T> Maybe<out T>.dispatchTo(liveData: MutableLiveData<MaybeEvent<T>>): Disposable
+
+}
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt
new file mode 100644
index 0000000..d0832ef
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt
@@ -0,0 +1,14 @@
+package ru.touchin.livedata.event
+
+/**
+ * Event class that emits from [io.reactivex.Completable].
+ */
+sealed class CompletableEvent {
+
+    object Loading: CompletableEvent()
+
+    object Completed: CompletableEvent()
+
+    data class Error(val throwable: Throwable): CompletableEvent()
+
+}
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt
new file mode 100644
index 0000000..0f88077
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt
@@ -0,0 +1,16 @@
+package ru.touchin.livedata.event
+
+/**
+ * Event class that emits from [io.reactivex.Maybe].
+ */
+sealed class MaybeEvent<out T>(open val data: T?) {
+
+    class Loading<out T>(data: T?): MaybeEvent<T>(data)
+
+    class Success<out T>(override val data: T): MaybeEvent<T>(data)
+
+    class Error<out T>(val throwable: Throwable, data: T?): MaybeEvent<T>(data)
+
+    class Completed<out T>(data: T?): MaybeEvent<T>(data)
+
+}
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt
new file mode 100644
index 0000000..5a6b8e2
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt
@@ -0,0 +1,16 @@
+package ru.touchin.livedata.event
+
+/**
+ * Event class that emits from [io.reactivex.Observable].
+ */
+sealed class ObservableEvent<out T>(open val data: T?) {
+
+    class Loading<out T>(data: T? = null): ObservableEvent<T>(data)
+
+    class Success<out T>(override val data: T): ObservableEvent<T>(data)
+
+    class Error<out T>(val throwable: Throwable, data: T? = null): ObservableEvent<T>(data)
+
+    class Completed<out T>(data: T? = null): ObservableEvent<T>(data)
+
+}
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt
new file mode 100644
index 0000000..8b53f63
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt
@@ -0,0 +1,14 @@
+package ru.touchin.livedata.event
+
+/**
+ * Event class that emits from [io.reactivex.Single].
+ */
+sealed class SingleEvent<out T>(open val data: T?) {
+
+    class Loading<out T>(data: T?): SingleEvent<T>(data)
+
+    class Success<out T>(override val data: T): SingleEvent<T>(data)
+
+    class Error<out T>(val throwable: Throwable, data: T?): SingleEvent<T>(data)
+
+}
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
new file mode 100644
index 0000000..e27a860
--- /dev/null
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/viewmodel/RxViewModel.kt
@@ -0,0 +1,24 @@
+package ru.touchin.templates.viewmodel
+
+import android.arch.lifecycle.ViewModel
+import android.support.annotation.CallSuper
+import ru.touchin.livedata.dispatcher.BaseLiveDataDispatcher
+import ru.touchin.livedata.dispatcher.LiveDataDispatcher
+import ru.touchin.livedata.destroyable.BaseDestroyable
+import ru.touchin.livedata.destroyable.Destroyable
+
+/**
+ * Base class of ViewModel with [io.reactivex.disposables.Disposable] handling.
+ */
+open class RxViewModel(
+        private val destroyable: BaseDestroyable = BaseDestroyable(),
+        private val liveDataDispatcher: BaseLiveDataDispatcher = BaseLiveDataDispatcher(destroyable)
+) : ViewModel(), Destroyable by destroyable, LiveDataDispatcher by liveDataDispatcher {
+
+    @CallSuper
+    override fun onCleared() {
+        super.onCleared()
+        destroyable.onDestroy()
+    }
+
+}
diff --git a/lifecycle-rx/src/main/res/values/strings.xml b/lifecycle-rx/src/main/res/values/strings.xml
new file mode 100644
index 0000000..b340b3d
--- /dev/null
+++ b/lifecycle-rx/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">lifecycle-rx</string>
+</resources>
diff --git a/logging/build.gradle b/logging/build.gradle
index 217c17b..69333c1 100644
--- a/logging/build.gradle
+++ b/logging/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion versions.minSdk
     }
 
     compileOptions {
diff --git a/navigation/build.gradle b/navigation/build.gradle
index 26d4258..8a95e1c 100644
--- a/navigation/build.gradle
+++ b/navigation/build.gradle
@@ -1,10 +1,11 @@
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion versions.minSdk
     }
 
     compileOptions {
diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
deleted file mode 100644
index 8d68057..0000000
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/OnFragmentStartedListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation;
-
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-
-/**
- * Created by Gavriil Sitnikov on 08/10/2014.
- * Base interface to listen child fragments start.
- * Usually it helps to determine that fragment have showed on screen and we can change {@link android.app.Activity}'s navigation state for example.
- */
-public interface OnFragmentStartedListener {
-
-    /**
-     * Calls by child fragment (added via {@link android.support.v4.app.FragmentManager}) on it'sstart.
-     *
-     * @param fragment Child fragment which called this method.
-     */
-    void onFragmentStarted(@NonNull Fragment fragment);
-
-}
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 e2d88f6..090f9c0 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
@@ -29,6 +29,7 @@ import android.view.MenuItem;
 import android.view.View;
 
 import ru.touchin.roboswag.components.navigation.activities.BaseActivity;
+import ru.touchin.roboswag.components.navigation.activities.OnBackPressedListener;
 import ru.touchin.roboswag.components.utils.UiUtils;
 
 /**
@@ -36,7 +37,7 @@ import ru.touchin.roboswag.components.utils.UiUtils;
  * Simple realization of one-side {@link ActionBarDrawerToggle}.
  */
 public class SimpleActionBarDrawerToggle extends ActionBarDrawerToggle
-        implements FragmentManager.OnBackStackChangedListener, BaseActivity.OnBackPressedListener {
+        implements FragmentManager.OnBackStackChangedListener, OnBackPressedListener {
 
     @NonNull
     private final BaseActivity activity;
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 ee39486..2e09da4 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
@@ -25,7 +25,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.util.ArraySet;
 import android.support.v7.app.AppCompatActivity;
-import android.view.MenuItem;
 
 import java.util.Set;
 
@@ -96,13 +95,9 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
-            return true;
-        } else {
-            return super.onOptionsItemSelected(item);
-        }
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
 
     public void addOnBackPressedListener(@NonNull final OnBackPressedListener onBackPressedListener) {
@@ -123,18 +118,4 @@ public abstract class BaseActivity extends AppCompatActivity {
         super.onBackPressed();
     }
 
-    /*
-     * Interface to be implemented for someone who want to intercept device back button pressing event.
-     */
-    public interface OnBackPressedListener {
-
-        /**
-         * Calls when user presses device back button.
-         *
-         * @return True if it is processed by this object.
-         */
-        boolean onBackPressed();
-
-    }
-
 }
diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/OnBackPressedListener.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/OnBackPressedListener.java
new file mode 100644
index 0000000..0f052f2
--- /dev/null
+++ b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/activities/OnBackPressedListener.java
@@ -0,0 +1,15 @@
+package ru.touchin.roboswag.components.navigation.activities;
+
+/**
+ * Interface to be implemented for someone who want to intercept device back button pressing event.
+ */
+public interface OnBackPressedListener {
+
+    /**
+     * Calls when user presses device back button.
+     *
+     * @return True if it is processed by this object.
+     */
+    boolean onBackPressed();
+
+}
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 065f06b..34e4b32 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
@@ -20,6 +20,8 @@
 package ru.touchin.roboswag.components.navigation.fragments;
 
 import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.arch.lifecycle.Lifecycle;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Canvas;
@@ -27,8 +29,10 @@ 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 android.view.LayoutInflater;
 import android.view.Menu;
@@ -41,6 +45,7 @@ import android.widget.FrameLayout;
 
 import java.lang.reflect.Constructor;
 
+import ru.touchin.roboswag.components.navigation.BuildConfig;
 import ru.touchin.roboswag.components.navigation.viewcontrollers.ViewController;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.log.LcGroup;
@@ -54,24 +59,15 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * @param <TActivity> Type of {@link FragmentActivity} where fragment could be attached to.
  */
 @SuppressWarnings("PMD.TooManyMethods")
-public class ViewControllerFragment<TActivity extends FragmentActivity, TState extends Parcelable> extends ViewFragment<TActivity> {
+public class ViewControllerFragment<TActivity extends FragmentActivity, TState extends Parcelable> extends Fragment {
 
     private static final String VIEW_CONTROLLER_CLASS_EXTRA = "VIEW_CONTROLLER_CLASS_EXTRA";
     private static final String VIEW_CONTROLLER_STATE_EXTRA = "VIEW_CONTROLLER_STATE_EXTRA";
 
-    private static boolean inDebugMode;
     private static long acceptableUiCalculationTime = 100;
 
-    /**
-     * Enables debugging features like serialization of {@link #getState()} every creation.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
     /**
      * Sets acceptable UI calculation time so there will be warnings in logs if ViewController's inflate/layout actions will take more than that time.
-     * Works only if {@link #setInDebugMode()} called.
      * It's 100ms by default.
      */
     public static void setAcceptableUiCalculationTime(final long acceptableUiCalculationTime) {
@@ -113,6 +109,8 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     @Nullable
     private ActivityResult pendingActivityResult;
 
+    private boolean appeared;
+
     /**
      * Returns specific {@link Parcelable} which contains state of fragment and it's {@link ViewController}.
      *
@@ -128,19 +126,19 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         return viewControllerClass;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setHasOptionsMenu(!isChildFragment());
 
-        //noinspection unchecked
         viewControllerClass = (Class<ViewController<TActivity, TState>>) getArguments().getSerializable(VIEW_CONTROLLER_CLASS_EXTRA);
         state = savedInstanceState != null
                 ? savedInstanceState.getParcelable(VIEW_CONTROLLER_STATE_EXTRA)
                 : (getArguments() != null ? getArguments().getParcelable(VIEW_CONTROLLER_STATE_EXTRA) : null);
         if (state != null) {
-            if (inDebugMode) {
+            if (BuildConfig.DEBUG) {
                 state = reserialize(state);
             }
         } else {
@@ -148,43 +146,6 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
-    @NonNull
-    private ViewController createViewController(
-            @NonNull final FragmentActivity activity,
-            @NonNull final PlaceholderView view,
-            @Nullable final Bundle savedInstanceState
-    ) {
-        if (viewControllerClass.getConstructors().length != 1) {
-            throw new ShouldNotHappenException("There should be single constructor for " + viewControllerClass);
-        }
-        final Constructor<?> constructor = viewControllerClass.getConstructors()[0];
-        final ViewController.CreationContext creationContext = new ViewController.CreationContext(activity, this, view);
-        final long creationTime = inDebugMode ? SystemClock.elapsedRealtime() : 0;
-        try {
-            switch (constructor.getParameterTypes().length) {
-                case 2:
-                    return (ViewController) constructor.newInstance(creationContext, savedInstanceState);
-                case 3:
-                    return (ViewController) constructor.newInstance(this, creationContext, savedInstanceState);
-                default:
-                    throw new ShouldNotHappenException("Wrong constructor parameters count: " + constructor.getParameterTypes().length);
-            }
-        } catch (@NonNull final Exception exception) {
-            throw new ShouldNotHappenException(exception);
-        } finally {
-            checkCreationTime(creationTime);
-        }
-    }
-
-    private void checkCreationTime(final long creationTime) {
-        if (inDebugMode) {
-            final long creationPeriod = SystemClock.elapsedRealtime() - creationTime;
-            if (creationPeriod > acceptableUiCalculationTime) {
-                LcGroup.UI_METRICS.w("Creation of %s took too much: %dms", viewControllerClass, creationPeriod);
-            }
-        }
-    }
-
     @NonNull
     @Override
     public final View onCreateView(
@@ -199,7 +160,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         //noinspection ConstantConditions
-        viewController = createViewController(requireActivity(), (PlaceholderView) getView(), savedInstanceState);
+        viewController = createViewController(requireActivity(), (ViewGroup) getView(), savedInstanceState);
         viewController.onCreate();
         if (pendingActivityResult != null) {
             viewController.onActivityResult(pendingActivityResult.requestCode, pendingActivityResult.resultCode, pendingActivityResult.data);
@@ -235,25 +196,33 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
-    protected void onStart(@NonNull final View view, @NonNull final TActivity activity) {
-        super.onStart(view, activity);
+    public void onStart() {
+        super.onStart();
+        if (!appeared && isMenuVisible()) {
+            onAppear();
+        }
         if (viewController != null) {
             viewController.onStart();
         }
     }
 
-    @Override
-    protected void onAppear(@NonNull final View view, @NonNull final TActivity activity) {
-        super.onAppear(view, activity);
+    /**
+     * Called when fragment is moved in started state and it's {@link #isMenuVisible()} sets to true.
+     * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
+     */
+    @CallSuper
+    protected void onAppear() {
+        appeared = true;
         if (viewController != null) {
             viewController.onAppear();
         }
     }
 
     @Override
-    protected void onResume(@NonNull final View view, @NonNull final TActivity activity) {
-        super.onResume(view, activity);
+    public void onResume() {
+        super.onResume();
         if (viewController != null) {
             viewController.onResume();
         }
@@ -281,8 +250,8 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
     }
 
     @Override
-    protected void onPause(@NonNull final View view, @NonNull final TActivity activity) {
-        super.onPause(view, activity);
+    public void onPause() {
+        super.onPause();
         if (viewController != null) {
             viewController.onPause();
         }
@@ -297,20 +266,27 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         savedInstanceState.putParcelable(VIEW_CONTROLLER_STATE_EXTRA, state);
     }
 
-    @Override
-    protected void onDisappear(@NonNull final View view, @NonNull final TActivity activity) {
-        super.onDisappear(view, activity);
+    /**
+     * Called when fragment is moved in stopped state or it's {@link #isMenuVisible()} sets to false.
+     * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
+     */
+    @CallSuper
+    protected void onDisappear() {
+        appeared = false;
         if (viewController != null) {
             viewController.onDisappear();
         }
     }
 
     @Override
-    protected void onStop(@NonNull final View view, @NonNull final TActivity activity) {
+    public void onStop() {
+        if (appeared) {
+            onDisappear();
+        }
         if (viewController != null) {
             viewController.onStop();
         }
-        super.onStop(view, activity);
+        super.onStop();
     }
 
     @Override
@@ -339,6 +315,66 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
+    @Override
+    public void setMenuVisibility(final boolean menuVisible) {
+        super.setMenuVisibility(menuVisible);
+        if (getActivity() != null && getView() != null) {
+            final boolean started = getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
+            if (!appeared && menuVisible && started) {
+                onAppear();
+            }
+            if (appeared && (!menuVisible || !started)) {
+                onDisappear();
+            }
+        }
+    }
+
+    /**
+     * Returns if fragment have parent fragment.
+     *
+     * @return Returns true if fragment is in some fragment's children stack.
+     */
+    public boolean isChildFragment() {
+        return getParentFragment() != null;
+    }
+
+    @NonNull
+    private ViewController createViewController(
+            @NonNull final FragmentActivity activity,
+            @NonNull final ViewGroup view,
+            @Nullable final Bundle savedInstanceState
+    ) {
+        if (viewControllerClass.getConstructors().length != 1) {
+            throw new ShouldNotHappenException("There should be single constructor for " + viewControllerClass);
+        }
+        final Constructor<?> constructor = viewControllerClass.getConstructors()[0];
+        final ViewController.CreationContext creationContext = new ViewController.CreationContext(activity, this, view);
+        final long creationTime = BuildConfig.DEBUG ? SystemClock.elapsedRealtime() : 0;
+        try {
+            switch (constructor.getParameterTypes().length) {
+                case 2:
+                    return (ViewController) constructor.newInstance(creationContext, savedInstanceState);
+                case 3:
+                    return (ViewController) constructor.newInstance(this, creationContext, savedInstanceState);
+                default:
+                    throw new ShouldNotHappenException("Wrong constructor parameters count: " + constructor.getParameterTypes().length);
+            }
+        } catch (@NonNull final Exception exception) {
+            throw new ShouldNotHappenException(exception);
+        } finally {
+            checkCreationTime(creationTime);
+        }
+    }
+
+    private void checkCreationTime(final long creationTime) {
+        if (BuildConfig.DEBUG) {
+            final long creationPeriod = SystemClock.elapsedRealtime() - creationTime;
+            if (creationPeriod > acceptableUiCalculationTime) {
+                LcGroup.UI_METRICS.w("Creation of %s took too much: %dms", viewControllerClass, creationPeriod);
+            }
+        }
+    }
+
     private static class PlaceholderView extends FrameLayout {
 
         @NonNull
@@ -353,7 +389,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         @Override
         protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-            if (inDebugMode && lastMeasureTime == 0) {
+            if (BuildConfig.DEBUG && lastMeasureTime == 0) {
                 lastMeasureTime = SystemClock.uptimeMillis();
             }
         }
@@ -361,7 +397,7 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         @Override
         protected void onDraw(@NonNull final Canvas canvas) {
             super.onDraw(canvas);
-            if (inDebugMode && lastMeasureTime > 0) {
+            if (BuildConfig.DEBUG && lastMeasureTime > 0) {
                 final long layoutTime = SystemClock.uptimeMillis() - lastMeasureTime;
                 if (layoutTime > acceptableUiCalculationTime) {
                     LcGroup.UI_METRICS.w("Measure and layout of %s took too much: %dms", tagName, layoutTime);
diff --git a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java b/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
deleted file mode 100644
index bca1f28..0000000
--- a/navigation/src/main/java/ru/touchin/roboswag/components/navigation/fragments/ViewFragment.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
- *
- *  This file is part of RoboSwag library.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package ru.touchin.roboswag.components.navigation.fragments;
-
-import android.arch.lifecycle.Lifecycle;
-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.v4.app.FragmentActivity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import ru.touchin.roboswag.components.navigation.OnFragmentStartedListener;
-import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.utils.BiConsumer;
-
-/**
- * Created by Gavriil Sitnikov on 21/10/2015.
- * Non-background fragment that have specific activity as a parent.
- *
- * @param <TActivity> Type of activity which to such fragment could be attached.
- */
-public abstract class ViewFragment<TActivity extends FragmentActivity> extends Fragment implements OnFragmentStartedListener {
-
-    private boolean appeared;
-
-    /**
-     * Returns if fragment have parent fragment.
-     *
-     * @return Returns true if fragment is in some fragment's children stack.
-     */
-    public boolean isChildFragment() {
-        return getParentFragment() != null;
-    }
-
-    /**
-     * Returns specific activity which to this fragment could be attached.
-     *
-     * @return Returns parent activity.
-     */
-    @SuppressWarnings("unchecked")
-    @Nullable
-    protected final TActivity getBaseActivity() {
-        if (getActivity() == null) {
-            return null;
-        }
-
-        try {
-            return (TActivity) getActivity();
-        } catch (final ClassCastException exception) {
-            Lc.assertion(exception);
-            return null;
-        }
-    }
-
-    @NonNull
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater,
-                             @Nullable final ViewGroup container,
-                             @Nullable final Bundle savedInstanceState) {
-        throw new IllegalStateException("Method onCreateView() should be overridden");
-    }
-
-    @Override
-    @CallSuper
-    public void onFragmentStarted(@NonNull final Fragment fragment) {
-        //do nothing
-    }
-
-    @Override
-    public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (getView() == null || getBaseActivity() == null) {
-            Lc.assertion("View and activity shouldn't be null");
-        }
-    }
-
-    private void callMethodAfterInstantiation(@NonNull final BiConsumer<View, TActivity> action) {
-        if (getView() == null || getBaseActivity() == null) {
-            Lc.assertion("View and activity shouldn't be null");
-            return;
-        }
-        try {
-            action.accept(getView(), getBaseActivity());
-        } catch (final Exception exception) {
-            Lc.assertion(exception);
-        }
-    }
-
-    @Deprecated
-    @Override
-    public void onStart() {
-        super.onStart();
-        callMethodAfterInstantiation(this::onStart);
-    }
-
-    /**
-     * Replacement of {@link #onStart} with non null activity as first parameter.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    @CallSuper
-    @SuppressWarnings("RestrictedApi")
-    //RestrictedApi: we need isMenuVisible() to check analytics rightly!
-    protected void onStart(@NonNull final View view, @NonNull final TActivity activity) {
-        if (getParentFragment() instanceof OnFragmentStartedListener) {
-            ((OnFragmentStartedListener) getParentFragment()).onFragmentStarted(this);
-        } else if (activity instanceof OnFragmentStartedListener) {
-            ((OnFragmentStartedListener) activity).onFragmentStarted(this);
-        }
-        if (!appeared && isMenuVisible()) {
-            onAppear(view, activity);
-        }
-    }
-
-    /**
-     * Called when fragment is moved in started state and it's {@link #isMenuVisible()} sets to true.
-     * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    protected void onAppear(@NonNull final View view, @NonNull final TActivity activity) {
-        appeared = true;
-    }
-
-    @Deprecated
-    @Override
-    public void onResume() {
-        super.onResume();
-        callMethodAfterInstantiation(this::onResume);
-    }
-
-    /**
-     * Replacement of {@link #onResume} with non null activity as first parameter.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    @CallSuper
-    protected void onResume(@NonNull final View view, @NonNull final TActivity activity) {
-        //do nothing
-    }
-
-    @Override
-    public void setMenuVisibility(final boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-        if (getBaseActivity() != null && getView() != null) {
-            final boolean started = getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
-            if (!appeared && menuVisible && started) {
-                onAppear(getView(), getBaseActivity());
-            }
-            if (appeared && (!menuVisible || !started)) {
-                onDisappear(getView(), getBaseActivity());
-            }
-        }
-    }
-
-    @Deprecated
-    @Override
-    public void onPause() {
-        callMethodAfterInstantiation(this::onPause);
-        super.onPause();
-    }
-
-    /**
-     * Replacement of {@link #onPause} with non null activity as first parameter.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    @CallSuper
-    protected void onPause(@NonNull final View view, @NonNull final TActivity activity) {
-        // do nothing
-    }
-
-    /**
-     * Called when fragment is moved in stopped state or it's {@link #isMenuVisible()} sets to false.
-     * Usually it is indicating that user can't see fragment on screen and useful to track analytics events.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    protected void onDisappear(@NonNull final View view, @NonNull final TActivity activity) {
-        appeared = false;
-    }
-
-    @Deprecated
-    @Override
-    public void onStop() {
-        callMethodAfterInstantiation(this::onStop);
-        super.onStop();
-    }
-
-    /**
-     * Replacement of {@link #onStop} with non null activity as first parameter.
-     *
-     * @param view     Instantiated view.
-     * @param activity Activity which fragment attached to.
-     */
-    @CallSuper
-    protected void onStop(@NonNull final View view, @NonNull final TActivity activity) {
-        if (appeared) {
-            onDisappear(view, activity);
-        }
-    }
-
-}
diff --git a/sample/build.gradle b/sample/build.gradle
index 65044a9..24ac6ff 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -3,14 +3,16 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion versions.compileSdk
+
     defaultConfig {
         applicationId "ru.touchin.roboswag.components"
-        minSdkVersion 16
-        targetSdkVersion 27
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.compileSdk
         versionCode 1
         versionName "1.0"
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -21,6 +23,7 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+
+    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }
diff --git a/settings.gradle b/settings.gradle
index 9e1f446..c6b0741 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':sample', ':utils', ':logging', ':navigation', ':storable'
+include ':sample', ':utils', ':logging', ':navigation', ':storable', ':api-logansquare', ':lifecycle-common', ':lifecycle-rx'
diff --git a/storable/build.gradle b/storable/build.gradle
index 2a6be21..18cb730 100644
--- a/storable/build.gradle
+++ b/storable/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion versions.minSdk
     }
 
     compileOptions {
diff --git a/utils/build.gradle b/utils/build.gradle
index 217c17b..69333c1 100644
--- a/utils/build.gradle
+++ b/utils/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion versions.compileSdk
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion versions.minSdk
     }
 
     compileOptions {
diff --git a/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java b/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
deleted file mode 100644
index c13ac22..0000000
--- a/utils/src/main/java/ru/touchin/roboswag/core/utils/BiConsumer.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ru.touchin.roboswag.core.utils;
-
-import android.support.annotation.Nullable;
-
-/**
- * A functional interface (callback) that accepts two values (of possibly different types).
- * @param <T1> the first value type
- * @param <T2> the second value type
- */
-public interface BiConsumer<T1, T2> {
-
-    /**
-     * Performs an operation on the given values.
-     * @param t1 the first value
-     * @param t2 the second value
-     * @throws Exception on error
-     */
-    void accept(@Nullable T1 t1, @Nullable T2 t2) throws Exception;
-}
diff --git a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
new file mode 100644
index 0000000..8d8284d
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Process;
+import android.support.annotation.NonNull;
+import android.telephony.TelephonyManager;
+
+/**
+ * Utility class that is providing common methods related to android device.
+ */
+public final class DeviceUtils {
+
+    /**
+     * Detects active network type.
+     *
+     * @param context Application context
+     * @return Active network type {@link NetworkType}
+     */
+    @NonNull
+    public static NetworkType getNetworkType(@NonNull final Context context) {
+        if (context.checkPermission(Manifest.permission.ACCESS_NETWORK_STATE, Process.myPid(), Process.myUid())
+                != PackageManager.PERMISSION_GRANTED) {
+            return NetworkType.UNKNOWN;
+        }
+        final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        @SuppressLint("MissingPermission") final NetworkInfo info = cm.getActiveNetworkInfo();
+        if (info == null || !info.isConnected()) {
+            return NetworkType.NONE;
+        }
+        if (info.getType() == ConnectivityManager.TYPE_WIFI) {
+            return NetworkType.WI_FI;
+        }
+        if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
+            final int networkType = info.getSubtype();
+            switch (networkType) {
+                case TelephonyManager.NETWORK_TYPE_GPRS:
+                case TelephonyManager.NETWORK_TYPE_EDGE:
+                case TelephonyManager.NETWORK_TYPE_CDMA:
+                case TelephonyManager.NETWORK_TYPE_1xRTT:
+                case TelephonyManager.NETWORK_TYPE_IDEN:
+                    return NetworkType.MOBILE_2G;
+                case TelephonyManager.NETWORK_TYPE_UMTS:
+                case TelephonyManager.NETWORK_TYPE_EVDO_0:
+                case TelephonyManager.NETWORK_TYPE_EVDO_A:
+                case TelephonyManager.NETWORK_TYPE_HSDPA:
+                case TelephonyManager.NETWORK_TYPE_HSUPA:
+                case TelephonyManager.NETWORK_TYPE_HSPA:
+                case TelephonyManager.NETWORK_TYPE_EVDO_B:
+                case TelephonyManager.NETWORK_TYPE_EHRPD:
+                case TelephonyManager.NETWORK_TYPE_HSPAP:
+                    return NetworkType.MOBILE_3G;
+                case TelephonyManager.NETWORK_TYPE_LTE:
+                case 19: // NETWORK_TYPE_LTE_CA is hide
+                    return NetworkType.MOBILE_LTE;
+                case TelephonyManager.NETWORK_TYPE_UNKNOWN:
+                default:
+                    return NetworkType.UNKNOWN;
+            }
+        }
+        return NetworkType.UNKNOWN;
+    }
+
+    /**
+     * Detects if some network connected.
+     *
+     * @param context Application context
+     * @return true if network connected, false otherwise.
+     */
+    public static boolean isNetworkConnected(@NonNull final Context context) {
+        return getNetworkType(context) != NetworkType.NONE;
+    }
+
+    private DeviceUtils() {
+    }
+
+    /**
+     * Available network types.
+     */
+    public enum NetworkType {
+        /**
+         * Mobile 2G network.
+         */
+        MOBILE_2G("2g"),
+        /**
+         * Mobile 3G network.
+         */
+        MOBILE_3G("3g"),
+        /**
+         * Mobile LTE network.
+         */
+        MOBILE_LTE("lte"),
+        /**
+         * Wi-Fi network.
+         */
+        WI_FI("Wi-Fi"),
+        /**
+         * Unknown network type.
+         */
+        UNKNOWN("unknown"),
+        /**
+         * No network.
+         */
+        NONE("none");
+
+        @NonNull
+        private final String name;
+
+        NetworkType(@NonNull final String name) {
+            this.name = name;
+        }
+
+        /**
+         * @return Network type readable name.
+         */
+        @NonNull
+        public String getName() {
+            return name;
+        }
+
+    }
+
+}

From 4e81ba9c9aab12d781135759565d7b27db3c1d8a Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 12:40:23 +0300
Subject: [PATCH 85/95] Added views module

---
 settings.gradle                               |   2 +-
 .../touchin/defaults/DefaultTextWatcher.java  |  24 +
 views/.gitignore                              |   1 +
 views/build.gradle                            |  21 +
 views/src/main/AndroidManifest.xml            |   2 +
 .../components/views/MaterialLoadingBar.java  | 119 +++++
 .../views/MaterialProgressDrawable.java       | 292 +++++++++++
 .../components/views/TypefacedEditText.java   | 332 +++++++++++++
 .../components/views/TypefacedTextView.java   | 467 ++++++++++++++++++
 .../views/internal/AttributesUtils.java       | 170 +++++++
 views/src/main/res/values/attrs.xml           |  27 +
 11 files changed, 1456 insertions(+), 1 deletion(-)
 create mode 100644 utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
 create mode 100644 views/.gitignore
 create mode 100644 views/build.gradle
 create mode 100644 views/src/main/AndroidManifest.xml
 create mode 100644 views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
 create mode 100644 views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
 create mode 100644 views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
 create mode 100644 views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
 create mode 100644 views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
 create mode 100644 views/src/main/res/values/attrs.xml

diff --git a/settings.gradle b/settings.gradle
index c6b0741..3e31f83 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':sample', ':utils', ':logging', ':navigation', ':storable', ':api-logansquare', ':lifecycle-common', ':lifecycle-rx'
+include ':sample', ':utils', ':logging', ':navigation', ':storable', ':api-logansquare', ':lifecycle-common', ':lifecycle-rx', ':views'
diff --git a/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java b/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
new file mode 100644
index 0000000..563c518
--- /dev/null
+++ b/utils/src/main/java/ru/touchin/defaults/DefaultTextWatcher.java
@@ -0,0 +1,24 @@
+package ru.touchin.defaults;
+
+import android.support.annotation.NonNull;
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public class DefaultTextWatcher implements TextWatcher {
+
+    @Override
+    public void beforeTextChanged(@NonNull final CharSequence oldText, final int start, final int count, final int after) {
+        // Do nothing
+    }
+
+    @Override
+    public void onTextChanged(@NonNull final CharSequence inputText, final int start, final int before, final int count) {
+        // Do nothing
+    }
+
+    @Override
+    public void afterTextChanged(@NonNull final Editable editable) {
+        // Do nothing
+    }
+
+}
diff --git a/views/.gitignore b/views/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/views/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/views/build.gradle b/views/build.gradle
new file mode 100644
index 0000000..9ea4f9e
--- /dev/null
+++ b/views/build.gradle
@@ -0,0 +1,21 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(":utils")
+    api project(":logging")
+
+    implementation "com.android.support:design:$versions.supportLibrary"
+}
diff --git a/views/src/main/AndroidManifest.xml b/views/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..354617c
--- /dev/null
+++ b/views/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest
+    package="ru.touchin.roboswag.components.views"/>
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
new file mode 100644
index 0000000..c3b88ef
--- /dev/null
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialLoadingBar.java
@@ -0,0 +1,119 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.util.AttributeSet;
+import android.util.TypedValue;
+
+import ru.touchin.roboswag.components.utils.UiUtils;
+
+/**
+ * Created by Ilia Kurtov on 07/12/2016.
+ * Simple endless progress bar view in material (round circle) style.
+ * It is able to setup size, stroke width and color.
+ * See MaterialLoadingBar Attributes:
+ * R.styleable#MaterialLoadingBar_size
+ * R.styleable#MaterialLoadingBar_strokeWidth
+ * R.styleable#MaterialLoadingBar_color
+ * Use
+ * R.styleable#MaterialLoadingBar_materialLoadingBarStyle
+ * to set default style of MaterialLoadingBar in your Theme.
+ * Sample:
+ * <style name="MyAppLoadingBar">
+ * <item name="strokeWidth">3dp</item>
+ * <item name="color">@android:color/black</item>
+ * <item name="size">24dp</item>
+ * </style>
+ * <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+ * <item name="materialLoadingBarStyle">@style/MyAppLoadingBar</item>
+ * </style>
+ */
+public class MaterialLoadingBar extends AppCompatImageView {
+
+    private static int getPrimaryColor(@NonNull final Context context) {
+        final int colorAttr;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            colorAttr = android.R.attr.colorPrimary;
+        } else {
+            colorAttr = context.getResources().getIdentifier("colorPrimary", "attr", context.getPackageName());
+        }
+        final TypedValue outValue = new TypedValue();
+        context.getTheme().resolveAttribute(colorAttr, outValue, true);
+        return outValue.data;
+    }
+
+    private MaterialProgressDrawable progressDrawable;
+
+    public MaterialLoadingBar(@NonNull final Context context) {
+        this(context, null);
+    }
+
+    public MaterialLoadingBar(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        this(context, attrs, R.attr.materialLoadingBarStyle);
+    }
+
+    public MaterialLoadingBar(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MaterialLoadingBar,
+                defStyleAttr,
+                0);
+        final int size = (int) typedArray.getDimension(R.styleable.MaterialLoadingBar_size, UiUtils.OfMetrics.dpToPixels(context, 48));
+        final int color = typedArray.getColor(R.styleable.MaterialLoadingBar_color, getPrimaryColor(context));
+        final float strokeWidth = typedArray.getDimension(R.styleable.MaterialLoadingBar_strokeWidth,
+                UiUtils.OfMetrics.dpToPixels(context, 4));
+        typedArray.recycle();
+
+        progressDrawable = new MaterialProgressDrawable(context, size);
+        setColor(color);
+        progressDrawable.setStrokeWidth(strokeWidth);
+        setScaleType(ScaleType.CENTER);
+        setImageDrawable(progressDrawable);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        progressDrawable.start();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        progressDrawable.stop();
+        super.onDetachedFromWindow();
+    }
+
+    /**
+     * Set color of loader.
+     *
+     * @param colorInt Color of loader to be set.
+     */
+    public void setColor(@ColorInt final int colorInt) {
+        progressDrawable.setColor(colorInt);
+    }
+
+}
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
new file mode 100644
index 0000000..a152cb4
--- /dev/null
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/MaterialProgressDrawable.java
@@ -0,0 +1,292 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.components.views;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+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 ru.touchin.roboswag.components.utils.UiUtils;
+
+/**
+ * Created by Gavriil Sitnikov on 01/03/16.
+ * Simple realization of endless progress bar which is looking material-like.
+ */
+public class MaterialProgressDrawable extends Drawable implements Runnable, Animatable {
+
+    private static final int UPDATE_INTERVAL = 1000 / 60;
+
+    private static final float DEFAULT_STROKE_WIDTH_DP = 4.5f;
+    private static final Parameters DEFAULT_PARAMETERS = new Parameters(20, 270, 4, 12, 4, 8);
+
+    private final int size;
+    @NonNull
+    private final Paint paint;
+    @NonNull
+    private Parameters parameters = DEFAULT_PARAMETERS;
+    @NonNull
+    private final RectF arcBounds = new RectF();
+
+    private float rotationAngle;
+    private float arcSize;
+    private boolean running;
+
+    public MaterialProgressDrawable(@NonNull final Context context) {
+        this(context, -1);
+    }
+
+    public MaterialProgressDrawable(@NonNull final Context context, final int size) {
+        super();
+
+        this.size = size;
+        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(UiUtils.OfMetrics.dpToPixels(context, DEFAULT_STROKE_WIDTH_DP));
+        paint.setColor(Color.BLACK);
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return size;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return size;
+    }
+
+    /**
+     * Returns width of arc.
+     *
+     * @return Width.
+     */
+    public float getStrokeWidth() {
+        return paint.getStrokeWidth();
+    }
+
+    /**
+     * Sets width of arc.
+     *
+     * @param strokeWidth Width.
+     */
+    public void setStrokeWidth(final float strokeWidth) {
+        paint.setStrokeWidth(strokeWidth);
+        updateArcBounds();
+        invalidateSelf();
+    }
+
+    /**
+     * Sets color of arc.
+     *
+     * @param color Color.
+     */
+    public void setColor(@ColorInt final int color) {
+        paint.setColor(color);
+        invalidateSelf();
+    }
+
+    /**
+     * Returns magic parameters of spinning.
+     *
+     * @return Parameters of spinning.
+     */
+    @NonNull
+    public Parameters getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Sets magic parameters of spinning.
+     *
+     * @param parameters Parameters of spinning.
+     */
+    public void setParameters(@NonNull final Parameters parameters) {
+        this.parameters = parameters;
+        invalidateSelf();
+    }
+
+    @Override
+    protected void onBoundsChange(@NonNull final Rect bounds) {
+        super.onBoundsChange(bounds);
+        updateArcBounds();
+    }
+
+    private void updateArcBounds() {
+        arcBounds.set(getBounds());
+        //HACK: + 1 as anti-aliasing drawing bug workaround
+        final int inset = (int) (paint.getStrokeWidth() / 2) + 1;
+        arcBounds.inset(inset, inset);
+    }
+
+    @SuppressWarnings("PMD.NPathComplexity")
+    @Override
+    public void draw(@NonNull final Canvas canvas) {
+        final boolean isGrowingCycle = (((int) (arcSize / parameters.maxAngle)) % 2) == 0;
+        final float angle = arcSize % parameters.maxAngle;
+        final float shift = (angle / parameters.maxAngle) * parameters.gapAngle;
+        canvas.drawArc(arcBounds, isGrowingCycle ? rotationAngle + shift : rotationAngle + parameters.gapAngle - shift,
+                isGrowingCycle ? angle + parameters.gapAngle : parameters.maxAngle - angle + parameters.gapAngle, false, paint);
+        //TODO: compute based on animation start time
+        rotationAngle += isGrowingCycle ? parameters.rotationMagicNumber1 : parameters.rotationMagicNumber2;
+        arcSize += isGrowingCycle ? parameters.arcMagicNumber1 : parameters.arcMagicNumber2;
+        if (arcSize < 0) {
+            arcSize = 0;
+        }
+        if (isRunning()) {
+            scheduleSelf(this, SystemClock.uptimeMillis() + UPDATE_INTERVAL);
+        }
+    }
+
+    @Override
+    public void setAlpha(final int alpha) {
+        paint.setAlpha(alpha);
+        invalidateSelf();
+    }
+
+    @Override
+    public void setColorFilter(@Nullable final ColorFilter colorFilter) {
+        paint.setColorFilter(colorFilter);
+        invalidateSelf();
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void start() {
+        if (!running) {
+            running = true;
+            run();
+        }
+    }
+
+    @Override
+    public void stop() {
+        if (running) {
+            unscheduleSelf(this);
+            running = false;
+        }
+    }
+
+    @Override
+    public boolean isRunning() {
+        return running;
+    }
+
+    @Override
+    public void run() {
+        if (running) {
+            invalidateSelf();
+        }
+    }
+
+    /**
+     * Some parameters which are using to spin progress bar.
+     */
+    public static class Parameters {
+
+        private final float gapAngle;
+        private final float maxAngle;
+        private final float rotationMagicNumber1;
+        private final float rotationMagicNumber2;
+        private final float arcMagicNumber1;
+        private final float arcMagicNumber2;
+
+        public Parameters(final float gapAngle, final float maxAngle,
+                          final float rotationMagicNumber1, final float rotationMagicNumber2,
+                          final float arcMagicNumber1, final float arcMagicNumber2) {
+            this.gapAngle = gapAngle;
+            this.maxAngle = maxAngle;
+            this.rotationMagicNumber1 = rotationMagicNumber1;
+            this.rotationMagicNumber2 = rotationMagicNumber2;
+            this.arcMagicNumber1 = arcMagicNumber1;
+            this.arcMagicNumber2 = arcMagicNumber2;
+        }
+
+        /**
+         * Returns angle of gap of arc.
+         *
+         * @return Angle of gap.
+         */
+        public float getGapAngle() {
+            return gapAngle;
+        }
+
+        /**
+         * Returns maximum angle of arc.
+         *
+         * @return Maximum angle of arc.
+         */
+        public float getMaxAngle() {
+            return maxAngle;
+        }
+
+        /**
+         * Magic parameter 1.
+         *
+         * @return Magic.
+         */
+        public float getRotationMagicNumber1() {
+            return rotationMagicNumber1;
+        }
+
+        /**
+         * Magic parameter 2.
+         *
+         * @return Magic.
+         */
+        public float getRotationMagicNumber2() {
+            return rotationMagicNumber2;
+        }
+
+        /**
+         * Magic parameter 3.
+         *
+         * @return Magic.
+         */
+        public float getArcMagicNumber1() {
+            return arcMagicNumber1;
+        }
+
+        /**
+         * Magic parameter 4.
+         *
+         * @return Magic.
+         */
+        public float getArcMagicNumber2() {
+            return arcMagicNumber2;
+        }
+
+    }
+
+}
\ 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
new file mode 100644
index 0000000..d556a81
--- /dev/null
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedEditText.java
@@ -0,0 +1,332 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.text.InputType;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.method.SingleLineTransformationMethod;
+import android.text.method.TransformationMethod;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewParent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ru.touchin.defaults.DefaultTextWatcher;
+import ru.touchin.roboswag.components.views.internal.AttributesUtils;
+import ru.touchin.roboswag.core.log.Lc;
+
+/**
+ * Created by Gavriil Sitnikov on 18/07/2014.
+ * TextView that supports fonts from Typefaces class
+ */
+
+/**
+ * Created by Gavriil Sitnikov on 18/07/2014.
+ * EditText that supports custom typeface and forces developer to specify if this view multiline or not.
+ * Also in debug mode it has common checks for popular bugs.
+ */
+@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+//ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
+public class TypefacedEditText extends AppCompatEditText {
+
+    private static boolean inDebugMode;
+
+    /**
+     * Enables debugging features like checking attributes on inflation.
+     */
+    public static void setInDebugMode() {
+        inDebugMode = true;
+    }
+
+    private boolean multiline;
+    private boolean constructed;
+
+    @Nullable
+    private OnTextChangedListener onTextChangedListener;
+
+    public TypefacedEditText(@NonNull final Context context) {
+        super(context);
+        initialize(context, null);
+    }
+
+    public TypefacedEditText(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public TypefacedEditText(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        constructed = true;
+        super.setIncludeFontPadding(false);
+        initializeTextChangedListener();
+        if (attrs != null) {
+            final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedEditText);
+            final boolean multiline = typedArray.getBoolean(R.styleable.TypefacedEditText_isMultiline, false);
+            if (multiline) {
+                setMultiline(AttributesUtils.getMaxLinesFromAttrs(context, attrs));
+            } else {
+                setSingleLine();
+            }
+            typedArray.recycle();
+            if (inDebugMode) {
+                checkAttributes(context, attrs);
+            }
+        }
+    }
+
+    @Nullable
+    public InputConnection onCreateInputConnection(@NonNull final EditorInfo attrs) {
+        final InputConnection inputConnection = super.onCreateInputConnection(attrs);
+        if (inputConnection != null && attrs.hintText == null) {
+            for (ViewParent parent = getParent(); parent instanceof View; parent = parent.getParent()) {
+                if (parent instanceof TextInputLayout) {
+                    attrs.hintText = ((TextInputLayout) parent).getHint();
+                    break;
+                }
+            }
+        }
+
+        return inputConnection;
+    }
+
+    private void checkAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs) {
+        final List<String> errors = new ArrayList<>();
+        Boolean multiline = null;
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedEditText);
+        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedEditText_isMultiline, true,
+                "isMultiline required parameter");
+        if (typedArray.hasValue(R.styleable.TypefacedEditText_isMultiline)) {
+            multiline = typedArray.getBoolean(R.styleable.TypefacedEditText_isMultiline, false);
+        }
+        typedArray.recycle();
+
+        try {
+            final Class androidRes = Class.forName("com.android.internal.R$styleable");
+
+            typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
+            AttributesUtils.checkRegularTextViewAttributes(typedArray, androidRes, errors, "isMultiline");
+            checkEditTextSpecificAttributes(typedArray, androidRes, errors);
+            if (multiline != null) {
+                checkMultilineAttributes(typedArray, androidRes, errors, multiline);
+            }
+        } catch (final Exception exception) {
+            Lc.e(exception, "Error during checking attributes");
+        }
+        AttributesUtils.handleErrors(this, errors);
+        typedArray.recycle();
+    }
+
+    private void checkEditTextSpecificAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
+                                                 @NonNull final List<String> errors)
+            throws NoSuchFieldException, IllegalAccessException {
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_singleLine"), false,
+                "remove singleLine and use isMultiline");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_includeFontPadding"), false,
+                "includeFontPadding forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_ellipsize"), false,
+                "ellipsize forbid parameter");
+
+        if (typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_hint"))) {
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textColorHint"), true,
+                    "textColorHint required parameter if hint is not null");
+        }
+
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textSize"), true,
+                "textSize required parameter. If it's dynamic then use '0sp'");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_inputType"), true,
+                "inputType required parameter");
+
+        final int inputType = typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_inputType"), -1);
+        if (AttributesUtils.isNumberInputType(inputType)) {
+            errors.add("use inputType phone instead of number");
+        }
+
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeOptions"), true,
+                "imeOptions required parameter");
+    }
+
+    private void checkMultilineAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
+                                          @NonNull final List<String> errors, final boolean multiline)
+            throws NoSuchFieldException, IllegalAccessException {
+        if (multiline) {
+            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_lines"), -1) == 1) {
+                errors.add("lines should be more than 1 if isMultiline is true");
+            }
+            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), -1) == 1) {
+                errors.add("maxLines should be more than 1 if isMultiline is true");
+            }
+            if (!typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_maxLines"))
+                    && !typedArray.hasValue(AttributesUtils.getField(androidRes, "TextView_maxLength"))) {
+                errors.add("specify maxLines or maxLength if isMultiline is true");
+            }
+        } else {
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_lines"), false,
+                    "remove lines and use isMultiline");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLines"), false,
+                    "maxLines remove and use isMultiline");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_minLines"), false,
+                    "minLines remove and use isMultiline");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLength"), true,
+                    "maxLength required parameter if isMultiline is false");
+        }
+    }
+
+    private void initializeTextChangedListener() {
+        addTextChangedListener(new DefaultTextWatcher() {
+            @Override
+            public void onTextChanged(@NonNull final CharSequence inputText, final int start, final int before, final int count) {
+                if (onTextChangedListener != null) {
+                    onTextChangedListener.onTextChanged(inputText);
+                }
+            }
+        });
+    }
+
+    /**
+     * Sets if view supports multiline text alignment.
+     *
+     * @param maxLines Maximum lines to be set.
+     */
+    public void setMultiline(final int maxLines) {
+        if (maxLines <= 1) {
+            Lc.assertion("Wrong maxLines: " + maxLines);
+            return;
+        }
+        multiline = true;
+        final TransformationMethod transformationMethod = getTransformationMethod();
+        super.setSingleLine(false);
+        super.setMaxLines(maxLines);
+        if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
+            setTransformationMethod(transformationMethod);
+        }
+    }
+
+    @Override
+    public void setSingleLine(final boolean singleLine) {
+        if (singleLine) {
+            setSingleLine();
+        } else {
+            setMultiline(Integer.MAX_VALUE);
+        }
+    }
+
+    @Override
+    public void setSingleLine() {
+        final TransformationMethod transformationMethod = getTransformationMethod();
+        super.setSingleLine(true);
+        if (transformationMethod != null) {
+            /*DEBUG if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
+                Lc.w("SingleLineTransformationMethod method ignored because of previous transformation method: " + transformationMethod);
+            }*/
+            setTransformationMethod(transformationMethod);
+        }
+        setLines(1);
+        multiline = false;
+    }
+
+    @Override
+    public void setLines(final int lines) {
+        if (constructed && multiline && lines == 1) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "lines = 1 is illegal if multiline is set to true")));
+            return;
+        }
+        super.setLines(lines);
+    }
+
+    @Override
+    public void setMaxLines(final int maxLines) {
+        if (constructed && !multiline && maxLines > 1) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "maxLines > 1 is illegal if multiline is set to false")));
+            return;
+        }
+        super.setMaxLines(maxLines);
+    }
+
+    @Override
+    public void setMinLines(final int minLines) {
+        if (constructed && !multiline && minLines > 1) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "minLines > 1 is illegal if multiline is set to false")));
+            return;
+        }
+        super.setMinLines(minLines);
+    }
+
+    @Override
+    public final void setIncludeFontPadding(final boolean includeFontPadding) {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(
+                AttributesUtils.viewError(this, "Do not specify font padding as it is hard to make pixel-perfect design with such option")));
+    }
+
+    @Override
+    public void setEllipsize(@NonNull final TextUtils.TruncateAt ellipsis) {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify ellipsize for EditText")));
+    }
+
+    @Override
+    public void setInputType(final int type) {
+        if (AttributesUtils.isNumberInputType(type)) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this,
+                    "Do not specify number InputType for EditText, use phone instead")));
+            super.setInputType(InputType.TYPE_CLASS_PHONE);
+            return;
+        }
+        super.setInputType(type);
+    }
+
+    public void setOnTextChangedListener(@Nullable final OnTextChangedListener onTextChangedListener) {
+        this.onTextChangedListener = onTextChangedListener;
+    }
+
+    /**
+     * Simplified variant of {@link TextWatcher}.
+     */
+    public interface OnTextChangedListener {
+
+        /**
+         * Calls when text have changed.
+         *
+         * @param text New text.
+         */
+        void onTextChanged(@NonNull CharSequence text);
+
+    }
+
+}
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
new file mode 100644
index 0000000..188686c
--- /dev/null
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/TypefacedTextView.java
@@ -0,0 +1,467 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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;
+import android.util.TypedValue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ru.touchin.roboswag.components.utils.UiUtils;
+import ru.touchin.roboswag.components.views.internal.AttributesUtils;
+import ru.touchin.roboswag.core.log.Lc;
+
+/**
+ * Created by Gavriil Sitnikov on 18/07/2014.
+ * TextView that supports custom typeface and forces developer to specify {@link LineStrategy}.
+ * Also in debug mode it has common checks for popular bugs.
+ */
+@SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+//ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
+public class TypefacedTextView extends AppCompatTextView {
+
+    private static final int SIZE_THRESHOLD = 10000;
+
+    private static final int UNSPECIFIED_MEASURE_SPEC = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
+    private static final int START_SCALABLE_DIFFERENCE = 4;
+
+    private static boolean inDebugMode;
+
+    /**
+     * Enables debugging features like checking attributes on inflation.
+     */
+    public static void setInDebugMode() {
+        inDebugMode = true;
+    }
+
+    private boolean constructed;
+    @NonNull
+    private LineStrategy lineStrategy = LineStrategy.SINGLE_LINE_ELLIPSIZE;
+
+    public TypefacedTextView(@NonNull final Context context) {
+        super(context);
+        initialize(context, null);
+    }
+
+    public TypefacedTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        super(context, attrs);
+        initialize(context, attrs);
+    }
+
+    public TypefacedTextView(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
+        super(context, attrs, defStyle);
+        initialize(context, attrs);
+    }
+
+    private void initialize(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        constructed = true;
+        super.setIncludeFontPadding(false);
+        if (attrs != null) {
+            final TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedTextView);
+            final LineStrategy lineStrategy = LineStrategy
+                    .byResIndex(typedArray.getInt(R.styleable.TypefacedTextView_lineStrategy, LineStrategy.MULTILINE_ELLIPSIZE.ordinal()));
+            if (lineStrategy.multiline) {
+                setLineStrategy(lineStrategy, AttributesUtils.getMaxLinesFromAttrs(context, attrs));
+            } else {
+                setLineStrategy(lineStrategy);
+            }
+            typedArray.recycle();
+            if (inDebugMode) {
+                checkAttributes(context, attrs);
+            }
+        }
+    }
+
+    private void checkAttributes(@NonNull final Context context, @NonNull final AttributeSet attrs) {
+        final List<String> errors = new ArrayList<>();
+        LineStrategy lineStrategy = null;
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.TypefacedTextView);
+        AttributesUtils.checkAttribute(typedArray, errors, R.styleable.TypefacedTextView_lineStrategy, true,
+                "lineStrategy required parameter");
+        if (typedArray.hasValue(R.styleable.TypefacedTextView_lineStrategy)) {
+            lineStrategy = LineStrategy.byResIndex(typedArray.getInt(R.styleable.TypefacedTextView_lineStrategy, -1));
+        }
+        typedArray.recycle();
+
+        try {
+            final Class androidRes = Class.forName("com.android.internal.R$styleable");
+
+            typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
+            AttributesUtils.checkRegularTextViewAttributes(typedArray, androidRes, errors, "lineStrategy");
+            checkTextViewSpecificAttributes(typedArray, androidRes, errors);
+
+            if (lineStrategy != null) {
+                checkLineStrategyAttributes(typedArray, androidRes, errors, lineStrategy);
+            }
+        } catch (final Exception exception) {
+            Lc.e(exception, "Error during checking attributes");
+        }
+        AttributesUtils.handleErrors(this, errors);
+        typedArray.recycle();
+    }
+
+    private void checkTextViewSpecificAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
+                                                 @NonNull final List<String> errors)
+            throws NoSuchFieldException, IllegalAccessException {
+
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_phoneNumber"), false,
+                "phoneNumber forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_password"), false,
+                "password forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_numeric"), false,
+                "numeric forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_inputType"), false,
+                "inputType forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeOptions"), false,
+                "imeOptions forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeActionId"), false,
+                "imeActionId forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_imeActionLabel"), false,
+                "imeActionLabel forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_hint"), false,
+                "hint forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_editable"), false,
+                "editable forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_digits"), false,
+                "digits forbid parameter");
+        AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_cursorVisible"), false,
+                "cursorVisible forbid parameter");
+    }
+
+    private void checkLineStrategyAttributes(@NonNull final TypedArray typedArray, @NonNull final Class androidRes,
+                                             @NonNull final List<String> errors, @NonNull final LineStrategy lineStrategy)
+            throws NoSuchFieldException, IllegalAccessException {
+        if (!lineStrategy.scalable) {
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textSize"), true,
+                    "textSize required parameter. If it's dynamic then use '0sp'");
+        }
+        if (lineStrategy.multiline) {
+            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_lines"), -1) == 1) {
+                errors.add("lines should be more than 1 if lineStrategy is true");
+            }
+            if (typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), -1) == 1) {
+                errors.add("maxLines should be more than 1 if lineStrategy is true");
+            }
+        } else {
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_lines"), false,
+                    "remove lines and use lineStrategy");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_maxLines"), false,
+                    "remove maxLines and use lineStrategy");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_minLines"), false,
+                    "remove minLines and use lineStrategy");
+            AttributesUtils.checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textAllCaps"), false,
+                    "remove textAllCaps and use app:textAllCaps");
+        }
+    }
+
+    /**
+     * Sets behavior of text if there is no space for it in one line.
+     *
+     * @param lineStrategy Specific {@link LineStrategy}.
+     */
+    public void setLineStrategy(@NonNull final LineStrategy lineStrategy) {
+        setLineStrategy(lineStrategy, Integer.MAX_VALUE);
+    }
+
+    /**
+     * Sets behavior of text if there is no space for it in one line.
+     *
+     * @param lineStrategy Specific {@link LineStrategy};
+     * @param maxLines     Max lines if line strategy is multiline.
+     */
+    public void setLineStrategy(@NonNull final LineStrategy lineStrategy, final int maxLines) {
+        this.lineStrategy = lineStrategy;
+        final TransformationMethod transformationMethod = getTransformationMethod();
+        super.setSingleLine(!lineStrategy.multiline);
+        if (transformationMethod != null) {
+            /*DEBUG if (!(transformationMethod instanceof SingleLineTransformationMethod)) {
+                Lc.w("SingleLineTransformationMethod method ignored because of previous transformation method: " + transformationMethod);
+            }*/
+            setTransformationMethod(transformationMethod);
+        }
+        if (lineStrategy.multiline) {
+            super.setMaxLines(maxLines);
+        }
+        switch (lineStrategy) {
+            case SINGLE_LINE_ELLIPSIZE:
+            case MULTILINE_ELLIPSIZE:
+                super.setEllipsize(TextUtils.TruncateAt.END);
+                break;
+            case SINGLE_LINE_MARQUEE:
+            case MULTILINE_MARQUEE:
+                super.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+                break;
+            case SINGLE_LINE_AUTO_SCALE:
+                super.setEllipsize(null);
+                break;
+            case SINGLE_LINE_ELLIPSIZE_MIDDLE:
+            case MULTILINE_ELLIPSIZE_MIDDLE:
+                super.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+                break;
+            default:
+                Lc.assertion("Unknown line strategy: " + lineStrategy);
+                break;
+        }
+        if (lineStrategy.scalable) {
+            requestLayout();
+        }
+    }
+
+    /**
+     * Returns behavior of text if there is no space for it in one line.
+     *
+     * @return Specific {@link LineStrategy}.
+     */
+    @NonNull
+    public LineStrategy getLineStrategy() {
+        return lineStrategy;
+    }
+
+    @Override
+    public void setSingleLine() {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify setSingleLine use setLineStrategy instead")));
+    }
+
+    @Override
+    public void setSingleLine(final boolean singleLine) {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify setSingleLine use setLineStrategy instead")));
+    }
+
+    @Override
+    public void setLines(final int lines) {
+        if (constructed && lineStrategy.multiline && lines == 1) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "lines = 1 is illegal if lineStrategy is multiline")));
+            return;
+        }
+        super.setLines(lines);
+    }
+
+    @Override
+    public void setMaxLines(final int maxLines) {
+        if (constructed && !lineStrategy.multiline && maxLines > 1) {
+            Lc.assertion(new IllegalStateException(
+                    AttributesUtils.viewError(this, "maxLines > 1 is illegal if lineStrategy is single line")));
+            return;
+        }
+        super.setMaxLines(maxLines);
+    }
+
+    @Override
+    public final void setIncludeFontPadding(final boolean includeFontPadding) {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(
+                AttributesUtils.viewError(this, "Do not specify font padding as it is hard to make pixel-perfect design with such option")));
+    }
+
+    @Override
+    public void setMinLines(final int minLines) {
+        if (constructed && !lineStrategy.multiline && minLines > 1) {
+            Lc.assertion(new IllegalStateException(
+                    AttributesUtils.viewError(this, "minLines > 1 is illegal if lineStrategy is single line")));
+            return;
+        }
+        super.setMinLines(minLines);
+    }
+
+    @Override
+    public void setEllipsize(@NonNull final TextUtils.TruncateAt ellipsize) {
+        if (!constructed) {
+            return;
+        }
+        Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "Do not specify ellipsize use setLineStrategy instead")));
+    }
+
+    @Override
+    public void setText(@Nullable final CharSequence text, @Nullable final BufferType type) {
+        super.setText(text, type);
+        if (constructed && lineStrategy.scalable) {
+            requestLayout();
+        }
+    }
+
+    @Override
+    public void setTextSize(final float size) {
+        if (constructed && lineStrategy.scalable) {
+            Lc.cutAssertion(new IllegalStateException(AttributesUtils.viewError(this, "textSize call is illegal if lineStrategy is scalable")));
+            return;
+        }
+        super.setTextSize(size);
+    }
+
+    @Override
+    public void setTextSize(final int unit, final float size) {
+        if (constructed && lineStrategy.scalable) {
+            Lc.assertion(new IllegalStateException(AttributesUtils.viewError(this, "textSize call is illegal if lineStrategy is scalable")));
+            return;
+        }
+        super.setTextSize(unit, size);
+    }
+
+    @SuppressLint("WrongCall")
+    //WrongCall: actually this method is always calling from onMeasure
+    private void computeScalableTextSize(final int maxWidth, final int maxHeight) {
+        final int minDifference = (int) UiUtils.OfMetrics.dpToPixels(getContext(), 1);
+        int difference = (int) UiUtils.OfMetrics.dpToPixels(getContext(), START_SCALABLE_DIFFERENCE);
+        ScaleAction scaleAction = ScaleAction.DO_NOTHING;
+        ScaleAction previousScaleAction = ScaleAction.DO_NOTHING;
+        do {
+            switch (scaleAction) {
+                case SCALE_DOWN:
+                    if (difference > minDifference) {
+                        difference -= minDifference;
+                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() - difference));
+                    } else {
+                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() - minDifference));
+                        if (previousScaleAction == ScaleAction.SCALE_UP) {
+                            return;
+                        }
+                    }
+                    break;
+                case SCALE_UP:
+                    if (difference > minDifference) {
+                        difference -= minDifference;
+                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() + difference));
+                    } else {
+                        if (previousScaleAction == ScaleAction.SCALE_DOWN) {
+                            return;
+                        }
+                        super.setTextSize(TypedValue.COMPLEX_UNIT_PX, Math.max(0, getTextSize() + minDifference));
+                    }
+                    break;
+                case DO_NOTHING:
+                default:
+                    break;
+            }
+            super.onMeasure(UNSPECIFIED_MEASURE_SPEC, UNSPECIFIED_MEASURE_SPEC);
+            previousScaleAction = scaleAction;
+            scaleAction = computeScaleAction(maxWidth, maxHeight);
+        }
+        while (scaleAction != ScaleAction.DO_NOTHING);
+    }
+
+    @NonNull
+    private ScaleAction computeScaleAction(final int maxWidth, final int maxHeight) {
+        ScaleAction result = ScaleAction.DO_NOTHING;
+        if (maxWidth < getMeasuredWidth()) {
+            result = ScaleAction.SCALE_DOWN;
+        } else if (maxWidth > getMeasuredWidth()) {
+            result = ScaleAction.SCALE_UP;
+        }
+
+        if (maxHeight < getMeasuredHeight()) {
+            result = ScaleAction.SCALE_DOWN;
+        } else if (maxHeight > getMeasuredHeight() && result != ScaleAction.SCALE_DOWN) {
+            result = ScaleAction.SCALE_UP;
+        }
+        return result;
+    }
+
+    @Override
+    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
+        final int maxWidth = MeasureSpec.getSize(widthMeasureSpec);
+        final int maxHeight = MeasureSpec.getSize(heightMeasureSpec);
+        if (!constructed || !lineStrategy.scalable || (maxWidth <= 0 && maxHeight <= 0) || TextUtils.isEmpty(getText())) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+
+        computeScalableTextSize(MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED ? maxWidth : SIZE_THRESHOLD,
+                MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.UNSPECIFIED ? maxHeight : SIZE_THRESHOLD);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    private enum ScaleAction {
+        SCALE_DOWN,
+        SCALE_UP,
+        DO_NOTHING
+    }
+
+    /**
+     * Specific behavior, mostly based on combination of {@link #getEllipsize()} and {@link #getMaxLines()} to specify how view should show text
+     * if there is no space for it on one line.
+     */
+    public enum LineStrategy {
+
+        /**
+         * Not more than one line and ellipsize text with dots at the end.
+         */
+        SINGLE_LINE_ELLIPSIZE(false, false),
+        /**
+         * Not more than one line and ellipsize text with marquee at the end.
+         */
+        SINGLE_LINE_MARQUEE(false, false),
+        /**
+         * Not more than one line and scale text to maximum possible size.
+         */
+        SINGLE_LINE_AUTO_SCALE(false, true),
+        /**
+         * More than one line and ellipsize text with dots at the end.
+         */
+        MULTILINE_ELLIPSIZE(true, false),
+        /**
+         * More than one line and ellipsize text with marquee at the end.
+         */
+        MULTILINE_MARQUEE(true, false),
+        /**
+         * Not more than one line and ellipsize text with dots in the middle.
+         */
+        SINGLE_LINE_ELLIPSIZE_MIDDLE(false, false),
+        /**
+         * More than one line and ellipsize text with dots in the middle.
+         */
+        MULTILINE_ELLIPSIZE_MIDDLE(true, false);
+
+        @NonNull
+        public static LineStrategy byResIndex(final int resIndex) {
+            if (resIndex < 0 || resIndex >= values().length) {
+                Lc.assertion("Unexpected resIndex " + resIndex);
+                return MULTILINE_ELLIPSIZE;
+            }
+            return values()[resIndex];
+        }
+
+        private final boolean multiline;
+        private final boolean scalable;
+
+        LineStrategy(final boolean multiline, final boolean scalable) {
+            this.multiline = multiline;
+            this.scalable = scalable;
+        }
+
+    }
+
+}
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
new file mode 100644
index 0000000..a8c6474
--- /dev/null
+++ b/views/src/main/java/ru/touchin/roboswag/components/views/internal/AttributesUtils.java
@@ -0,0 +1,170 @@
+/*
+ *  Copyright (c) 2015 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.text.InputType;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+
+import ru.touchin.roboswag.components.utils.UiUtils;
+import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov on 13/06/2016.
+ * Bunch of inner helper library methods to validate attributes of custom views.
+ */
+public final class AttributesUtils {
+
+    /**
+     * Gets static field of class.
+     *
+     * @param resourcesClass Class to get field from;
+     * @param fieldName      name of field;
+     * @param <T>            Type of object that is stored in field;
+     * @return Field value;
+     * @throws NoSuchFieldException   Throws on reflection call;
+     * @throws IllegalAccessException Throws on reflection call.
+     */
+    @NonNull
+    @SuppressWarnings("unchecked")
+    public static <T> T getField(@NonNull final Class resourcesClass, @NonNull final String fieldName)
+            throws NoSuchFieldException, IllegalAccessException {
+        final Field field = resourcesClass.getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return (T) field.get(null);
+    }
+
+    /**
+     * Checks if attribute is in array or not and collecterror if attribute missed.
+     *
+     * @param typedArray  Array of attributes;
+     * @param errors      Errors to collect into;
+     * @param resourceId  Id of attribute;
+     * @param required    Is parameter have to be in array OR it have not to be in;
+     * @param description Description of error.
+     */
+    public static void checkAttribute(
+            @NonNull final TypedArray typedArray,
+            @NonNull final Collection<String> errors,
+            @StyleableRes final int resourceId,
+            final boolean required,
+            @NonNull final String description
+    ) {
+        if ((required && typedArray.hasValue(resourceId))
+                || (!required && !typedArray.hasValue(resourceId))) {
+            return;
+        }
+        errors.add(description);
+    }
+
+    /**
+     * Collects regular {@link android.widget.TextView} errors.
+     *
+     * @param typedArray                Array of attributes;
+     * @param androidRes                Class of styleable attributes;
+     * @param errors                    Errors to collect into;
+     * @param lineStrategyParameterName name of line strategy parameter;
+     * @throws NoSuchFieldException   Throws during getting attribute values through reflection;
+     * @throws IllegalAccessException Throws during getting attribute values through reflection.
+     */
+    public static void checkRegularTextViewAttributes(
+            @NonNull final TypedArray typedArray,
+            @NonNull final Class androidRes,
+            @NonNull final Collection<String> errors,
+            @NonNull final String lineStrategyParameterName
+    )
+            throws NoSuchFieldException, IllegalAccessException {
+        checkAttribute(typedArray, errors, getField(androidRes, "TextView_fontFamily"), true, "fontFamily required parameter");
+        checkAttribute(typedArray, errors, getField(androidRes, "TextView_includeFontPadding"), false, "includeFontPadding forbid parameter");
+        checkAttribute(typedArray, errors, getField(androidRes, "TextView_singleLine"), false,
+                "remove singleLine and use " + lineStrategyParameterName);
+        checkAttribute(typedArray, errors, getField(androidRes, "TextView_ellipsize"), false,
+                "remove ellipsize and use " + lineStrategyParameterName);
+        checkAttribute(typedArray, errors, AttributesUtils.getField(androidRes, "TextView_textColor"), true,
+                "textColor required parameter. If it's dynamic then use 'android:color/transparent'");
+    }
+
+    /**
+     * Inner helper library method to merge errors in string and assert it.
+     *
+     * @param view   View with errors;
+     * @param errors Errors of view.
+     */
+    public static void handleErrors(@NonNull final View view, @NonNull final Collection<String> errors) {
+        if (!errors.isEmpty()) {
+            final String exceptionText = viewError(view, TextUtils.join("\n", errors));
+            Lc.cutAssertion(new ShouldNotHappenException(exceptionText));
+        }
+    }
+
+    /**
+     * Returns max lines attribute value for views extended from {@link android.widget.TextView}.
+     *
+     * @param context Context of attributes;
+     * @param attrs   TextView based attributes;
+     * @return Max lines value.
+     */
+    public static int getMaxLinesFromAttrs(@NonNull final Context context, @NonNull final AttributeSet attrs) {
+        try {
+            final Class androidRes = Class.forName("com.android.internal.R$styleable");
+            final TypedArray typedArray = context.obtainStyledAttributes(attrs, AttributesUtils.getField(androidRes, "TextView"));
+            final int result = typedArray.getInt(AttributesUtils.getField(androidRes, "TextView_maxLines"), Integer.MAX_VALUE);
+            typedArray.recycle();
+            return result;
+        } catch (final Exception exception) {
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    /**
+     * Creates readable view error.
+     *
+     * @param view      View of error;
+     * @param errorText Text of error;
+     * @return Readable error string.
+     */
+    @NonNull
+    public static String viewError(@NonNull final View view, @NonNull final String errorText) {
+        return "Errors for view id=" + UiUtils.OfViews.getViewIdString(view) + ":\n" + errorText;
+    }
+
+    /**
+     * Returns true if input type equals number input type.
+     *
+     * @param inputType Input type to check;
+     * @return true if input type equals number input type.
+     */
+    public static boolean isNumberInputType(final int inputType) {
+        return inputType == InputType.TYPE_CLASS_NUMBER || inputType == InputType.TYPE_DATETIME_VARIATION_NORMAL;
+    }
+
+    private AttributesUtils() {
+    }
+
+}
diff --git a/views/src/main/res/values/attrs.xml b/views/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..43424f2
--- /dev/null
+++ b/views/src/main/res/values/attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="TypefacedTextView">
+        <attr name="lineStrategy" format="enum">
+            <enum name="singleLineEllipsize" value="0"/>
+            <enum name="singleLineMarquee" value="1"/>
+            <enum name="singleLineAutoScale" value="2"/>
+            <enum name="multilineEllipsize" value="3"/>
+            <enum name="multilineMarquee" value="4"/>
+            <enum name="singleLineEllipsizeMiddle" value="5"/>
+            <enum name="multilineLineEllipsizeMiddle" value="6"/>
+        </attr>
+    </declare-styleable>
+
+    <declare-styleable name="TypefacedEditText">
+        <attr name="isMultiline" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="MaterialLoadingBar">
+        <attr name="strokeWidth" format="dimension"/>
+        <attr name="color" format="color"/>
+        <attr name="size" format="dimension"/>
+        <attr name="materialLoadingBarStyle" format="reference"/>
+    </declare-styleable>
+
+</resources>

From 1d6d6d06be09aeb8c1733b0d67f4f8b0e03cef36 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 15:16:24 +0300
Subject: [PATCH 86/95] Gradle for submodules

---
 api-logansquare/build.gradle                  |  2 +-
 lifecycle-common/build.gradle                 |  2 +-
 lifecycle-rx/build.gradle                     |  4 ++--
 .../dispatcher/BaseLiveDataDispatcher.kt      |  8 +++----
 .../livedata/dispatcher/LiveDataDispatcher.kt |  8 +++----
 .../livedata/event/CompletableEvent.kt        |  2 +-
 .../livedata/event/MaybeEvent.kt              |  2 +-
 .../livedata/event/ObservableEvent.kt         |  2 +-
 .../livedata/event/SingleEvent.kt             |  2 +-
 modules.gradle                                | 24 +++++++++++++++++++
 navigation/build.gradle                       |  4 ++--
 settings.gradle                               |  4 +++-
 storable/build.gradle                         |  4 ++--
 views/build.gradle                            |  4 ++--
 14 files changed, 49 insertions(+), 23 deletions(-)
 rename lifecycle-rx/src/main/java/ru/touchin/{ => templates}/livedata/event/CompletableEvent.kt (85%)
 rename lifecycle-rx/src/main/java/ru/touchin/{ => templates}/livedata/event/MaybeEvent.kt (89%)
 rename lifecycle-rx/src/main/java/ru/touchin/{ => templates}/livedata/event/ObservableEvent.kt (90%)
 rename lifecycle-rx/src/main/java/ru/touchin/{ => templates}/livedata/event/SingleEvent.kt (88%)
 create mode 100644 modules.gradle

diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle
index 9daa9da..aa39db6 100644
--- a/api-logansquare/build.gradle
+++ b/api-logansquare/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api project(":storable")
+    api project(":components-storable")
     api 'net.danlew:android.joda:2.9.9.4'
 
     implementation "com.android.support:support-annotations:$versions.supportLibrary"
diff --git a/lifecycle-common/build.gradle b/lifecycle-common/build.gradle
index e7ab339..76f9f0c 100644
--- a/lifecycle-common/build.gradle
+++ b/lifecycle-common/build.gradle
@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    api project(":navigation")
+    api project(":components-navigation")
 
     compileOnly "javax.inject:javax.inject:1"
 
diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle
index 0956030..67f0308 100644
--- a/lifecycle-rx/build.gradle
+++ b/lifecycle-rx/build.gradle
@@ -10,8 +10,8 @@ android {
 }
 
 dependencies {
-    api project(":utils")
-    api project(":logging")
+    api project(":components-utils")
+    api project(":components-logging")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
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 afcc376..dc6f5f4 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
@@ -9,10 +9,10 @@ import io.reactivex.Single
 import io.reactivex.disposables.Disposable
 import ru.touchin.livedata.destroyable.BaseDestroyable
 import ru.touchin.livedata.destroyable.Destroyable
-import ru.touchin.livedata.event.CompletableEvent
-import ru.touchin.livedata.event.MaybeEvent
-import ru.touchin.livedata.event.ObservableEvent
-import ru.touchin.livedata.event.SingleEvent
+import ru.touchin.templates.livedata.event.CompletableEvent
+import ru.touchin.templates.livedata.event.MaybeEvent
+import ru.touchin.templates.livedata.event.ObservableEvent
+import ru.touchin.templates.livedata.event.SingleEvent
 
 class BaseLiveDataDispatcher(private val destroyable: BaseDestroyable = BaseDestroyable()) : LiveDataDispatcher, Destroyable by destroyable {
 
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 e1d7d8f..8ef3510 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
@@ -7,10 +7,10 @@ import io.reactivex.Maybe
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.disposables.Disposable
-import ru.touchin.livedata.event.CompletableEvent
-import ru.touchin.livedata.event.MaybeEvent
-import ru.touchin.livedata.event.ObservableEvent
-import ru.touchin.livedata.event.SingleEvent
+import ru.touchin.templates.livedata.event.CompletableEvent
+import ru.touchin.templates.livedata.event.MaybeEvent
+import ru.touchin.templates.livedata.event.ObservableEvent
+import ru.touchin.templates.livedata.event.SingleEvent
 
 interface LiveDataDispatcher {
 
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt
similarity index 85%
rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt
rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt
index d0832ef..05fa013 100644
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/CompletableEvent.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/CompletableEvent.kt
@@ -1,4 +1,4 @@
-package ru.touchin.livedata.event
+package ru.touchin.templates.livedata.event
 
 /**
  * Event class that emits from [io.reactivex.Completable].
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt
similarity index 89%
rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt
rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt
index 0f88077..779fa5e 100644
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/MaybeEvent.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/MaybeEvent.kt
@@ -1,4 +1,4 @@
-package ru.touchin.livedata.event
+package ru.touchin.templates.livedata.event
 
 /**
  * Event class that emits from [io.reactivex.Maybe].
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt
similarity index 90%
rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt
rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt
index 5a6b8e2..02373d5 100644
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/ObservableEvent.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/ObservableEvent.kt
@@ -1,4 +1,4 @@
-package ru.touchin.livedata.event
+package ru.touchin.templates.livedata.event
 
 /**
  * Event class that emits from [io.reactivex.Observable].
diff --git a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt
similarity index 88%
rename from lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt
rename to lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt
index 8b53f63..f023393 100644
--- a/lifecycle-rx/src/main/java/ru/touchin/livedata/event/SingleEvent.kt
+++ b/lifecycle-rx/src/main/java/ru/touchin/templates/livedata/event/SingleEvent.kt
@@ -1,4 +1,4 @@
-package ru.touchin.livedata.event
+package ru.touchin.templates.livedata.event
 
 /**
  * Event class that emits from [io.reactivex.Single].
diff --git a/modules.gradle b/modules.gradle
new file mode 100644
index 0000000..fa997e9
--- /dev/null
+++ b/modules.gradle
@@ -0,0 +1,24 @@
+final String rootDir
+if (gradle.ext.has('componentsRoot')) {
+    rootDir = gradle.ext['componentsRoot']
+} else {
+    rootDir = settingsDir
+}
+
+include ':components-logging'
+include ':components-utils'
+include ':components-navigation'
+include ':components-storable'
+include ':components-api-logansquare'
+include ':components-lifecycle-common'
+include ':components-lifecycle-rx'
+include ':components-views'
+
+project(':components-utils').projectDir = new File(rootDir, 'utils')
+project(':components-logging').projectDir = new File(rootDir, 'logging')
+project(':components-navigation').projectDir = new File(rootDir, 'navigation')
+project(':components-storable').projectDir = new File(rootDir, 'storable')
+project(':components-api-logansquare').projectDir = new File(rootDir, 'api-logansquare')
+project(':components-lifecycle-common').projectDir = new File(rootDir, 'lifecycle-common')
+project(':components-lifecycle-rx').projectDir = new File(rootDir, 'lifecycle-rx')
+project(':components-views').projectDir = new File(rootDir, 'views')
diff --git a/navigation/build.gradle b/navigation/build.gradle
index 8a95e1c..43b0e28 100644
--- a/navigation/build.gradle
+++ b/navigation/build.gradle
@@ -15,8 +15,8 @@ android {
 }
 
 dependencies {
-    api project(":utils")
-    api project(":logging")
+    api project(":components-utils")
+    api project(":components-logging")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
diff --git a/settings.gradle b/settings.gradle
index 3e31f83..c8a70f0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,3 @@
-include ':sample', ':utils', ':logging', ':navigation', ':storable', ':api-logansquare', ':lifecycle-common', ':lifecycle-rx', ':views'
+apply from: 'modules.gradle'
+
+include 'sample'
diff --git a/storable/build.gradle b/storable/build.gradle
index 18cb730..3afe4ee 100644
--- a/storable/build.gradle
+++ b/storable/build.gradle
@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    api project(":utils")
-    api project(":logging")
+    api project(":components-utils")
+    api project(":components-logging")
 
     implementation "com.android.support:support-annotations:$versions.supportLibrary"
 
diff --git a/views/build.gradle b/views/build.gradle
index 9ea4f9e..992dbea 100644
--- a/views/build.gradle
+++ b/views/build.gradle
@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    api project(":utils")
-    api project(":logging")
+    api project(":components-utils")
+    api project(":components-logging")
 
     implementation "com.android.support:design:$versions.supportLibrary"
 }

From 7be175f7501be3eadcb052952691d7974ad74151 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 16:45:56 +0300
Subject: [PATCH 87/95] Added modules: recyclerview-adapters, kotlin-extensions

---
 api-logansquare/build.gradle                  |  2 +-
 kotlin-extensions/.gitignore                  |  1 +
 kotlin-extensions/build.gradle                | 16 ++++
 .../src/main/AndroidManifest.xml              |  2 +
 .../components/extensions/Delegates.kt        | 24 +++++
 .../roboswag/components/extensions/View.kt    | 20 ++++
 .../components/extensions/ViewHolder.kt       | 32 +++++++
 lifecycle-common/build.gradle                 |  2 +-
 lifecycle-rx/build.gradle                     |  4 +-
 modules.gradle                                | 36 +++----
 navigation/build.gradle                       |  4 +-
 recyclerview-adapters/.gitignore              |  1 +
 recyclerview-adapters/build.gradle            | 18 ++++
 .../src/main/AndroidManifest.xml              |  2 +
 .../components/adapters/AdapterDelegate.java  | 96 +++++++++++++++++++
 .../components/adapters/DelegatesManager.kt   | 52 ++++++++++
 .../adapters/DelegationListAdapter.kt         | 89 +++++++++++++++++
 .../adapters/ItemAdapterDelegate.java         | 85 ++++++++++++++++
 .../adapters/OffsetAdapterUpdateCallback.kt   | 24 +++++
 .../adapters/PositionAdapterDelegate.java     | 68 +++++++++++++
 storable/build.gradle                         |  4 +-
 views/build.gradle                            |  4 +-
 22 files changed, 560 insertions(+), 26 deletions(-)
 create mode 100644 kotlin-extensions/.gitignore
 create mode 100644 kotlin-extensions/build.gradle
 create mode 100644 kotlin-extensions/src/main/AndroidManifest.xml
 create mode 100644 kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
 create mode 100644 kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
 create mode 100644 kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
 create mode 100644 recyclerview-adapters/.gitignore
 create mode 100644 recyclerview-adapters/build.gradle
 create mode 100644 recyclerview-adapters/src/main/AndroidManifest.xml
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
 create mode 100644 recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java

diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle
index aa39db6..9daa9da 100644
--- a/api-logansquare/build.gradle
+++ b/api-logansquare/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api project(":components-storable")
+    api project(":storable")
     api 'net.danlew:android.joda:2.9.9.4'
 
     implementation "com.android.support:support-annotations:$versions.supportLibrary"
diff --git a/kotlin-extensions/.gitignore b/kotlin-extensions/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/kotlin-extensions/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/kotlin-extensions/build.gradle b/kotlin-extensions/build.gradle
new file mode 100644
index 0000000..bcc6129
--- /dev/null
+++ b/kotlin-extensions/build.gradle
@@ -0,0 +1,16 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.android.support:recyclerview-v7:$versions.supportLibrary"
+}
diff --git a/kotlin-extensions/src/main/AndroidManifest.xml b/kotlin-extensions/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..25060ad
--- /dev/null
+++ b/kotlin-extensions/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest
+    package="ru.touchin.roboswag.components.extensions"/>
diff --git a/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
new file mode 100644
index 0000000..050bd6b
--- /dev/null
+++ b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/Delegates.kt
@@ -0,0 +1,24 @@
+package ru.touchin.roboswag.components.extensions
+
+import kotlin.properties.Delegates
+import kotlin.properties.ObservableProperty
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * Simple observable delegate only for notification of new value.
+ */
+inline fun <T> Delegates.observable(
+        initialValue: T,
+        crossinline onChange: (newValue: T) -> Unit
+): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
+    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) = onChange(newValue)
+}
+
+inline fun <T> Delegates.distinctUntilChanged(
+        initialValue: T,
+        crossinline onChange: (newValue: T) -> Unit
+): ReadWriteProperty<Any?, T> = object : ObservableProperty<T>(initialValue) {
+    override fun afterChange(property: KProperty<*>, oldValue: T, newValue: T) =
+            if (newValue != null && oldValue != newValue) onChange(newValue) else Unit
+}
diff --git a/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/View.kt b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
new file mode 100644
index 0000000..9f4ddca
--- /dev/null
+++ b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/View.kt
@@ -0,0 +1,20 @@
+package ru.touchin.roboswag.components.extensions
+
+import android.os.Build
+import android.view.View
+
+private const val RIPPLE_EFFECT_DELAY = 150L
+
+/**
+ * Sets click listener to view. On click it will call something after delay.
+ *
+ * @param delay     Delay after which click listener will be called;
+ * @param listener  Click listener.
+ */
+fun View.setOnRippleClickListener(delay: Long = RIPPLE_EFFECT_DELAY, listener: (View) -> Unit) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        setOnClickListener { view -> postDelayed({ if (hasWindowFocus()) listener(view) }, delay) }
+    } else {
+        setOnClickListener(listener)
+    }
+}
diff --git a/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
new file mode 100644
index 0000000..db7165f
--- /dev/null
+++ b/kotlin-extensions/src/main/java/ru/touchin/roboswag/components/extensions/ViewHolder.kt
@@ -0,0 +1,32 @@
+package ru.touchin.roboswag.components.extensions
+
+import android.content.Context
+import android.content.res.ColorStateList
+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.StringRes
+import android.support.v4.content.ContextCompat
+import android.support.v7.widget.RecyclerView
+import android.view.View
+
+fun <T : View> RecyclerView.ViewHolder.findViewById(@IdRes resId: Int): T = itemView.findViewById(resId)
+
+val RecyclerView.ViewHolder.context: Context
+    get() = itemView.context
+
+fun RecyclerView.ViewHolder.getText(@StringRes resId: Int): CharSequence = context.getText(resId)
+
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int): String = context.getString(resId)
+
+@SuppressWarnings("SpreadOperator") // it's OK for small arrays
+fun RecyclerView.ViewHolder.getString(@StringRes resId: Int, vararg args: Any): String = context.getString(resId, *args)
+
+@ColorInt
+fun RecyclerView.ViewHolder.getColor(@ColorRes resId: Int): Int = ContextCompat.getColor(context, resId)
+
+fun RecyclerView.ViewHolder.getColorStateList(@ColorRes resId: Int): ColorStateList? = ContextCompat.getColorStateList(context, resId)
+
+fun RecyclerView.ViewHolder.getDrawable(@DrawableRes resId: Int): Drawable? = ContextCompat.getDrawable(context, resId)
diff --git a/lifecycle-common/build.gradle b/lifecycle-common/build.gradle
index 76f9f0c..e7ab339 100644
--- a/lifecycle-common/build.gradle
+++ b/lifecycle-common/build.gradle
@@ -15,7 +15,7 @@ android {
 }
 
 dependencies {
-    api project(":components-navigation")
+    api project(":navigation")
 
     compileOnly "javax.inject:javax.inject:1"
 
diff --git a/lifecycle-rx/build.gradle b/lifecycle-rx/build.gradle
index 67f0308..0956030 100644
--- a/lifecycle-rx/build.gradle
+++ b/lifecycle-rx/build.gradle
@@ -10,8 +10,8 @@ android {
 }
 
 dependencies {
-    api project(":components-utils")
-    api project(":components-logging")
+    api project(":utils")
+    api project(":logging")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
diff --git a/modules.gradle b/modules.gradle
index fa997e9..9b11a59 100644
--- a/modules.gradle
+++ b/modules.gradle
@@ -5,20 +5,24 @@ if (gradle.ext.has('componentsRoot')) {
     rootDir = settingsDir
 }
 
-include ':components-logging'
-include ':components-utils'
-include ':components-navigation'
-include ':components-storable'
-include ':components-api-logansquare'
-include ':components-lifecycle-common'
-include ':components-lifecycle-rx'
-include ':components-views'
+include ':logging'
+include ':utils'
+include ':navigation'
+include ':storable'
+include ':api-logansquare'
+include ':lifecycle-common'
+include ':lifecycle-rx'
+include ':views'
+include ':recyclerview-adapters'
+include ':kotlin-extensions'
 
-project(':components-utils').projectDir = new File(rootDir, 'utils')
-project(':components-logging').projectDir = new File(rootDir, 'logging')
-project(':components-navigation').projectDir = new File(rootDir, 'navigation')
-project(':components-storable').projectDir = new File(rootDir, 'storable')
-project(':components-api-logansquare').projectDir = new File(rootDir, 'api-logansquare')
-project(':components-lifecycle-common').projectDir = new File(rootDir, 'lifecycle-common')
-project(':components-lifecycle-rx').projectDir = new File(rootDir, 'lifecycle-rx')
-project(':components-views').projectDir = new File(rootDir, 'views')
+project(':utils').projectDir = new File(rootDir, 'utils')
+project(':logging').projectDir = new File(rootDir, 'logging')
+project(':navigation').projectDir = new File(rootDir, 'navigation')
+project(':storable').projectDir = new File(rootDir, 'storable')
+project(':api-logansquare').projectDir = new File(rootDir, 'api-logansquare')
+project(':lifecycle-common').projectDir = new File(rootDir, 'lifecycle-common')
+project(':lifecycle-rx').projectDir = new File(rootDir, 'lifecycle-rx')
+project(':views').projectDir = new File(rootDir, 'views')
+project(':recyclerview-adapters').projectDir = new File(rootDir, 'recyclerview-adapters')
+project(':kotlin-extensions').projectDir = new File(rootDir, 'kotlin-extensions')
diff --git a/navigation/build.gradle b/navigation/build.gradle
index 43b0e28..8a95e1c 100644
--- a/navigation/build.gradle
+++ b/navigation/build.gradle
@@ -15,8 +15,8 @@ android {
 }
 
 dependencies {
-    api project(":components-utils")
-    api project(":components-logging")
+    api project(":utils")
+    api project(":logging")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
diff --git a/recyclerview-adapters/.gitignore b/recyclerview-adapters/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/recyclerview-adapters/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/recyclerview-adapters/build.gradle b/recyclerview-adapters/build.gradle
new file mode 100644
index 0000000..12fc082
--- /dev/null
+++ b/recyclerview-adapters/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+}
+
+dependencies {
+    api project(':kotlin-extensions')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    implementation "com.android.support:recyclerview-v7:$versions.supportLibrary"
+}
diff --git a/recyclerview-adapters/src/main/AndroidManifest.xml b/recyclerview-adapters/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2228245
--- /dev/null
+++ b/recyclerview-adapters/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest
+    package="ru.touchin.roboswag.components.adapters"/>
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
new file mode 100644
index 0000000..25be0c9
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/AdapterDelegate.java
@@ -0,0 +1,96 @@
+/*
+ *  Copyright (c) 2017 RoboSwag (Gavriil Sitnikov, Vsevolod Ivanov)
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.roboswag.components.adapters;
+
+import android.support.annotation.NonNull;
+import android.support.v4.view.ViewCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+/**
+ * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
+ * Default {@link #getItemViewType} is generating on construction of object.
+ *
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
+ */
+public abstract class AdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> {
+
+    private final int defaultItemViewType = ViewCompat.generateViewId();
+
+    /**
+     * Unique ID of AdapterDelegate.
+     *
+     * @return Unique ID.
+     */
+    public int getItemViewType() {
+        return defaultItemViewType;
+    }
+
+    /**
+     * Returns if object is processable by this delegate.
+     *
+     * @param items                  Items to check;
+     * @param adapterPosition        Position of item in adapter;
+     * @param collectionPosition     Position of item in collection;
+     * @return True if item is processable by this delegate.
+     */
+    public abstract boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition);
+
+    /**
+     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
+     *
+     * @param items                Items in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection;
+     * @return Unique item ID.
+     */
+    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return 0;
+    }
+
+    /**
+     * Creates ViewHolder to bind item to it later.
+     *
+     * @param parent Container of ViewHolder's view.
+     * @return New ViewHolder.
+     */
+    @NonNull
+    public abstract TViewHolder onCreateViewHolder(@NonNull final ViewGroup parent);
+
+    /**
+     * Binds item to created by this object ViewHolder.
+     *
+     * @param holder               ViewHolder to bind item to;
+     * @param items                Items in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
+     * @param payloads             Payloads;
+     */
+    public abstract void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    );
+
+}
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
new file mode 100644
index 0000000..e3ba14f
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegatesManager.kt
@@ -0,0 +1,52 @@
+package ru.touchin.roboswag.components.adapters
+
+import android.support.v7.widget.RecyclerView
+import android.util.SparseArray
+import android.view.ViewGroup
+
+/**
+ * Manager for delegation callbacks from [RecyclerView.Adapter] to delegates.
+ */
+class DelegatesManager {
+
+    private val delegates = SparseArray<AdapterDelegate<*>>()
+
+    fun getItemViewType(items: List<*>, adapterPosition: Int, collectionPosition: Int): Int {
+        for (index in 0 until delegates.size()) {
+            val delegate = delegates.valueAt(index)
+            if (delegate.isForViewType(items, adapterPosition, collectionPosition)) {
+                return delegate.itemViewType
+            }
+        }
+        throw IllegalStateException("Delegate not found for adapterPosition: $adapterPosition")
+    }
+
+    fun getItemId(items: List<*>, adapterPosition: Int, collectionPosition: Int): Long {
+        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
+        return delegate.getItemId(items, adapterPosition, collectionPosition)
+    }
+
+    fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder = getDelegate(viewType).onCreateViewHolder(parent)
+
+    fun onBindViewHolder(holder: RecyclerView.ViewHolder, items: List<*>, adapterPosition: Int, collectionPosition: Int, payloads: List<Any>) {
+        val delegate = getDelegate(getItemViewType(items, adapterPosition, collectionPosition))
+        delegate.onBindViewHolder(holder, items, adapterPosition, collectionPosition, payloads)
+    }
+
+    /**
+     * Adds [PositionAdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: AdapterDelegate<*>) = delegates.put(delegate.itemViewType, delegate)
+
+    /**
+     * Removes [AdapterDelegate] from adapter.
+     *
+     * @param delegate Delegate to remove.
+     */
+    fun removeDelegate(delegate: AdapterDelegate<*>) = delegates.remove(delegate.itemViewType)
+
+    private fun getDelegate(viewType: Int) = delegates[viewType] ?: throw IllegalStateException("No AdapterDelegate added for view type: $viewType")
+
+}
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
new file mode 100644
index 0000000..094b298
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/DelegationListAdapter.kt
@@ -0,0 +1,89 @@
+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 android.view.ViewGroup
+import ru.touchin.roboswag.components.extensions.setOnRippleClickListener
+
+/**
+ * Base adapter with delegation and diff computing on background thread.
+ */
+open class DelegationListAdapter<TItem>(config: AsyncDifferConfig<TItem>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    constructor(diffCallback: DiffUtil.ItemCallback<TItem>) : this(AsyncDifferConfig.Builder<TItem>(diffCallback).build())
+
+    var itemClickListener: ((TItem, RecyclerView.ViewHolder) -> Unit)? = null
+
+    private val delegatesManager = DelegatesManager()
+    private var differ = AsyncListDiffer(OffsetAdapterUpdateCallback(this, ::getHeadersCount), config)
+
+    open fun getHeadersCount() = 0
+
+    open fun getFootersCount() = 0
+
+    override fun getItemCount() = getHeadersCount() + getList().size + getFootersCount()
+
+    override fun getItemViewType(position: Int) = delegatesManager.getItemViewType(getList(), position, getCollectionPosition(position))
+
+    override fun getItemId(position: Int) = delegatesManager.getItemId(getList(), position, getCollectionPosition(position))
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = delegatesManager.onCreateViewHolder(parent, viewType)
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: List<Any>) {
+        val collectionPosition = getCollectionPosition(position)
+        if (collectionPosition in 0 until getList().size) {
+            if (itemClickListener != null) {
+                holder.itemView.setOnRippleClickListener {
+                    itemClickListener?.invoke(getList()[getCollectionPosition(holder.adapterPosition)], holder)
+                }
+            } else {
+                holder.itemView.setOnClickListener(null)
+            }
+        }
+        delegatesManager.onBindViewHolder(holder, getList(), position, collectionPosition, payloads)
+    }
+
+    final override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) = Unit
+
+    /**
+     * Adds [AdapterDelegate] to adapter.
+     *
+     * @param delegate Delegate to add.
+     */
+    fun addDelegate(delegate: AdapterDelegate<*>) = delegatesManager.addDelegate(delegate)
+
+    /**
+     * Removes [AdapterDelegate] from adapter.
+     *
+     * @param delegate Delegate to remove.
+     */
+    fun removeDelegate(delegate: AdapterDelegate<*>) = delegatesManager.removeDelegate(delegate)
+
+    /**
+     * Submits a new list to be diffed, and displayed.
+     *
+     * If a list is already being displayed, a diff will be computed on a background thread, which
+     * will dispatch Adapter.notifyItem events on the main thread.
+     *
+     * @param list The new list to be displayed.
+     */
+    fun submitList(list: List<TItem>) = differ.submitList(list)
+
+    /**
+     * Get the current List - any diffing to present this list has already been computed and
+     * dispatched via the ListUpdateCallback.
+     * <p>
+     * If a <code>null</code> List, or no List has been submitted, an empty list will be returned.
+     * <p>
+     * The returned list may not be mutated - mutations to content must be done through
+     * {@link #submitList(List)}.
+     *
+     * @return current List.
+     */
+    fun getList(): List<TItem> = differ.currentList
+
+    fun getCollectionPosition(adapterPosition: Int) = adapterPosition - getHeadersCount()
+
+}
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
new file mode 100644
index 0000000..324bcf4
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/ItemAdapterDelegate.java
@@ -0,0 +1,85 @@
+package ru.touchin.roboswag.components.adapters;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+
+import java.util.List;
+
+/**
+ * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
+ * Such delegates are creating and binding ViewHolders for specific items.
+ * Default {@link #getItemViewType} is generating on construction of object.
+ *
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate;
+ * @param <TItem>       Type of items to bind to {@link RecyclerView.ViewHolder}s.
+ */
+public abstract class ItemAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder, TItem> extends AdapterDelegate<TViewHolder> {
+
+    @Override
+    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return collectionPosition >= 0
+                && collectionPosition < items.size()
+                && isForViewType(items.get(collectionPosition), adapterPosition, collectionPosition);
+    }
+
+    /**
+     * Returns if object is processable by this delegate.
+     * This item will be casted to {@link TItem} and passes to {@link #onBindViewHolder(TViewHolder, TItem, int, int, List)}.
+     *
+     * @param item                  Item to check;
+     * @param adapterPosition       Position of item in adapter;
+     * @param collectionPosition    Position of item in collection that contains item;
+     * @return True if item is processable by this delegate.
+     */
+    public boolean isForViewType(@NonNull final Object item, final int adapterPosition, final int collectionPosition) {
+        return true;
+    }
+
+    @Override
+    public long getItemId(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        //noinspection unchecked
+        return getItemId((TItem) items.get(collectionPosition), adapterPosition, collectionPosition);
+    }
+
+    /**
+     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
+     *
+     * @param item                 Item in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
+     * @return Unique item ID.
+     */
+    public long getItemId(@NonNull final TItem item, final int adapterPosition, final int collectionPosition) {
+        return 0;
+    }
+
+    @Override
+    public void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    ) {
+        //noinspection unchecked
+        onBindViewHolder((TViewHolder) holder, (TItem) items.get(collectionPosition), adapterPosition, collectionPosition, payloads);
+    }
+
+    /**
+     * Binds item with payloads to created by this object ViewHolder.
+     *
+     * @param holder               ViewHolder to bind item to;
+     * @param item                 Item in adapter;
+     * @param adapterPosition      Position of item in adapter;
+     * @param collectionPosition   Position of item in collection that contains item;
+     * @param payloads             Payloads;
+     */
+    public abstract void onBindViewHolder(
+            @NonNull final TViewHolder holder,
+            @NonNull final TItem item,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    );
+
+}
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
new file mode 100644
index 0000000..9715eb2
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/OffsetAdapterUpdateCallback.kt
@@ -0,0 +1,24 @@
+package ru.touchin.roboswag.components.adapters
+
+import android.support.v7.util.ListUpdateCallback
+import android.support.v7.widget.RecyclerView
+
+class OffsetAdapterUpdateCallback(private val adapter: RecyclerView.Adapter<*>, private val offsetProvider: () -> Int) : ListUpdateCallback  {
+
+    override fun onInserted(position: Int, count: Int) {
+        adapter.notifyItemRangeInserted(position + offsetProvider(), count)
+    }
+
+    override fun onRemoved(position: Int, count: Int) {
+        adapter.notifyItemRangeRemoved(position + offsetProvider(), count)
+    }
+
+    override fun onMoved(fromPosition: Int, toPosition: Int) {
+        adapter.notifyItemMoved(fromPosition + offsetProvider(), toPosition + offsetProvider())
+    }
+
+    override fun onChanged(position: Int, count: Int, payload: Any?) {
+        adapter.notifyItemRangeChanged(position + offsetProvider(), count, payload)
+    }
+
+}
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
new file mode 100644
index 0000000..ada8888
--- /dev/null
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/components/adapters/PositionAdapterDelegate.java
@@ -0,0 +1,68 @@
+package ru.touchin.roboswag.components.adapters;
+
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+
+import java.util.List;
+
+/**
+ * Objects of such class controls creation and binding of specific type of RecyclerView's ViewHolders.
+ * Such delegates are creating and binding ViewHolders by position in adapter.
+ * Default {@link #getItemViewType} is generating on construction of object.
+ *
+ * @param <TViewHolder> Type of {@link RecyclerView.ViewHolder} of delegate.
+ */
+public abstract class PositionAdapterDelegate<TViewHolder extends RecyclerView.ViewHolder> extends AdapterDelegate<TViewHolder> {
+
+    @Override
+    public boolean isForViewType(@NonNull final List<Object> items, final int adapterPosition, final int collectionPosition) {
+        return isForViewType(adapterPosition);
+    }
+
+    /**
+     * Returns if object is processable by this delegate.
+     *
+     * @param adapterPosition Position of item in adapter;
+     * @return True if item is processable by this delegate.
+     */
+    public abstract boolean isForViewType(final int adapterPosition);
+
+    @Override
+    public long getItemId(@NonNull final List<Object> objects, final int adapterPosition, final int itemsOffset) {
+        return getItemId(adapterPosition);
+    }
+
+    /**
+     * Returns unique ID of item to support stable ID's logic of RecyclerView's adapter.
+     *
+     * @param adapterPosition Position of item in adapter;
+     * @return Unique item ID.
+     */
+    public long getItemId(final int adapterPosition) {
+        return 0;
+    }
+
+    @Override
+    public void onBindViewHolder(
+            @NonNull final RecyclerView.ViewHolder holder,
+            @NonNull final List<Object> items,
+            final int adapterPosition,
+            final int collectionPosition,
+            @NonNull final List<Object> payloads
+    ) {
+        //noinspection unchecked
+        onBindViewHolder((TViewHolder) holder, adapterPosition, payloads);
+    }
+
+    /**
+     * Binds position with payloads to ViewHolder.
+     *
+     * @param holder            ViewHolder to bind position to;
+     * @param adapterPosition   Position of item in adapter;
+     * @param payloads          Payloads.
+     */
+    public void onBindViewHolder(@NonNull final TViewHolder holder, final int adapterPosition, @NonNull final List<Object> payloads) {
+        //do nothing by default
+    }
+
+}
diff --git a/storable/build.gradle b/storable/build.gradle
index 3afe4ee..18cb730 100644
--- a/storable/build.gradle
+++ b/storable/build.gradle
@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    api project(":components-utils")
-    api project(":components-logging")
+    api project(":utils")
+    api project(":logging")
 
     implementation "com.android.support:support-annotations:$versions.supportLibrary"
 
diff --git a/views/build.gradle b/views/build.gradle
index 992dbea..9ea4f9e 100644
--- a/views/build.gradle
+++ b/views/build.gradle
@@ -14,8 +14,8 @@ android {
 }
 
 dependencies {
-    api project(":components-utils")
-    api project(":components-logging")
+    api project(":utils")
+    api project(":logging")
 
     implementation "com.android.support:design:$versions.supportLibrary"
 }

From b68c651e6ad99666639a61926a63ea25f2a2eb75 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 19:08:21 +0300
Subject: [PATCH 88/95] Added templates module

---
 api-logansquare/build.gradle                  |   4 -
 build.gradle                                  |   4 +-
 modules.gradle                                |   2 +
 templates/.gitignore                          |   1 +
 templates/build.gradle                        |  31 ++++
 templates/src/main/AndroidManifest.xml        |   3 +
 .../ru/touchin/templates/TouchinActivity.java |  70 +++++++++
 .../java/ru/touchin/templates/TouchinApp.java | 146 ++++++++++++++++++
 .../components/views/TypefacedEditText.java   |  16 +-
 .../components/views/TypefacedTextView.java   |  11 +-
 10 files changed, 258 insertions(+), 30 deletions(-)
 create mode 100644 templates/.gitignore
 create mode 100644 templates/build.gradle
 create mode 100644 templates/src/main/AndroidManifest.xml
 create mode 100644 templates/src/main/java/ru/touchin/templates/TouchinActivity.java
 create mode 100644 templates/src/main/java/ru/touchin/templates/TouchinApp.java

diff --git a/api-logansquare/build.gradle b/api-logansquare/build.gradle
index 9daa9da..3e774b1 100644
--- a/api-logansquare/build.gradle
+++ b/api-logansquare/build.gradle
@@ -13,10 +13,6 @@ android {
     }
 }
 
-repositories {
-    maven { url "http://dl.bintray.com/touchin/touchin-tools" }
-}
-
 dependencies {
     api project(":storable")
     api 'net.danlew:android.joda:2.9.9.4'
diff --git a/build.gradle b/build.gradle
index d489a4e..ae4e81d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "http://dl.bintray.com/touchin/touchin-tools" }
     }
 }
 
@@ -31,6 +32,7 @@ ext {
             dagger        : '2.16',
             retrofit      : '2.4.0',
             rxJava        : '2.1.17',
-            rxAndroid     : '2.0.2'
+            rxAndroid     : '2.0.2',
+            crashlytics   : '2.9.4'
     ]
 }
diff --git a/modules.gradle b/modules.gradle
index 9b11a59..750126e 100644
--- a/modules.gradle
+++ b/modules.gradle
@@ -15,6 +15,7 @@ include ':lifecycle-rx'
 include ':views'
 include ':recyclerview-adapters'
 include ':kotlin-extensions'
+include ':templates'
 
 project(':utils').projectDir = new File(rootDir, 'utils')
 project(':logging').projectDir = new File(rootDir, 'logging')
@@ -26,3 +27,4 @@ project(':lifecycle-rx').projectDir = new File(rootDir, 'lifecycle-rx')
 project(':views').projectDir = new File(rootDir, 'views')
 project(':recyclerview-adapters').projectDir = new File(rootDir, 'recyclerview-adapters')
 project(':kotlin-extensions').projectDir = new File(rootDir, 'kotlin-extensions')
+project(':templates').projectDir = new File(rootDir, 'templates')
diff --git a/templates/.gitignore b/templates/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/templates/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/templates/build.gradle b/templates/build.gradle
new file mode 100644
index 0000000..1ee1e3b
--- /dev/null
+++ b/templates/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api project(":utils")
+    api project(":logging")
+    api project(":api-logansquare")
+    api project(":navigation")
+
+    api 'com.android.support:multidex:1.0.3'
+
+    api 'net.danlew:android.joda:2.9.9.4'
+
+    implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
+
+    implementation("com.crashlytics.sdk.android:crashlytics:$versions.crashlytics@aar") {
+        transitive = true
+    }
+}
diff --git a/templates/src/main/AndroidManifest.xml b/templates/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..ad64e1e
--- /dev/null
+++ b/templates/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.touchin.templates"/>
diff --git a/templates/src/main/java/ru/touchin/templates/TouchinActivity.java b/templates/src/main/java/ru/touchin/templates/TouchinActivity.java
new file mode 100644
index 0000000..41b2e28
--- /dev/null
+++ b/templates/src/main/java/ru/touchin/templates/TouchinActivity.java
@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package ru.touchin.templates;
+
+import android.app.ActivityManager;
+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 ru.touchin.roboswag.components.navigation.activities.BaseActivity;
+import ru.touchin.roboswag.core.log.Lc;
+
+/**
+ * Created by Gavriil Sitnikov on 11/03/16.
+ * Base class of activity to extends for Touch Instinct related projects.
+ */
+public abstract class TouchinActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Possible work around for market launches. See http://code.google.com/p/android/issues/detail?id=2373
+        // for more details. Essentially, the market launches the main activity on top of other activities.
+        // we never want this to happen. Instead, we check if we are the root and if not, we finish.
+        if (!isTaskRoot() && getIntent().hasCategory(Intent.CATEGORY_LAUNCHER) && Intent.ACTION_MAIN.equals(getIntent().getAction())) {
+            Lc.e("Finishing activity as it is launcher but not root");
+            finish();
+        }
+    }
+
+    /**
+     * Setup task description of application for Android 5.0 and later. It is showing when user opens task bar.
+     *
+     * @param label           Name of application to show in task bar;
+     * @param iconRes         Icon of application to show in task bar;
+     * @param primaryColorRes Color of application to show in task bar.
+     */
+    protected void setupTaskDescriptor(@NonNull final String label, @DrawableRes final int iconRes, @ColorRes final int primaryColorRes) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            final ActivityManager.TaskDescription taskDescription = new ActivityManager.TaskDescription(label,
+                    ((BitmapDrawable) ContextCompat.getDrawable(this, iconRes)).getBitmap(),
+                    ContextCompat.getColor(this, primaryColorRes));
+            setTaskDescription(taskDescription);
+        }
+    }
+
+}
diff --git a/templates/src/main/java/ru/touchin/templates/TouchinApp.java b/templates/src/main/java/ru/touchin/templates/TouchinApp.java
new file mode 100644
index 0000000..8d33cb0
--- /dev/null
+++ b/templates/src/main/java/ru/touchin/templates/TouchinApp.java
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2016 Touch Instinct
+ *
+ *  This file is part of RoboSwag library.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+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 android.util.Log;
+
+import com.crashlytics.android.Crashlytics;
+
+import net.danlew.android.joda.JodaTimeAndroid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.fabric.sdk.android.Fabric;
+import ru.touchin.roboswag.core.log.ConsoleLogProcessor;
+import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.log.LcGroup;
+import ru.touchin.roboswag.core.log.LcLevel;
+import ru.touchin.roboswag.core.log.LogProcessor;
+import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
+
+/**
+ * Created by Gavriil Sitnikov on 10/03/16.
+ * Base class of application to extends for Touch Instinct related projects.
+ */
+public abstract class TouchinApp extends Application {
+
+    @Override
+    protected void attachBaseContext(@NonNull final Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(base);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        JodaTimeAndroid.init(this);
+        if (BuildConfig.DEBUG) {
+            enableStrictMode();
+            Lc.initialize(new ConsoleLogProcessor(LcLevel.VERBOSE), true);
+            LcGroup.UI_LIFECYCLE.disable();
+        } else {
+            try {
+                final Crashlytics crashlytics = new Crashlytics();
+                Fabric.with(this, crashlytics);
+                Fabric.getLogger().setLogLevel(Log.ERROR);
+                Lc.initialize(new CrashlyticsLogProcessor(crashlytics), false);
+            } catch (final NoClassDefFoundError error) {
+                Lc.initialize(new ConsoleLogProcessor(LcLevel.INFO), false);
+                Lc.e("Crashlytics initialization error! Did you forget to add\n"
+                        + "compile('com.crashlytics.sdk.android:crashlytics:+@aar') {\n"
+                        + "        transitive = true;\n"
+                        + "}\n"
+                        + "to your build.gradle?", error);
+            }
+        }
+    }
+
+    private void enableStrictMode() {
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectAll()
+                .permitDiskReads()
+                .permitDiskWrites()
+                .penaltyLog()
+                .build());
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectAll()
+                .penaltyLog()
+                .build());
+    }
+
+    private static class CrashlyticsLogProcessor extends LogProcessor {
+
+        @NonNull
+        private final Crashlytics crashlytics;
+
+        public CrashlyticsLogProcessor(@NonNull final Crashlytics crashlytics) {
+            super(LcLevel.INFO);
+            this.crashlytics = crashlytics;
+        }
+
+        @Override
+        public void processLogMessage(@NonNull final LcGroup group,
+                                      @NonNull final LcLevel level,
+                                      @NonNull final String tag,
+                                      @NonNull final String message,
+                                      @Nullable final Throwable throwable) {
+            if (group == LcGroup.UI_LIFECYCLE) {
+                crashlytics.core.log(level.getPriority(), tag, message);
+            } else if (!level.lessThan(LcLevel.ASSERT)
+                    || (group == ApiModel.API_VALIDATION_LC_GROUP && level == LcLevel.ERROR)) {
+                Log.e(tag, message);
+                if (throwable != null) {
+                    crashlytics.core.log(level.getPriority(), tag, message);
+                    crashlytics.core.logException(throwable);
+                } else {
+                    final ShouldNotHappenException exceptionToLog = new ShouldNotHappenException(tag + ':' + message);
+                    reduceStackTrace(exceptionToLog);
+                    crashlytics.core.logException(exceptionToLog);
+                }
+            }
+        }
+
+        private void reduceStackTrace(@NonNull final Throwable throwable) {
+            final StackTraceElement[] stackTrace = throwable.getStackTrace();
+            final List<StackTraceElement> reducedStackTraceList = new ArrayList<>();
+            for (int i = stackTrace.length - 1; i >= 0; i--) {
+                final StackTraceElement stackTraceElement = stackTrace[i];
+                if (stackTraceElement.getClassName().contains(getClass().getSimpleName())
+                        || stackTraceElement.getClassName().contains(LcGroup.class.getName())
+                        || stackTraceElement.getClassName().contains(Lc.class.getName())) {
+                    break;
+                }
+                reducedStackTraceList.add(0, stackTraceElement);
+            }
+            StackTraceElement[] reducedStackTrace = new StackTraceElement[reducedStackTraceList.size()];
+            reducedStackTrace = reducedStackTraceList.toArray(reducedStackTrace);
+            throwable.setStackTrace(reducedStackTrace);
+        }
+
+    }
+
+}
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 d556a81..ceac558 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
@@ -43,11 +43,6 @@ import ru.touchin.defaults.DefaultTextWatcher;
 import ru.touchin.roboswag.components.views.internal.AttributesUtils;
 import ru.touchin.roboswag.core.log.Lc;
 
-/**
- * Created by Gavriil Sitnikov on 18/07/2014.
- * TextView that supports fonts from Typefaces class
- */
-
 /**
  * Created by Gavriil Sitnikov on 18/07/2014.
  * EditText that supports custom typeface and forces developer to specify if this view multiline or not.
@@ -57,15 +52,6 @@ import ru.touchin.roboswag.core.log.Lc;
 //ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
 public class TypefacedEditText extends AppCompatEditText {
 
-    private static boolean inDebugMode;
-
-    /**
-     * Enables debugging features like checking attributes on inflation.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
     private boolean multiline;
     private boolean constructed;
 
@@ -100,7 +86,7 @@ public class TypefacedEditText extends AppCompatEditText {
                 setSingleLine();
             }
             typedArray.recycle();
-            if (inDebugMode) {
+            if (BuildConfig.DEBUG) {
                 checkAttributes(context, attrs);
             }
         }
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 188686c..702342d 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
@@ -51,15 +51,6 @@ public class TypefacedTextView extends AppCompatTextView {
     private static final int UNSPECIFIED_MEASURE_SPEC = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
     private static final int START_SCALABLE_DIFFERENCE = 4;
 
-    private static boolean inDebugMode;
-
-    /**
-     * Enables debugging features like checking attributes on inflation.
-     */
-    public static void setInDebugMode() {
-        inDebugMode = true;
-    }
-
     private boolean constructed;
     @NonNull
     private LineStrategy lineStrategy = LineStrategy.SINGLE_LINE_ELLIPSIZE;
@@ -92,7 +83,7 @@ public class TypefacedTextView extends AppCompatTextView {
                 setLineStrategy(lineStrategy);
             }
             typedArray.recycle();
-            if (inDebugMode) {
+            if (BuildConfig.DEBUG) {
                 checkAttributes(context, attrs);
             }
         }

From f15d2f73afc43bf1cca77f62cd8fa64fbf618133 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 23:17:01 +0300
Subject: [PATCH 89/95] Build fix

---
 lifecycle-common/src/main/AndroidManifest.xml |  3 +-
 lifecycle-rx/src/main/AndroidManifest.xml     |  4 +-
 .../viewcontrollers/ViewController.java       |  2 +-
 .../ru/touchin/templates/DeviceUtils.java     | 68 +++++++++++--------
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/lifecycle-common/src/main/AndroidManifest.xml b/lifecycle-common/src/main/AndroidManifest.xml
index f617b1f..26f2069 100644
--- a/lifecycle-common/src/main/AndroidManifest.xml
+++ b/lifecycle-common/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest
-    package="ru.touchin.lifecycle"/>
+<manifest package="ru.touchin.lifecycle.common"/>
diff --git a/lifecycle-rx/src/main/AndroidManifest.xml b/lifecycle-rx/src/main/AndroidManifest.xml
index 68016e6..9145647 100644
--- a/lifecycle-rx/src/main/AndroidManifest.xml
+++ b/lifecycle-rx/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ru.touchin.lifecycle"/>
+<manifest package="ru.touchin.lifecycle.rx"/>
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 8e4c7d0..0aa771b 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
@@ -222,7 +222,7 @@ public class ViewController<TActivity extends FragmentActivity, TState extends P
 
     /**
      * Returns a color state list associated with a particular resource ID.
-     * <p>
+     *
      * <p>Starting in {@link android.os.Build.VERSION_CODES#M}, the returned
      * color state list will be styled for the specified Context's theme.
      *
diff --git a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
index 8d8284d..8a7e1fb 100644
--- a/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
+++ b/utils/src/main/java/ru/touchin/templates/DeviceUtils.java
@@ -47,41 +47,21 @@ public final class DeviceUtils {
             return NetworkType.UNKNOWN;
         }
         final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (cm == null) {
+            return NetworkType.UNKNOWN;
+        }
         @SuppressLint("MissingPermission") final NetworkInfo info = cm.getActiveNetworkInfo();
         if (info == null || !info.isConnected()) {
             return NetworkType.NONE;
         }
-        if (info.getType() == ConnectivityManager.TYPE_WIFI) {
-            return NetworkType.WI_FI;
+        switch (info.getType()) {
+            case ConnectivityManager.TYPE_WIFI:
+                return NetworkType.WI_FI;
+            case ConnectivityManager.TYPE_MOBILE:
+                return getMobileNetworkType(info);
+            default:
+                return NetworkType.UNKNOWN;
         }
-        if (info.getType() == ConnectivityManager.TYPE_MOBILE) {
-            final int networkType = info.getSubtype();
-            switch (networkType) {
-                case TelephonyManager.NETWORK_TYPE_GPRS:
-                case TelephonyManager.NETWORK_TYPE_EDGE:
-                case TelephonyManager.NETWORK_TYPE_CDMA:
-                case TelephonyManager.NETWORK_TYPE_1xRTT:
-                case TelephonyManager.NETWORK_TYPE_IDEN:
-                    return NetworkType.MOBILE_2G;
-                case TelephonyManager.NETWORK_TYPE_UMTS:
-                case TelephonyManager.NETWORK_TYPE_EVDO_0:
-                case TelephonyManager.NETWORK_TYPE_EVDO_A:
-                case TelephonyManager.NETWORK_TYPE_HSDPA:
-                case TelephonyManager.NETWORK_TYPE_HSUPA:
-                case TelephonyManager.NETWORK_TYPE_HSPA:
-                case TelephonyManager.NETWORK_TYPE_EVDO_B:
-                case TelephonyManager.NETWORK_TYPE_EHRPD:
-                case TelephonyManager.NETWORK_TYPE_HSPAP:
-                    return NetworkType.MOBILE_3G;
-                case TelephonyManager.NETWORK_TYPE_LTE:
-                case 19: // NETWORK_TYPE_LTE_CA is hide
-                    return NetworkType.MOBILE_LTE;
-                case TelephonyManager.NETWORK_TYPE_UNKNOWN:
-                default:
-                    return NetworkType.UNKNOWN;
-            }
-        }
-        return NetworkType.UNKNOWN;
     }
 
     /**
@@ -94,6 +74,34 @@ public final class DeviceUtils {
         return getNetworkType(context) != NetworkType.NONE;
     }
 
+    @NonNull
+    private static NetworkType getMobileNetworkType(@NonNull final NetworkInfo info) {
+        switch (info.getSubtype()) {
+            case TelephonyManager.NETWORK_TYPE_GPRS:
+            case TelephonyManager.NETWORK_TYPE_EDGE:
+            case TelephonyManager.NETWORK_TYPE_CDMA:
+            case TelephonyManager.NETWORK_TYPE_1xRTT:
+            case TelephonyManager.NETWORK_TYPE_IDEN:
+                return NetworkType.MOBILE_2G;
+            case TelephonyManager.NETWORK_TYPE_UMTS:
+            case TelephonyManager.NETWORK_TYPE_EVDO_0:
+            case TelephonyManager.NETWORK_TYPE_EVDO_A:
+            case TelephonyManager.NETWORK_TYPE_HSDPA:
+            case TelephonyManager.NETWORK_TYPE_HSUPA:
+            case TelephonyManager.NETWORK_TYPE_HSPA:
+            case TelephonyManager.NETWORK_TYPE_EVDO_B:
+            case TelephonyManager.NETWORK_TYPE_EHRPD:
+            case TelephonyManager.NETWORK_TYPE_HSPAP:
+                return NetworkType.MOBILE_3G;
+            case TelephonyManager.NETWORK_TYPE_LTE:
+            case 19: // NETWORK_TYPE_LTE_CA is hide
+                return NetworkType.MOBILE_LTE;
+            case TelephonyManager.NETWORK_TYPE_UNKNOWN:
+            default:
+                return NetworkType.UNKNOWN;
+        }
+    }
+
     private DeviceUtils() {
     }
 

From 52ae28096a9c01d9929df6ff66127126b321e506 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Tue, 21 Aug 2018 23:43:37 +0300
Subject: [PATCH 90/95] Build scripts and static

---
 .gitmodules                         | 3 +++
 BuildScripts                        | 1 +
 build.gradle                        | 1 +
 sample/build.gradle                 | 2 ++
 sample/src/main/AndroidManifest.xml | 9 +++++----
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 BuildScripts

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4aebbba
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "BuildScripts"]
+	path = BuildScripts
+	url = git@github.com:TouchInstinct/BuildScripts.git
diff --git a/BuildScripts b/BuildScripts
new file mode 160000
index 0000000..64424e9
--- /dev/null
+++ b/BuildScripts
@@ -0,0 +1 @@
+Subproject commit 64424e91972838b84217da0878a2ecac074c76a7
diff --git a/build.gradle b/build.gradle
index ae4e81d..a720f4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'de.aaschmid:gradle-cpd-plugin:1.0'
     }
 }
 
diff --git a/sample/build.gradle b/sample/build.gradle
index 24ac6ff..fa25d2c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -27,3 +27,5 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$versions.supportLibrary"
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }
+
+apply from: "$rootDir/BuildScripts/gradle/staticAnalysis.gradle"
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 515c1fc..a99bb50 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="ru.touchin.roboswag.components">
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From 95aa507c39af8f5be394fec2639a8843bbb76f9d Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <Denis.Karmyshakov@gmail.com>
Date: Wed, 22 Aug 2018 00:48:07 +0300
Subject: [PATCH 91/95] Configuring path for static

---
 BuildScripts        | 2 +-
 sample/build.gradle | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BuildScripts b/BuildScripts
index 64424e9..3fe4b2a 160000
--- a/BuildScripts
+++ b/BuildScripts
@@ -1 +1 @@
-Subproject commit 64424e91972838b84217da0878a2ecac074c76a7
+Subproject commit 3fe4b2a1aea149050b34c60ec7e2a876dfd8c0b2
diff --git a/sample/build.gradle b/sample/build.gradle
index fa25d2c..7a28aea 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -28,4 +28,5 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }
 
-apply from: "$rootDir/BuildScripts/gradle/staticAnalysis.gradle"
+ext.buildScriptsDir = "$rootDir/BuildScripts"
+apply from: "$buildScriptsDir/gradle/staticAnalysis.gradle"

From 20705feac657652ad5a84eef76dfc10f0a409fcd Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Wed, 22 Aug 2018 16:08:45 +0300
Subject: [PATCH 92/95] Typefaced* views now deprecated due to using reflection

---
 .../ru/touchin/roboswag/components/views/TypefacedEditText.java  | 1 +
 .../ru/touchin/roboswag/components/views/TypefacedTextView.java  | 1 +
 .../roboswag/components/views/internal/AttributesUtils.java      | 1 +
 3 files changed, 3 insertions(+)

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 ceac558..40415e5 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
@@ -49,6 +49,7 @@ import ru.touchin.roboswag.core.log.Lc;
  * Also in debug mode it has common checks for popular bugs.
  */
 @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+@Deprecated
 //ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
 public class TypefacedEditText extends AppCompatEditText {
 
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 702342d..0c19b4d 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
@@ -43,6 +43,7 @@ import ru.touchin.roboswag.core.log.Lc;
  * Also in debug mode it has common checks for popular bugs.
  */
 @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+@Deprecated
 //ConstructorCallsOverridableMethod: it's ok as we need to setTypeface
 public class TypefacedTextView extends AppCompatTextView {
 
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 a8c6474..0c85eac 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
@@ -39,6 +39,7 @@ import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
  * Created by Gavriil Sitnikov on 13/06/2016.
  * Bunch of inner helper library methods to validate attributes of custom views.
  */
+@Deprecated
 public final class AttributesUtils {
 
     /**

From 2e511b7d5533437cfa718836bd7cacdcaf50bded Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Wed, 22 Aug 2018 16:35:58 +0300
Subject: [PATCH 93/95] Storable update

---
 .../utils/storables/PreferenceStore.java      | 84 ++++++++++---------
 .../utils/storables/PreferenceUtils.java      | 24 +++---
 .../observables/storable/BaseStorable.java    | 27 ++++--
 .../core/observables/storable/Migration.java  |  2 +-
 .../core/observables/storable/Store.java      | 19 +++++
 5 files changed, 95 insertions(+), 61 deletions(-)

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 73d90bf..3349dc9 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
@@ -25,11 +25,11 @@ import android.support.annotation.Nullable;
 
 import java.lang.reflect.Type;
 
+import io.reactivex.Completable;
+import io.reactivex.Single;
 import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.observables.storable.Store;
 import ru.touchin.roboswag.core.utils.Optional;
-import io.reactivex.Completable;
-import io.reactivex.Single;
 
 /**
  * Created by Gavriil Sitnikov on 18/03/16.
@@ -71,52 +71,54 @@ public class PreferenceStore<T> implements Store<String, T> {
     @NonNull
     @Override
     public Completable storeObject(@NonNull final Type storeObjectType, @NonNull final String key, @Nullable final T storeObject) {
-        return Completable.fromAction(() -> {
-            if (storeObject == null) {
-                preferences.edit().remove(key).apply();
-                return;
-            }
-
-            if (isTypeBoolean(storeObjectType)) {
-                preferences.edit().putBoolean(key, (Boolean) storeObject).apply();
-            } else if (storeObjectType.equals(String.class)) {
-                preferences.edit().putString(key, (String) storeObject).apply();
-            } else if (isTypeInteger(storeObjectType)) {
-                preferences.edit().putInt(key, (Integer) storeObject).apply();
-            } else if (isTypeLong(storeObjectType)) {
-                preferences.edit().putLong(key, (Long) storeObject).apply();
-            } else if (isTypeFloat(storeObjectType)) {
-                preferences.edit().putFloat(key, (Float) storeObject).apply();
-            } else {
-                Lc.assertion("Unsupported type of object " + storeObjectType);
-            }
-        });
+        return Completable.fromAction(() -> setObject(storeObjectType, key, storeObject));
     }
 
     @NonNull
     @Override
-    @SuppressWarnings("unchecked")
-    //unchecked: it is checking class in if-else statements
     public Single<Optional<T>> loadObject(@NonNull final Type storeObjectType, @NonNull final String key) {
-        return Single.fromCallable(() -> {
-            if (!preferences.contains(key)) {
-                return new Optional<>(null);
-            }
+        return Single.fromCallable(() -> new Optional<>(!preferences.contains(key) ? null : getObject(storeObjectType, key)));
+    }
 
-            if (isTypeBoolean(storeObjectType)) {
-                return new Optional<>((T) ((Boolean) preferences.getBoolean(key, false)));
-            } else if (storeObjectType.equals(String.class)) {
-                return new Optional<>((T) (preferences.getString(key, null)));
-            } else if (isTypeInteger(storeObjectType)) {
-                return new Optional<>((T) ((Integer) preferences.getInt(key, 0)));
-            } else if (isTypeLong(storeObjectType)) {
-                return new Optional<>((T) ((Long) preferences.getLong(key, 0L)));
-            } else if (isTypeFloat(storeObjectType)) {
-                return new Optional<>((T) ((Float) preferences.getFloat(key, 0f)));
-            }
+    @Override
+    public void setObject(@NonNull final Type storeObjectType, @NonNull final String key, @Nullable final T storeObject) {
+        if (storeObject == null) {
+            preferences.edit().remove(key).apply();
+            return;
+        }
+        if (isTypeBoolean(storeObjectType)) {
+            preferences.edit().putBoolean(key, (Boolean) storeObject).apply();
+        } else if (storeObjectType.equals(String.class)) {
+            preferences.edit().putString(key, (String) storeObject).apply();
+        } else if (isTypeInteger(storeObjectType)) {
+            preferences.edit().putInt(key, (Integer) storeObject).apply();
+        } else if (isTypeLong(storeObjectType)) {
+            preferences.edit().putLong(key, (Long) storeObject).apply();
+        } else if (isTypeFloat(storeObjectType)) {
+            preferences.edit().putFloat(key, (Float) storeObject).apply();
+        } else {
             Lc.assertion("Unsupported type of object " + storeObjectType);
-            return new Optional<>(null);
-        });
+        }
+    }
+
+    @Nullable
+    @SuppressWarnings("unchecked") //unchecked: it is checking class in if-else statements
+    @Override
+    public T getObject(@NonNull final Type storeObjectType, @NonNull final String key) {
+        if (isTypeBoolean(storeObjectType)) {
+            return (T) ((Boolean) preferences.getBoolean(key, false));
+        } else if (storeObjectType.equals(String.class)) {
+            return (T) (preferences.getString(key, null));
+        } else if (isTypeInteger(storeObjectType)) {
+            return (T) ((Integer) preferences.getInt(key, 0));
+        } else if (isTypeLong(storeObjectType)) {
+            return (T) ((Long) preferences.getLong(key, 0L));
+        } else if (isTypeFloat(storeObjectType)) {
+            return (T) ((Float) preferences.getFloat(key, 0f));
+        } else {
+            Lc.assertion("Unsupported type of object " + storeObjectType);
+            return null;
+        }
     }
 
 }
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 5ae4521..b9e9883 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
@@ -49,7 +49,7 @@ public final class PreferenceUtils {
                 name,
                 String.class,
                 String.class,
-                new PreferenceStore<String>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).build();
     }
@@ -72,7 +72,7 @@ public final class PreferenceUtils {
                 name,
                 String.class,
                 String.class,
-                new PreferenceStore<String>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
@@ -90,7 +90,7 @@ public final class PreferenceUtils {
                 name,
                 Long.class,
                 Long.class,
-                new PreferenceStore<Long>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).build();
     }
@@ -113,7 +113,7 @@ public final class PreferenceUtils {
                 name,
                 Long.class,
                 Long.class,
-                new PreferenceStore<Long>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
@@ -131,7 +131,7 @@ public final class PreferenceUtils {
                 name,
                 Boolean.class,
                 Boolean.class,
-                new PreferenceStore<Boolean>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).build();
     }
@@ -154,7 +154,7 @@ public final class PreferenceUtils {
                 name,
                 Boolean.class,
                 Boolean.class,
-                new PreferenceStore<Boolean>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
@@ -172,7 +172,7 @@ public final class PreferenceUtils {
                 name,
                 Integer.class,
                 Integer.class,
-                new PreferenceStore<Integer>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).build();
     }
@@ -195,7 +195,7 @@ public final class PreferenceUtils {
                 name,
                 Integer.class,
                 Integer.class,
-                new PreferenceStore<Integer>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
@@ -213,7 +213,7 @@ public final class PreferenceUtils {
                 name,
                 Float.class,
                 Float.class,
-                new PreferenceStore<Float>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).build();
     }
@@ -236,7 +236,7 @@ public final class PreferenceUtils {
                 name,
                 Float.class,
                 Float.class,
-                new PreferenceStore<Float>(preferences),
+                new PreferenceStore<>(preferences),
                 new SameTypesConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
@@ -258,7 +258,7 @@ public final class PreferenceUtils {
                 name,
                 enumClass,
                 String.class,
-                new PreferenceStore<String>(preferences),
+                new PreferenceStore<>(preferences),
                 new EnumToStringConverter<>()
         ).build();
     }
@@ -282,7 +282,7 @@ public final class PreferenceUtils {
                 name,
                 enumClass,
                 String.class,
-                new PreferenceStore<String>(preferences),
+                new PreferenceStore<>(preferences),
                 new EnumToStringConverter<>()
         ).setDefaultValue(defaultValue).build();
     }
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 390a024..7b721b4 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
@@ -298,10 +298,18 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      *
      * @param newValue Value to set;
      */
-    @Deprecated
-    //deprecation: it should be used for debug only and in very rare cases.
     public void setSync(@Nullable final TObject newValue) {
-        set(newValue).blockingAwait();
+        final TStoreObject newStoreValue;
+        try {
+            newStoreValue = converter.toStoreObject(objectType, storeObjectType, newValue);
+        } catch (final Converter.ConversionException exception) {
+            STORABLE_LC_GROUP.w(exception, "Exception while trying to store value of '%s' from store %s by %s",
+                    key, newValue, store, converter);
+            return;
+        }
+        store.setObject(storeObjectType, key, newStoreValue);
+        newStoreValueEvent.onNext(new Optional<>(newStoreValue));
+        STORABLE_LC_GROUP.i("Value of '%s' force changed to '%s'", key, newStoreValue);
     }
 
     @NonNull
@@ -334,11 +342,16 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
      *
      * @return Returns value;
      */
-    @Deprecated
-    //deprecation: it should be used for debug only and in very rare cases.
     @Nullable
-    public TReturnObject getSync() {
-        return get().blockingGet();
+    public TObject getSync() {
+        final TStoreObject storeObject = store.getObject(storeObjectType, key);
+        try {
+            return converter.toObject(objectType, storeObjectType, storeObject);
+        } catch (final Converter.ConversionException exception) {
+            STORABLE_LC_GROUP.w(exception, "Exception while trying to converting value of '%s' from store %s by %s",
+                    key, storeObject, store, converter);
+            return null;
+        }
     }
 
     /**
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 3fa2475..62397f2 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
@@ -101,7 +101,7 @@ public class Migration<TKey> {
                                     .switchMap(throwable -> throwable instanceof NextLoopMigrationException
                                             ? Flowable.just(new Object()) : Flowable.error(throwable)));
                 })
-                .toCompletable()
+                .ignoreElement()
                 .andThen(versionsStore.storeObject(Long.class, key, latestVersion))
                 .onErrorResumeNext(throwable -> {
                     if (throwable instanceof MigrationException) {
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 c6c3a3b..ad31c4d 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
@@ -67,4 +67,23 @@ public interface Store<TKey, TStoreObject> {
     @NonNull
     Single<Optional<TStoreObject>> loadObject(@NonNull Type storeObjectType, @NonNull TKey key);
 
+    /**
+     * Stores object to store with related key.
+     *
+     * @param storeObjectType Type of object to store;
+     * @param key             Key related to object;
+     * @param storeObject     Object to store;
+     */
+    void setObject(@NonNull Type storeObjectType, @NonNull TKey key, @Nullable TStoreObject storeObject);
+
+    /**
+     * Gets object from store by key.
+     *
+     * @param storeObjectType Type of object to store;
+     * @param key             Key related to object;
+     * @return Object from store found by key;
+     */
+    @Nullable
+    TStoreObject getObject(@NonNull Type storeObjectType, @NonNull TKey key);
+
 }

From 771565e812ca55d660660f3967af7a60f0e55c19 Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Wed, 22 Aug 2018 17:48:49 +0300
Subject: [PATCH 94/95] toString for ViewControllerFragment

---
 .../navigation/fragments/ViewControllerFragment.java        | 6 ++++++
 1 file changed, 6 insertions(+)

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 34e4b32..cb38f7a 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
@@ -375,6 +375,12 @@ public class ViewControllerFragment<TActivity extends FragmentActivity, TState e
         }
     }
 
+    @NonNull
+    @Override
+    public String toString() {
+        return super.toString() + " ViewController: " + getViewControllerClass();
+    }
+
     private static class PlaceholderView extends FrameLayout {
 
         @NonNull

From 01a75bffbfb20f98f09083e2f51f7f519ffec8cf Mon Sep 17 00:00:00 2001
From: Denis Karmyshakov <denis.karmyshakov@gmail.com>
Date: Wed, 22 Aug 2018 18:17:14 +0300
Subject: [PATCH 95/95] Merge fix

---
 .../roboswag/components/views/MaterialLoadingBar.java    | 9 ---------
 1 file changed, 9 deletions(-)

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 a7d83bd..c3b88ef 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
@@ -116,13 +116,4 @@ public class MaterialLoadingBar extends AppCompatImageView {
         progressDrawable.setColor(colorInt);
     }
 
-    /**
-     * Set color of loader.
-     *
-     * @param colorInt Color of loader to be set.
-     */
-    public void setColor(@ColorInt final int colorInt) {
-        progressDrawable.setColor(colorInt);
-    }
-
 }