浏览代码

Moved edit book model to models package

Vadik Sirekanyan 7 年之前
父节点
当前提交
a8ecc9eddf

+ 1 - 0
app/src/main/java/com/sirekanyan/knigopis/dependency/book.kt

@@ -3,6 +3,7 @@ package com.sirekanyan.knigopis.dependency
 import com.sirekanyan.knigopis.common.extensions.app
 import com.sirekanyan.knigopis.common.extensions.getRootView
 import com.sirekanyan.knigopis.feature.book.*
+import com.sirekanyan.knigopis.model.EditBookModel
 
 fun BookActivity.providePresenter(book: EditBookModel): BookPresenter {
     val interactor = BookInteractorImpl(app.bookRepository)

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

@@ -12,9 +12,9 @@ import com.sirekanyan.knigopis.common.functions.createLoginIntent
 import com.sirekanyan.knigopis.common.functions.extra
 import com.sirekanyan.knigopis.common.functions.logError
 import com.sirekanyan.knigopis.dependency.providePresenter
-import com.sirekanyan.knigopis.feature.book.EMPTY_BOOK
+import com.sirekanyan.knigopis.model.EMPTY_BOOK
 import com.sirekanyan.knigopis.feature.book.createBookIntent
-import com.sirekanyan.knigopis.feature.book.createEditBook
+import com.sirekanyan.knigopis.model.createEditBook
 import com.sirekanyan.knigopis.feature.books.BooksPresenter
 import com.sirekanyan.knigopis.feature.login.LoginPresenter
 import com.sirekanyan.knigopis.feature.notes.NotesPresenter

+ 0 - 3
app/src/main/java/com/sirekanyan/knigopis/feature/book/BookAction.kt

@@ -1,3 +0,0 @@
-package com.sirekanyan.knigopis.feature.book
-
-enum class BookAction { NEW, EDIT, COPY }

+ 1 - 0
app/src/main/java/com/sirekanyan/knigopis/feature/book/BookActivity.kt

@@ -9,6 +9,7 @@ import com.sirekanyan.knigopis.common.extensions.app
 import com.sirekanyan.knigopis.common.extensions.setDarkTheme
 import com.sirekanyan.knigopis.common.functions.extra
 import com.sirekanyan.knigopis.dependency.providePresenter
+import com.sirekanyan.knigopis.model.EditBookModel
 
 private val EXTRA_BOOK = extra("book")
 

+ 1 - 0
app/src/main/java/com/sirekanyan/knigopis/feature/book/BookInteractor.kt

@@ -2,6 +2,7 @@ package com.sirekanyan.knigopis.feature.book
 
 import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.MIN_BOOK_PRIORITY
+import com.sirekanyan.knigopis.model.EditBookModel
 import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
 import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import com.sirekanyan.knigopis.repository.BookRepository

+ 2 - 0
app/src/main/java/com/sirekanyan/knigopis/feature/book/BookPresenter.kt

@@ -7,7 +7,9 @@ import com.sirekanyan.knigopis.common.Presenter
 import com.sirekanyan.knigopis.common.extensions.io2main
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 import com.sirekanyan.knigopis.common.functions.logError
+import com.sirekanyan.knigopis.model.BookAction
 import com.sirekanyan.knigopis.model.DateModel
+import com.sirekanyan.knigopis.model.EditBookModel
 import java.util.*
 
 interface BookPresenter : Presenter {

+ 1 - 0
app/src/main/java/com/sirekanyan/knigopis/feature/book/BookView.kt

@@ -8,6 +8,7 @@ import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.common.functions.createBookImageUrl
 import com.sirekanyan.knigopis.model.DateModel
+import com.sirekanyan.knigopis.model.EditBookModel
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.book_edit.*
 

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

@@ -18,9 +18,9 @@ import com.sirekanyan.knigopis.common.functions.logError
 import com.sirekanyan.knigopis.dependency.provideDialogs
 import com.sirekanyan.knigopis.dependency.provideInteractor
 import com.sirekanyan.knigopis.feature.book.createBookIntent
-import com.sirekanyan.knigopis.feature.book.createDoneBook
-import com.sirekanyan.knigopis.feature.book.createTodoBook
 import com.sirekanyan.knigopis.model.BookDataModel
+import com.sirekanyan.knigopis.model.createDoneBook
+import com.sirekanyan.knigopis.model.createTodoBook
 import kotlinx.android.synthetic.main.user_activity.*
 
 private val EXTRA_USER_ID = extra("user_id")

+ 3 - 0
app/src/main/java/com/sirekanyan/knigopis/model/BookAction.kt

@@ -0,0 +1,3 @@
+package com.sirekanyan.knigopis.model
+
+enum class BookAction { NEW, EDIT, COPY }

+ 1 - 4
app/src/main/java/com/sirekanyan/knigopis/feature/book/EditBookModel.kt → app/src/main/java/com/sirekanyan/knigopis/model/EditBookModel.kt

@@ -1,10 +1,7 @@
-package com.sirekanyan.knigopis.feature.book
+package com.sirekanyan.knigopis.model
 
 import android.os.Parcelable
 import com.sirekanyan.knigopis.MAX_BOOK_PRIORITY
-import com.sirekanyan.knigopis.model.BookDataModel
-import com.sirekanyan.knigopis.model.DateModel
-import com.sirekanyan.knigopis.model.EMPTY_DATE
 import kotlinx.android.parcel.Parcelize
 
 val EMPTY_BOOK = EditBookModel(BookAction.NEW)