Moved values to constants

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

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

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

@@ -10,11 +10,11 @@ import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.*
 import com.sirekanyan.knigopis.common.extensions.*
 import com.sirekanyan.knigopis.model.BookDataModel
+import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
+import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import com.sirekanyan.knigopis.repository.BookRepository
 import com.sirekanyan.knigopis.repository.Configuration
 import com.sirekanyan.knigopis.repository.api.createBookImageUrl
-import com.sirekanyan.knigopis.model.dto.FinishedBookToSend
-import com.sirekanyan.knigopis.model.dto.PlannedBookToSend
 import kotlinx.android.synthetic.main.book_edit.*
 import org.koin.android.ext.android.inject
 import java.util.*
@@ -49,7 +49,7 @@ fun Context.createEditBookIntent(book: BookDataModel): Intent =
                 putExtra(EXTRA_BOOK_YEAR, book.date?.year)
                 putExtra(EXTRA_BOOK_MONTH, book.date?.month)
                 putExtra(EXTRA_BOOK_DAY, book.date?.day)
-                putExtra(EXTRA_BOOK_PROGRESS, 100)
+                putExtra(EXTRA_BOOK_PROGRESS, MAX_BOOK_PRIORITY)
             } else {
                 putExtra(EXTRA_BOOK_PROGRESS, book.priority)
             }
@@ -83,7 +83,7 @@ class BookActivity : AppCompatActivity() {
                     hideKeyboard()
                     val wasFinished = intent.getBooleanExtra(EXTRA_BOOK_FINISHED, false)
                         .takeUnless { bookId == null }
-                    if (progressSeekBar.progress == 100) {
+                    if (progressSeekBar.progress == MAX_BOOK_PRIORITY) {
                         repository.saveBook(
                             bookId,
                             FinishedBookToSend(
@@ -103,7 +103,7 @@ class BookActivity : AppCompatActivity() {
                                 titleEditText.text.toString(),
                                 authorEditText.text.toString(),
                                 notesTextArea.text.toString(),
-                                progressSeekBar.progress.takeIf { it in (1..100) }
+                                progressSeekBar.progress.takeIf { it in (MIN_BOOK_PRIORITY..MAX_BOOK_PRIORITY) }
                             ),
                             wasFinished
                         )
@@ -147,7 +147,7 @@ class BookActivity : AppCompatActivity() {
             override fun onStopTrackingTouch(seekBar: SeekBar?) {}
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 progressText.text = "$progress%"
-                if (progress == 100) {
+                if (progress == MAX_BOOK_PRIORITY) {
                     bookDateInputGroup.showNow()
                     if (yearEditText.text.isEmpty() && monthEditText.text.isEmpty() && dayEditText.text.isEmpty()) {
                         yearEditText.setText(today.get(Calendar.YEAR).toString())

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

@@ -61,7 +61,7 @@ class ProfileActivity : AppCompatActivity() {
         val book = books.random() ?: return
         randomProfileBook.alpha = 1f
         val title = resources.getTitleString(book.title)
-        val priority = (book as? PlannedBook)?.priority ?: 100
+        val priority = (book as? PlannedBook)?.priority ?: MAX_BOOK_PRIORITY
         randomProfileBook.text = getString(R.string.profile_text_random, title, priority)
         randomProfileBook.animate()
             .setInterpolator(AccelerateInterpolator())
@@ -77,9 +77,9 @@ class ProfileActivity : AppCompatActivity() {
 
     private fun refreshProfile() {
         api.getProfile(auth.getAccessToken()).io2main()
-            .subscribe(::onRefreshProfile, {
+            .subscribe(::onRefreshProfile) {
                 logError("cannot get profile", it)
-            })
+            }
     }
 
     private fun onRefreshProfile(user: User) {
@@ -92,13 +92,13 @@ class ProfileActivity : AppCompatActivity() {
 
     private fun refreshCounters() {
         api.getFinishedBooks(auth.getAccessToken()).io2main()
-            .subscribe(::onRefreshFinishedBooks, {
+            .subscribe(::onRefreshFinishedBooks) {
                 logError("cannot check finished books count", it)
-            })
+            }
         api.getPlannedBooks(auth.getAccessToken()).io2main()
-            .subscribe(::onRefreshPlannedBooks, {
+            .subscribe(::onRefreshPlannedBooks) {
                 logError("cannot check planned books count", it)
-            })
+            }
     }
 
     @Suppress("USELESS_CAST")

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

@@ -176,7 +176,7 @@ class UserActivity : AppCompatActivity() {
                 startActivity(createNewBookIntent(book.title, book.author))
             },
             createDialogItem(R.string.user_button_done, R.drawable.ic_playlist_add_check) {
-                startActivity(createNewBookIntent(book.title, book.author, 100))
+                startActivity(createNewBookIntent(book.title, book.author, MAX_BOOK_PRIORITY))
             }
         )
     }

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

@@ -3,11 +3,12 @@ package com.sirekanyan.knigopis.model
 import android.text.SpannableString
 import android.text.format.DateUtils
 import android.text.style.SuperscriptSpan
-import com.sirekanyan.knigopis.repository.api.createBookImageUrl
+import com.sirekanyan.knigopis.common.MAX_BOOK_PRIORITY
 import com.sirekanyan.knigopis.model.dto.FinishedBook
-import com.sirekanyan.knigopis.model.dto.PlannedBook
 import com.sirekanyan.knigopis.model.dto.Note
+import com.sirekanyan.knigopis.model.dto.PlannedBook
 import com.sirekanyan.knigopis.model.dto.Subscription
+import com.sirekanyan.knigopis.repository.api.createBookImageUrl
 
 fun PlannedBook.toBookModel(group: BookGroupModel) =
     BookDataModel(
@@ -28,7 +29,7 @@ fun FinishedBook.toBookModel(group: BookGroupModel) =
         title,
         author,
         true,
-        100,
+        MAX_BOOK_PRIORITY,
         DateModel(readYear, readMonth, readDay),
         notes
     )