소스 검색

Moved classes to appropriate packages

Vadik Sirekanyan 7 년 전
부모
커밋
2f48b5dd14

+ 3 - 0
app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -9,7 +9,10 @@ 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.adapters.CoverPagerAdapter
 import me.vadik.knigopis.api.BookCoverSearch
+import me.vadik.knigopis.data.BookRepository
+import me.vadik.knigopis.data.Configuration
 import me.vadik.knigopis.model.FinishedBook
 import me.vadik.knigopis.model.FinishedBookToSend
 import me.vadik.knigopis.model.PlannedBook

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

@@ -30,9 +30,7 @@ import me.vadik.knigopis.auth.KAuth
 import me.vadik.knigopis.common.HeaderItemDecoration
 import me.vadik.knigopis.common.ResourceProvider
 import me.vadik.knigopis.common.StickyHeaderInterface
-import me.vadik.knigopis.data.AvatarCache
-import me.vadik.knigopis.data.AvatarCacheImpl
-import me.vadik.knigopis.data.SubscriptionRepository
+import me.vadik.knigopis.data.*
 import me.vadik.knigopis.dialog.DialogFactory
 import me.vadik.knigopis.model.*
 import me.vadik.knigopis.model.CurrentTab.*

+ 2 - 1
app/src/main/java/me/vadik/knigopis/CoverPagerAdapter.kt → app/src/main/java/me/vadik/knigopis/adapters/CoverPagerAdapter.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.adapters
 
 import android.support.v4.view.PagerAdapter
 import android.view.View
@@ -8,6 +8,7 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
+import me.vadik.knigopis.doOnSuccess
 
 class CoverPagerAdapter(
     private val urls: List<String>,

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

@@ -1,7 +1,7 @@
 package me.vadik.knigopis.api
 
 import io.reactivex.Single
-import me.vadik.knigopis.BookCoverCache
+import me.vadik.knigopis.data.BookCoverCache
 import me.vadik.knigopis.io2main
 import me.vadik.knigopis.model.Book
 import me.vadik.knigopis.model.ImageThumbnail

+ 1 - 1
app/src/main/java/me/vadik/knigopis/BookCoverCache.kt → app/src/main/java/me/vadik/knigopis/data/BookCoverCache.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.data
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE

+ 0 - 1
app/src/main/java/me/vadik/knigopis/data/BookOrganizer.kt

@@ -1,6 +1,5 @@
 package me.vadik.knigopis.data
 
-import me.vadik.knigopis.Configuration
 import me.vadik.knigopis.R
 import me.vadik.knigopis.common.ResourceProvider
 import me.vadik.knigopis.model.Book

+ 3 - 3
app/src/main/java/me/vadik/knigopis/BookRepository.kt → app/src/main/java/me/vadik/knigopis/data/BookRepository.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.data
 
 import io.reactivex.Completable
 import io.reactivex.Single
@@ -6,8 +6,8 @@ import io.reactivex.rxkotlin.Singles
 import me.vadik.knigopis.api.Endpoint
 import me.vadik.knigopis.auth.KAuth
 import me.vadik.knigopis.common.NetworkChecker
-import me.vadik.knigopis.data.BookCache
-import me.vadik.knigopis.data.BookOrganizer
+import me.vadik.knigopis.logError
+import me.vadik.knigopis.logWarn
 import me.vadik.knigopis.model.*
 
 interface BookRepository {

+ 1 - 1
app/src/main/java/me/vadik/knigopis/Configuration.kt → app/src/main/java/me/vadik/knigopis/data/Configuration.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package me.vadik.knigopis.data
 
 import android.content.Context
 

+ 1 - 0
app/src/main/java/me/vadik/knigopis/user/UserActivity.kt

@@ -15,6 +15,7 @@ import me.vadik.knigopis.*
 import me.vadik.knigopis.adapters.books.BooksAdapter
 import me.vadik.knigopis.common.HeaderItemDecoration
 import me.vadik.knigopis.common.StickyHeaderInterface
+import me.vadik.knigopis.data.Configuration
 import me.vadik.knigopis.dialog.DialogFactory
 import me.vadik.knigopis.model.Book
 import me.vadik.knigopis.model.BookHeader