Optimized imports

app/src/main/java/me/vadik/knigopis/feature/MainActivity.kt

@@ -21,31 +21,32 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.books_page.*
 import kotlinx.android.synthetic.main.notes_page.*
 import kotlinx.android.synthetic.main.users_page.*
-import me.vadik.knigopis.*
+import me.vadik.knigopis.BuildConfig
+import me.vadik.knigopis.R
+import me.vadik.knigopis.Router
 import me.vadik.knigopis.common.*
+import me.vadik.knigopis.common.extensions.showNow
+import me.vadik.knigopis.common.extensions.startActivityOrNull
+import me.vadik.knigopis.common.extensions.toast
+import me.vadik.knigopis.common.view.dialog.DialogFactory
+import me.vadik.knigopis.common.view.header.HeaderItemDecoration
+import me.vadik.knigopis.common.view.header.StickyHeaderInterface
+import me.vadik.knigopis.feature.book.createEditBookIntent
+import me.vadik.knigopis.feature.book.createNewBookIntent
 import me.vadik.knigopis.feature.books.BooksAdapter
 import me.vadik.knigopis.feature.notes.NotesAdapter
+import me.vadik.knigopis.feature.profile.createProfileIntent
+import me.vadik.knigopis.feature.user.createUserIntent
 import me.vadik.knigopis.feature.users.UsersAdapter
+import me.vadik.knigopis.repository.*
 import me.vadik.knigopis.repository.api.BookCoverSearch
 import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.feature.book.createEditBookIntent
-import me.vadik.knigopis.feature.book.createNewBookIntent
 import me.vadik.knigopis.repository.cache.AvatarCache
 import me.vadik.knigopis.repository.cache.AvatarCacheImpl
-import me.vadik.knigopis.common.view.header.HeaderItemDecoration
-import me.vadik.knigopis.common.view.header.StickyHeaderInterface
-import me.vadik.knigopis.repository.*
-import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.repository.model.*
 import me.vadik.knigopis.repository.model.CurrentTab.*
 import me.vadik.knigopis.repository.model.note.Note
 import me.vadik.knigopis.repository.model.subscription.Subscription
-import me.vadik.knigopis.feature.profile.createProfileIntent
-import me.vadik.knigopis.feature.user.createUserIntent
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.extensions.startActivityOrNull
-import me.vadik.knigopis.common.extensions.toast
 import org.koin.android.ext.android.inject
 import retrofit2.HttpException
 
