Vadik Sirekanyan před 7 roky
rodič
revize
04889e36a7

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/common/adapter/BookViewHolder.kt

@@ -3,11 +3,11 @@ package com.sirekanyan.knigopis.common.adapter
 import android.support.annotation.StringRes
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import kotlinx.android.synthetic.main.header.view.*
-import kotlinx.android.synthetic.main.user_book.view.*
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.extensions.setSquareImage
 import com.sirekanyan.knigopis.common.extensions.showNow
+import kotlinx.android.synthetic.main.header.view.*
+import kotlinx.android.synthetic.main.user_book.view.*
 
 sealed class BookViewHolder(view: View) : RecyclerView.ViewHolder(view)
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogFactory.kt

@@ -2,10 +2,10 @@ package com.sirekanyan.knigopis.common.view.dialog
 
 import android.content.Context
 import android.support.design.widget.BottomSheetDialog
-import kotlinx.android.synthetic.main.bottom_sheet_dialog_item.view.*
-import kotlinx.android.synthetic.main.bottom_sheet_dialog_view.*
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.extensions.inflate
+import kotlinx.android.synthetic.main.bottom_sheet_dialog_item.view.*
+import kotlinx.android.synthetic.main.bottom_sheet_dialog_view.*
 
 interface DialogFactory {
 

+ 7 - 7
app/src/main/java/com/sirekanyan/knigopis/feature/MainActivity.kt

@@ -14,13 +14,6 @@ import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
-import com.tbruyelle.rxpermissions2.RxPermissions
-import io.reactivex.Single
-import kotlinx.android.synthetic.main.about.view.*
-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 com.sirekanyan.knigopis.BuildConfig
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.Router
@@ -44,6 +37,13 @@ import com.sirekanyan.knigopis.repository.model.*
 import com.sirekanyan.knigopis.repository.model.CurrentTab.*
 import com.sirekanyan.knigopis.repository.model.note.Note
 import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import com.tbruyelle.rxpermissions2.RxPermissions
+import io.reactivex.Single
+import kotlinx.android.synthetic.main.about.view.*
+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 org.koin.android.ext.android.inject
 import retrofit2.HttpException
 

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/notes/NoteViewHolder.kt

@@ -3,9 +3,9 @@ package com.sirekanyan.knigopis.feature.notes
 import android.support.v7.widget.RecyclerView
 import android.text.format.DateUtils
 import android.view.View
-import kotlinx.android.synthetic.main.note.view.*
 import com.sirekanyan.knigopis.common.extensions.setCircleImage
 import com.sirekanyan.knigopis.common.extensions.setSquareImage
+import kotlinx.android.synthetic.main.note.view.*
 
 class NoteViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 

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

@@ -8,13 +8,13 @@ import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import android.view.animation.AccelerateInterpolator
 import android.view.inputmethod.EditorInfo
-import kotlinx.android.synthetic.main.profile_activity.*
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.*
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.repository.KAuth
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.model.*
+import kotlinx.android.synthetic.main.profile_activity.*
 import org.koin.android.ext.android.inject
 
 fun Context.createProfileIntent() = Intent(this, ProfileActivity::class.java)

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

@@ -1,12 +1,12 @@
 package com.sirekanyan.knigopis.feature.user
 
-import io.reactivex.Completable
-import io.reactivex.Single
 import com.sirekanyan.knigopis.common.io2main
 import com.sirekanyan.knigopis.repository.KAuth
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.model.Book
 import com.sirekanyan.knigopis.repository.model.BookHeader
+import io.reactivex.Completable
+import io.reactivex.Single
 
 interface UserInteractor {
 

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/feature/users/UserViewHolder.kt

@@ -2,11 +2,11 @@ package com.sirekanyan.knigopis.feature.users
 
 import android.support.v7.widget.RecyclerView
 import android.view.View
-import kotlinx.android.synthetic.main.user.view.*
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.extensions.setCircleImage
 import com.sirekanyan.knigopis.common.extensions.showNow
 import com.sirekanyan.knigopis.common.getHtmlString
+import kotlinx.android.synthetic.main.user.view.*
 
 class UserViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 

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

@@ -1,14 +1,14 @@
 package com.sirekanyan.knigopis.repository
 
-import io.reactivex.Completable
-import io.reactivex.Single
-import io.reactivex.rxkotlin.Singles
 import com.sirekanyan.knigopis.common.NetworkChecker
 import com.sirekanyan.knigopis.common.logError
 import com.sirekanyan.knigopis.common.logWarn
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.BookCache
 import com.sirekanyan.knigopis.repository.model.*
+import io.reactivex.Completable
+import io.reactivex.Single
+import io.reactivex.rxkotlin.Singles
 
 interface BookRepository {
 

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

@@ -1,13 +1,13 @@
 package com.sirekanyan.knigopis.repository
 
-import io.reactivex.Completable
-import io.reactivex.Single
 import com.sirekanyan.knigopis.common.NetworkChecker
 import com.sirekanyan.knigopis.common.logError
 import com.sirekanyan.knigopis.common.logWarn
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.NoteCache
 import com.sirekanyan.knigopis.repository.model.note.Note
+import io.reactivex.Completable
+import io.reactivex.Single
 
 interface NoteRepository {
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/SubscriptionRepository.kt

@@ -1,13 +1,13 @@
 package com.sirekanyan.knigopis.repository
 
-import io.reactivex.Completable
-import io.reactivex.Single
 import com.sirekanyan.knigopis.common.NetworkChecker
 import com.sirekanyan.knigopis.common.logError
 import com.sirekanyan.knigopis.common.logWarn
 import com.sirekanyan.knigopis.repository.api.Endpoint
 import com.sirekanyan.knigopis.repository.cache.SubscriptionCache
 import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import io.reactivex.Completable
+import io.reactivex.Single
 
 interface SubscriptionRepository {
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/api/Endpoint.kt

@@ -1,10 +1,10 @@
 package com.sirekanyan.knigopis.repository.api
 
-import io.reactivex.Completable
-import io.reactivex.Single
 import com.sirekanyan.knigopis.repository.model.*
 import com.sirekanyan.knigopis.repository.model.note.Note
 import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import io.reactivex.Completable
+import io.reactivex.Single
 import retrofit2.http.*
 
 interface Endpoint {

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/cache/BookCache.kt

@@ -1,12 +1,12 @@
 package com.sirekanyan.knigopis.repository.cache
 
-import io.reactivex.Completable
-import io.reactivex.Maybe
 import com.sirekanyan.knigopis.repository.cache.common.CacheKey
 import com.sirekanyan.knigopis.repository.cache.common.CommonCache
 import com.sirekanyan.knigopis.repository.cache.common.genericType
 import com.sirekanyan.knigopis.repository.model.FinishedBook
 import com.sirekanyan.knigopis.repository.model.PlannedBook
+import io.reactivex.Completable
+import io.reactivex.Maybe
 
 interface BookCache {
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/cache/NoteCache.kt

@@ -1,11 +1,11 @@
 package com.sirekanyan.knigopis.repository.cache
 
-import io.reactivex.Completable
-import io.reactivex.Maybe
 import com.sirekanyan.knigopis.repository.cache.common.CacheKey
 import com.sirekanyan.knigopis.repository.cache.common.CommonCache
 import com.sirekanyan.knigopis.repository.cache.common.genericType
 import com.sirekanyan.knigopis.repository.model.note.Note
+import io.reactivex.Completable
+import io.reactivex.Maybe
 
 interface NoteCache {
 

+ 2 - 2
app/src/main/java/com/sirekanyan/knigopis/repository/cache/SubscriptionCache.kt

@@ -1,11 +1,11 @@
 package com.sirekanyan.knigopis.repository.cache
 
-import io.reactivex.Completable
-import io.reactivex.Maybe
 import com.sirekanyan.knigopis.repository.cache.common.CacheKey
 import com.sirekanyan.knigopis.repository.cache.common.CommonCache
 import com.sirekanyan.knigopis.repository.cache.common.genericType
 import com.sirekanyan.knigopis.repository.model.subscription.Subscription
+import io.reactivex.Completable
+import io.reactivex.Maybe
 
 interface SubscriptionCache {