UnusedImports fix (#112)

* Gradle update

* Excluding apache.httpcomponents

build.gradle

@@ -1,9 +1,7 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion compileSdk
-    buildToolsVersion "25.0.3"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -17,36 +15,40 @@ android {
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
+    maven { url "http://dl.bintray.com/touchin/touchin-tools" }
 }
 
 dependencies {
-    compile project(path: ':libraries:components')
+    api project(path: ':libraries:components')
 
-    compile 'net.danlew:android.joda:2.9.9'
+    api 'net.danlew:android.joda:2.9.9'
-    compile 'com.android.support:multidex:1.0.1'
+    api 'com.android.support:multidex:1.0.2'
-    compile 'io.reactivex:rxandroid:1.2.1'
+    api "io.reactivex:rxandroid:$rxAndroidVersion"
+    api "io.reactivex:rxjava:$rxJavaVersion"
 
-    provided 'com.android.support:appcompat-v7:25.3.1'
+    compileOnly "com.android.support:appcompat-v7:$supportLibraryVersion"
-    provided 'com.android.support:recyclerview-v7:25.3.1'
+    compileOnly "com.android.support:recyclerview-v7:$supportLibraryVersion"
 
-    provided 'com.squareup.retrofit2:retrofit:2.3.0'
+    compileOnly 'com.squareup.retrofit2:retrofit:2.3.0'
-    provided('com.google.http-client:google-http-client-jackson2:1.22.0') {
+    compileOnly('com.google.http-client:google-http-client-jackson2:1.23.0') {
         exclude(group: 'org.apache.httpcomponents', module: 'httpclient')
     }
 
-    provided 'com.facebook.fresco:fresco:1.4.0'
+    compileOnly 'com.facebook.fresco:fresco:1.5.0'
-    provided 'com.bluelinelabs:logansquare:1.3.7'
+    compileOnly 'ru.touchin:logansquare:1.4.1'
 
-    provided 'com.scottyab:aes-crypto:0.0.4'
+    compileOnly 'com.scottyab:aes-crypto:0.0.4'
 
-    provided('io.socket:socket.io-client:1.0.0') {
+    // don't use latest(1.0 and above)  because they don't support Socket.IO server 1.x version
+    //noinspection NewerVersionAvailable
+    compileOnly('io.socket:socket.io-client:0.9.0') {
         exclude group: 'org.json', module: 'json'
     }
 
-    provided('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') {
+    compileOnly('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true;
+        transitive = true
     }
 
-    provided 'com.facebook.stetho:stetho:1.5.0'
+    compileOnly 'com.facebook.stetho:stetho:1.5.0'
 
 }

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() {
+    }
+
+}

src/main/java/ru/touchin/templates/ApiModel.java

@@ -50,9 +50,9 @@ public abstract class ApiModel implements Serializable {
      * @param collectionValidationRule Rule explaining what to do if invalid items found;
      * @throws ValidationException Exception of validation.
      */
-    @SuppressWarnings("PMD.PreserveStackTrace")
+    @SuppressWarnings({"PMD.PreserveStackTrace", "PMD.CyclomaticComplexity"})
     // PreserveStackTrace: it's ok - we are logging it on Lc.e()
-    protected static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule)
+    public static void validateCollection(@NonNull final Collection collection, @NonNull final CollectionValidationRule collectionValidationRule)
             throws ValidationException {
         boolean haveValidItem = false;
         int position = 0;
@@ -60,6 +60,10 @@ public abstract class ApiModel implements Serializable {
         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;
             }
 
@@ -113,7 +117,7 @@ public abstract class ApiModel implements Serializable {
         //do nothing
     }
 
-    protected enum CollectionValidationRule {
+    public enum CollectionValidationRule {
         EXCEPTION_IF_ANY_INVALID,
         EXCEPTION_IF_ALL_INVALID,
         REMOVE_INVALID_ITEMS,

src/main/java/ru/touchin/templates/DeviceUtils.java

@@ -19,9 +19,7 @@
 
 package ru.touchin.templates;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
@@ -29,7 +27,6 @@ import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
@@ -37,8 +34,8 @@ import java.io.UnsupportedEncodingException;
 import java.util.UUID;
 
 import ru.touchin.roboswag.core.log.Lc;
+import ru.touchin.roboswag.core.observables.RxAndroidUtils;
 import rx.Observable;
-import rx.Subscriber;
 
 /**
  * Utility class that is providing common methods related to android device.
@@ -109,13 +106,8 @@ public final class DeviceUtils {
      */
     @NonNull
     public static NetworkType getNetworkType(@NonNull final Context context) {
-        final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        final ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        return getNetworkType(connectivityManager);
+        final NetworkInfo info = cm.getActiveNetworkInfo();
-    }
-
-    @NonNull
-    private static NetworkType getNetworkType(@NonNull final ConnectivityManager connectivityManager) {
-        final NetworkInfo info = connectivityManager.getActiveNetworkInfo();
         if (info == null || !info.isConnected()) {
             return NetworkType.NONE;
         }
@@ -162,6 +154,7 @@ public final class DeviceUtils {
         return getNetworkType(context) != NetworkType.NONE;
     }
 
+
     /**
      * Returns observable to observe is device connected to Wi-Fi network.
      *
@@ -170,38 +163,12 @@ public final class DeviceUtils {
      */
     @NonNull
     public static Observable<Boolean> observeIsConnectedToWifi(@NonNull final Context context) {
-        return Observable.switchOnNext(Observable.fromCallable(() -> {
+        return RxAndroidUtils.observeBroadcastEvent(context, new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION))
-            final WifiStateReceiver wifiStateReceiver = new WifiStateReceiver();
+                .map(intent -> {
-            return Observable
+                    final NetworkInfo networkInfo = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-                    .<Boolean>create(subscriber -> {
+                    return networkInfo != null && networkInfo.isConnected();
-                        subscriber.onNext(DeviceUtils.getNetworkType(context) == DeviceUtils.NetworkType.WI_FI);
+                })
-                        wifiStateReceiver.setSubscriber(subscriber);
+                .distinctUntilChanged();
-                        context.registerReceiver(wifiStateReceiver, WifiStateReceiver.INTENT_FILTER);
-                    })
-                    .doOnUnsubscribe(() -> context.unregisterReceiver(wifiStateReceiver))
-                    .distinctUntilChanged();
-        }));
-    }
-
-    /**
-     * Returns observable to observe is device connected to the internet.
-     *
-     * @param context Context to register BroadcastReceiver to check connection to the internet;
-     * @return Observable of internet connection status.
-     */
-    @NonNull
-    public static Observable<Boolean> observeIsNetworkConnected(@NonNull final Context context) {
-        return Observable.switchOnNext(Observable.fromCallable(() -> {
-            final NetworkStateReceiver networkStateReceiver = new NetworkStateReceiver();
-            return Observable
-                    .<Boolean>create(subscriber -> {
-                        subscriber.onNext(isNetworkConnected(context));
-                        networkStateReceiver.setSubscriber(subscriber);
-                        context.registerReceiver(networkStateReceiver, NetworkStateReceiver.INTENT_FILTER);
-                    })
-                    .doOnUnsubscribe(() -> context.unregisterReceiver(networkStateReceiver))
-                    .distinctUntilChanged();
-        }));
     }
 
     private DeviceUtils() {
@@ -253,48 +220,4 @@ public final class DeviceUtils {
 
     }
 
-    private static class WifiStateReceiver extends BroadcastReceiver {
-
-        private static final IntentFilter INTENT_FILTER = new IntentFilter(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-
-        @Nullable
-        private Subscriber<? super Boolean> subscriber;
-
-        public void setSubscriber(@Nullable final Subscriber<? super Boolean> subscriber) {
-            this.subscriber = subscriber;
-        }
-
-        @Override
-        public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
-            final NetworkInfo networkInfo = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-            if (subscriber != null) {
-                subscriber.onNext(networkInfo != null && networkInfo.isConnected());
-            }
-        }
-
-    }
-
-    private static class NetworkStateReceiver extends BroadcastReceiver {
-
-        private static final IntentFilter INTENT_FILTER = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
-        @Nullable
-        private ConnectivityManager connectivityManager;
-
-        @Nullable
-        private Subscriber<? super Boolean> subscriber;
-
-        public void setSubscriber(@Nullable final Subscriber<? super Boolean> subscriber) {
-            this.subscriber = subscriber;
-        }
-
-        public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
-            if (connectivityManager == null) {
-                connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-            }
-            if (subscriber != null) {
-                subscriber.onNext(isNetworkConnected(context));
-            }
-        }
-    }
-
 }

src/main/java/ru/touchin/templates/TouchinActivity.java

@@ -21,7 +21,7 @@ package ru.touchin.templates;
 
 import android.app.ActivityManager;
 import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
+import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
@@ -62,9 +62,14 @@ public abstract class TouchinActivity<TLogic extends Logic> extends ViewControll
      * @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) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             final ActivityManager.TaskDescription taskDescription = new ActivityManager.TaskDescription(label,
-                    ((BitmapDrawable) ContextCompat.getDrawable(this, iconRes)).getBitmap(),
+                    iconRes,
+                    ContextCompat.getColor(this, primaryColorRes));
+            setTaskDescription(taskDescription);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            final ActivityManager.TaskDescription taskDescription = new ActivityManager.TaskDescription(label,
+                    BitmapFactory.decodeResource(getResources(), iconRes),
                     ContextCompat.getColor(this, primaryColorRes));
             setTaskDescription(taskDescription);
         }

src/main/java/ru/touchin/templates/TouchinApp.java

@@ -38,6 +38,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import io.fabric.sdk.android.Fabric;
+import ru.touchin.roboswag.components.adapters.ObservableCollectionAdapter;
 import ru.touchin.roboswag.components.navigation.fragments.ViewControllerFragment;
 import ru.touchin.roboswag.components.utils.UiUtils;
 import ru.touchin.roboswag.components.views.TypefacedEditText;
@@ -91,6 +92,7 @@ public abstract class TouchinApp extends Application {
         JodaTimeAndroid.init(this);
         if (isDebug()) {
             enableStrictMode();
+            ObservableCollectionAdapter.setInDebugMode();
             ViewControllerFragment.setInDebugMode();
             TypefacedEditText.setInDebugMode();
             TypefacedTextView.setInDebugMode();

src/main/java/ru/touchin/templates/TouchinService.java

@@ -32,6 +32,7 @@ import ru.touchin.roboswag.core.log.Lc;
 import ru.touchin.roboswag.core.utils.ServiceBinder;
 import ru.touchin.roboswag.core.utils.ShouldNotHappenException;
 import rx.Completable;
+import rx.CompletableSubscriber;
 import rx.Observable;
 import rx.Single;
 import rx.SingleSubscriber;
@@ -226,7 +227,7 @@ public abstract class TouchinService<TLogic extends Logic> extends Service {
      * 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 Completable.CompletableSubscriber#onCompleted()} item;
+     * @param onCompletedAction Action which will raise on every {@link CompletableSubscriber#onCompleted()} item;
      * @return {@link Subscription} which is wrapping source completable to unsubscribe from it onDestroy.
      */
     @NonNull
@@ -240,8 +241,8 @@ public abstract class TouchinService<TLogic extends Logic> extends Service {
      * Don't forget to process errors if completable can emit them.
      *
      * @param completable       {@link Single} to subscribe until onDestroy;
-     * @param onCompletedAction Action which will raise on {@link Completable.CompletableSubscriber#onCompleted()} item;
+     * @param onCompletedAction Action which will raise on {@link CompletableSubscriber#onCompleted()} item;
-     * @param onErrorAction     Action which will raise on every {@link Completable.CompletableSubscriber#onError(Throwable)} throwable;
+     * @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.
      */
     @NonNull

src/main/java/ru/touchin/templates/calendar/CalendarAdapter.java

@@ -51,8 +51,7 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
     public static final int MONTHS_IN_YEAR = 12;
     public static final long ONE_DAY_LENGTH = TimeUnit.DAYS.toMillis(1);
 
-    @NonNull
+    private List<CalendarItem> calendarItems;
-    private final List<CalendarItem> calendarItems;
     @Nullable
     private Integer startSelectionPosition;
     @Nullable
@@ -72,6 +71,10 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
         if (monthsNames != null && monthsNames.length == MONTHS_IN_YEAR) {
             this.monthsNames = monthsNames;
         }
+        updateCalendarItems(startDate, endDate);
+    }
+
+    public final void updateCalendarItems(@NonNull final DateTime startDate, @NonNull final DateTime endDate) {
         calendarItems = CalendarUtils.fillRanges(startDate, endDate);
         if (calendarItems.isEmpty()) {
             throw new ShouldNotHappenException("There is no items in calendar with startDate: " + DateTimeFormat.fullDate().print(startDate)
@@ -86,12 +89,12 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
      * @param endSelectionDate   Last date that should be selected (inclusive).
      */
     public void setSelectedRange(@Nullable final DateTime startSelectionDate, @Nullable final DateTime endSelectionDate) {
-        if (startSelectionDate != null) {
+        startSelectionPosition = startSelectionDate != null
-            startSelectionPosition = CalendarUtils.findPositionByDate(calendarItems, startSelectionDate.withTimeAtStartOfDay().getMillis());
+                ? CalendarUtils.findPositionByDate(calendarItems, startSelectionDate.withTimeAtStartOfDay().getMillis())
-        }
+                : null;
-        if (endSelectionDate != null) {
+        endSelectionPosition = endSelectionDate != null
-            endSelectionPosition = CalendarUtils.findPositionByDate(calendarItems, endSelectionDate.withTimeAtStartOfDay().getMillis());
+                ? CalendarUtils.findPositionByDate(calendarItems, endSelectionDate.withTimeAtStartOfDay().getMillis())
-        }
+                : null;
 
         notifySelectedDaysChanged();
     }
@@ -132,6 +135,16 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
         notifyItemRangeChanged(startSelectionPosition, endSelectionPosition - startSelectionPosition);
     }
 
+    @NonNull
+    protected List<CalendarItem> getCalendarItems() {
+        return calendarItems;
+    }
+
+    @NonNull
+    protected String getMonthsNameByHeaderCalendarItem(@NonNull final CalendarHeaderItem item) {
+        return monthsNames != null ? monthsNames[item.getMonth()] : String.valueOf(item.getMonth());
+    }
+
     @NonNull
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
@@ -237,7 +250,7 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
     }
 
     //TODO fix suppress
-    @SuppressWarnings("PMD.CyclomaticComplexity")
+    @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
     private void bindDay(@NonNull final TDayViewHolder holder, final int position, @NonNull final CalendarItem calendarItem) {
         final String currentDay = String.valueOf(((CalendarDayItem) calendarItem).getPositionOfFirstDay()
                 + position - calendarItem.getStartRange());
@@ -245,13 +258,18 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
                 + (position - calendarItem.getStartRange()) * ONE_DAY_LENGTH);
         final ComparingToToday dateState = ((CalendarDayItem) calendarItem).getComparingToToday();
         if (startSelectionPosition != null && position == startSelectionPosition) {
-            if (endSelectionPosition == null || endSelectionPosition.equals(startSelectionPosition)) {
+            if (endSelectionPosition == null || endSelectionPosition.equals(startSelectionPosition)
+                    || startSelectionPosition > endSelectionPosition) {
                 bindDayItem(holder, currentDay, currentDate, SelectionMode.SELECTED_ONE_ONLY, dateState);
                 return;
             }
             bindDayItem(holder, currentDay, currentDate, SelectionMode.SELECTED_FIRST, dateState);
             return;
         }
+        if (startSelectionPosition != null && endSelectionPosition != null && startSelectionPosition > endSelectionPosition) {
+            bindDayItem(holder, currentDay, currentDate, SelectionMode.NOT_SELECTED, dateState);
+            return;
+        }
         if (endSelectionPosition != null && position == endSelectionPosition) {
             bindDayItem(holder, currentDay, currentDate, SelectionMode.SELECTED_LAST, dateState);
             return;
@@ -285,6 +303,10 @@ public abstract class CalendarAdapter<TDayViewHolder extends RecyclerView.ViewHo
         return calendarItems.isEmpty() ? 0 : calendarItems.get(calendarItems.size() - 1).getEndRange();
     }
 
+    protected boolean isEndPositionExist() {
+        return endSelectionPosition != null;
+    }
+
     /**
      * Selection mode that shows the type of selection of a calendar cell.
      */

src/main/java/ru/touchin/templates/calendar/CalendarRecyclerView.java

@@ -23,6 +23,7 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.util.AttributeSet;
 
 import ru.touchin.roboswag.core.log.Lc;
@@ -45,11 +46,31 @@ public class CalendarRecyclerView extends RecyclerView {
         this(context, attrs, 0);
     }
 
+    @SuppressWarnings("PMD.ConstructorCallsOverridableMethod")
+    //ConstructorCallsOverridableMethod: it's OK
     public CalendarRecyclerView(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyle) {
         super(context, attrs, defStyle);
-        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.HEADER_ITEM_TYPE, HEADER_MAX_ELEMENTS_IN_A_ROW * 3);
+        initialize();
-        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.EMPTY_ITEM_TYPE, EMPTY_MAX_ELEMENTS_IN_A_ROW * 3);
+    }
-        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.DAY_ITEM_TYPE, DAY_MAX_ELEMENTS_IN_A_ROW * 3);
+
+    private void initialize() {
+        setupCacheForMonthsOnScreenCount(3);
+        final StaggeredGridLayoutManager layoutManager = new StaggeredGridLayoutManager(7, StaggeredGridLayoutManager.VERTICAL);
+        layoutManager.setGapStrategy(StaggeredGridLayoutManager.GAP_HANDLING_NONE);
+        setLayoutManager(layoutManager);
+        setItemAnimator(null);
+    }
+
+    /**
+     * Setups recycler cache for smooth scroll without lagging based on month that could be displayed on screen.
+     *
+     * @param maxMonthOnScreen Maximum months count on screen.
+     */
+    public void setupCacheForMonthsOnScreenCount(final int maxMonthOnScreen) {
+        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.HEADER_ITEM_TYPE, HEADER_MAX_ELEMENTS_IN_A_ROW * (maxMonthOnScreen + 1));
+        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.EMPTY_ITEM_TYPE, EMPTY_MAX_ELEMENTS_IN_A_ROW * (maxMonthOnScreen * 2 + 1));
+        // we need such much views to prevent cache/gap animations of StaggeredGridLayoutManager
+        getRecycledViewPool().setMaxRecycledViews(CalendarAdapter.DAY_ITEM_TYPE, DAY_MAX_ELEMENTS_IN_A_ROW * (maxMonthOnScreen * 5 + 1));
         setItemViewCacheSize(0);
     }
 

src/main/java/ru/touchin/templates/calendar/CalendarUtils.java

@@ -59,7 +59,7 @@ public final class CalendarUtils {
      * @param calendarItems List of {@link CalendarItem} where need to find specific element;
      * @param position      Position of adapter;
      * @return Position of Header that respond to requested position.
-     *     Returns null if Header or related CalendarItem was not found for specified position.
+     * Returns null if Header or related CalendarItem was not found for specified position.
      */
     @Nullable
     public static Integer findPositionOfSelectedMonth(@NonNull final List<CalendarItem> calendarItems, final long position) {
@@ -76,7 +76,7 @@ public final class CalendarUtils {
      * @param calendarItems List of {@link CalendarItem} where need to find specific element;
      * @param date          Requested date in milliseconds.
      * @return Position of Calendar cell that that has specific date.
-     *     Returns null if CalendarItem was not found for specified position.
+     * Returns null if CalendarItem was not found for specified position.
      */
     @Nullable
     public static Integer findPositionByDate(@NonNull final List<CalendarItem> calendarItems, final long date) {

src/main/java/ru/touchin/templates/chat/Chat.java

@@ -31,9 +31,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import ru.touchin.roboswag.core.log.Lc;
-import ru.touchin.roboswag.core.observables.collections.Change;
 import ru.touchin.roboswag.core.observables.collections.ObservableCollection;
 import ru.touchin.roboswag.core.observables.collections.ObservableList;
+import rx.Completable;
 import rx.Observable;
 import rx.Scheduler;
 import rx.Subscription;
@@ -76,17 +76,10 @@ public abstract class Chat<TOutgoingMessage> {
                     final List<TOutgoingMessage> reversedMessages = new ArrayList<>(initialMessages);
                     Collections.reverse(reversedMessages);
                     return Observable.from(reversedMessages)
-                            .concatWith(sendingMessages.observeChanges().concatMap(changes -> {
+                            .concatWith(sendingMessages.observeChanges().concatMap(changes ->
-                                final Collection<TOutgoingMessage> insertedMessages = new ArrayList<>();
+                                    changes.getInsertedItems().isEmpty() ? Observable.empty() : Observable.from(changes.getInsertedItems())))
-                                for (final Change<TOutgoingMessage> change : changes.getChanges()) {
-                                    if (change.getType() == Change.Type.INSERTED) {
-                                        insertedMessages.addAll(change.getChangedItems());
-                                    }
-                                }
-                                return insertedMessages.isEmpty() ? Observable.empty() : Observable.from(insertedMessages);
-                            }))
                             //observe on some scheduler?
-                            .flatMap(this::internalSendMessage);
+                            .flatMap(message -> internalSendMessage(message).toObservable());
                 });
     }
 
@@ -175,6 +168,14 @@ public abstract class Chat<TOutgoingMessage> {
         retrySendingRequest.onNext(null);
     }
 
+    /**
+     * Method to cancel sending current message.
+     */
+    @NonNull
+    public Observable<?> observeCancelEvent(@NonNull final TOutgoingMessage message) {
+        return Observable.never();
+    }
+
     /**
      * Deactivates chat so it will stop sending messages.
      */
@@ -188,9 +189,9 @@ public abstract class Chat<TOutgoingMessage> {
     }
 
     @NonNull
-    private Observable<?> internalSendMessage(@NonNull final TOutgoingMessage message) {
+    private Completable internalSendMessage(@NonNull final TOutgoingMessage message) {
         final SubscriptionHolder subscriptionHolder = new SubscriptionHolder();
-        return Observable
+        return Completable
                 .create(subscriber -> {
                     subscriptionHolder.subscription = sendingScheduler.createWorker().schedule(() -> {
                         final CountDownLatch blocker = new CountDownLatch(1);
@@ -201,6 +202,7 @@ public abstract class Chat<TOutgoingMessage> {
                                 .first()
                                 .switchMap(shouldSendMessage -> shouldSendMessage
                                         ? createSendMessageObservable(message).ignoreElements() : Observable.empty())
+                                .takeUntil(observeCancelEvent(message))
                                 .retryWhen(attempts -> attempts.switchMap(ignored -> {
                                     isSendingInError.onNext(true);
                                     return Observable

src/main/java/ru/touchin/templates/googlejson/GoogleJsonPreferences.java

@@ -29,9 +29,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import ru.touchin.roboswag.components.utils.storables.PreferenceStore;
 import ru.touchin.roboswag.core.observables.storable.Converter;
@@ -85,26 +83,6 @@ public final class GoogleJsonPreferences {
                 .build();
     }
 
-    @NonNull
-    public static <T> Storable<String, Set<T>, String> jsonSetStorable(@NonNull final String name,
-                                                                       @NonNull final Class<T> jsonItemClass,
-                                                                       @NonNull final SharedPreferences preferences) {
-        return new Storable.Builder<>(name, Set.class, String.class, new PreferenceStore<>(preferences), new JsonSetConverter<>(jsonItemClass))
-                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
-                .build();
-    }
-
-    @NonNull
-    public static <T> NonNullStorable<String, Set<T>, String> jsonSetStorable(@NonNull final String name,
-                                                                              @NonNull final Class<T> jsonItemClass,
-                                                                              @NonNull final SharedPreferences preferences,
-                                                                              @NonNull final Set<T> defaultValue) {
-        return new Storable.Builder<>(name, Set.class, String.class, new PreferenceStore<>(preferences), new JsonSetConverter<>(jsonItemClass))
-                .setObserveStrategy(Storable.ObserveStrategy.CACHE_ACTUAL_VALUE)
-                .setDefaultValue(defaultValue)
-                .build();
-    }
-
     private GoogleJsonPreferences() {
     }
 
@@ -168,29 +146,4 @@ public final class GoogleJsonPreferences {
 
     }
 
-    public static class JsonSetConverter<T> extends JsonConverter<Set<T>> {
-
-        @NonNull
-        private final Class<T> itemClass;
-
-        public JsonSetConverter(@NonNull final Class<T> itemClass) {
-            super();
-            this.itemClass = itemClass;
-        }
-
-        @Nullable
-        @Override
-        public Set<T> toObject(@NonNull final Type jsonObjectType, @NonNull final Type stringType, @Nullable final String storeValue) {
-            if (storeValue == null) {
-                return null;
-            }
-            try {
-                return new HashSet<>(GoogleJsonModel.DEFAULT_JSON_FACTORY.createJsonParser(storeValue).parseArray(HashSet.class, itemClass));
-            } catch (final IOException exception) {
-                throw new ShouldNotHappenException(exception);
-            }
-        }
-
-    }
-
 }

src/main/java/ru/touchin/templates/logansquare/LoganSquareEnumConverter.java

@@ -35,24 +35,34 @@ public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends
 
     @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 null;
+            return defaultValue;
         }
         for (final T value : enumValues) {
             if (value.getValueName().equals(string)) {
                 return value;
             }
         }
-        throw new ShouldNotHappenException();
+        if (defaultValue != null) {
+            return defaultValue;
+        }
+        throw new ShouldNotHappenException("Enum parsing exception for value: " + string);
     }
 
     @Nullable

src/main/java/ru/touchin/templates/logansquare/LoganSquareJodaTimeConverter.java

@@ -42,7 +42,7 @@ public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
     @Override
     public DateTime parse(@NonNull final JsonParser jsonParser) throws IOException {
         final String dateString = jsonParser.getValueAsString();
-        if (dateString == null) {
+        if (dateString == null || dateString.isEmpty()) {
             return null;
         }
         try {
@@ -60,9 +60,9 @@ public class LoganSquareJodaTimeConverter implements TypeConverter<DateTime> {
                           @NonNull final JsonGenerator jsonGenerator)
             throws IOException {
         if (fieldName != null) {
-            jsonGenerator.writeStringField(fieldName, object != null ? object.toString() : null);
+            jsonGenerator.writeStringField(fieldName, object != null && !object.toString().isEmpty() ? object.toString() : null);
         } else {
-            jsonGenerator.writeString(object != null ? object.toString() : null);
+            jsonGenerator.writeString(object != null && !object.toString().isEmpty() ? object.toString() : null);
         }
     }
 

src/main/java/ru/touchin/templates/logansquare/LoganSquareJsonFactory.java

@@ -20,14 +20,20 @@
 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.google.api.client.json.jackson2.JacksonFactory;
+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;
@@ -38,7 +44,7 @@ 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 Google Jackson library {@link JacksonFactory}.
+ * LoganSquareConverter class to use with {@link Retrofit} to parse and generate models based on Logan Square library.
  */
 public class LoganSquareJsonFactory extends Converter.Factory {
 
@@ -59,6 +65,16 @@ public class LoganSquareJsonFactory extends Converter.Factory {
         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
@@ -73,7 +89,23 @@ public class LoganSquareJsonFactory extends Converter.Factory {
         @NonNull
         @Override
         protected T parseResponse(@NonNull final ResponseBody value) throws IOException {
-            return (T) LoganSquare.parse(value.byteStream(), (Class) type);
+            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);
+            }
         }
 
     }
@@ -81,11 +113,29 @@ public class LoganSquareJsonFactory extends Converter.Factory {
     public static class LoganSquareRequestBodyConverter<T> extends JsonRequestBodyConverter<T> {
 
         @Override
-        protected void writeValueToByteArray(@NonNull final T value, @NonNull final ByteArrayOutputStream byteArrayOutputStream)
+        protected void writeValueToByteArray(@NonNull final T value, @NonNull final ByteArrayOutputStream byteArrayOutputStream) throws IOException {
-                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();
+            }
+        }
+
+    }
+
+}

src/main/java/ru/touchin/templates/requests/HttpRequest.java

@@ -203,23 +203,9 @@ public abstract class HttpRequest<T> {
     @NonNull
     public Observable<T> execute() {
         return Observable
-                .<RequestController>create(subscriber -> {
+                .fromCallable(RequestController::new)
-                    try {
-                        subscriber.onNext(new RequestController());
-                    } catch (final IOException exception) {
-                        subscriber.onError(exception);
-                    }
-                    subscriber.onCompleted();
-                })
                 .switchMap(requestController -> Observable
-                        .<T>create(requestSubscriber -> {
+                        .fromCallable(() -> executeSyncInternal(requestController))
-                            try {
-                                requestSubscriber.onNext(executeSyncInternal(requestController));
-                            } catch (final IOException exception) {
-                                requestSubscriber.onError(exception);
-                            }
-                            requestSubscriber.onCompleted();
-                        })
                         .subscribeOn(Schedulers.io())
                         .unsubscribeOn(Schedulers.io())
                         .doOnUnsubscribe(requestController.call::cancel));

src/main/java/ru/touchin/templates/retrofit/JsonResponseBodyConverter.java

@@ -24,6 +24,8 @@ 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;
 
@@ -57,20 +59,46 @@ public abstract class JsonResponseBodyConverter<T> implements Converter<Response
                 Lc.assertion(exception);
             }
             throw exception;
+        } finally {
+            value.close();
         }
 
         if (result instanceof ApiModel) {
-            try {
+            validateModel((ApiModel) result);
-                ((ApiModel) result).validate();
+        }
-            } catch (final ApiModel.ValidationException validationException) {
+        if (result instanceof Collection) {
-                Lc.assertion(validationException);
+            validateCollection((Collection) result);
-                throw validationException;
+        }
-            }
+        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.
      *

src/main/java/ru/touchin/templates/socket/SocketConnection.java

@@ -85,29 +85,21 @@ public abstract class SocketConnection {
     @NonNull
     private Observable<Pair<Socket, State>> createSocketObservable() {
         return Observable
-                .<Socket>create(subscriber -> {
+                .fromCallable(this::createSocket)
-                    try {
-                        final Socket socket = createSocket();
-                        subscriber.onNext(socket);
-                    } catch (final Exception exception) {
-                        Lc.assertion(exception);
-                    }
-                    subscriber.onCompleted();
-                })
                 .switchMap(socket -> Observable
-                        .<Pair<Socket, State>>create(subscriber -> {
+                        .<Pair<Socket, State>>create(emitter -> {
-                            socket.on(Socket.EVENT_CONNECT, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTED)));
+                            socket.on(Socket.EVENT_CONNECT, args -> emitter.onNext(new Pair<>(socket, State.CONNECTED)));
-                            socket.on(Socket.EVENT_CONNECTING, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTING)));
+                            socket.on(Socket.EVENT_CONNECTING, args -> emitter.onNext(new Pair<>(socket, State.CONNECTING)));
-                            socket.on(Socket.EVENT_CONNECT_ERROR, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
+                            socket.on(Socket.EVENT_CONNECT_ERROR, args -> emitter.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
-                            socket.on(Socket.EVENT_CONNECT_TIMEOUT, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
+                            socket.on(Socket.EVENT_CONNECT_TIMEOUT, args -> emitter.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
-                            socket.on(Socket.EVENT_DISCONNECT, args -> subscriber.onNext(new Pair<>(socket, State.DISCONNECTED)));
+                            socket.on(Socket.EVENT_DISCONNECT, args -> emitter.onNext(new Pair<>(socket, State.DISCONNECTED)));
-                            socket.on(Socket.EVENT_RECONNECT_ATTEMPT, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTING)));
+                            socket.on(Socket.EVENT_RECONNECT_ATTEMPT, args -> emitter.onNext(new Pair<>(socket, State.CONNECTING)));
-                            socket.on(Socket.EVENT_RECONNECTING, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTING)));
+                            socket.on(Socket.EVENT_RECONNECTING, args -> emitter.onNext(new Pair<>(socket, State.CONNECTING)));
-                            socket.on(Socket.EVENT_RECONNECT, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTED)));
+                            socket.on(Socket.EVENT_RECONNECT, args -> emitter.onNext(new Pair<>(socket, State.CONNECTED)));
-                            socket.on(Socket.EVENT_RECONNECT_ERROR, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
+                            socket.on(Socket.EVENT_RECONNECT_ERROR, args -> emitter.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
-                            socket.on(Socket.EVENT_RECONNECT_FAILED, args -> subscriber.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
+                            socket.on(Socket.EVENT_RECONNECT_FAILED, args -> emitter.onNext(new Pair<>(socket, State.CONNECTION_ERROR)));
-                            subscriber.onNext(new Pair<>(socket, State.DISCONNECTED));
+                            emitter.onNext(new Pair<>(socket, State.DISCONNECTED));
-                        })
+                        }, rx.Emitter.BackpressureMode.LATEST)
                         .distinctUntilChanged()
                         .doOnSubscribe(() -> {
                             if (autoConnectOnAnySubscription) {
@@ -139,13 +131,13 @@ public abstract class SocketConnection {
     //unchecked: it's OK as we are caching raw observables
     protected <T> Observable<T> observeEvent(@NonNull final SocketEvent<T> socketEvent) {
         return Observable.switchOnNext(Observable
-                .<Observable<T>>create(observableSubscriber -> {
+                .fromCallable(() -> {
                     Observable<T> result = (Observable<T>) messagesObservableCache.get(socketEvent);
                     if (result == null) {
                         result = getSocket()
                                 .switchMap(socket -> Observable
-                                        .<T>create(subscriber ->
+                                        .<T>create(emitter -> socket.on(socketEvent.getName(), new SocketListener<>(socketEvent, emitter::onNext)),
-                                                socket.on(socketEvent.getName(), new SocketListener<>(socketEvent, subscriber::onNext)))
+                                                rx.Emitter.BackpressureMode.BUFFER)
                                         .unsubscribeOn(scheduler)
                                         .doOnUnsubscribe(() -> {
                                             socket.off(socketEvent.getName());
@@ -155,8 +147,7 @@ public abstract class SocketConnection {
                                 .refCount();
                         messagesObservableCache.put(socketEvent, result);
                     }
-                    observableSubscriber.onNext(result);
+                    return result;
-                    observableSubscriber.onCompleted();
                 })
                 .subscribeOn(scheduler));
     }

src/main/java/ru/touchin/templates/validation/ValidationState.java

@@ -59,6 +59,7 @@ public class ValidationState implements Serializable {
 
     /**
      * Returns unique code of the {@link ValidationState}.
+     *
      * @return code or the ValidationState.
      */
     public int getCode() {
@@ -67,6 +68,7 @@ public class ValidationState implements Serializable {
 
     /**
      * Don't forget to override this method!
+     *
      * @param object that you want to compare.
      * @return true if objects equals and false otherwise.
      */

src/main/java/ru/touchin/templates/validation/ViewWithError.java

@@ -38,6 +38,7 @@ public interface ViewWithError {
      * Shows error
      * Pass here error state.
      * It is not correct to pass here {@link ValidationState#VALID} or {@link ValidationState#INITIAL}
+     *
      * @param validationState error state. Can be other than {@link ValidationState} if you have successor of base {@link ValidationState}.
      */
     void showError(@NonNull final ValidationState validationState);

src/main/java/ru/touchin/templates/validation/validationcontrollers/BooleanValidationController.java

@@ -37,6 +37,7 @@ public class BooleanValidationController extends ValidationController<Boolean, B
 
     /**
      * This method validates bounded view.
+     *
      * @param activatedObservable emits true when we need to show error on empty fields. Eg when user clicks on Done button but he missed some
      *                            necessary fields to fill.
      * @return observable without any concrete type. Simply subscribe to this method to make it works.

src/main/java/ru/touchin/templates/validation/validationcontrollers/EditTextValidationController.java

@@ -98,8 +98,7 @@ public class EditTextValidationController<TModel extends Serializable>
     /**
      * If we don't want to show error when focus is lost.
      *
-     * @param showErrorOnFocusOut  show an error or don't show an error. 
+     * @param showErrorOnFocusOut show an error or don't show an error.
-     *
      */
     public void setShowErrorOnFocusOut(final boolean showErrorOnFocusOut) {
         this.showErrorOnFocusOut = showErrorOnFocusOut;

src/main/java/ru/touchin/templates/validation/validationcontrollers/SimpleValidationController.java

@@ -12,7 +12,8 @@ import rx.Observable;
  * Created by Ilia Kurtov on 24/01/2017.
  * {@link ValidationController} for models that have the same modal as wrapper model. You can use it when you simply need to be sure
  * that user have selected some item and it is not null.
- * @param <TModel> type of the model.
+ *
+ * @param <TModel>     type of the model.
  * @param <TValidator> corresponding {@link Validator}
  */
 public class SimpleValidationController<TModel extends Serializable, TValidator extends Validator<TModel, TModel>>
@@ -24,6 +25,7 @@ public class SimpleValidationController<TModel extends Serializable, TValidator
 
     /**
      * This method validates bounded view.
+     *
      * @param activatedObservable emits true when we need to show error on empty fields. Eg when user clicks on Done button but he missed some
      *                            necessary fields to fill.
      * @return observable without any concrete type. Simply subscribe to this method to make it works.

src/main/java/ru/touchin/templates/validation/validationcontrollers/ValidationController.java

@@ -53,10 +53,11 @@ public class ValidationController
     /**
      * Bind to this observable to connect view and model. If you provide first argument (viewStateObservable) - the connection would be two-way.
      * If not - one-way. This method changes updates view with current {@link ValidationState}.
+     *
      * @param viewStateObservable input view state {@link Observable}.
      *                            Eg it can be observable with input text from the {@link android.widget.EditText}
-     * @param updateViewAction action that updates current state of the bounded view.
+     * @param updateViewAction    action that updates current state of the bounded view.
-     * @param viewWithError view that implements {@link ViewWithError} interface and could reacts to the validation errors.
+     * @param viewWithError       view that implements {@link ViewWithError} interface and could reacts to the validation errors.
      * @return observable without any concrete type. Simply subscribe to this method to make it works.
      */
     @NonNull
@@ -68,7 +69,7 @@ public class ValidationController
                 : Observable.empty();
         return Observable
                 .merge(getValidator().getWrapperModel().observe()
-                        .observeOn(AndroidSchedulers.mainThread())
+                                .observeOn(AndroidSchedulers.mainThread())
                                 .doOnNext(updateViewAction),
                         getValidator().getValidationState().observe()
                                 .observeOn(AndroidSchedulers.mainThread())
@@ -84,6 +85,7 @@ public class ValidationController
 
     /**
      * Helper function to check if validation state in error state ot not
+     *
      * @param validationState the state you want to check for the errors.
      * @return true if validation state is in error and false otherwise.
      */

src/main/java/ru/touchin/templates/validation/validators/EditTextValidator.java

@@ -51,6 +51,7 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
      * This flag needed to force showing errors. You don't want to show final error when you start to enter data in some field at first time.
      * But if user leaves this view and final check not passed - you need to force to show an error till user not enters correct data and leaves
      * the view.
+     *
      * @return {@link NonNullChangeable} with current state of the flag - do we need to show errors from final checks while user types.
      */
     @NonNull
@@ -60,6 +61,7 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
 
     /**
      * Use this method to get or set final check.
+     *
      * @return final check.
      */
     @NonNull
@@ -69,6 +71,7 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
 
     /**
      * Use this method to get or set primary check.
+     *
      * @return primary check.
      */
     @NonNull
@@ -119,6 +122,7 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
 
     /**
      * Validates text with primary check.
+     *
      * @param text - input text.
      * @return {@link Observable} with the result of the primary check.
      */
@@ -129,6 +133,7 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
 
     /**
      * Validates text with final check.
+     *
      * @param text - input text.
      * @return {@link Observable} with the result of the final check.
      */
@@ -140,9 +145,10 @@ public abstract class EditTextValidator<TModel extends Serializable> extends Val
     /**
      * Validates text with primary and final check consequentially and returns {@link Observable} with {@link HalfNullablePair} of final state
      * and resulting model.
+     *
      * @param text - input text.
      * @return pair with final {@link ValidationState} that is always not null and a model that we get after converting the text.
-     *         Model can be null if validation fails on primary or final checks.
+     * Model can be null if validation fails on primary or final checks.
      */
     @NonNull
     @Override

src/main/java/ru/touchin/templates/validation/validators/SameTypeValidator.java

@@ -12,12 +12,14 @@ import rx.Observable;
 /**
  * Created by Ilia Kurtov on 24/01/2017.
  * Class that simplifies work with {@link Validator}'s that have the same wrapper model and model type.
+ *
  * @param <TModel> model that should be bounded with a view.
  */
 public class SameTypeValidator<TModel extends Serializable> extends Validator<TModel, TModel> {
 
     /**
      * Simply returns the same model without any converting.
+     *
      * @param wrapperModel input model.
      * @return the same model as input parameter.
      * @throws Throwable - in this case no throwable would be thrown.
@@ -31,9 +33,10 @@ public class SameTypeValidator<TModel extends Serializable> extends Validator<TM
 
     /**
      * Validates {@link TModel} and returns {@link Observable} with {@link HalfNullablePair} of final state and resulting model.
+     *
      * @param wrapperModel - not null value that should be validated.
      * @return pair with final {@link ValidationState} that is always not null and a model that we get after converting the {@link TModel}.
-     *         Model can be null if validation fails.
+     * Model can be null if validation fails.
      */
     @NonNull
     @Override

src/main/java/ru/touchin/templates/validation/validators/Validator.java

@@ -54,6 +54,7 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
 
     /**
      * This method converts {@link TWrapperModel} into a {@link TModel}.
+     *
      * @param wrapperModel - not null value that should be converted into a {@link TModel} object.
      * @return converted wrapperModel into a {@link TModel}.
      * @throws Throwable for the cases when converting cannot be processed.
@@ -63,6 +64,7 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
 
     /**
      * Call this method to get {@link Changeable} with {@link TWrapperModel} inside it that should be connected to its bounded view.
+     *
      * @return {@link Changeable} with {@link TWrapperModel}.
      */
     @NonNull
@@ -72,6 +74,7 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
 
     /**
      * Returns current {@link ValidationState} or its successor. Needed to connect with bounded view and react to this state changes.
+     *
      * @return current validation state.
      */
     @NonNull
@@ -82,6 +85,7 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
     /**
      * This method needed to get {@link ValidationState} that needed to be shown when bounded view is empty and you need to show to user reminder,
      * that he or she needs to fill this view.
+     *
      * @return {@link ValidationState} that should be shown for an empty field.
      */
     @NonNull
@@ -91,9 +95,10 @@ public abstract class Validator<TWrapperModel extends Serializable, TModel exten
 
     /**
      * Validates {@link TWrapperModel} and returns {@link Observable} with {@link HalfNullablePair} of final state and resulting model.
+     *
      * @param wrapperModel - not null value that should be validated.
      * @return pair with final {@link ValidationState} that is always not null and a model that we get after converting the {@link TWrapperModel}.
-     *         Model can be null if validation fails.
+     * Model can be null if validation fails.
      */
     @NonNull
     public abstract Observable<HalfNullablePair<ValidationState, TModel>> fullValidateAndGetModel(@NonNull final TWrapperModel wrapperModel);