Merge remote-tracking branch 'origin/kotlin' into kotlin

# Conflicts: # README.md
D00mch · Apr 27, 2018 · 4f2f06a · 4f2f06a
2 parents 32507a1 + aa2ffd2
commit 4f2f06a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ class ImageDelegateAdapter(private val onImageClick: (ImageViewModel) -> Unit)
 
 ```
 
-Check part `with(viewHolder)`. This works like basic view holder without creating one. Just override onBind and onCreate methods. See the [View holder pattern support and caching options](
+Check `with(viewHolder)` part. This works like the basic view holder without creating one. Just override onBind and onCreate methods. See the [View holder pattern support and caching options](
 https://github.com/Kotlin/KEEP/blob/master/proposals/android-extensions-entity-caching.md
 ) for more information.
 

diff --git a/...chev/delegateadapters/KDelegateAdapter.kt → ...egateadapter/delegate/KDelegateAdapter.kt b/...chev/delegateadapters/KDelegateAdapter.kt → ...egateadapter/delegate/KDelegateAdapter.kt
@@ -1,8 +1,6 @@
-package com.example.dumchev.delegateadapters
+package com.example.delegateadapter.delegate
 
 import android.view.View
-import com.example.delegateadapter.delegate.BaseDelegateAdapter
-import com.example.delegateadapter.delegate.BaseViewHolder
 import kotlinx.android.extensions.LayoutContainer
 
 /**

diff --git a/...e/src/main/java/com/example/dumchev/delegateadapters/base/adapter/CheckDelegateAdapter.kt b/...e/src/main/java/com/example/dumchev/delegateadapters/base/adapter/CheckDelegateAdapter.kt
@@ -1,6 +1,6 @@
 package com.example.dumchev.delegateadapters.base.adapter
 
-import com.example.dumchev.delegateadapters.KDelegateAdapter
+import com.example.delegateadapter.delegate.KDelegateAdapter
 import com.example.dumchev.delegateadapters.R
 import com.example.dumchev.delegateadapters.base.model.CheckViewModel
 import kotlinx.android.synthetic.main.check_item.*

diff --git a/...e/src/main/java/com/example/dumchev/delegateadapters/base/adapter/ImageDelegateAdapter.kt b/...e/src/main/java/com/example/dumchev/delegateadapters/base/adapter/ImageDelegateAdapter.kt
@@ -1,7 +1,7 @@
 package com.example.dumchev.delegateadapters.base.adapter
 
 import android.view.View
-import com.example.dumchev.delegateadapters.KDelegateAdapter
+import com.example.delegateadapter.delegate.KDelegateAdapter
 import com.example.dumchev.delegateadapters.R
 import com.example.dumchev.delegateadapters.base.model.ImageViewModel
 import kotlinx.android.synthetic.main.image_item.*

diff --git a/...ple/src/main/java/com/example/dumchev/delegateadapters/base/adapter/TxtDelegateAdapter.kt b/...ple/src/main/java/com/example/dumchev/delegateadapters/base/adapter/TxtDelegateAdapter.kt
@@ -1,6 +1,6 @@
 package com.example.dumchev.delegateadapters.base.adapter
 
-import com.example.dumchev.delegateadapters.KDelegateAdapter
+import com.example.delegateadapter.delegate.KDelegateAdapter
 import com.example.dumchev.delegateadapters.R
 import com.example.dumchev.delegateadapters.base.model.TextViewModel
 import kotlinx.android.synthetic.main.text_item.*