Browse Source

Refactoring: moved api classes to separate package

sirekanyan 8 years ago
parent
commit
db59d8f7c4

+ 1 - 1
app/src/main/java/me/vadik/knigopis/App.kt

@@ -2,7 +2,7 @@ package me.vadik.knigopis
 
 import android.app.Application
 import com.google.gson.GsonBuilder
-import me.vadik.knigopis.gson.ImageThumbnailDeserializer
+import me.vadik.knigopis.api.gson.ImageThumbnailDeserializer
 import me.vadik.knigopis.model.ImageThumbnail
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory

+ 5 - 1
app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -9,11 +9,15 @@ import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
 import android.view.MenuItem
 import android.view.View
-import me.vadik.knigopis.CurrentTab.*
+import me.vadik.knigopis.model.CurrentTab.*
 import me.vadik.knigopis.adapters.BooksAdapter
 import me.vadik.knigopis.adapters.UsersAdapter
+import me.vadik.knigopis.api.BookCoverSearchImpl
+import me.vadik.knigopis.api.Endpoint
+import me.vadik.knigopis.api.ImageEndpoint
 import me.vadik.knigopis.auth.KAuth
 import me.vadik.knigopis.auth.KAuthImpl
+import me.vadik.knigopis.model.CurrentTab
 import me.vadik.knigopis.model.FinishedBook
 import me.vadik.knigopis.model.PlannedBook
 import me.vadik.knigopis.model.User

+ 1 - 1
app/src/main/java/me/vadik/knigopis/adapters/BooksAdapter.kt

@@ -4,7 +4,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
-import me.vadik.knigopis.BookCoverSearch
+import me.vadik.knigopis.api.BookCoverSearch
 import me.vadik.knigopis.R
 import me.vadik.knigopis.logError
 import me.vadik.knigopis.model.Book

+ 2 - 1
app/src/main/java/me/vadik/knigopis/BookCoverSearch.kt → app/src/main/java/me/vadik/knigopis/api/BookCoverSearch.kt

@@ -1,7 +1,8 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.api
 
 import android.content.SharedPreferences
 import io.reactivex.Single
+import me.vadik.knigopis.io2main
 import me.vadik.knigopis.model.Book
 import java.util.concurrent.TimeUnit
 

+ 1 - 1
app/src/main/java/me/vadik/knigopis/Endpoint.kt → app/src/main/java/me/vadik/knigopis/api/Endpoint.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.api
 
 import io.reactivex.Single
 import me.vadik.knigopis.model.FinishedBook

+ 1 - 1
app/src/main/java/me/vadik/knigopis/ImageEndpoint.kt → app/src/main/java/me/vadik/knigopis/api/ImageEndpoint.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.api
 
 import io.reactivex.Single
 import me.vadik.knigopis.model.ImageThumbnail

+ 1 - 1
app/src/main/java/me/vadik/knigopis/gson/ImageThumbnailDeserializer.kt → app/src/main/java/me/vadik/knigopis/api/gson/ImageThumbnailDeserializer.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.gson
+package me.vadik.knigopis.api.gson
 
 import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer

+ 1 - 1
app/src/main/java/me/vadik/knigopis/auth/KAuth.kt

@@ -2,7 +2,7 @@ package me.vadik.knigopis.auth
 
 import android.content.Context
 import android.content.Intent
-import me.vadik.knigopis.Endpoint
+import me.vadik.knigopis.api.Endpoint
 import me.vadik.knigopis.io2main
 import me.vadik.knigopis.logError
 import ru.ulogin.sdk.UloginAuthActivity

+ 2 - 1
app/src/main/java/me/vadik/knigopis/CurrentTab.kt → app/src/main/java/me/vadik/knigopis/model/CurrentTab.kt

@@ -1,6 +1,7 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.model
 
 import android.support.annotation.IdRes
+import me.vadik.knigopis.R
 
 enum class CurrentTab(@IdRes val itemId: Int) {