@@ -143,7 +144,8 @@ class MainActivity : AppCompatActivity(), Router {
         initNavigationView()
         initToolbar(toolbar)
         addBookButton.setOnClickListener {
-            startActivityForResult(createNewBookIntent(),
+            startActivityForResult(
+                createNewBookIntent(),
                 BOOK_REQUEST_CODE
             )
         }
@@ -209,12 +211,8 @@ class MainActivity : AppCompatActivity(), Router {
 
     override fun openBookScreen(book: Book) {
         when (book) {
-            is PlannedBook -> startActivityForResult(createEditBookIntent(book),
-                BOOK_REQUEST_CODE
-            )
-            is FinishedBook -> startActivityForResult(createEditBookIntent(book),
-                BOOK_REQUEST_CODE
-            )
+            is PlannedBook -> startActivityForResult(createEditBookIntent(book), BOOK_REQUEST_CODE)
+            is FinishedBook -> startActivityForResult(createEditBookIntent(book), BOOK_REQUEST_CODE)
             else -> throw UnsupportedOperationException()
         }
     }
@@ -318,9 +316,7 @@ class MainActivity : AppCompatActivity(), Router {
                         auth.logout()
                         refresh()
                     } else {
-                        startActivityForResult(auth.getTokenRequest(),
-                            ULOGIN_REQUEST_CODE
-                        )
+                        startActivityForResult(auth.getTokenRequest(), ULOGIN_REQUEST_CODE)
                     }
                     refreshOptionsMenu()
                 }

app/src/main/java/me/vadik/knigopis/feature/book/BookActivity.kt

@@ -9,19 +9,19 @@ import android.view.View.VISIBLE
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import kotlinx.android.synthetic.main.book_edit.*
-import me.vadik.knigopis.*
+import me.vadik.knigopis.R
 import me.vadik.knigopis.common.*
-import me.vadik.knigopis.repository.api.BookCoverSearch
+import me.vadik.knigopis.common.extensions.hideKeyboard
+import me.vadik.knigopis.common.extensions.hideNow
+import me.vadik.knigopis.common.extensions.showNow
+import me.vadik.knigopis.common.extensions.toast
 import me.vadik.knigopis.repository.BookRepository
 import me.vadik.knigopis.repository.Configuration
+import me.vadik.knigopis.repository.api.BookCoverSearch
 import me.vadik.knigopis.repository.model.FinishedBook
 import me.vadik.knigopis.repository.model.FinishedBookToSend
 import me.vadik.knigopis.repository.model.PlannedBook
 import me.vadik.knigopis.repository.model.PlannedBookToSend
-import me.vadik.knigopis.common.extensions.hideKeyboard
-import me.vadik.knigopis.common.extensions.hideNow
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.extensions.toast
 import org.koin.android.ext.android.inject
 import java.util.*
 

app/src/main/java/me/vadik/knigopis/feature/books/BooksAdapter.kt

@@ -8,23 +8,24 @@ import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestOptions
-import me.vadik.knigopis.*
+import me.vadik.knigopis.R
+import me.vadik.knigopis.Router
 import me.vadik.knigopis.common.Adapter
+import me.vadik.knigopis.common.extensions.hideNow
+import me.vadik.knigopis.common.extensions.showNow
+import me.vadik.knigopis.common.extensions.toast
 import me.vadik.knigopis.common.io2main
 import me.vadik.knigopis.common.logError
 import me.vadik.knigopis.common.setProgressSmoothly
-import me.vadik.knigopis.repository.api.BookCoverSearch
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.KAuth
 import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.common.view.dialog.createDialogItem
+import me.vadik.knigopis.repository.KAuth
+import me.vadik.knigopis.repository.api.BookCoverSearch
+import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.BookHeader
 import me.vadik.knigopis.repository.model.FinishedBook
 import me.vadik.knigopis.repository.model.PlannedBook
-import me.vadik.knigopis.common.extensions.hideNow
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.extensions.toast
 
 class BooksAdapter(
     private val coverSearch: BookCoverSearch,

app/src/main/java/me/vadik/knigopis/feature/notes/NotesAdapter.kt

@@ -4,8 +4,8 @@ import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
 import me.vadik.knigopis.R
 import me.vadik.knigopis.Router
-import me.vadik.knigopis.repository.cache.AvatarCache
 import me.vadik.knigopis.common.extensions.inflate
+import me.vadik.knigopis.repository.cache.AvatarCache
 import me.vadik.knigopis.repository.model.note.Note
 
 class NotesAdapter(

app/src/main/java/me/vadik/knigopis/feature/profile/ProfileActivity.kt

@@ -9,13 +9,12 @@ import android.view.MenuItem
 import android.view.animation.AccelerateInterpolator
 import android.view.inputmethod.EditorInfo
 import kotlinx.android.synthetic.main.profile_activity.*
-import me.vadik.knigopis.*
+import me.vadik.knigopis.R
 import me.vadik.knigopis.common.*
-import me.vadik.knigopis.repository.api.Endpoint
+import me.vadik.knigopis.common.extensions.*
 import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.common.extensions.setCircleImage
+import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.repository.model.*
-import me.vadik.knigopis.common.extensions.*
 import org.koin.android.ext.android.inject
 
 fun Context.createProfileIntent() = Intent(this, ProfileActivity::class.java)

app/src/main/java/me/vadik/knigopis/feature/user/BooksAdapter.kt

@@ -4,9 +4,9 @@ import me.vadik.knigopis.R
 import me.vadik.knigopis.common.adapter.AbstractBooksAdapter
 import me.vadik.knigopis.common.adapter.BookHeaderViewHolder
 import me.vadik.knigopis.common.adapter.BookItemViewHolder
-import me.vadik.knigopis.feature.book.createNewBookIntent
 import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.common.view.dialog.createDialogItem
+import me.vadik.knigopis.feature.book.createNewBookIntent
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.BookHeader
 import me.vadik.knigopis.repository.model.FinishedBook

app/src/main/java/me/vadik/knigopis/feature/user/UserActivity.kt

@@ -11,15 +11,15 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
 import kotlinx.android.synthetic.main.user_activity.*
-import me.vadik.knigopis.*
+import me.vadik.knigopis.R
 import me.vadik.knigopis.common.*
+import me.vadik.knigopis.common.extensions.*
+import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.common.view.header.HeaderItemDecoration
 import me.vadik.knigopis.common.view.header.StickyHeaderInterface
 import me.vadik.knigopis.repository.Configuration
-import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.BookHeader
-import me.vadik.knigopis.common.extensions.*
 import org.koin.android.ext.android.inject
 
 private const val EXTRA_USER_ID = "me.vadik.knigopis.extra_user_id"

app/src/main/java/me/vadik/knigopis/feature/user/UserInteractor.kt

@@ -2,9 +2,9 @@ package me.vadik.knigopis.feature.user
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.KAuth
 import me.vadik.knigopis.common.io2main
+import me.vadik.knigopis.repository.KAuth
+import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.BookHeader
 

app/src/main/java/me/vadik/knigopis/feature/user/behavior/BehaviorHelper.kt

@@ -2,12 +2,13 @@ package me.vadik.knigopis.feature.user.behavior
 
 import android.view.View
 
-val View.simpleState get() = SimpleViewState(
-    x.toInt(),
-    y.toInt(),
-    width,
-    height
-)
+val View.simpleState
+    get() = SimpleViewState(
+        x.toInt(),
+        y.toInt(),
+        width,
+        height
+    )
 
 class BehaviorHelper(val start: SimpleViewState, val end: SimpleViewState) {
 

app/src/main/java/me/vadik/knigopis/feature/users/UserViewHolder.kt

@@ -5,8 +5,8 @@ import android.view.View
 import kotlinx.android.synthetic.main.user.view.*
 import me.vadik.knigopis.R
 import me.vadik.knigopis.common.extensions.setCircleImage
-import me.vadik.knigopis.common.getHtmlString
 import me.vadik.knigopis.common.extensions.showNow
+import me.vadik.knigopis.common.getHtmlString
 
 class UserViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 

app/src/main/java/me/vadik/knigopis/feature/users/UsersAdapter.kt

@@ -5,9 +5,9 @@ import android.view.ViewGroup
 import me.vadik.knigopis.R
 import me.vadik.knigopis.Router
 import me.vadik.knigopis.common.ResourceProvider
+import me.vadik.knigopis.common.extensions.inflate
 import me.vadik.knigopis.common.view.dialog.DialogFactory
 import me.vadik.knigopis.common.view.dialog.createDialogItem
-import me.vadik.knigopis.common.extensions.inflate
 import me.vadik.knigopis.repository.model.subscription.Subscription
 
 class UsersAdapter(

app/src/main/java/me/vadik/knigopis/repository/BookRepository.kt

@@ -3,11 +3,11 @@ package me.vadik.knigopis.repository
 import io.reactivex.Completable
 import io.reactivex.Single
 import io.reactivex.rxkotlin.Singles
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.BookCache
 import me.vadik.knigopis.common.NetworkChecker
 import me.vadik.knigopis.common.logError
 import me.vadik.knigopis.common.logWarn
+import me.vadik.knigopis.repository.api.Endpoint
+import me.vadik.knigopis.repository.cache.BookCache
 import me.vadik.knigopis.repository.model.*
 
 interface BookRepository {

app/src/main/java/me/vadik/knigopis/repository/KAuth.kt

@@ -2,9 +2,9 @@ package me.vadik.knigopis.repository
 
 import android.content.Context
 import android.content.Intent
-import me.vadik.knigopis.repository.api.Endpoint
 import me.vadik.knigopis.common.io2main
 import me.vadik.knigopis.common.logError
+import me.vadik.knigopis.repository.api.Endpoint
 import ru.ulogin.sdk.UloginAuthActivity
 import java.util.*
 

app/src/main/java/me/vadik/knigopis/repository/NoteRepository.kt

@@ -2,11 +2,11 @@ package me.vadik.knigopis.repository
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.NoteCache
 import me.vadik.knigopis.common.NetworkChecker
 import me.vadik.knigopis.common.logError
 import me.vadik.knigopis.common.logWarn
+import me.vadik.knigopis.repository.api.Endpoint
+import me.vadik.knigopis.repository.cache.NoteCache
 import me.vadik.knigopis.repository.model.note.Note
 
 interface NoteRepository {

app/src/main/java/me/vadik/knigopis/repository/SubscriptionRepository.kt

@@ -2,11 +2,11 @@ package me.vadik.knigopis.repository
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.SubscriptionCache
 import me.vadik.knigopis.common.NetworkChecker
 import me.vadik.knigopis.common.logError
 import me.vadik.knigopis.common.logWarn
+import me.vadik.knigopis.repository.api.Endpoint
+import me.vadik.knigopis.repository.cache.SubscriptionCache
 import me.vadik.knigopis.repository.model.subscription.Subscription
 
 interface SubscriptionRepository {

app/src/main/java/me/vadik/knigopis/repository/api/BookCoverSearch.kt

@@ -1,8 +1,8 @@
 package me.vadik.knigopis.repository.api
 
 import io.reactivex.Single
-import me.vadik.knigopis.repository.cache.BookCoverCache
 import me.vadik.knigopis.common.io2main
+import me.vadik.knigopis.repository.cache.BookCoverCache
 import me.vadik.knigopis.repository.model.Book
 import me.vadik.knigopis.repository.model.ImageThumbnail
 import java.util.concurrent.TimeUnit