Moved classes to appropriate packages

app/src/main/java/com/sirekanyan/knigopis/Constants.kt

@@ -0,0 +1,4 @@
+package com.sirekanyan.knigopis
+
+const val MIN_BOOK_PRIORITY = 1
+const val MAX_BOOK_PRIORITY = 100

app/src/main/java/com/sirekanyan/knigopis/common/BaseActivity.kt

@@ -2,8 +2,6 @@ package com.sirekanyan.knigopis.common
 
 import android.support.v7.app.AppCompatActivity
 import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.disposables.CompositeDisposable
 
@@ -11,14 +9,6 @@ abstract class BaseActivity : AppCompatActivity() {
 
     private val disposables = CompositeDisposable()
 
-    fun <T> Flowable<T>.bind(onSuccess: (T) -> Unit, onError: (Throwable) -> Unit) {
-        disposables.add(subscribe(onSuccess, onError))
-    }
-
-    fun <T> Observable<T>.bind(onSuccess: (T) -> Unit, onError: (Throwable) -> Unit) {
-        disposables.add(subscribe(onSuccess, onError))
-    }
-
     fun <T> Single<T>.bind(onSuccess: (T) -> Unit, onError: (Throwable) -> Unit) {
         disposables.add(subscribe(onSuccess, onError))
     }

app/src/main/java/com/sirekanyan/knigopis/common/CommonResource.kt

@@ -1,7 +0,0 @@
-package com.sirekanyan.knigopis.common
-
-import android.view.View
-
-interface CommonResource<in T : View> {
-    fun setValueTo(view: T)
-}

app/src/main/java/com/sirekanyan/knigopis/common/Constants.kt

@@ -1,4 +0,0 @@
-package com.sirekanyan.knigopis.common
-
-const val MIN_BOOK_PRIORITY = 1
-const val MAX_BOOK_PRIORITY = 100

app/src/main/java/com/sirekanyan/knigopis/common/NetworkChecker.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/NetworkChecker.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common
+package com.sirekanyan.knigopis.common.android
 
 import android.app.Application
 import com.sirekanyan.knigopis.common.extensions.systemConnectivityManager

app/src/main/java/com/sirekanyan/knigopis/common/Permissions.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/Permissions.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common
+package com.sirekanyan.knigopis.common.android
 
 import android.Manifest.permission.READ_PHONE_STATE
 import android.app.Activity
@@ -12,7 +12,8 @@ interface Permissions {
 
 }
 
-class PermissionsImpl(private val activity: Activity) : Permissions {
+class PermissionsImpl(private val activity: Activity) :
+    Permissions {
 
     override fun requestReadPhoneState(): Single<Permission> =
         RxPermissions(activity).requestEach(READ_PHONE_STATE).firstOrError()

app/src/main/java/com/sirekanyan/knigopis/common/ResourceProvider.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/ResourceProvider.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common
+package com.sirekanyan.knigopis.common.android
 
 import android.app.Application
 
@@ -10,7 +10,8 @@ interface ResourceProvider {
 
 }
 
-class ResourceProviderImpl(private val app: Application) : ResourceProvider {
+class ResourceProviderImpl(private val app: Application) :
+    ResourceProvider {
 
     override fun getString(id: Int, vararg args: Any): String =
         app.getString(id, *args)

app/src/main/java/com/sirekanyan/knigopis/common/StringResource.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/StringResource.kt

@@ -1,10 +1,10 @@
-package com.sirekanyan.knigopis.common
+package com.sirekanyan.knigopis.common.android
 
 import android.support.annotation.StringRes
 import android.widget.TextView
 
-interface StringResource : CommonResource<TextView> {
-    override fun setValueTo(view: TextView)
+interface StringResource {
+    fun setValueTo(view: TextView)
 }
 
 class PlainStringResource(private val text: String) : StringResource {
@@ -13,7 +13,7 @@ class PlainStringResource(private val text: String) : StringResource {
     }
 }
 
-class IntegerStringResource(@StringRes private val textRes: Int) : StringResource {
+class IdStringResource(@StringRes private val textRes: Int) : StringResource {
     override fun setValueTo(view: TextView) {
         view.setText(textRes)
     }

app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogFactory.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/dialog/DialogFactory.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.view.dialog
+package com.sirekanyan.knigopis.common.android.dialog
 
 import android.content.Context
 import android.support.design.widget.BottomSheetDialog

app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogItem.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/dialog/DialogItem.kt

@@ -1,7 +1,7 @@
-package com.sirekanyan.knigopis.common.view.dialog
+package com.sirekanyan.knigopis.common.android.dialog
 
 import android.support.annotation.DrawableRes
-import com.sirekanyan.knigopis.common.StringResource
+import com.sirekanyan.knigopis.common.android.StringResource
 
 class DialogItem(
     val title: StringResource,

app/src/main/java/com/sirekanyan/knigopis/common/android/dialog/DialogItemFactory.kt

@@ -0,0 +1,10 @@
+package com.sirekanyan.knigopis.common.android.dialog
+
+import com.sirekanyan.knigopis.common.android.IdStringResource
+import com.sirekanyan.knigopis.common.android.PlainStringResource
+
+fun createDialogItem(titleRes: Int, iconRes: Int, onClick: () -> Unit) =
+    DialogItem(IdStringResource(titleRes), iconRes, onClick)
+
+fun createDialogItem(title: String, iconRes: Int, onClick: () -> Unit) =
+    DialogItem(PlainStringResource(title), iconRes, onClick)

app/src/main/java/com/sirekanyan/knigopis/common/view/header/HeaderItemDecoration.java → app/src/main/java/com/sirekanyan/knigopis/common/android/header/HeaderItemDecoration.java

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.view.header;
+package com.sirekanyan.knigopis.common.android.header;
 
 import android.graphics.Canvas;
 import android.support.annotation.NonNull;

app/src/main/java/com/sirekanyan/knigopis/common/view/header/StickyHeader.java → app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeader.java

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.view.header;
+package com.sirekanyan.knigopis.common.android.header;
 
 import android.view.View;
 

app/src/main/java/com/sirekanyan/knigopis/common/view/header/StickyHeaderImpl.kt → app/src/main/java/com/sirekanyan/knigopis/common/android/header/StickyHeaderImpl.kt

@@ -1,4 +1,4 @@
-package com.sirekanyan.knigopis.common.view.header
+package com.sirekanyan.knigopis.common.android.header
 
 import android.view.View
 import com.sirekanyan.knigopis.R

app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogItemFactory.kt

@@ -1,10 +0,0 @@
-package com.sirekanyan.knigopis.common.view.dialog
-
-import com.sirekanyan.knigopis.common.IntegerStringResource
-import com.sirekanyan.knigopis.common.PlainStringResource
-
-fun createDialogItem(titleRes: Int, iconRes: Int, onClick: () -> Unit) =
-    DialogItem(IntegerStringResource(titleRes), iconRes, onClick)
-
-fun createDialogItem(title: String, iconRes: Int, onClick: () -> Unit) =
-    DialogItem(PlainStringResource(title), iconRes, onClick)

app/src/main/java/com/sirekanyan/knigopis/dependency.kt

@@ -5,10 +5,10 @@ import android.content.Context
 import android.view.View
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import com.sirekanyan.knigopis.common.*
+import com.sirekanyan.knigopis.common.android.*
 import com.sirekanyan.knigopis.common.extensions.getRootView
-import com.sirekanyan.knigopis.common.view.dialog.BottomSheetDialogFactory
-import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.android.dialog.BottomSheetDialogFactory
+import com.sirekanyan.knigopis.common.android.dialog.DialogFactory
 import com.sirekanyan.knigopis.feature.MainPresenter
 import com.sirekanyan.knigopis.feature.MainPresenterImpl
 import com.sirekanyan.knigopis.feature.MainViewImpl

app/src/main/java/com/sirekanyan/knigopis/feature/MainPresenter.kt

@@ -2,9 +2,9 @@ package com.sirekanyan.knigopis.feature
 
 import android.net.Uri
 import com.sirekanyan.knigopis.common.BasePresenter
-import com.sirekanyan.knigopis.common.Permissions
+import com.sirekanyan.knigopis.common.android.Permissions
 import com.sirekanyan.knigopis.common.Presenter
-import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.common.extensions.io2main
 import com.sirekanyan.knigopis.common.extensions.toUriOrNull
 import com.sirekanyan.knigopis.common.functions.logError

app/src/main/java/com/sirekanyan/knigopis/feature/MainView.kt

@@ -9,11 +9,11 @@ import android.widget.TextView
 import com.sirekanyan.knigopis.BuildConfig
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.extensions.*
-import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
-import com.sirekanyan.knigopis.common.view.dialog.DialogItem
-import com.sirekanyan.knigopis.common.view.dialog.createDialogItem
-import com.sirekanyan.knigopis.common.view.header.HeaderItemDecoration
-import com.sirekanyan.knigopis.common.view.header.StickyHeaderImpl
+import com.sirekanyan.knigopis.common.android.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.android.dialog.DialogItem
+import com.sirekanyan.knigopis.common.android.dialog.createDialogItem
+import com.sirekanyan.knigopis.common.android.header.HeaderItemDecoration
+import com.sirekanyan.knigopis.common.android.header.StickyHeaderImpl
 import com.sirekanyan.knigopis.feature.books.BooksAdapter
 import com.sirekanyan.knigopis.feature.books.BooksView
 import com.sirekanyan.knigopis.feature.login.LoginView

app/src/main/java/com/sirekanyan/knigopis/feature/book/BookActivity.kt

@@ -7,8 +7,8 @@ import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.BaseActivity
-import com.sirekanyan.knigopis.common.MAX_BOOK_PRIORITY
-import com.sirekanyan.knigopis.common.MIN_BOOK_PRIORITY
+import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
+import com.sirekanyan.knigopis.MIN_BOOK_PRIORITY
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 import com.sirekanyan.knigopis.common.functions.extra

app/src/main/java/com/sirekanyan/knigopis/feature/profile/ProfileActivity.kt

@@ -9,7 +9,7 @@ import android.view.animation.AccelerateInterpolator
 import android.view.inputmethod.EditorInfo
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.BaseActivity
-import com.sirekanyan.knigopis.common.MAX_BOOK_PRIORITY
+import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.common.functions.createTextShareIntent
 import com.sirekanyan.knigopis.common.functions.logError

app/src/main/java/com/sirekanyan/knigopis/feature/user/UserActivity.kt

@@ -7,16 +7,16 @@ import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
+import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.BaseActivity
-import com.sirekanyan.knigopis.common.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.common.functions.extra
 import com.sirekanyan.knigopis.common.functions.logError
-import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
-import com.sirekanyan.knigopis.common.view.dialog.createDialogItem
-import com.sirekanyan.knigopis.common.view.header.HeaderItemDecoration
-import com.sirekanyan.knigopis.common.view.header.StickyHeaderImpl
+import com.sirekanyan.knigopis.common.android.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.android.dialog.createDialogItem
+import com.sirekanyan.knigopis.common.android.header.HeaderItemDecoration
+import com.sirekanyan.knigopis.common.android.header.StickyHeaderImpl
 import com.sirekanyan.knigopis.createParameters
 import com.sirekanyan.knigopis.feature.book.createNewBookIntent
 import com.sirekanyan.knigopis.model.BookDataModel

app/src/main/java/com/sirekanyan/knigopis/feature/user/UserInteractor.kt

@@ -1,6 +1,6 @@
 package com.sirekanyan.knigopis.feature.user
 
-import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.common.extensions.io2main
 import com.sirekanyan.knigopis.model.BookModel
 import com.sirekanyan.knigopis.model.createBookHeaderModel

app/src/main/java/com/sirekanyan/knigopis/feature/users/UriItem.kt

@@ -2,7 +2,7 @@ package com.sirekanyan.knigopis.feature.users
 
 import android.net.Uri
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.android.ResourceProvider
 
 class UriItem(val uri: Uri, resource: ResourceProvider) {
     private val social = uri.toSocialNetwork()

app/src/main/java/com/sirekanyan/knigopis/model/BookModel.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.model
 
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.common.adapter.HeadedModel
 import com.sirekanyan.knigopis.common.extensions.orDefault
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl

app/src/main/java/com/sirekanyan/knigopis/model/mappers.kt

@@ -3,7 +3,7 @@ package com.sirekanyan.knigopis.model
 import android.text.SpannableString
 import android.text.format.DateUtils
 import android.text.style.SuperscriptSpan
-import com.sirekanyan.knigopis.common.MAX_BOOK_PRIORITY
+import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 import com.sirekanyan.knigopis.model.dto.FinishedBook
 import com.sirekanyan.knigopis.model.dto.Note

app/src/main/java/com/sirekanyan/knigopis/repository/BookOrganizer.kt

@@ -1,7 +1,7 @@
 package com.sirekanyan.knigopis.repository
 
 import com.sirekanyan.knigopis.R
-import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.android.ResourceProvider
 import com.sirekanyan.knigopis.model.BookModel
 import com.sirekanyan.knigopis.model.createBookHeaderModel
 import com.sirekanyan.knigopis.model.dto.FinishedBook

app/src/main/java/com/sirekanyan/knigopis/repository/BookRepository.kt

@@ -1,6 +1,6 @@
 package com.sirekanyan.knigopis.repository
 
-import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.android.NetworkChecker
 import com.sirekanyan.knigopis.model.BookDataModel
 import com.sirekanyan.knigopis.model.BookModel
 import com.sirekanyan.knigopis.model.dto.FinishedBook

app/src/main/java/com/sirekanyan/knigopis/repository/CommonRepository.kt

@@ -1,6 +1,6 @@
 package com.sirekanyan.knigopis.repository
 
-import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.android.NetworkChecker
 import io.reactivex.Completable
 import io.reactivex.Flowable
 import io.reactivex.Maybe

app/src/main/java/com/sirekanyan/knigopis/repository/NoteRepository.kt

@@ -1,6 +1,6 @@
 package com.sirekanyan.knigopis.repository
 
-import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.android.NetworkChecker
 import com.sirekanyan.knigopis.model.NoteModel
 import com.sirekanyan.knigopis.model.toNoteModel
 import com.sirekanyan.knigopis.repository.cache.CacheKey

app/src/main/java/com/sirekanyan/knigopis/repository/UserRepository.kt

@@ -1,6 +1,6 @@
 package com.sirekanyan.knigopis.repository
 
-import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.android.NetworkChecker
 import com.sirekanyan.knigopis.model.UserModel
 import com.sirekanyan.knigopis.model.toUserModel
 import com.sirekanyan.knigopis.repository.cache.CacheKey