From 061f8796441015cbcd914819934c9df3e8f178dd Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 27 Jul 2018 17:08:20 +0300
Subject: [PATCH 01/18] Use android x without support

---
 backdrop/build.gradle                         |  8 ++---
 .../backdrop/BackdropBehavior.kt              | 10 +++---
 gradle.properties                             |  2 ++
 sample/build.gradle                           | 35 +++++--------------
 .../backdropview/extensions.kt                | 18 +++-------
 .../backdropview/ui/MainActivity.kt           |  6 ++--
 .../backdropview/ui/common/BaseListAdapter.kt |  4 +--
 .../backdropview/ui/common/Screen.kt          |  3 +-
 .../backdropview/ui/gallery/GalleryAdapter.kt |  2 +-
 .../backdropview/ui/gallery/GalleryScreen.kt  |  6 ++--
 .../backdropview/ui/list/ListItemsAdapter.kt  |  2 +-
 .../backdropview/ui/list/ListScreen.kt        |  2 +-
 sample/src/main/res/layout/activity_main.xml  |  8 ++---
 sample/src/main/res/layout/item_gallery.xml   |  4 +--
 sample/src/main/res/layout/item_list.xml      |  8 ++---
 sample/src/main/res/layout/screen_gallery.xml |  6 ++--
 sample/src/main/res/layout/screen_list.xml    |  6 ++--
 sample/src/main/res/layout/screen_text.xml    |  8 ++---
 sample/src/main/res/values/styles.xml         |  2 +-
 19 files changed, 58 insertions(+), 82 deletions(-)

diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 331b605..1200dcc 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -37,11 +37,11 @@ subprojects {
 
 android {
 
-    compileSdkVersion 27
+    compileSdkVersion 'android-P'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
     }
 
     buildTypes {
@@ -57,14 +57,14 @@ android {
 }
 
 ext {
-    supportVersion = '27.1.1'
     kotlin_version = '1.2.41'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:appcompat-v7:$supportVersion"
+    // Android X
+    implementation "androidx.appcompat:appcompat:1.0.0-beta01"
 
     // Kotlin
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 406fff0..7fecd09 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -3,11 +3,11 @@ package ru.semper_viventem.backdrop
 import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.annotation.IdRes
-import android.support.design.widget.CoordinatorLayout
-import android.support.v7.widget.Toolbar
 import android.util.AttributeSet
 import android.view.View
+import androidx.annotation.IdRes
+import androidx.appcompat.widget.Toolbar
+import androidx.coordinatorlayout.widget.CoordinatorLayout
 
 
 class BackdropBehavior : CoordinatorLayout.Behavior<View> {
@@ -48,13 +48,13 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
-    override fun onSaveInstanceState(parent: CoordinatorLayout?, child: View?): Parcelable {
+    override fun onSaveInstanceState(parent: CoordinatorLayout, child: View): Parcelable {
         return Bundle().apply {
             putSerializable(ARG_DROP_STATE, dropState)
         }
     }
 
-    override fun onRestoreInstanceState(parent: CoordinatorLayout?, child: View?, state: Parcelable?) {
+    override fun onRestoreInstanceState(parent: CoordinatorLayout, child: View, state: Parcelable) {
         super.onRestoreInstanceState(parent, child, state)
 
             dropState = (state as? Bundle)?.getSerializable(ARG_DROP_STATE) as? DropState ?: DEFAULT_DROP_STATE
diff --git a/gradle.properties b/gradle.properties
index 743d692..8cb12f2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX = true
+android.enableJetifier = false
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/sample/build.gradle b/sample/build.gradle
index 378bbda..109bfac 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -14,7 +14,6 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -28,39 +27,23 @@ android {
     }
 }
 
-ext {
-    supportVersion = '28.0.0-alpha3'
-    retrofitVersion = '2.2.0'
-    conductorVersion = "2.1.4"
-    playServicesVersion = "15.0.0"
-}
-
 androidExtensions {
     experimental = true
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    // Support
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
-    // Material Components
-    // implementation "com.google.android.material:material:1.0.0-alpha1"
+
+    // Android X
+    implementation "androidx.appcompat:appcompat:1.0.0-beta01"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.2"
+    implementation "com.google.android.material:material:1.0.0-beta01"
+
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    // Tests
-    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'
-    // Logging
-    implementation 'com.jakewharton.timber:timber:4.5.1'
+
     // Images
-    implementation 'com.github.bumptech.glide:glide:4.6.1'
-    kapt 'com.github.bumptech.glide:compiler:4.7.1'
-    // Lists
-    implementation 'com.hannesdorfmann:adapterdelegates3:3.0.1'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+
     implementation project(':backdrop')
 }
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
index 0ed258d..39b5833 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
@@ -1,16 +1,14 @@
 package ru.semper_viventem.backdropview
 
 import android.content.Context
-import android.support.annotation.LayoutRes
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.CoordinatorLayout.Behavior
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
+import androidx.annotation.LayoutRes
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.squareup.picasso.Picasso
 
 
 fun ViewGroup.inflate(@LayoutRes layoutRes: Int, attachToRoot: Boolean = false): View {
@@ -34,15 +32,9 @@ fun View.showKeyboard(show: Boolean) {
 }
 
 fun ImageView.load(
-    url: String?,
-    round: Boolean = false
+    url: String?
 ) {
-    Glide.with(context)
+    Picasso.get()
         .load(url)
-        .apply {
-            if (round) {
-                apply(RequestOptions.circleCropTransform())
-            }
-        }
         .into(this)
 }
\ No newline at end of file
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
index c771da2..be3bbc5 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
@@ -1,9 +1,9 @@
 package ru.semper_viventem.backdropview.ui
 
 import android.os.Bundle
-import android.support.annotation.IdRes
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.annotation.IdRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.activity_main.*
 import ru.semper_viventem.backdrop.BackdropBehavior
 import ru.semper_viventem.backdropview.R
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/BaseListAdapter.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/BaseListAdapter.kt
index 0f589cc..c16e9ae 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/BaseListAdapter.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/BaseListAdapter.kt
@@ -1,7 +1,7 @@
 package ru.semper_viventem.backdropview.ui.common
 
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
 
 /**
  * Easy to use base adapter for lists with single item type.
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
index 5f7b67f..f1f5f13 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
@@ -1,11 +1,10 @@
 package ru.semper_viventem.backdropview.ui.common
 
-import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 
 
 abstract class Screen : Fragment {
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryAdapter.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryAdapter.kt
index 78faf63..da0f23a 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryAdapter.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryAdapter.kt
@@ -1,8 +1,8 @@
 package ru.semper_viventem.backdropview.ui.gallery
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.item_gallery.view.*
 import ru.semper_viventem.backdropview.R
 import ru.semper_viventem.backdropview.inflate
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryScreen.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryScreen.kt
index 067a1ab..650e099 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryScreen.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/gallery/GalleryScreen.kt
@@ -1,9 +1,9 @@
 package ru.semper_viventem.backdropview.ui.gallery
 
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.LinearSnapHelper
 import android.view.View
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearSnapHelper
 import kotlinx.android.synthetic.main.screen_gallery.view.*
 import ru.semper_viventem.backdropview.R
 import ru.semper_viventem.backdropview.ui.common.Screen
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListItemsAdapter.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListItemsAdapter.kt
index 53a4a66..76ac4dd 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListItemsAdapter.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListItemsAdapter.kt
@@ -1,8 +1,8 @@
 package ru.semper_viventem.backdropview.ui.list
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.item_list.view.*
 import ru.semper_viventem.backdropview.R
 import ru.semper_viventem.backdropview.inflate
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListScreen.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListScreen.kt
index b7c8d14..d32d968 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListScreen.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/list/ListScreen.kt
@@ -1,7 +1,7 @@
 package ru.semper_viventem.backdropview.ui.list
 
-import android.support.v7.widget.LinearLayoutManager
 import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.screen_list.view.*
 import ru.semper_viventem.backdropview.R
 import ru.semper_viventem.backdropview.ui.common.Screen
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index a5f0462..31b8a93 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:background="@color/colorPrimary"
     tools:context=".ui.MainActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -23,7 +23,7 @@
         android:layout_marginStart="@dimen/small_gap"
         android:orientation="vertical">
 
-        <android.support.design.widget.NavigationView
+        <com.google.android.material.navigation.NavigationView
             android:id="@+id/navigationView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -44,4 +44,4 @@
         android:paddingTop="@dimen/foreground_radius"
         app:layout_behavior="ru.semper_viventem.backdrop.BackdropBehavior"/>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/item_gallery.xml b/sample/src/main/res/layout/item_gallery.xml
index 415245a..8173d4a 100644
--- a/sample/src/main/res/layout/item_gallery.xml
+++ b/sample/src/main/res/layout/item_gallery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.card.MaterialCardView
+<com.google.android.material.card.MaterialCardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -24,4 +24,4 @@
         android:textStyle="bold"
         android:textSize="16sp"
         tools:text="Title"/>
-</android.support.design.card.MaterialCardView>
\ No newline at end of file
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/item_list.xml b/sample/src/main/res/layout/item_list.xml
index 1fc1dbe..43d140e 100644
--- a/sample/src/main/res/layout/item_list.xml
+++ b/sample/src/main/res/layout/item_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <android.support.design.card.MaterialCardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/imageCard"
         android:layout_width="80dp"
         android:layout_height="80dp"
@@ -27,7 +27,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             tools:background="@color/colorAccent"/>
-    </android.support.design.card.MaterialCardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <TextView
         android:id="@+id/title"
@@ -56,4 +56,4 @@
         app:layout_constraintTop_toBottomOf="@id/title"
         app:layout_constraintVertical_bias="0.0"
         tools:text="Description"/>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/screen_gallery.xml b/sample/src/main/res/layout/screen_gallery.xml
index 67bb476..5e51a09 100644
--- a/sample/src/main/res/layout/screen_gallery.xml
+++ b/sample/src/main/res/layout/screen_gallery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -31,7 +31,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -40,4 +40,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/screen_list.xml b/sample/src/main/res/layout/screen_list.xml
index 6bc2446..42352ab 100644
--- a/sample/src/main/res/layout/screen_list.xml
+++ b/sample/src/main/res/layout/screen_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -31,7 +31,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -40,4 +40,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/screen_text.xml b/sample/src/main/res/layout/screen_text.xml
index b7f47ed..56ac96f 100644
--- a/sample/src/main/res/layout/screen_text.xml
+++ b/sample/src/main/res/layout/screen_text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -31,7 +31,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/screenTitle"/>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -57,6 +57,6 @@
                 android:layout_margin="@dimen/normal_gap"
                 android:text="@string/jabberwocky"/>
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 0eb88fe..bdfe33e 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

From 141d7177270ab12a7a86afb0dd79fd57f165d737 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 27 Jul 2018 17:17:41 +0300
Subject: [PATCH 02/18] Update jcenter version

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

diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 1200dcc..0ddf1be 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -20,7 +20,7 @@ ext {
     siteUrl = 'https://github.com/Semper-Viventem/BackdropView'
     gitUrl = 'https://github.com/Semper-Viventem/BackdropView'
 
-    libraryVersion = '0.1.2'
+    libraryVersion = '0.1.2_x'
 
     developerId = 'semper-viventem'
     developerName = 'constantine'

From 60aa0fe32ed4b7e4aecb66034ff43dc1740e02e8 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 27 Jul 2018 17:39:41 +0300
Subject: [PATCH 03/18] Update image and base screen

---
 .../ru/semper_viventem/backdropview/ui/common/Screen.kt     | 6 +++---
 .../ru/semper_viventem/backdropview/ui/text/TextScreen.kt   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
index f1f5f13..a17654e 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/common/Screen.kt
@@ -21,10 +21,10 @@ abstract class Screen : Fragment {
         return inflater.inflate(layoutId, container, false)
     }
 
-    override fun onStart() {
-        super.onStart()
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-        onInitView(view!!)
+        onInitView(view)
     }
 
     abstract fun onInitView(view: View)
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/text/TextScreen.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/text/TextScreen.kt
index 0f5863b..3dc9bcc 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/text/TextScreen.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/text/TextScreen.kt
@@ -13,6 +13,6 @@ class TextScreen : Screen() {
 
     override fun onInitView(view: View) {
 
-        view.image.load("http://mariakucherenko.com/wp-content/uploads/2011/08/20110814_%D0%BA%D0%BE%D1%82.jpg")
+        view.image.load("https://habrastorage.org/webt/r9/p8/fi/r9p8figkbszo_cyhdg-6nad4mp0.png")
     }
 }
\ No newline at end of file

From 71612d5d4aa2588ea39e034b820415506a3a55f2 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 17 Aug 2018 14:21:16 +0300
Subject: [PATCH 04/18] * Update library  * Fix name of attach method

---
 README.md                                                   | 4 ++--
 backdrop/build.gradle                                       | 4 ++--
 .../kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt  | 4 ++--
 build.gradle                                                | 6 +++---
 sample/build.gradle                                         | 4 ++--
 .../ru/semper_viventem/backdropview/ui/MainActivity.kt      | 6 ++----
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 0fe02b2..fc3ece9 100644
--- a/README.md
+++ b/README.md
@@ -97,8 +97,8 @@ fun <T : CoordinatorLayout.Behavior<*>> View.findBehavior(): T = layoutParams.ru
 val backdropBehavior: BackdropBehavior = foregroundContainer.findBehavior() // find behavior
 
 with(backdropBehavior) {
-        attacheBackContainer(R.id.backContainer) // set back container
-        attacheToolbar(R.id.toolbar) // set toolbar
+        attachBackContainer(R.id.backContainer) // set back container
+        attachToolbar(R.id.toolbar) // set toolbar
         
         // set navigation icons for toolbar
         setClosedIcon(R.drawable.ic_menu)
diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 0ddf1be..0742ac9 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -20,7 +20,7 @@ ext {
     siteUrl = 'https://github.com/Semper-Viventem/BackdropView'
     gitUrl = 'https://github.com/Semper-Viventem/BackdropView'
 
-    libraryVersion = '0.1.2_x'
+    libraryVersion = '0.1.3_x'
 
     developerId = 'semper-viventem'
     developerName = 'constantine'
@@ -64,7 +64,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Android X
-    implementation "androidx.appcompat:appcompat:1.0.0-beta01"
+    implementation "androidx.appcompat:appcompat:1.0.0-rc01"
 
     // Kotlin
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 7fecd09..be43dc0 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -93,11 +93,11 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         this.closedIconId = iconRes
     }
 
-    fun attacheToolbar(@IdRes toolbarId: Int) {
+    fun attachToolbar(@IdRes toolbarId: Int) {
         this.toolbarId = toolbarId
     }
 
-    fun attacheBackContainer(@IdRes backContainerId: Int) {
+    fun attachBackContainer(@IdRes backContainerId: Int) {
         this.backContainerId = backContainerId
     }
 
diff --git a/build.gradle b/build.gradle
index ebd7618..e5ea96e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,17 @@
 // 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.2.50'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
index 109bfac..159796f 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -35,9 +35,9 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // Android X
-    implementation "androidx.appcompat:appcompat:1.0.0-beta01"
+    implementation "androidx.appcompat:appcompat:1.0.0-rc01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.2"
-    implementation "com.google.android.material:material:1.0.0-beta01"
+    implementation "com.google.android.material:material:1.0.0-rc01"
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
index be3bbc5..eed3e36 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
@@ -4,10 +4,8 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.activity_main.*
 import ru.semper_viventem.backdrop.BackdropBehavior
 import ru.semper_viventem.backdropview.R
-import ru.semper_viventem.backdropview.findBehavior
 import ru.semper_viventem.backdropview.ui.gallery.GalleryScreen
 import ru.semper_viventem.backdropview.ui.list.ListScreen
 import ru.semper_viventem.backdropview.ui.text.TextScreen
@@ -34,8 +32,8 @@ class MainActivity : AppCompatActivity() {
 
         backdropBehavior = foregroundContainer.findBehavior()
         with(backdropBehavior) {
-            attacheBackContainer(R.id.backContainer)
-            attacheToolbar(R.id.toolbar)
+            attachBackContainer(R.id.backContainer)
+            attachToolbar(R.id.toolbar)
         }
         with(toolbar) {
             setTitle(R.string.app_name)

From a5183545abaf79a61bff67202102209b83a453bd Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 17 Aug 2018 14:22:54 +0300
Subject: [PATCH 05/18] Fix import

---
 .../kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
index eed3e36..6337096 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
+import kotlinx.android.synthetic.main.activity_main.*
 import ru.semper_viventem.backdrop.BackdropBehavior
 import ru.semper_viventem.backdropview.R
+import ru.semper_viventem.backdropview.findBehavior
 import ru.semper_viventem.backdropview.ui.gallery.GalleryScreen
 import ru.semper_viventem.backdropview.ui.list.ListScreen
 import ru.semper_viventem.backdropview.ui.text.TextScreen

From 50ef06457798a2c2d9295b4ceec1833142622ca2 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 17 Aug 2018 14:54:05 +0300
Subject: [PATCH 06/18] Fix version

---
 README.md             | 4 ++--
 backdrop/build.gradle | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fc3ece9..ad3a1d5 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,13 @@ This library makes it easy to implement a [Backdrop](https://material.io/design/
 *For support library:*
 ```groovy
 dependencies {
-    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.2'
+    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.5'
 }
 ```
 *For Android X:*
 ```groovy
 dependencies {
-    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.2_x'
+    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.5_x'
 }
 ```
 **JitPack:**
diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 0742ac9..5f697c7 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -20,7 +20,7 @@ ext {
     siteUrl = 'https://github.com/Semper-Viventem/BackdropView'
     gitUrl = 'https://github.com/Semper-Viventem/BackdropView'
 
-    libraryVersion = '0.1.3_x'
+    libraryVersion = '0.1.5_x'
 
     developerId = 'semper-viventem'
     developerName = 'constantine'

From e342573b2a9969fc5fba1f6d55f8020308f26f20 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Fri, 17 Aug 2018 14:59:14 +0300
Subject: [PATCH 07/18] Fix redme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad3a1d5..a54da66 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.Semper-Viventem:BackdropView:0.1.2'
+    implementation 'com.github.Semper-Viventem:BackdropView:0.1.5'
 }
 ```
 

From 07bbcc87857bc9e84c5c67c081c910e48ffc4cbd Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 20:30:09 +0300
Subject: [PATCH 08/18] Update sdk version. Use last version of libraries

---
 backdrop/build.gradle                    | 8 ++++----
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 sample/build.gradle                      | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 5f697c7..0f14afa 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -20,7 +20,7 @@ ext {
     siteUrl = 'https://github.com/Semper-Viventem/BackdropView'
     gitUrl = 'https://github.com/Semper-Viventem/BackdropView'
 
-    libraryVersion = '0.1.5_x'
+    libraryVersion = '0.1.6'
 
     developerId = 'semper-viventem'
     developerName = 'constantine'
@@ -37,7 +37,7 @@ subprojects {
 
 android {
 
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 21
@@ -57,14 +57,14 @@ android {
 }
 
 ext {
-    kotlin_version = '1.2.41'
+    kotlin_version = '1.3.20'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // Android X
-    implementation "androidx.appcompat:appcompat:1.0.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.1.0-alpha02"
 
     // Kotlin
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/build.gradle b/build.gradle
index e5ea96e..64e05f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.50'
+    ext.kotlin_version = '1.3.20'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4329a2d..e84047a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 19 19:46:00 MSK 2018
+#Sun Feb 10 20:17:37 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
diff --git a/sample/build.gradle b/sample/build.gradle
index 159796f..68890c3 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 
 android {
 
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "ru.semper_viventem.backdropview"
@@ -35,9 +35,9 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     // Android X
-    implementation "androidx.appcompat:appcompat:1.0.0-rc01"
-    implementation "androidx.constraintlayout:constraintlayout:1.1.2"
-    implementation "com.google.android.material:material:1.0.0-rc01"
+    implementation "androidx.appcompat:appcompat:1.1.0-alpha02"
+    implementation "androidx.constraintlayout:constraintlayout:1.1.3"
+    implementation "com.google.android.material:material:1.1.0-alpha03"
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

From db309fb6e44d5aecf9014ae4855a4893b1d84176 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 20:40:00 +0300
Subject: [PATCH 09/18] Enable jetifier

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

diff --git a/gradle.properties b/gradle.properties
index 8cb12f2..b0fa301 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX = true
-android.enableJetifier = false
+android.enableJetifier = true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

From 98c900d52d6324659aa33e4fe58fe33b6c603a54 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 20:46:44 +0300
Subject: [PATCH 10/18] Replace Picasso on Glide

---
 sample/build.gradle                                           | 2 +-
 .../main/kotlin/ru/semper_viventem/backdropview/extensions.kt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sample/build.gradle b/sample/build.gradle
index 68890c3..0107386 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -43,7 +43,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     // Images
-    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
 
     implementation project(':backdrop')
 }
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
index 39b5833..93c93a2 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/extensions.kt
@@ -8,7 +8,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import androidx.annotation.LayoutRes
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.squareup.picasso.Picasso
+import com.bumptech.glide.Glide
 
 
 fun ViewGroup.inflate(@LayoutRes layoutRes: Int, attachToRoot: Boolean = false): View {
@@ -34,7 +34,7 @@ fun View.showKeyboard(show: Boolean) {
 fun ImageView.load(
     url: String?
 ) {
-    Picasso.get()
+    Glide.with(this)
         .load(url)
         .into(this)
 }
\ No newline at end of file

From a4228e5da2fe53d5df9abbe548b120ba28aae1c5 Mon Sep 17 00:00:00 2001
From: Semper-Viventem <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 21:43:59 +0300
Subject: [PATCH 11/18] Create logic for backContainer

---
 backdrop/build.gradle                         |  1 +
 .../backdrop/BackdropBehavior.kt              | 61 +++++++++++++------
 .../semper_viventem/backdrop/BackdropUtils.kt | 18 ++++++
 3 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt

diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 0f14afa..7afcb06 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -65,6 +65,7 @@ dependencies {
 
     // Android X
     implementation "androidx.appcompat:appcompat:1.1.0-alpha02"
+    implementation "com.google.android.material:material:1.1.0-alpha03"
 
     // Kotlin
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index be43dc0..d7b42da 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -5,9 +5,11 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.util.AttributeSet
 import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.IdRes
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.appbar.AppBarLayout
 
 
 class BackdropBehavior : CoordinatorLayout.Behavior<View> {
@@ -30,12 +32,14 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         private const val ARG_DROP_STATE = "arg_drop_state"
     }
 
+    private var utils = BackdropUtils()
+
     private var toolbarId: Int? = null
-    private var backContainerId: Int? = null
+    private var backLayoutId: Int? = null
 
-    private var child: View? = null
     private var toolbar: Toolbar? = null
-    private var backContainer: View? = null
+    private var backLayout: ViewGroup? = null
+    private var frontLayout: View? = null
 
     private var closedIconId: Int = R.drawable.ic_menu
     private var openedIconRes: Int = R.drawable.ic_close
@@ -61,25 +65,32 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     }
 
     override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
-        if (toolbarId == null || backContainerId == null) return false
+        if (toolbarId == null || backLayoutId == null) return false
 
         return when (dependency.id) {
             toolbarId -> true
-            backContainerId -> true
+            backLayoutId -> true
             else -> false
         }
     }
 
     override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
 
-        this.child = child
+        this.frontLayout = child as? ViewGroup ?: throw IllegalArgumentException("BackLayout must extend a ViewGroup")
         when (dependency.id) {
-            toolbarId -> toolbar = dependency as Toolbar
-            backContainerId -> backContainer = dependency
+            toolbarId -> toolbar = dependency as? Toolbar
+                    ?: throw IllegalArgumentException("toolbarId doesn't match Toolbar")
+
+            backLayoutId -> {
+                backLayout = dependency as? AppBarLayout
+                        ?: throw IllegalArgumentException("appBarLayoutId doesn't match AppBarLayout")
+                toolbar = utils.findToolbar(backLayout!!)
+                        ?: throw IllegalArgumentException("AppBarLayout mast contain a Toolbar!")
+            }
         }
 
-        if (toolbar != null && backContainer != null) {
-            initViews(parent, child, toolbar!!, backContainer!!)
+        if (toolbar != null && frontLayout != null) {
+            initViews(parent, backLayout!!, toolbar!!, frontLayout!!)
         }
 
         return super.onDependentViewChanged(parent, child, dependency)
@@ -97,8 +108,20 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         this.toolbarId = toolbarId
     }
 
+    /**
+     * Attach back layout to Backdrop.
+     * BackDropLayout must contain a [Toolbar]
+     */
+    fun attachBackLayout(@IdRes appBarLayoutId: Int) {
+        this.backLayoutId = appBarLayoutId
+    }
+
+    /**
+     * @@deprecated — use [BackdropBehavior.attachBackLayout]
+     */
+    @Deprecated("Use BackdropBehavior.attachBackLayout")
     fun attachBackContainer(@IdRes backContainerId: Int) {
-        this.backContainerId = backContainerId
+        this.backLayoutId = backContainerId
     }
 
     fun addOnDropListener(listener: OnDropListener) {
@@ -113,8 +136,8 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         false
     } else {
         dropState = DropState.OPEN
-        if (child != null && toolbar != null && backContainer != null) {
-            drawDropState(child!!, toolbar!!, backContainer!!, withAnimation)
+        if (backLayout != null && toolbar != null && frontLayout != null) {
+            drawDropState(backLayout!!, toolbar!!, frontLayout!!, withAnimation)
         } else {
             throw IllegalArgumentException("Toolbar and backContainer must be initialized")
         }
@@ -126,8 +149,8 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         false
     } else {
         dropState = DropState.CLOSE
-        if (child != null && toolbar != null && backContainer != null) {
-            drawDropState(child!!, toolbar!!, backContainer!!, withAnimation)
+        if (backLayout != null && toolbar != null && frontLayout != null) {
+            drawDropState(backLayout!!, toolbar!!, frontLayout!!, withAnimation)
         } else {
             throw IllegalArgumentException("Toolbar and backContainer must be initialized")
         }
@@ -135,10 +158,10 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         true
     }
 
-    private fun initViews(parent: CoordinatorLayout, child: View, toolbar: Toolbar, backContainer: View) {
+    private fun initViews(parent: CoordinatorLayout, backDropLayout: View, toolbar: Toolbar, backContainer: View) {
         backContainer.y = toolbar.y + toolbar.height
-        child.layoutParams.height = parent.height - toolbar.height
-        drawDropState(child, toolbar, backContainer, false)
+        backDropLayout.layoutParams.height = parent.height - toolbar.height
+        drawDropState(backDropLayout, toolbar, backContainer, false)
 
         with(toolbar) {
             setNavigationOnClickListener {
@@ -146,7 +169,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
                     DropState.CLOSE -> DropState.OPEN
                     DropState.OPEN -> DropState.CLOSE
                 }
-                drawDropState(child, toolbar, backContainer)
+                drawDropState(backDropLayout, toolbar, backContainer)
                 notifyListeners(true)
             }
         }
diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt
new file mode 100644
index 0000000..94f008d
--- /dev/null
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt
@@ -0,0 +1,18 @@
+package ru.semper_viventem.backdrop
+
+import android.view.ViewGroup
+import androidx.appcompat.widget.Toolbar
+
+class BackdropUtils {
+
+    fun findToolbar(viewGroup: ViewGroup): Toolbar? {
+        for (chileId in 0..viewGroup.childCount) {
+            val childView = viewGroup.getChildAt(chileId)
+            if (childView is Toolbar) {
+                return childView
+            }
+        }
+
+        return null
+    }
+}
\ No newline at end of file

From 13b48d791dee48e74c5a73bafc246ef33ec9509f Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 22:44:17 +0300
Subject: [PATCH 12/18] Fix bug with layout finding

---
 .../backdrop/BackdropBehavior.kt              | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index d7b42da..93d24b8 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup
 import androidx.annotation.IdRes
 import androidx.appcompat.widget.Toolbar
 import androidx.coordinatorlayout.widget.CoordinatorLayout
-import com.google.android.material.appbar.AppBarLayout
 
 
 class BackdropBehavior : CoordinatorLayout.Behavior<View> {
@@ -77,20 +76,23 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     override fun onDependentViewChanged(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
 
         this.frontLayout = child as? ViewGroup ?: throw IllegalArgumentException("BackLayout must extend a ViewGroup")
+
         when (dependency.id) {
-            toolbarId -> toolbar = dependency as? Toolbar
-                    ?: throw IllegalArgumentException("toolbarId doesn't match Toolbar")
+            toolbarId -> toolbar = dependency as? Toolbar ?: throw IllegalArgumentException("toolbarId doesn't match Toolbar")
 
             backLayoutId -> {
-                backLayout = dependency as? AppBarLayout
-                        ?: throw IllegalArgumentException("appBarLayoutId doesn't match AppBarLayout")
-                toolbar = utils.findToolbar(backLayout!!)
-                        ?: throw IllegalArgumentException("AppBarLayout mast contain a Toolbar!")
+                backLayout = dependency as? ViewGroup ?: throw IllegalArgumentException("backLayoutId doesn't match back Layout")
+
+                // TODO (next release): remove this conditional
+                if (toolbarId == null) {
+                    toolbar = utils.findToolbar(backLayout!!)
+                            ?: throw IllegalArgumentException("AppBarLayout mast contain a Toolbar!")
+                }
             }
         }
 
-        if (toolbar != null && frontLayout != null) {
-            initViews(parent, backLayout!!, toolbar!!, frontLayout!!)
+        if (toolbar != null && frontLayout != null && backLayout != null) {
+            initViews(parent, frontLayout!!, toolbar!!, backLayout!!)
         }
 
         return super.onDependentViewChanged(parent, child, dependency)
@@ -104,10 +106,6 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         this.closedIconId = iconRes
     }
 
-    fun attachToolbar(@IdRes toolbarId: Int) {
-        this.toolbarId = toolbarId
-    }
-
     /**
      * Attach back layout to Backdrop.
      * BackDropLayout must contain a [Toolbar]
@@ -117,7 +115,14 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     }
 
     /**
-     * @@deprecated — use [BackdropBehavior.attachBackLayout]
+     * @deprecated — use [BackdropBehavior.attachBackLayout]. This method will be removed in version 0.1.7+
+     */
+    fun attachToolbar(@IdRes toolbarId: Int) {
+        this.toolbarId = toolbarId
+    }
+
+    /**
+     * @deprecated — use [BackdropBehavior.attachBackLayout]. This method will be removed in version 0.1.7+
      */
     @Deprecated("Use BackdropBehavior.attachBackLayout")
     fun attachBackContainer(@IdRes backContainerId: Int) {
@@ -158,10 +163,15 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         true
     }
 
-    private fun initViews(parent: CoordinatorLayout, backDropLayout: View, toolbar: Toolbar, backContainer: View) {
-        backContainer.y = toolbar.y + toolbar.height
-        backDropLayout.layoutParams.height = parent.height - toolbar.height
-        drawDropState(backDropLayout, toolbar, backContainer, false)
+    private fun initViews(parent: CoordinatorLayout, frontLayout: View, toolbar: Toolbar, backLayout: View) {
+
+        // TODO (next release): remove this conditional
+        if (toolbarId != null) {
+            backLayout.y = toolbar.y + toolbar.height
+        }
+
+        frontLayout.layoutParams.height = parent.height - (toolbar.y.toInt() + toolbar.height)
+        drawDropState(frontLayout, toolbar, backLayout, false)
 
         with(toolbar) {
             setNavigationOnClickListener {
@@ -169,7 +179,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
                     DropState.CLOSE -> DropState.OPEN
                     DropState.OPEN -> DropState.CLOSE
                 }
-                drawDropState(backDropLayout, toolbar, backContainer)
+                drawDropState(frontLayout, toolbar, backLayout)
                 notifyListeners(true)
             }
         }

From d179e74026c8d7979e88ee17a2e2cf39dfd0d4bd Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:09:59 +0300
Subject: [PATCH 13/18] Fix problem with jumping of backLayout

---
 .../backdrop/BackdropBehavior.kt              | 47 +++++++++++++------
 .../semper_viventem/backdrop/BackdropUtils.kt |  2 +-
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 93d24b8..08b3f88 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -45,6 +45,8 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
 
     private var dropState: DropState = DEFAULT_DROP_STATE
 
+    private var needToInitializing = true
+
     private var dropListeners = mutableListOf<OnDropListener>()
 
     constructor() : super()
@@ -91,7 +93,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
             }
         }
 
-        if (toolbar != null && frontLayout != null && backLayout != null) {
+        if (toolbar != null && frontLayout != null && backLayout != null && needToInitializing) {
             initViews(parent, frontLayout!!, toolbar!!, backLayout!!)
         }
 
@@ -142,7 +144,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     } else {
         dropState = DropState.OPEN
         if (backLayout != null && toolbar != null && frontLayout != null) {
-            drawDropState(backLayout!!, toolbar!!, frontLayout!!, withAnimation)
+            drawDropState(frontLayout!!, toolbar!!, backLayout!!, withAnimation)
         } else {
             throw IllegalArgumentException("Toolbar and backContainer must be initialized")
         }
@@ -155,7 +157,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     } else {
         dropState = DropState.CLOSE
         if (backLayout != null && toolbar != null && frontLayout != null) {
-            drawDropState(backLayout!!, toolbar!!, frontLayout!!, withAnimation)
+            drawDropState(frontLayout!!, toolbar!!, backLayout!!, withAnimation)
         } else {
             throw IllegalArgumentException("Toolbar and backContainer must be initialized")
         }
@@ -165,12 +167,14 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
 
     private fun initViews(parent: CoordinatorLayout, frontLayout: View, toolbar: Toolbar, backLayout: View) {
 
-        // TODO (next release): remove this conditional
+        // TODO (next release): remove this block
         if (toolbarId != null) {
             backLayout.y = toolbar.y + toolbar.height
+            frontLayout.layoutParams.height = parent.height - toolbar.height
+        } else {
+            frontLayout.layoutParams.height = parent.height - (backLayout.y.toInt() + toolbar.y.toInt() + toolbar.height)
         }
 
-        frontLayout.layoutParams.height = parent.height - (toolbar.y.toInt() + toolbar.height)
         drawDropState(frontLayout, toolbar, backLayout, false)
 
         with(toolbar) {
@@ -183,33 +187,48 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
                 notifyListeners(true)
             }
         }
+
+        needToInitializing = false
     }
 
-    private fun drawDropState(child: View, toolbar: Toolbar, backContainer: View, withAnimation: Boolean = true) {
+    private fun drawDropState(frontLayout: View, toolbar: Toolbar, backContainer: View, withAnimation: Boolean = true) {
         when (dropState) {
             DropState.CLOSE -> {
-                drawClosedState(child, backContainer, withAnimation)
+                drawClosedState(frontLayout, backContainer, toolbar, withAnimation)
                 toolbar.setNavigationIcon(closedIconId)
             }
             DropState.OPEN -> {
-                drawOpenedState(child, backContainer, withAnimation)
+                drawOpenedState(frontLayout, backContainer, withAnimation)
                 toolbar.setNavigationIcon(openedIconRes)
             }
         }
     }
 
-    private fun drawClosedState(child: View, backContainer: View, withAnimation: Boolean = true) {
-        val position = backContainer.y
+    private fun drawClosedState(frontLayout: View, backLayout: View, toolbar: Toolbar, withAnimation: Boolean = true) {
+        val position = calculateTopPosition(backLayout, toolbar)
         val duration = if (withAnimation) DEFAULT_DURATION else WITHOUT_DURATION
 
-        child.animate().y(position).setDuration(duration).start()
+        frontLayout.animate().y(position).setDuration(duration).start()
     }
 
-    private fun drawOpenedState(child: View, backContainer: View, withAnimation: Boolean = true) {
-        val position = backContainer.y + backContainer.height
+    private fun drawOpenedState(frontLayout: View, backLayout: View, withAnimation: Boolean = true) {
+        val position = calculateBottomPosition(backLayout)
         val duration = if (withAnimation) DEFAULT_DURATION else WITHOUT_DURATION
 
-        child.animate().y(position).setDuration(duration).start()
+        frontLayout.animate().y(position).setDuration(duration).start()
+    }
+
+    private fun calculateTopPosition(backLayout: View, toolbar: Toolbar): Float {
+        // TODO (next release): remove this block
+        return if (toolbarId != null) {
+            backLayout.y
+        } else {
+            (backLayout.y + toolbar.y + toolbar.height)
+        }
+    }
+
+    private fun calculateBottomPosition(backLayout: View): Float {
+        return backLayout.y + backLayout.height
     }
 
     private fun notifyListeners(fromUser: Boolean) {
diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt
index 94f008d..f69d5f5 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropUtils.kt
@@ -3,7 +3,7 @@ package ru.semper_viventem.backdrop
 import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 
-class BackdropUtils {
+internal class BackdropUtils {
 
     fun findToolbar(viewGroup: ViewGroup): Toolbar? {
         for (chileId in 0..viewGroup.childCount) {

From 1e75fc95cee505c3391c74bd4e5f74cc15ee9dec Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:15:05 +0300
Subject: [PATCH 14/18] Add deprecated annotation

---
 .../main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 08b3f88..899a68d 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -119,6 +119,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     /**
      * @deprecated — use [BackdropBehavior.attachBackLayout]. This method will be removed in version 0.1.7+
      */
+    @Deprecated("Use BackdropBehavior.attachBackLayout")
     fun attachToolbar(@IdRes toolbarId: Int) {
         this.toolbarId = toolbarId
     }

From 57fcac7970808e46139cc681e3b5d8716817e2b2 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:22:36 +0300
Subject: [PATCH 15/18] New logic of backLayout drawing

---
 .../backdrop/BackdropBehavior.kt              |  5 +----
 .../backdropview/ui/MainActivity.kt           |  3 +--
 sample/src/main/res/layout/activity_main.xml  | 20 +++++++++----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 899a68d..8e9164c 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -66,7 +66,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
     }
 
     override fun layoutDependsOn(parent: CoordinatorLayout, child: View, dependency: View): Boolean {
-        if (toolbarId == null || backLayoutId == null) return false
+        if (toolbarId == null && backLayoutId == null) return false
 
         return when (dependency.id) {
             toolbarId -> true
@@ -171,9 +171,6 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
         // TODO (next release): remove this block
         if (toolbarId != null) {
             backLayout.y = toolbar.y + toolbar.height
-            frontLayout.layoutParams.height = parent.height - toolbar.height
-        } else {
-            frontLayout.layoutParams.height = parent.height - (backLayout.y.toInt() + toolbar.y.toInt() + toolbar.height)
         }
 
         drawDropState(frontLayout, toolbar, backLayout, false)
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
index 6337096..604498c 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
@@ -34,8 +34,7 @@ class MainActivity : AppCompatActivity() {
 
         backdropBehavior = foregroundContainer.findBehavior()
         with(backdropBehavior) {
-            attachBackContainer(R.id.backContainer)
-            attachToolbar(R.id.toolbar)
+            attachBackLayout(R.id.backContainer)
         }
         with(toolbar) {
             setTitle(R.string.app_name)
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 31b8a93..d5b96de 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -9,29 +9,29 @@
     android:background="@color/colorPrimary"
     tools:context=".ui.MainActivity">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:titleTextColor="@color/white"/>
-
-    <LinearLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/backContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/small_gap"
-        android:layout_marginStart="@dimen/small_gap"
         android:orientation="vertical">
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:titleTextColor="@color/white"/>
+
         <com.google.android.material.navigation.NavigationView
             android:id="@+id/navigationView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingStart="@dimen/small_gap"
+            android:paddingEnd="@dimen/small_gap"
             android:background="@android:color/transparent"
             app:itemBackground="@drawable/bg_menu_item"
             app:itemTextColor="@color/white"
             app:menu="@menu/main_menu"/>
-    </LinearLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/foregroundContainer"

From 3f70ac7a73f2c94fe38e602c6ad376675d4fc0b0 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:39:17 +0300
Subject: [PATCH 16/18] Update REDME. Update names of views.

Signed-off-by: Constantine <kostyaxxx8@gmail.com>
---
 README.md                                     | 58 ++++++++++---------
 .../backdropview/ui/MainActivity.kt           |  6 +-
 sample/src/main/res/layout/activity_main.xml  |  4 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index a54da66..af1a11b 100644
--- a/README.md
+++ b/README.md
@@ -15,19 +15,12 @@ This library makes it easy to implement a [Backdrop](https://material.io/design/
 
 ## Download
 **JCenter (Recommended):**
-
-*For support library:*
 ```groovy
 dependencies {
-    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.5'
-}
-```
-*For Android X:*
-```groovy
-dependencies {
-    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.5_x'
+    implementation 'ru.semper-viventem.backdrop:backdrop:0.1.6'
 }
 ```
+
 **JitPack:**
 ```groovy
 repositories {
@@ -36,34 +29,41 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.Semper-Viventem:BackdropView:0.1.5'
+    implementation 'com.github.Semper-Viventem:BackdropView:0.1.6'
 }
 ```
 
 ## How to use it?
-You need to add a layout Toolbar, back container and foreground container
+You need to add front layout and back layout (with toolbar) to CoordinatorLayout.
 
-Add BackdropBehavior to the Foreground View Container:
+Add BackdropBehavior to your front layout:
 
 **XML**
 ```xml
 <android.support.design.widget.CoordinatorLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout
-        android:id="@+id/backContainer"
+    
+    <!-- BackLayout for BackDrop -->
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/backLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
-        
-        <!-- anything -->
-    </LinearLayout>
+
+        <!-- Must contain a Toolbar -->
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <!-- For example, NavigationView. Or you can use anything -->
+        <com.google.android.material.navigation.NavigationView
+            android:id="@+id/navigationView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:menu="@menu/main_menu"/>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <!-- Add BackdropBehavior to this view -->
     <android.support.design.card.MaterialCardView
@@ -72,7 +72,7 @@ Add BackdropBehavior to the Foreground View Container:
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         
-        <!-- anything -->
+        <!-- Anything -->
     </android.support.design.card.MaterialCardView>
 
 </android.support.design.widget.CoordinatorLayout>
@@ -97,14 +97,16 @@ fun <T : CoordinatorLayout.Behavior<*>> View.findBehavior(): T = layoutParams.ru
 val backdropBehavior: BackdropBehavior = foregroundContainer.findBehavior() // find behavior
 
 with(backdropBehavior) {
-        attachBackContainer(R.id.backContainer) // set back container
-        attachToolbar(R.id.toolbar) // set toolbar
+
+        // Attach your back layout to behavior.
+        // BackDropBehavior will find the toolbar itself.
+        attachBackLayout(R.id.backLayout)
         
-        // set navigation icons for toolbar
+        // Set navigation icons for toolbar
         setClosedIcon(R.drawable.ic_menu)
         setOpenedIcon(R.drawable.ic_close)
         
-        // add listener
+        // Add listener
         addOnDropListener(object : BackdropBehavior.OnDropListener {
             override fun onDrop(dropState: BackdropBehavior.DropState, fromUser: Boolean) {
                 // TODO: handle listener            
diff --git a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
index 604498c..c9adab3 100644
--- a/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
+++ b/sample/src/main/kotlin/ru/semper_viventem/backdropview/ui/MainActivity.kt
@@ -21,7 +21,7 @@ class MainActivity : AppCompatActivity() {
         private const val MENU_TEXT = R.id.menuText
         private const val MENU_LIST = R.id.menuList
 
-        private const val FRAGMENT_CONTAINER = R.id.foregroundContainer
+        private const val FRAGMENT_CONTAINER = R.id.frontLayout
 
         private const val DEFAULT_ITEM = MENU_GALLERY
     }
@@ -32,9 +32,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        backdropBehavior = foregroundContainer.findBehavior()
+        backdropBehavior = frontLayout.findBehavior()
         with(backdropBehavior) {
-            attachBackLayout(R.id.backContainer)
+            attachBackLayout(R.id.backLayout)
         }
         with(toolbar) {
             setTitle(R.string.app_name)
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index d5b96de..96ba40f 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
     tools:context=".ui.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/backContainer"
+        android:id="@+id/backLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -34,7 +34,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
-        android:id="@+id/foregroundContainer"
+        android:id="@+id/frontLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/bg_top_radius"

From f77ae977b6cf2db4e77309871b8d4c0447356a90 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:43:37 +0300
Subject: [PATCH 17/18] Remove unusing dependency

---
 backdrop/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backdrop/build.gradle b/backdrop/build.gradle
index 7afcb06..0f14afa 100644
--- a/backdrop/build.gradle
+++ b/backdrop/build.gradle
@@ -65,7 +65,6 @@ dependencies {
 
     // Android X
     implementation "androidx.appcompat:appcompat:1.1.0-alpha02"
-    implementation "com.google.android.material:material:1.1.0-alpha03"
 
     // Kotlin
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

From 1cced4079a2f09f04aca690e52e97a34c1886598 Mon Sep 17 00:00:00 2001
From: Constantine <kostyaxxx8@gmail.com>
Date: Sun, 10 Feb 2019 23:46:45 +0300
Subject: [PATCH 18/18] Fix bug with front layout size

Signed-off-by: Constantine <kostyaxxx8@gmail.com>
---
 .../main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
index 8e9164c..27a9be1 100644
--- a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
+++ b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -173,6 +173,7 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
             backLayout.y = toolbar.y + toolbar.height
         }
 
+        frontLayout.layoutParams.height = parent.height - calculateTopPosition(backLayout, toolbar).toInt()
         drawDropState(frontLayout, toolbar, backLayout, false)
 
         with(toolbar) {