From 62492585b024757c0156fba1e9ea48223fe2b327 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 14:35:29 +0300
Subject: [PATCH 01/23] minor changes

---
 app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt    | 1 +
 .../com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
index 544dd8d..b990f89 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
@@ -7,6 +7,7 @@ const val RESPONSE = "RESPONSE"
 
 const val EMPTY_STRING = ""
 const val DEFAULT_RATING = "Y"
+const val ZERO = 0
 
 const val BASE_URL = "https://api.giphy.com/v1/"
 const val API_KEY = "ixOZB0aOMOF7Ivx1vuTIBAeXdksNdGTB"
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index b6e25c1..1730d9d 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -22,7 +22,7 @@ class MainViewModel(private val context: Application,
     lateinit var pagedListLiveData: LiveData<PagedList<String>>
 
     val searchWord: ObservableField<String> = ObservableField()
-    val ratingSelectedPos = ObservableInt(0)
+    val ratingSelectedPos = ObservableInt(ZERO)
     val progress = ObservableInt(View.VISIBLE)
 
     fun initPaging() {

From 613477b1abfb9ce82a60b0374aead1e45668dd3f Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 14:43:01 +0300
Subject: [PATCH 02/23] minor changes

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

diff --git a/app/build.gradle b/app/build.gradle
index 0c9ab02..d190784 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -49,7 +49,7 @@ dependencies {
 
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.10"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.1'
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
 
     // Koin for Kotlin

From 335d407d2c304d3b13a62a59fbbbb7469e44af24 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:00:52 +0300
Subject: [PATCH 03/23] API_KEY migrate in interceptor

---
 .../pavel/gifrandom/rest/JsonLoggingInterceptor.kt       | 9 +++++++--
 .../java/com/haretskiy/pavel/gifrandom/rest/RestApi.kt   | 6 ++----
 .../com/haretskiy/pavel/gifrandom/rest/RestApiImpl.kt    | 5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt
index 66be238..6fd5ff2 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt
@@ -6,6 +6,7 @@ import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.ResponseBody
 
+
 class JsonLoggingInterceptor : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response? {
@@ -13,9 +14,13 @@ class JsonLoggingInterceptor : Interceptor {
         try {
             val t1 = System.nanoTime()
 
-            Log.d(START, "Sending request ${request.url()} Headers: ${request.headers()}")
+            val url = request.url().newBuilder().addQueryParameter("apikey", API_KEY).build()
+            val requestBuilder = request.newBuilder().url(url)
+            val newRequest = requestBuilder.build()
+
+            Log.d(START, "Sending request ${newRequest.url()} Headers: ${newRequest.headers()}")
 
-            val response = chain.proceed(request)
+            val response = chain.proceed(newRequest)
 
             val responseBodyString = response.body()?.string() ?: EMPTY_STRING
 
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApi.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApi.kt
index f70453b..9baaf7d 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApi.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApi.kt
@@ -10,14 +10,12 @@ import retrofit2.http.Query
 interface RestApi {
 
     @GET("gifs/trending")
-    fun loadGifs(@Query("api_key") aipKey: String,
-                 @Query("limit") limit: Int,
+    fun loadGifs(@Query("limit") limit: Int,
                  @Query("rating") rating: String,
                  @Query("offset") offset: String = ZERO_OFFSET): Observable<GifResponse>
 
     @GET("gifs/search")
-    fun loadGifsBySearchWord(@Query("api_key") apiKey: String,
-                             @Query("q") searchWord: String,
+    fun loadGifsBySearchWord(@Query("q") searchWord: String,
                              @Query("limit") limit: Int,
                              @Query("rating") rating: String,
                              @Query("offset") offset: String = ZERO_OFFSET): Observable<GifResponse>
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApiImpl.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApiImpl.kt
index 5cacf71..e635f34 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApiImpl.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/RestApiImpl.kt
@@ -1,13 +1,12 @@
 package com.haretskiy.pavel.gifrandom.rest
 
-import com.haretskiy.pavel.gifrandom.API_KEY
 import com.haretskiy.pavel.gifrandom.LIMIT
 import com.haretskiy.pavel.gifrandom.ZERO_OFFSET
 
 class RestApiImpl(private val restApi: RestApi) {
 
-    fun loadGifs(rating: String, offset: String = ZERO_OFFSET) = restApi.loadGifs(API_KEY, LIMIT, rating, offset)
+    fun loadGifs(rating: String, offset: String = ZERO_OFFSET) = restApi.loadGifs(LIMIT, rating, offset)
 
-    fun loadGifsByWord(word: String, rating: String, offset: String = ZERO_OFFSET) = restApi.loadGifsBySearchWord(API_KEY, word, LIMIT, rating, offset)
+    fun loadGifsByWord(word: String, rating: String, offset: String = ZERO_OFFSET) = restApi.loadGifsBySearchWord(word, LIMIT, rating, offset)
 
 }
\ No newline at end of file

From b5701f3a9572cf96c377a8b2e92d9ecff5fcb900 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:02:42 +0300
Subject: [PATCH 04/23] minor changes

---
 app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt | 4 ++--
 .../rest/{JsonLoggingInterceptor.kt => JsonInterceptor.kt}    | 2 +-
 .../com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename app/src/main/java/com/haretskiy/pavel/gifrandom/rest/{JsonLoggingInterceptor.kt => JsonInterceptor.kt} (97%)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
index e6127ff..e256721 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
@@ -6,7 +6,7 @@ import com.haretskiy.pavel.gifrandom.BUNDLE_KEY_URL
 import com.haretskiy.pavel.gifrandom.adapters.GifAdapter
 import com.haretskiy.pavel.gifrandom.data.Repository
 import com.haretskiy.pavel.gifrandom.data.RepositoryImpl
-import com.haretskiy.pavel.gifrandom.rest.JsonLoggingInterceptor
+import com.haretskiy.pavel.gifrandom.rest.JsonInterceptor
 import com.haretskiy.pavel.gifrandom.rest.RestApi
 import com.haretskiy.pavel.gifrandom.rest.RestApiImpl
 import com.haretskiy.pavel.gifrandom.utils.*
@@ -26,7 +26,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 val restModule: Module = applicationContext {
-    bean { OkHttpClient.Builder().addInterceptor(JsonLoggingInterceptor()).build() }
+    bean { OkHttpClient.Builder().addInterceptor(JsonInterceptor()).build() }
     bean { GsonBuilder().setLenient().create() }
     bean {
         Retrofit.Builder()
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonInterceptor.kt
similarity index 97%
rename from app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt
rename to app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonInterceptor.kt
index 6fd5ff2..5df51a0 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonLoggingInterceptor.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/rest/JsonInterceptor.kt
@@ -7,7 +7,7 @@ import okhttp3.Response
 import okhttp3.ResponseBody
 
 
-class JsonLoggingInterceptor : Interceptor {
+class JsonInterceptor : Interceptor {
 
     override fun intercept(chain: Interceptor.Chain): Response? {
         val request = chain.request()
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index 1730d9d..6033a0b 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -56,6 +56,7 @@ class MainViewModel(private val context: Application,
         factory.rating = getCurrentRating()
         factory.word = searchWord.get() ?: EMPTY_STRING
         factory.invalidate()
+        //todo: problem with position
     }
 
     @Suppress("UNUSED_PARAMETER")

From 15af6065be94ac999407f1fafe098ccd87687ffb Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:28:45 +0300
Subject: [PATCH 05/23] collaps toolbar (start)

---
 .../gifrandom/activities/MainActivity.kt      |  2 +-
 app/src/main/res/layout/activity_main.xml     | 61 ++--------------
 app/src/main/res/layout/main_content.xml      | 71 +++++++++++++++++++
 3 files changed, 79 insertions(+), 55 deletions(-)
 create mode 100644 app/src/main/res/layout/main_content.xml

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
index b7817f7..055859f 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
@@ -9,7 +9,7 @@ import com.haretskiy.pavel.gifrandom.R
 import com.haretskiy.pavel.gifrandom.adapters.GifAdapter
 import com.haretskiy.pavel.gifrandom.databinding.ActivityMainBinding
 import com.haretskiy.pavel.gifrandom.viewModels.MainViewModel
-import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.main_content.*
 import org.koin.android.architecture.ext.viewModel
 import org.koin.android.ext.android.inject
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c243f9f..85c4583 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,63 +9,16 @@
             type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
     </data>
 
-    <FrameLayout
-        android:descendantFocusability="beforeDescendants"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+        <include
+            layout="@layout/main_content"
+            app:model="@{model}" />
 
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:hint="@string/search"
-                android:inputType="text"
-                android:text="@={model.searchWord}" />
-
-            <Spinner
-                android:id="@+id/rating"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/ratings"
-                android:onItemSelected="@{model::onRatingSelected}"
-                android:selectedItemPosition="@={model.ratingSelectedPos}" />
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="@{model::onClickSearch}"
-                android:text="@string/search" />
-
-            <android.support.v7.widget.RecyclerView
-                android:scrollbars="vertical"
-                android:id="@+id/rv_gifs"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="50"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:visibility="@{model.progress}">
-
-            <ProgressBar
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="100dp" />
-        </FrameLayout>
-    </FrameLayout>
+    </LinearLayout>
 
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_content.xml b/app/src/main/res/layout/main_content.xml
new file mode 100644
index 0000000..e77867d
--- /dev/null
+++ b/app/src/main/res/layout/main_content.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:descendantFocusability="beforeDescendants"
+        android:focusable="true"
+        android:focusableInTouchMode="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                android:hint="@string/search"
+                android:inputType="text"
+                android:text="@={model.searchWord}" />
+
+            <Spinner
+                android:id="@+id/rating"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:entries="@array/ratings"
+                android:onItemSelected="@{model::onRatingSelected}"
+                android:selectedItemPosition="@={model.ratingSelectedPos}" />
+
+            <Button
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:onClick="@{model::onClickSearch}"
+                android:text="@string/search" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_gifs"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="50"
+                android:scrollbars="vertical"
+                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:visibility="@{model.progress}">
+
+            <ProgressBar
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:padding="100dp" />
+        </FrameLayout>
+    </FrameLayout>
+
+
+</layout>
\ No newline at end of file

From a29b9005785589f2246893b077730d0cfe343453 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:37:59 +0300
Subject: [PATCH 06/23] collaps toolbar (in progress)

---
 app/src/main/res/layout/activity_main.xml | 37 ++++++++++++++----
 app/src/main/res/layout/filter.xml        | 46 +++++++++++++++++++++++
 app/src/main/res/layout/main_content.xml  | 40 ++------------------
 3 files changed, 80 insertions(+), 43 deletions(-)
 create mode 100644 app/src/main/res/layout/filter.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 85c4583..884863b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,16 +9,39 @@
             type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
     </data>
 
-    <LinearLayout
+    <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <include
-            layout="@layout/main_content"
-            app:model="@{model}" />
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    </LinearLayout>
+            <android.support.design.widget.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <include
+                    layout="@layout/filter"
+                    app:model="@{model}" />
+
+            </android.support.design.widget.CollapsingToolbarLayout>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <include
+                layout="@layout/main_content"
+                app:model="@{model}" />
+
+        </FrameLayout>
+    </android.support.design.widget.CoordinatorLayout>
 
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/filter.xml b/app/src/main/res/layout/filter.xml
new file mode 100644
index 0000000..903b37b
--- /dev/null
+++ b/app/src/main/res/layout/filter.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
+    </data>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:descendantFocusability="beforeDescendants"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:hint="@string/search"
+            android:inputType="text"
+            android:text="@={model.searchWord}" />
+
+        <Spinner
+            android:id="@+id/rating"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:entries="@array/ratings"
+            android:onItemSelected="@{model::onRatingSelected}"
+            android:selectedItemPosition="@={model.ratingSelectedPos}" />
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:onClick="@{model::onClickSearch}"
+            android:text="@string/search" />
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_content.xml b/app/src/main/res/layout/main_content.xml
index e77867d..54e6ee9 100644
--- a/app/src/main/res/layout/main_content.xml
+++ b/app/src/main/res/layout/main_content.xml
@@ -16,43 +16,12 @@
         android:focusable="true"
         android:focusableInTouchMode="true">
 
-        <LinearLayout
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_gifs"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <EditText
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:hint="@string/search"
-                android:inputType="text"
-                android:text="@={model.searchWord}" />
-
-            <Spinner
-                android:id="@+id/rating"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/ratings"
-                android:onItemSelected="@{model::onRatingSelected}"
-                android:selectedItemPosition="@={model.ratingSelectedPos}" />
-
-            <Button
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:onClick="@{model::onClickSearch}"
-                android:text="@string/search" />
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/rv_gifs"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="50"
-                android:scrollbars="vertical"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
-        </LinearLayout>
+            android:scrollbars="vertical"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -67,5 +36,4 @@
         </FrameLayout>
     </FrameLayout>
 
-
 </layout>
\ No newline at end of file

From 327d06fb0858d5c8c289c08b01ee0987cf3bcc37 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:39:39 +0300
Subject: [PATCH 07/23] collaps toolbar (in progress)

---
 app/src/main/res/layout/activity_main.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 884863b..9acce6a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,6 +14,7 @@
         android:layout_height="match_parent">
 
         <android.support.design.widget.AppBarLayout
+            android:background="@android:color/white"
             android:id="@+id/appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">

From e5411c9ed6545dd41f686a4554a6d2dab7aa1b4d Mon Sep 17 00:00:00 2001
From: Pavel <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:46:32 +0300
Subject: [PATCH 08/23] collaps toolbar (in progress)

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ad20e1..08de947 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         </activity>
         <activity
             android:name=".activities.DetailActivity"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
     </application>
 
 </manifest>
\ No newline at end of file

From 61d815bc2eb4a31aa14b0f28a4d0cae95e613822 Mon Sep 17 00:00:00 2001
From: Pavel <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 15:52:43 +0300
Subject: [PATCH 09/23] collaps toolbar (in progress)

---
 app/src/main/res/layout/activity_main.xml | 40 ++++++-----------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9acce6a..a3e4a24 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,40 +9,20 @@
             type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
     </data>
 
-    <android.support.design.widget.CoordinatorLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
-            android:background="@android:color/white"
-            android:id="@+id/appbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <include
+            layout="@layout/filter"
+            app:model="@{model}" />
 
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+        <include
+            layout="@layout/main_content"
+            app:model="@{model}" />
 
-                <include
-                    layout="@layout/filter"
-                    app:model="@{model}" />
-
-            </android.support.design.widget.CollapsingToolbarLayout>
-
-        </android.support.design.widget.AppBarLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-            <include
-                layout="@layout/main_content"
-                app:model="@{model}" />
-
-        </FrameLayout>
-    </android.support.design.widget.CoordinatorLayout>
+    </LinearLayout>
 
 
 </layout>
\ No newline at end of file

From 1dbac4b9b6991fa498143ec55e280a62a7ca5791 Mon Sep 17 00:00:00 2001
From: Pavel <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 16:04:23 +0300
Subject: [PATCH 10/23] collaps toolbar (in progress)

---
 app/src/main/res/layout/activity_main.xml | 40 +++++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a3e4a24..5f15507 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,20 +9,40 @@
             type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
     </data>
 
-    <LinearLayout
+    <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <include
-            layout="@layout/filter"
-            app:model="@{model}" />
+        <android.support.design.widget.AppBarLayout
+            android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <include
-            layout="@layout/main_content"
-            app:model="@{model}" />
+            <android.support.design.widget.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-    </LinearLayout>
+                <include
+                    layout="@layout/filter"
+                    app:model="@{model}" />
+
+            </android.support.design.widget.CollapsingToolbarLayout>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <include
+                layout="@layout/main_content"
+                app:model="@{model}" />
+
+        </FrameLayout>
+    </android.support.design.widget.CoordinatorLayout>
 
 
 </layout>
\ No newline at end of file

From a8942da6b30d2ce89607b4dbc0cec75c0bba9ea5 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 16:26:11 +0300
Subject: [PATCH 11/23] position rotate bug fixed

---
 .../gifrandom/activities/MainActivity.kt      |  1 -
 .../gifrandom/viewModels/MainViewModel.kt     | 43 ++++++++-----------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
index 055859f..08aed49 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
@@ -27,7 +27,6 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        mainViewModel.initPaging()
         binding.model = mainViewModel
 
         initRecyclerView()
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index 6033a0b..aabe236 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -2,7 +2,6 @@ package com.haretskiy.pavel.gifrandom.viewModels
 
 import android.app.Application
 import android.arch.lifecycle.AndroidViewModel
-import android.arch.lifecycle.LiveData
 import android.arch.paging.LivePagedListBuilder
 import android.arch.paging.PagedList
 import android.databinding.ObservableField
@@ -18,35 +17,29 @@ import java.util.concurrent.Executors
 class MainViewModel(private val context: Application,
                     private val factory: GifsSourceFactory) : AndroidViewModel(context) {
 
-    private lateinit var config: PagedList.Config
-    lateinit var pagedListLiveData: LiveData<PagedList<String>>
+    private val config = PagedList.Config.Builder()
+            .setEnablePlaceholders(false)
+            .setInitialLoadSizeHint(INITIAL_LOAD_SIZE)
+            .setPrefetchDistance(PREFETCH_SIZE)
+            .setPageSize(LIMIT)
+            .build()
+    val pagedListLiveData = LivePagedListBuilder(
+            factory.initCallback(object : GifsDataSource.GifsLoadedCallback {
+                override fun onStartInitialLoad() {
+                    progress.set(View.VISIBLE)
+                }
+
+                override fun onFinishInitialLoad() {
+                    progress.set(View.GONE)
+                }
+            }), config)
+            .setFetchExecutor(Executors.newSingleThreadExecutor())
+            .build()
 
     val searchWord: ObservableField<String> = ObservableField()
     val ratingSelectedPos = ObservableInt(ZERO)
     val progress = ObservableInt(View.VISIBLE)
 
-    fun initPaging() {
-        config = PagedList.Config.Builder()
-                .setEnablePlaceholders(false)
-                .setInitialLoadSizeHint(INITIAL_LOAD_SIZE)
-                .setPrefetchDistance(PREFETCH_SIZE)
-                .setPageSize(LIMIT)
-                .build()
-
-        pagedListLiveData = LivePagedListBuilder(
-                factory.initCallback(object : GifsDataSource.GifsLoadedCallback {
-                    override fun onStartInitialLoad() {
-                        progress.set(View.VISIBLE)
-                    }
-
-                    override fun onFinishInitialLoad() {
-                        progress.set(View.GONE)
-                    }
-                }), config)
-                .setFetchExecutor(Executors.newSingleThreadExecutor())
-                .build()
-    }
-
     private fun getCurrentRating(): String {
         val ratings = context.resources.getStringArray(R.array.ratings)
         return ratings[ratingSelectedPos.get()]

From 42d9ab2d40e8a99b96c818921d04e9a75b7e3f68 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 16:33:14 +0300
Subject: [PATCH 12/23] minor changes

---
 app/src/main/AndroidManifest.xml                              | 4 +---
 .../com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt | 1 +
 app/src/main/res/layout/activity_main.xml                     | 1 +
 app/src/main/res/values/styles.xml                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 08de947..5d08a75 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,9 +19,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activities.DetailActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name=".activities.DetailActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index aabe236..8e6961b 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -23,6 +23,7 @@ class MainViewModel(private val context: Application,
             .setPrefetchDistance(PREFETCH_SIZE)
             .setPageSize(LIMIT)
             .build()
+
     val pagedListLiveData = LivePagedListBuilder(
             factory.initCallback(object : GifsDataSource.GifsLoadedCallback {
                 override fun onStartInitialLoad() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5f15507..a2d4b3a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,6 +19,7 @@
             android:layout_height="wrap_content">
 
             <android.support.design.widget.CollapsingToolbarLayout
+                android:theme="@style/AppTheme"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f7eda9c..b2a9391 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From 98db218ace8940347b6180005653e954b62a84a0 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 17:06:37 +0300
Subject: [PATCH 13/23] collapse toolbar added

---
 .../gifrandom/activities/MainActivity.kt      | 14 +++++
 .../gifrandom/viewModels/MainViewModel.kt     | 25 ++++++++
 app/src/main/res/layout/activity_main.xml     |  9 ++-
 app/src/main/res/layout/toolbar.xml           | 58 +++++++++++++++++++
 4 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/toolbar.xml

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
index 08aed49..995a624 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
@@ -6,10 +6,12 @@ import android.databinding.DataBindingUtil
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.haretskiy.pavel.gifrandom.R
+import com.haretskiy.pavel.gifrandom.ZERO
 import com.haretskiy.pavel.gifrandom.adapters.GifAdapter
 import com.haretskiy.pavel.gifrandom.databinding.ActivityMainBinding
 import com.haretskiy.pavel.gifrandom.viewModels.MainViewModel
 import kotlinx.android.synthetic.main.main_content.*
+import kotlinx.android.synthetic.main.toolbar.*
 import org.koin.android.architecture.ext.viewModel
 import org.koin.android.ext.android.inject
 
@@ -28,8 +30,10 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         binding.model = mainViewModel
+        mainViewModel.setBinding(binding)
 
         initRecyclerView()
+        initToolbar()
     }
 
     private fun initRecyclerView() {
@@ -38,6 +42,16 @@ class MainActivity : AppCompatActivity() {
             adapter.submitList(urls)
         })
         rv_gifs.adapter = adapter
+
+        mainViewModel.positLiveData.observe(this, Observer {
+            if (it == true) {
+                rv_gifs.scrollToPosition(ZERO)
+            }
+        })
+    }
+
+    private fun initToolbar() {
+        setSupportActionBar(toolbar)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index 8e6961b..4d78cf2 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -2,6 +2,7 @@ package com.haretskiy.pavel.gifrandom.viewModels
 
 import android.app.Application
 import android.arch.lifecycle.AndroidViewModel
+import android.arch.lifecycle.MutableLiveData
 import android.arch.paging.LivePagedListBuilder
 import android.arch.paging.PagedList
 import android.databinding.ObservableField
@@ -9,6 +10,7 @@ import android.databinding.ObservableInt
 import android.view.View
 import android.widget.AdapterView
 import com.haretskiy.pavel.gifrandom.*
+import com.haretskiy.pavel.gifrandom.databinding.ActivityMainBinding
 import com.haretskiy.pavel.gifrandom.utils.pagging.GifsDataSource
 import com.haretskiy.pavel.gifrandom.utils.pagging.GifsSourceFactory
 import java.util.concurrent.Executors
@@ -40,6 +42,11 @@ class MainViewModel(private val context: Application,
     val searchWord: ObservableField<String> = ObservableField()
     val ratingSelectedPos = ObservableInt(ZERO)
     val progress = ObservableInt(View.VISIBLE)
+    val toolbarVisibility = ObservableInt(View.VISIBLE)
+
+    val positLiveData = MutableLiveData<Boolean>()
+
+    private lateinit var binding: ActivityMainBinding
 
     private fun getCurrentRating(): String {
         val ratings = context.resources.getStringArray(R.array.ratings)
@@ -53,9 +60,27 @@ class MainViewModel(private val context: Application,
         //todo: problem with position
     }
 
+    fun onClickFilter(@Suppress("UNUSED_PARAMETER") v: View) {
+        positLiveData.postValue(true)
+    }
+
+
     @Suppress("UNUSED_PARAMETER")
     fun onRatingSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
     }
 
+    fun setBinding(binding: ActivityMainBinding) {
+        this.binding = binding
+        binding.appbar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
+            if (Math.abs(verticalOffset) - appBarLayout.totalScrollRange >= 0) {
+                //  Collapse
+                toolbarVisibility.set(View.VISIBLE)
+            } else {
+                //Expanded
+                toolbarVisibility.set(View.GONE)
+            }
+        }
+    }
+
 }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2d4b3a..d05706d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,16 +19,23 @@
             android:layout_height="wrap_content">
 
             <android.support.design.widget.CollapsingToolbarLayout
-                android:theme="@style/AppTheme"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@android:color/white"
+                android:theme="@style/AppTheme"
                 app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <include
                     layout="@layout/filter"
                     app:model="@{model}" />
 
+                <include
+                    layout="@layout/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    app:model="@{model}" />
+
             </android.support.design.widget.CollapsingToolbarLayout>
 
         </android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000..700432d
--- /dev/null
+++ b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="model"
+            type="com.haretskiy.pavel.gifrandom.viewModels.MainViewModel" />
+    </data>
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="@color/colorPrimary"
+        android:visibility="@{model.toolbarVisibility}">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/colorPrimary"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginBottom="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:gravity="center"
+                android:text="@string/app_name"
+                android:textColor="@android:color/white"
+                android:textSize="22sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginTop="8dp"
+                android:contentDescription="@string/app_name"
+                android:gravity="center|end"
+                android:onClick="@{model::onClickFilter}"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@android:drawable/ic_menu_search" />
+
+        </android.support.constraint.ConstraintLayout>
+    </android.support.v7.widget.Toolbar>
+</layout>
\ No newline at end of file

From 8483d522141508089a9f23dc19ae312154f945ab Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 17:08:36 +0300
Subject: [PATCH 14/23] collapse toolbar added

---
 .../com/haretskiy/pavel/gifrandom/activities/MainActivity.kt  | 4 +---
 .../com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
index 995a624..5c43fca 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
@@ -37,17 +37,15 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun initRecyclerView() {
-
         mainViewModel.pagedListLiveData.observe(this, Observer<PagedList<String>> { urls ->
             adapter.submitList(urls)
         })
-        rv_gifs.adapter = adapter
-
         mainViewModel.positLiveData.observe(this, Observer {
             if (it == true) {
                 rv_gifs.scrollToPosition(ZERO)
             }
         })
+        rv_gifs.adapter = adapter
     }
 
     private fun initToolbar() {
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index 4d78cf2..053e0d6 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -46,8 +46,6 @@ class MainViewModel(private val context: Application,
 
     val positLiveData = MutableLiveData<Boolean>()
 
-    private lateinit var binding: ActivityMainBinding
-
     private fun getCurrentRating(): String {
         val ratings = context.resources.getStringArray(R.array.ratings)
         return ratings[ratingSelectedPos.get()]
@@ -70,7 +68,6 @@ class MainViewModel(private val context: Application,
     }
 
     fun setBinding(binding: ActivityMainBinding) {
-        this.binding = binding
         binding.appbar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
             if (Math.abs(verticalOffset) - appBarLayout.totalScrollRange >= 0) {
                 //  Collapse

From 4440ec5aeb1ec7f3b2ebc220e1e449aaf6801840 Mon Sep 17 00:00:00 2001
From: Pavel <pasha280294@gmail.com>
Date: Mon, 11 Jun 2018 22:13:07 +0300
Subject: [PATCH 15/23] bug fixed

---
 .../com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
index d755e84..eaa5195 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
@@ -19,6 +19,9 @@ class RepositoryImpl(
                             if (it != null) {
                                 resultCallback.onResult(it)
                             }
+                        },
+                        {
+                            resultCallback.onResult(emptyList())
                         })
     }
 
@@ -31,6 +34,9 @@ class RepositoryImpl(
                             if (it != null) {
                                 resultCallback.onResult(it)
                             }
+                        },
+                        {
+                            resultCallback.onResult(emptyList())
                         })
     }
 

From ef2672be15ae3f1f921eeb755a5cda9b91b930f8 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Tue, 12 Jun 2018 11:29:13 +0300
Subject: [PATCH 16/23] bug fixed

---
 .../gifrandom/utils/pagging/GifsDataSource.kt | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
index 174baf9..c49eae4 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
@@ -35,15 +35,27 @@ class GifsDataSource(
         if (word.isEmpty()) {
             repository.loadTrendingGifs(rating, ZERO_OFFSET, object : RepositoryImpl.ResultCallback {
                 override fun onResult(list: List<String>) {
-                    callback.onResult(list, params.requestedStartPosition)
-                    gifsLoadedCallback.onFinishInitialLoad()
+                    try {
+                        var startPos = params.requestedStartPosition
+                        if (startPos < 0) startPos = 0
+                        callback.onResult(list, startPos)
+                        gifsLoadedCallback.onFinishInitialLoad()
+                    } catch (ex: Exception) {
+                        ex.printStackTrace()
+                    }
                 }
             })
         } else {
             repository.loadGifsByWord(word, rating, ZERO_OFFSET, object : RepositoryImpl.ResultCallback {
                 override fun onResult(list: List<String>) {
-                    callback.onResult(list, params.requestedStartPosition)
-                    gifsLoadedCallback.onFinishInitialLoad()
+                    try {
+                        var startPos = params.requestedStartPosition
+                        if (startPos < 0) startPos = 0
+                        callback.onResult(list, startPos)
+                        gifsLoadedCallback.onFinishInitialLoad()
+                    } catch (ex: Exception) {
+                        ex.printStackTrace()
+                    }
                 }
             })
         }

From 10ea5fe22e7f0eeb24d6aecf56b2dd2d6b9d14ee Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Tue, 12 Jun 2018 12:28:12 +0300
Subject: [PATCH 17/23] sharing added

---
 .../haretskiy/pavel/gifrandom/Constants.kt    |   4 +-
 .../haretskiy/pavel/gifrandom/utils/Router.kt |   1 +
 .../pavel/gifrandom/utils/RouterImpl.kt       |   9 +
 .../viewModels/GifHolderViewModel.kt          |   5 +
 .../drawable-v24/ic_launcher_foreground.xml   |  34 ----
 .../res/drawable/ic_launcher_background.xml   | 170 ------------------
 app/src/main/res/drawable/ic_share.png        | Bin 0 -> 1865 bytes
 app/src/main/res/layout/item_holder.xml       |  14 +-
 8 files changed, 30 insertions(+), 207 deletions(-)
 delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml
 delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml
 create mode 100755 app/src/main/res/drawable/ic_share.png

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
index b990f89..79cd9b9 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
@@ -20,4 +20,6 @@ const val BUNDLE_KEY_URL_DETAIL = "BUNDLE_KEY_URL_DETAIL"
 const val BUNDLE_KEY_URL = "BUNDLE_KEY_URL"
 
 const val VIEW_NAME_IMAGE = "VIEW_NAME_IMAGE"
-const val START_ANIMATION_DELAY = 600L
\ No newline at end of file
+const val START_ANIMATION_DELAY = 600L
+
+const val SHARE_TYPE_TEXT = "text/plain"
\ No newline at end of file
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Router.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Router.kt
index 3bc41be..d4376d0 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Router.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Router.kt
@@ -8,4 +8,5 @@ interface Router {
     fun startDetailActivity(url: String)
 
     fun startDetailActivity(context: Context, imageView: View, url: String)
+    fun shareGif(urlStr: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/RouterImpl.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/RouterImpl.kt
index d02928b..3020eaa 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/RouterImpl.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/RouterImpl.kt
@@ -7,6 +7,7 @@ import android.support.v4.app.ActivityOptionsCompat
 import android.support.v4.util.Pair
 import android.view.View
 import com.haretskiy.pavel.gifrandom.BUNDLE_KEY_URL_DETAIL
+import com.haretskiy.pavel.gifrandom.SHARE_TYPE_TEXT
 import com.haretskiy.pavel.gifrandom.VIEW_NAME_IMAGE
 import com.haretskiy.pavel.gifrandom.activities.DetailActivity
 
@@ -32,4 +33,12 @@ class RouterImpl(private var context: Context) : Router {
         context.startActivity(intent, activityOptions.toBundle())
     }
 
+    override fun shareGif(urlStr: String) {
+        val shareIntent = Intent(Intent.ACTION_SEND)
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        shareIntent.type = SHARE_TYPE_TEXT
+        shareIntent.putExtra(Intent.EXTRA_TEXT, urlStr)
+
+        context.startActivity(shareIntent)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
index 01a6a7b..0de7464 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
@@ -29,6 +29,11 @@ class GifHolderViewModel(
         router.startDetailActivity(mItemGifBinding.root.context, mItemGifBinding.imageView, urlStr)
     }
 
+    fun onClickShare(@Suppress("UNUSED_PARAMETER") v: View) {
+        router.shareGif(urlStr)
+    }
+
+
     fun initObservers(lifecycleOwner: LifecycleOwner) {
         progressController.subscribeOnProgressChanges(lifecycleOwner, Observer {
             progress.set(if (it == true) View.VISIBLE else View.GONE)
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index c7bd21d..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<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/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index d5fccc5..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?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/app/src/main/res/drawable/ic_share.png b/app/src/main/res/drawable/ic_share.png
new file mode 100755
index 0000000000000000000000000000000000000000..7e8ddc8ef2c64a8e560d9319fbe404ab1e5fddac
GIT binary patch
literal 1865
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
DI7oZA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/item_holder.xml b/app/src/main/res/layout/item_holder.xml
index e27f49d..b493e6f 100644
--- a/app/src/main/res/layout/item_holder.xml
+++ b/app/src/main/res/layout/item_holder.xml
@@ -27,8 +27,18 @@
             android:contentDescription="@string/app_name"
             android:onClick="@{gifViewModel::onItemClick}"
             tool:imageLoader="@{gifViewModel.loader}"
-            tool:progress="@{gifViewModel.observableProgressController}"
-            tool:imageUrl="@{gifViewModel.url}" />
+            tool:imageUrl="@{gifViewModel.url}"
+            tool:progress="@{gifViewModel.observableProgressController}" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:contentDescription="@string/app_name"
+            android:onClick="@{gifViewModel::onClickShare}"
+            android:scaleX="0.5"
+            android:scaleY="0.5"
+            android:src="@drawable/ic_share" />
 
         <ProgressBar
             android:id="@+id/progress_bar"

From 6a4b1d1d5f422765309aae35390c93053e09a351 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Tue, 12 Jun 2018 12:30:50 +0300
Subject: [PATCH 18/23] minor changes

---
 .../haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt   | 1 -
 .../com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt    | 1 -
 .../main/java/com/haretskiy/pavel/gifrandom/views/GifHolder.kt   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
index 0de7464..d89c707 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/GifHolderViewModel.kt
@@ -33,7 +33,6 @@ class GifHolderViewModel(
         router.shareGif(urlStr)
     }
 
-
     fun initObservers(lifecycleOwner: LifecycleOwner) {
         progressController.subscribeOnProgressChanges(lifecycleOwner, Observer {
             progress.set(if (it == true) View.VISIBLE else View.GONE)
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
index 053e0d6..b34e47b 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/viewModels/MainViewModel.kt
@@ -55,7 +55,6 @@ class MainViewModel(private val context: Application,
         factory.rating = getCurrentRating()
         factory.word = searchWord.get() ?: EMPTY_STRING
         factory.invalidate()
-        //todo: problem with position
     }
 
     fun onClickFilter(@Suppress("UNUSED_PARAMETER") v: View) {
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/views/GifHolder.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/views/GifHolder.kt
index d293fff..bad4395 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/views/GifHolder.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/views/GifHolder.kt
@@ -23,5 +23,4 @@ class GifHolder(private val imageLoader: ImageLoader,
         mItemGifBinding.executePendingBindings()
     }
 
-
 }
\ No newline at end of file

From 806d51bd6184507079c04e1e16db76874602f2d5 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Thu, 14 Jun 2018 12:07:00 +0300
Subject: [PATCH 19/23] data changes

---
 .../pavel/gifrandom/data/RepositoryImpl.kt    | 33 +++------
 .../gifrandom/utils/pagging/GifsDataSource.kt | 70 ++++++++-----------
 2 files changed, 39 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
index eaa5195..827b19c 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/data/RepositoryImpl.kt
@@ -11,23 +11,20 @@ class RepositoryImpl(
         private val restApi: RestApiImpl) : Repository {
 
     override fun loadTrendingGifs(rating: String, offset: String, resultCallback: ResultCallback) {
-        transformToListString(restApi.loadGifs(rating, offset))
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(
-                        {
-                            if (it != null) {
-                                resultCallback.onResult(it)
-                            }
-                        },
-                        {
-                            resultCallback.onResult(emptyList())
-                        })
+        load(restApi.loadGifs(rating, offset), resultCallback)
     }
 
     override fun loadGifsByWord(word: String, rating: String, offset: String, resultCallback: ResultCallback) {
-        transformToListString(restApi.loadGifsByWord(word, rating, offset))
-                .subscribeOn(Schedulers.io())
+        load(restApi.loadGifsByWord(word, rating, offset), resultCallback)
+    }
+
+    private fun load(obs: Observable<GifResponse>, resultCallback: ResultCallback) {
+        obs.subscribeOn(Schedulers.io())
+                .map {
+                    it.data.map {
+                        it.images?.original?.url ?: EMPTY_STRING
+                    }
+                }
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(
                         {
@@ -40,14 +37,6 @@ class RepositoryImpl(
                         })
     }
 
-    private fun transformToListString(response: Observable<GifResponse>): Observable<List<String>> =
-            response.map {
-                val list = it.data.map {
-                    it.images?.original?.url ?: EMPTY_STRING
-                }
-                list
-            }
-
     interface ResultCallback {
         fun onResult(list: List<String>)
     }
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
index c49eae4..8bfabcf 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/pagging/GifsDataSource.kt
@@ -3,61 +3,47 @@ package com.haretskiy.pavel.gifrandom.utils.pagging
 import android.arch.paging.PositionalDataSource
 import com.haretskiy.pavel.gifrandom.ZERO_OFFSET
 import com.haretskiy.pavel.gifrandom.data.Repository
-import com.haretskiy.pavel.gifrandom.data.RepositoryImpl
+import com.haretskiy.pavel.gifrandom.data.RepositoryImpl.ResultCallback
 
 class GifsDataSource(
         private val repository: Repository,
-        var gifsLoadedCallback: GifsLoadedCallback,
+        private var gifsLoadedCallback: GifsLoadedCallback,
         private var rating: String,
         private var word: String) : PositionalDataSource<String>() {
 
     override fun loadRange(params: LoadRangeParams, callback: LoadRangeCallback<String>) {
         gifsLoadedCallback.onStartPageLoad()
-        if (word.isEmpty()) {
-            repository.loadTrendingGifs(rating, params.startPosition.toString(), object : RepositoryImpl.ResultCallback {
-                override fun onResult(list: List<String>) {
-                    callback.onResult(list)
-                    gifsLoadedCallback.onFinishPageLoad()
-                }
-            })
-        } else {
-            repository.loadGifsByWord(word, rating, params.startPosition.toString(), object : RepositoryImpl.ResultCallback {
-                override fun onResult(list: List<String>) {
-                    callback.onResult(list)
-                    gifsLoadedCallback.onFinishPageLoad()
-                }
-            })
+        when {
+            word.isEmpty() -> repository.loadTrendingGifs(rating, params.startPosition.toString(), resultCallback(callback))
+            else -> repository.loadGifsByWord(word, rating, params.startPosition.toString(), resultCallback(callback))
         }
     }
 
     override fun loadInitial(params: LoadInitialParams, callback: LoadInitialCallback<String>) {
         gifsLoadedCallback.onStartInitialLoad()
-        if (word.isEmpty()) {
-            repository.loadTrendingGifs(rating, ZERO_OFFSET, object : RepositoryImpl.ResultCallback {
-                override fun onResult(list: List<String>) {
-                    try {
-                        var startPos = params.requestedStartPosition
-                        if (startPos < 0) startPos = 0
-                        callback.onResult(list, startPos)
-                        gifsLoadedCallback.onFinishInitialLoad()
-                    } catch (ex: Exception) {
-                        ex.printStackTrace()
-                    }
-                }
-            })
-        } else {
-            repository.loadGifsByWord(word, rating, ZERO_OFFSET, object : RepositoryImpl.ResultCallback {
-                override fun onResult(list: List<String>) {
-                    try {
-                        var startPos = params.requestedStartPosition
-                        if (startPos < 0) startPos = 0
-                        callback.onResult(list, startPos)
-                        gifsLoadedCallback.onFinishInitialLoad()
-                    } catch (ex: Exception) {
-                        ex.printStackTrace()
-                    }
-                }
-            })
+        when {
+            word.isEmpty() -> repository.loadTrendingGifs(rating, ZERO_OFFSET, initialResultCallback(params, callback))
+            else -> repository.loadGifsByWord(word, rating, ZERO_OFFSET, initialResultCallback(params, callback))
+        }
+    }
+
+    private fun initialResultCallback(params: LoadInitialParams, callback: LoadInitialCallback<String>) = object : ResultCallback {
+        override fun onResult(list: List<String>) = try {
+            var startPos = params.requestedStartPosition
+            when {
+                startPos < 0 -> startPos = 0
+            }
+            callback.onResult(list, startPos)
+            gifsLoadedCallback.onFinishInitialLoad()
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+    }
+
+    private fun resultCallback(callback: LoadRangeCallback<String>) = object : ResultCallback {
+        override fun onResult(list: List<String>) {
+            callback.onResult(list)
+            gifsLoadedCallback.onFinishPageLoad()
         }
     }
 

From 497d27f8d17fc269e00d5731ca259d055002be03 Mon Sep 17 00:00:00 2001
From: Pavel <pasha280294@gmail.com>
Date: Thu, 14 Jun 2018 12:17:21 +0300
Subject: [PATCH 20/23] minorChanges

---
 app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
index e256721..fef357a 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
@@ -50,7 +50,7 @@ val appModule: Module = applicationContext {
     factory { GifAdapter(get(), get(), get()) }
 }
 
-val viewModelModel: Module = applicationContext {
+val viewModelModule: Module = applicationContext {
     viewModel { MainViewModel(androidApplication(), get()) }
     viewModel { params: ParameterProvider ->
         DetailViewModel(get(), params[BUNDLE_KEY_URL])
@@ -58,6 +58,6 @@ val viewModelModel: Module = applicationContext {
 }
 
 
-val modules = listOf(restModule, appModule, viewModelModel)
+val modules = listOf(restModule, appModule, viewModelModule)
 
 

From a8c92df9df2054353c3d7a6f236e43b98a456908 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <pasha280294@gmail.com>
Date: Thu, 14 Jun 2018 12:35:07 +0300
Subject: [PATCH 21/23] keystore added

---
 GifsKeyStore           | Bin 0 -> 4271 bytes
 app/build.gradle       |  27 ++++++++++++++++++++++--
 app/proguard-rules.pro |  46 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 GifsKeyStore

diff --git a/GifsKeyStore b/GifsKeyStore
new file mode 100644
index 0000000000000000000000000000000000000000..1f72c1c8c10eb3c15de5c00e3d9c23ae3815576a
GIT binary patch
literal 4271
zcmb`}WmFXEx(DznkQzD!M7nEe7)rWJ8fh3nQR(g)KtP%ikPa#793%wX(j5azC`gwy
zNF47u`>u8NS$nO!?p^o8`{DoPt>=y3?cVJk0002}*?@q1?uh3I8xI5k0JOWwCQ1bW
zut2bI$SsTz8;=_s2mx||NPs{r03;l;Z81_-`M5X2l+Pf8l*oX|j_g8`{_Y@Zz`S!<
zZC_|MTG<%`7a_+gS~F0vsb8|p;T7?M$gT7Q^`0Njs&FUga%c6w<B}+TVzO0!=BW@%
z*;A3`74gb5t2QjVNS;y)2eA<u1nR3*sjvExhOd=*az+_9N)7kp^|yiIG48PKQ6TMK
z^33b0573QiP?#MmMGq)YXzsEzrl)0(Z(h~O!9U;W1ps`*hHzHMlal3O6t%O8Pfi^M
zH?ED(Ss%7OkS0Ly5NNX#UV$Oa<jq|v>W()pw*}M>ZO-;l^%w39sTa;y<XXD2d$!c3
z{;v{h^5D^FM$?mZEkB5h$Bgl!Qs(*sDLYq-$Ks#G^LG@ngaRqt5<ffUp~A$r8_u-f
zEIu%|L6j+4tMSY;QO85mZy$zA$Lebop$rx-K%Aj?AS>lHaZx2OD=i&fGxAW*^9#EV
zos1g?Y7iM`Aqk=}GewnG#NG&m4Lm@I@zoLH938dLeKmk@iYJBd!6}2hG4<@7cuDKs
z3(CvvxjXz~t$yUY80o7)6Y)Uf(|XOq5SxtWdlX{r$Mw@^>3lXsnHR6o_ER%uFF(WS
zrehYZip->>+yiPQx0_`D*b*?eQiK@mG?6hb2$gCt8n|#~S!pqPXpKAlDtH*3LNh7D
ztZCnbHAl|15Ly4)g5lm{f?|B>MM4(HuXCa0ng@>Mu2X9r4$G`Mbyn=DuU#Mg#FoFQ
z+Wm?3Y?fCJ_tkQw5LQ!k`>OpX{v_o%y)6l~-Nn4x;O(%uG-siNzy{-re2kjo?Of-z
z-DFCa)kC6k^<CldA$ZO3L07l~f6ARwZe810@p<-)Oh;jnmb8x5%7xru<?}Fzrv4F4
z?RHouE_{P)y}+YV1<~cTvs`&bMy&s$`&jlV|4GIgUAxCiE8A1HpqqSpp0}I}%HX2q
zMLLV?>Ld-}BgZ<5;+`<ofn*+7pnM>QUp$L$8Hl~}La4r-ZU024Or0NhH7Z6C&2-t8
z&zZ1-5_?dXvk}xz5H|a*pMG>_#MXF_deM4?_X_OUGd{qz)zwG8V~^u`_wYFTBQmu>
z@uXnK2QQc@#Y;n`J$hR_3+PR=zFSf%Kh-CbH_3(~bQt8RuD(a5?+pL$6Cc8{H-&Rr
zIhk6^#?<#rj>eLxk_m%dT!3d5)Q!uNXZbNE#9Ule_0pR2gs3_9ArxO_yKwrEwMK7k
z+#X{tva@VDZ=&Np3`FeaqX{wR3k~?_FI`vNbZw5f)BC3UgFbi-1|-spN}U-0JiO$K
zU)sPaX!}v;iPMc?8KcS_1@R8B19!T|${+2Y)nhNOUBXWCG}LIehl%U+fbQ3Tfhct}
zRnlX{7%!#71Fr{OCykbE4UJwz7~;NQ)@>a8+N?bm-5ghO=<e-%wpeF`=5kmbdE%Mu
zi*EtTxE-zTCbCNsRE(#=QwqUk-Lza9u7?YA!ksAuDcWAuBK)g0ff6D$!OQl66s|O4
zrtc2Ym#@!HcBc3OSgM6xnYp`o`yO%kHAcq&DlUZAJ6+_)+7>^6o>Y=%`Vl83hMiY~
z{13^PTLkv>$<ZEpoG!ZLq)<$oFsDfcEO9YVyiGNp#beHn*d@?CjfUBRDdIe@<E?$|
z>Y_-t6IopG$6y+^u3ztcaALpF?a|6U*V}uU-iip-=#eS={X7BzSSEZTFbMzvOacoB
zLt){-(|j-p2m(O_o4EI3P;6W-q$=_p3IyU~0bpVR_%K{-uptDS3}ovrKmf!0uYgAe
zwnupXcf$Wm0{=6?9#TOC#9^WW!Y~OzA()sM6;xOVCJGb(GydN@4hJ&*`y_wA;oxu}
z5#aYa@Ic`}ARu$>n@C5tOKa~DNKdX36t<C@nzTgt182S!jN)?RTt|{u@U0Up@7+4I
zj@ydsAsm8hj{%k_j_F+Pxi~6M*$QpPs$XYgT-KX3WA{xiKPdGl*B#1poVue&LcZG`
zdE$p5C4`R2(KUNLh$RY~q#_eWWZI?3raB+SXU^`<s#(7opMxgn?M%ob##*1WGA%J;
zEX`-4zpv6N@k&~wvu!rN;rJx=<Fx9kQ|fg>>!^9&OtW8fNxjxlG+Sgv{EynY%>x<f
z$pps_j>D`i=hU=6;W3ETf@bAuNaa<UcB#9J{v*db%xvO^-RX;a)|z?(@=jc5$z%Of
zVX(jfArKe{02VRA=wWofOGQTrp@fhJJbZtzC;2vm5zLd=2rc!C)qdXb@0<9$(!Vzm
z2v9JNd!D~4$`crb^|t><qUEud8nbS8x)y3`#zHK6>UqkMwSZ1d;1n&rcNCj-mH0GD
zBxH$NvAUR2v9O=E0x(rwlH7OTel|ul6PjNVBPS$3d3~RQ!u|~zn%{TNd3nULo1ysv
zjI+V@Xfvw{r;xlL@5``2zg6ODRAf?T8M7R+eoa;PO@v!~w$mhK@Ii#5aAX1l&imq*
zx<@JYb<T1jz}E3E=LB;I9F?=etE8mLKnI@VfaK43%$yRq4$u!9)#jf_FQT`W%oM=2
zMX~B@xCpkz;bNaJ{7-W^OaWP|iSE~MyGDk1x!NqLYHHVoZ4SDWvq7clgo2nN-@<?0
z4|{~Im*c<S5Cr}W2jFiw-24q3wgxO*hBItFz^aH3OibiHOe<$;`AV)J^ly&u0_a>g
ze7`z;Q|D(dO}Nf`JT<3vrKX4*yf3=$4?K8FwX{o|_S1T|U!<1cFbcX*_0;+CWNHqI
zi{VmT;3)rEyCm$I&;}$O>cw0B1wuJ~Hj%<xt^1QJ>v&eE(wew_(FV8qfG?JN%7=Dw
zel2ckqTiAu;Hsq%(cbhOJ7zfeDnPyxWt6Jmcyl7#a@=xC8o3_h*^9y_HSCV}3&d{J
zQ3WleR6A;ZgthOS5XT-4a{~r5Kogx?wK$ixk$11%NnSCs;%62i|A>!Y-0TS^oUzNr
znG?hnWPGvy_LKJyIoD?{ifFSJ9|bn%AGX&?wmiq5lW>|^Nm|99jOeQ;d%u4(Eh~3b
zs$A#5upJkJ8@5fd=>R5wDT${^Kvr|S<Emt6Ai)>iMw&@)T@nc!QA4v`bQ!_Mpa*fV
z)P``$y$(N#b*Y%krMO0}rEdRF<DogCD7?Y#lh5VU?-FT-o;-<{dkg)prJh~rK-l|*
zhd3&L+@xZgvc!VBK3O*<gb3Y?iwPo!ADU7xVE2Js2+poQ!M$f4M)C5R>oJg`I5Lck
z*~)d)j8N#&`2OzwS8TWl1NiAabCE8rzG$8P@!)k%C_Ju7BlFh5DRy@05#C4E5uiRV
zaF9Io!{}h^{$5et=+Bb-vepy%e)B<xR<Dm!I{bT=8M_h!V^TwCClTJC)vz!X%0?%q
zDh5dyOiQEeFOtFU(>~z_F#5bM!59iLDjuH*?I^o@*UcTnmSO46a==>>Qt$i+iY>E|
zZYFgaE(SF5Q65rKr}bI_Cr0A|39$tbigO_{8ved?wp11~@i)DrdJ?1QsMUEok|k&a
zYVr+r8JW3(<gsab^ARgHUYSlU4ny*e%7?ng?z;=ak?yU|awhXr_#_&bUiM$!U*kzi
zUFEepo|JUfGq^1B<nuo&^f2m+XMSNZC$CpOJ<;n6`C7wu2eKHu%xG1@yegMC&a8To
zVe3oL^yt3+p(VD<iiA|T;Y?&DUQA8dX|2|+;6S5HylSCuY~z>K`V*DPj%1N`cUK-l
zEgAwM2;S3}A+A9+(r6nxGyhL<9LX2MKZUVgmuPRYN$}E(uXOFO^#{?Iw7=`Eal_5?
zhlDR}*ic99T=hO>i^g_&#5Mg1J`gL!!wTT_^C#R#S22uj&@){cbBs%(Fe&Wgau_`~
zx}EK!ssZMsXKgsoI=<owQ6u)W-<X+9tgcM-fmD}VRH(E?J_)mfPoKIYLe4H>+pUD}
z<|M67HfQ?LG-e9|=@eCk#U6J<=|z}MGr{3~`(=`JrKf>)Fl025TS<8Z-fT`KJgt0L
z+3-+$4a)NMKDU6A>7@Rr5ZgU%8y)eZ$kQwWp71r%gf?xNUtqyvVo;ykHB`X|*CaR2
ztoVn^Oj;v9pWMsP=PtB4LoFu*fhHry@F7KPTey>w<qElwoS|Mow(YO?dY*3H2`Tgd
zwSY$cx7(vXr-f89JuGJkxYXXUN)ZCXnY0@EIpWJnHC`N+57ksy#ONDGNZzLp@Qp^$
zFq8EdRHhiM_6R87VU9JVP&pKnygDsj*S;?tQ0?FOYQS84QKqL&Wj@ihdNEE>bS$Qm
z4Oa89jFCRyv&Ls;RB$wVyIp_kE;LZ;OF?!%B#YUZ{nZV;zumwI3kQ+>=>|56oYVjK
zO<+oY>xO%Ok;4C05kew=QN-`~|2542WQr8iQ%w2VzGxx_bbSfBTlaZw=jOVYUFwIL
zBY15r6=Jy6@R`VRWJFCTvRPr>9xYNWNi`NosZQvzVE)Zx=3=_uj<CP7b^*;v-W_pQ
z^MHg7wa~<bANtbHMPc8xQzbW!zXC%u&~47pJy2kpZDlqDIncWIewH;OQ(R;;I&`Y5
zU`nPpBqcwfqE$qVHIsRZNDe-XStOHZ+?SlyTO%Qbr=xy$Ixn=4;m*z0;g(Wy8S->2
zHW(nHXj7j;69%rn^`M`dm7-tEW^e}iL#;ds+C&SyGfGt?lttz8R@;Unjn!H%b1P<(
zN_8jI2|s0d#GO2Dm7mwAE*5l`9{D>{AfpiHnq<yUBWzVLJg)~N1GC-yk5lkZQzVj%
z4c+I&x10~6<r5XSyBxct85^|YI!Kdt#X>&h5!>>7x%t>$^k#OH)J+llO(X1Fd;_|O
z%h3PL*H`wBrHe1YcLr(=b3+6977OYnjDl}d-jfjdOi3HfF6de8f8Q!`emRofhgPos
zwt8qXp^}8YQ)NXy<4nKEn$uiuN?Yc;jET%SAs`oM__7$pk$HX-R%U1znYdRyDS|s|
zN8im&L~nBpLmHrUa~2Ga^AdDbwtU`;BgYhtFwR4~-8{&5S}%OO4PWU-vP?1QHCbID
z#|TW2HioDTq5<`0^x~P@m)r(X6$v#9nvap*PctO4x&*hi_a>T=)BD{>;^3TnmNE>5
T!V7F@)e?oY&HG>$A@6?xfv$pN

literal 0
HcmV?d00001

diff --git a/app/build.gradle b/app/build.gradle
index d190784..b8ccf03 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,14 +9,37 @@ android {
         applicationId "com.haretskiy.pavel.gifrandom"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.01"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    signingConfigs {
+        debug {
+            keyAlias 'Debug'
+            keyPassword 'qazwsxedc'
+            storeFile file('../GifsKeyStore')
+            storePassword 'qazwsxedc'
+        }
+        release {
+            keyAlias 'Release'
+            keyPassword 'qazwsxedc'
+            storeFile file('../GifsKeyStore')
+            storePassword 'qazwsxedc'
+        }
+    }
     buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+            debuggable = true
+            signingConfig signingConfigs.debug
+        }
         release {
+            debuggable = false
             minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f1b4245..30e1c20 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,49 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+# Uncomment for DexGuard only
+#-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
+
+-dontwarn retrofit2.**
+-dontwarn org.codehaus.mojo.**
+-keep class retrofit2.** { *; }
+-keepattributes Exceptions
+-keepattributes RuntimeVisibleAnnotations
+-keepattributes RuntimeInvisibleAnnotations
+-keepattributes RuntimeVisibleParameterAnnotations
+-keepattributes RuntimeInvisibleParameterAnnotations
+
+-keepattributes EnclosingMethod
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+-keepclasseswithmembers interface * {
+    @retrofit2.* <methods>;
+}
+# Platform calls Class.forName on types which do not exist on Android to determine platform.
+-dontnote retrofit2.Platform
+# Platform used when running on RoboVM on iOS. Will not be used at runtime.
+-dontnote retrofit2.Platform$IOS$MainThreadExecutor
+# Platform used when running on Java 8 VMs. Will not be used at runtime.
+-dontwarn retrofit2.Platform$Java8
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+
+
+-keepattributes Signature
+-keepattributes Annotation
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
\ No newline at end of file

From 3ea55b45b54c21c82ce3c00d81352900cd403245 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <Pavel.Kharetski@apalon.com>
Date: Sun, 3 Feb 2019 22:16:04 +0300
Subject: [PATCH 22/23] Libs versions increased

---
 app/build.gradle                              | 24 +++++++++----------
 .../pavel/gifrandom/utils/Toaster.kt          |  2 +-
 build.gradle                                  |  9 +++----
 gradle/wrapper/gradle-wrapper.properties      |  4 ++--
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b8ccf03..6edbb55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.haretskiy.pavel.gifrandom"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 2
-        versionName "1.01"
+        versionCode 3
+        versionName "1.02"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -50,29 +50,33 @@ android {
 
 def retrofitVersion = '2.3.0'
 def support_version = "27.1.1"
-def glideVersion = '4.7.1'
-def koin_version = '0.9.2'
+def glideVersion = '4.8.0'
+def koin_version = '0.9.3'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
+    // Support
     implementation "com.android.support:appcompat-v7:${support_version}"
     implementation "com.android.support:design:${support_version}"
     implementation "com.android.support:recyclerview-v7:${support_version}"
     implementation "com.android.support:cardview-v7:${support_version}"
     implementation "com.android.support:support-v4:${support_version}"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
+    // Retrofit2
     implementation "com.squareup.retrofit2:retrofit:${retrofitVersion}"
     implementation "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofitVersion}"
 
-    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
-    implementation "io.reactivex.rxjava2:rxjava:2.1.10"
+    // RxJava2
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.5"
 
+    // Glide
     implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.10"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.1'
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
 
     // Koin for Kotlin
@@ -83,9 +87,5 @@ dependencies {
     implementation "org.koin:koin-android-architecture:$koin_version"
 
     // Paging
-    implementation "android.arch.paging:runtime:1.0.0"
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "android.arch.paging:runtime:1.0.1"
 }
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Toaster.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Toaster.kt
index 9cb8e93..9d44c87 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Toaster.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/utils/Toaster.kt
@@ -5,7 +5,7 @@ import android.widget.Toast
 
 class Toaster(private val context: Context) {
 
-    fun showToast(message: String, isLong: Boolean) {
+    fun showToast(message: String, isLong: Boolean = false) {
         Toast.makeText(context, message, if (isLong) Toast.LENGTH_LONG else Toast.LENGTH_SHORT).show()
     }
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index d7330b3..f2aa1a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,18 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.3.20'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.1.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 92ecc11..9b3f6fe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 05 10:23:04 MSK 2018
+#Sun Feb 03 22:04:17 MSK 2019
 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

From 7edd2cfd2c68b88767ec66be5e6175cb4631ab08 Mon Sep 17 00:00:00 2001
From: Pavel Haretskiy <Pavel.Kharetski@apalon.com>
Date: Sun, 3 Feb 2019 22:41:48 +0300
Subject: [PATCH 23/23] Koin version incr.

---
 app/build.gradle                              | 10 ++--
 .../haretskiy/pavel/gifrandom/Constants.kt    |  1 -
 .../gifrandom/activities/DetailActivity.kt    |  5 +-
 .../gifrandom/activities/MainActivity.kt      |  3 +-
 .../haretskiy/pavel/gifrandom/di/Modules.kt   | 52 ++++++++++---------
 5 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6edbb55..c8d349b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,7 +51,7 @@ android {
 def retrofitVersion = '2.3.0'
 def support_version = "27.1.1"
 def glideVersion = '4.8.0'
-def koin_version = '0.9.3'
+def koin_version = '1.0.2'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -79,12 +79,12 @@ dependencies {
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     kapt "com.github.bumptech.glide:compiler:$glideVersion"
 
-    // Koin for Kotlin
-    implementation "org.koin:koin-core:$koin_version"
     // Koin for Android
     implementation "org.koin:koin-android:$koin_version"
-    // Koin for Android Architecture Components
-    implementation "org.koin:koin-android-architecture:$koin_version"
+    // Koin Android Scope feature
+    implementation "org.koin:koin-android-scope:$koin_version"
+    // Koin Android ViewModel feature
+    implementation "org.koin:koin-android-viewmodel:$koin_version"
 
     // Paging
     implementation "android.arch.paging:runtime:1.0.1"
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
index 79cd9b9..df5965b 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/Constants.kt
@@ -17,7 +17,6 @@ const val PREFETCH_SIZE = 10
 const val ZERO_OFFSET = "0"
 
 const val BUNDLE_KEY_URL_DETAIL = "BUNDLE_KEY_URL_DETAIL"
-const val BUNDLE_KEY_URL = "BUNDLE_KEY_URL"
 
 const val VIEW_NAME_IMAGE = "VIEW_NAME_IMAGE"
 const val START_ANIMATION_DELAY = 600L
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/DetailActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/DetailActivity.kt
index e6abc78..86d2778 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/DetailActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/DetailActivity.kt
@@ -8,13 +8,14 @@ import android.support.v7.app.AppCompatActivity
 import com.haretskiy.pavel.gifrandom.*
 import com.haretskiy.pavel.gifrandom.databinding.ActivityDetailBinding
 import com.haretskiy.pavel.gifrandom.viewModels.DetailViewModel
-import org.koin.android.architecture.ext.viewModel
+import org.koin.android.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.ParameterList
 
 class DetailActivity : AppCompatActivity() {
 
     private var url = EMPTY_STRING
 
-    private val detailViewModel: DetailViewModel by viewModel { mapOf(BUNDLE_KEY_URL to url) }
+    private val detailViewModel: DetailViewModel by viewModel { ParameterList(url) }
 
     private val binding: ActivityDetailBinding by lazy {
         DataBindingUtil.setContentView(this, R.layout.activity_detail) as ActivityDetailBinding
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
index 5c43fca..96566b9 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/activities/MainActivity.kt
@@ -12,9 +12,8 @@ import com.haretskiy.pavel.gifrandom.databinding.ActivityMainBinding
 import com.haretskiy.pavel.gifrandom.viewModels.MainViewModel
 import kotlinx.android.synthetic.main.main_content.*
 import kotlinx.android.synthetic.main.toolbar.*
-import org.koin.android.architecture.ext.viewModel
 import org.koin.android.ext.android.inject
-
+import org.koin.android.viewmodel.ext.android.viewModel
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
index fef357a..4ffe446 100644
--- a/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
+++ b/app/src/main/java/com/haretskiy/pavel/gifrandom/di/Modules.kt
@@ -2,7 +2,6 @@ package com.haretskiy.pavel.gifrandom.di
 
 import com.google.gson.GsonBuilder
 import com.haretskiy.pavel.gifrandom.BASE_URL
-import com.haretskiy.pavel.gifrandom.BUNDLE_KEY_URL
 import com.haretskiy.pavel.gifrandom.adapters.GifAdapter
 import com.haretskiy.pavel.gifrandom.data.Repository
 import com.haretskiy.pavel.gifrandom.data.RepositoryImpl
@@ -15,20 +14,25 @@ import com.haretskiy.pavel.gifrandom.utils.pagging.GifsSourceFactory
 import com.haretskiy.pavel.gifrandom.viewModels.DetailViewModel
 import com.haretskiy.pavel.gifrandom.viewModels.MainViewModel
 import okhttp3.OkHttpClient
-import org.koin.android.architecture.ext.viewModel
 import org.koin.android.ext.koin.androidApplication
-import org.koin.dsl.context.ParameterProvider
+import org.koin.android.viewmodel.ext.koin.viewModel
 import org.koin.dsl.module.Module
-import org.koin.dsl.module.applicationContext
+import org.koin.dsl.module.module
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 
-
-val restModule: Module = applicationContext {
-    bean { OkHttpClient.Builder().addInterceptor(JsonInterceptor()).build() }
-    bean { GsonBuilder().setLenient().create() }
-    bean {
+val restModule: Module = module(definition = {
+    single {
+        OkHttpClient.Builder()
+                .addInterceptor(JsonInterceptor())
+                .build()
+    }
+    single {
+        GsonBuilder().setLenient()
+                .create()
+    }
+    single {
         Retrofit.Builder()
                 .baseUrl(BASE_URL)
                 .client(get())
@@ -37,27 +41,25 @@ val restModule: Module = applicationContext {
                 .build()
                 .create(RestApi::class.java)
     }
-    bean { RestApiImpl(get()) }
-}
+    single { RestApiImpl(get()) }
+})
 
-val appModule: Module = applicationContext {
-    bean { Toaster(androidApplication()) }
-    bean { ImageLoaderImpl() as ImageLoader }
-    bean { RouterImpl(androidApplication()) as Router }
-    bean { RepositoryImpl(get()) as Repository }
-    bean { DiffCallBack() }
-    bean { GifsSourceFactory(get()) }
+val appModule: Module = module(definition = {
+    single { Toaster(androidApplication()) }
+    single { ImageLoaderImpl() as ImageLoader }
+    single { RouterImpl(androidApplication()) as Router }
+    single { RepositoryImpl(get()) as Repository }
+    single { DiffCallBack() }
+    single { GifsSourceFactory(get()) }
     factory { GifAdapter(get(), get(), get()) }
-}
+})
 
-val viewModelModule: Module = applicationContext {
+val viewModelModule: Module = module(definition = {
     viewModel { MainViewModel(androidApplication(), get()) }
-    viewModel { params: ParameterProvider ->
-        DetailViewModel(get(), params[BUNDLE_KEY_URL])
+    viewModel {parameterList ->
+        DetailViewModel(get(), parameterList[0])
     }
-}
-
+})
 
 val modules = listOf(restModule, appModule, viewModelModule)
 
-