Replaced string with notes model

app/src/main/java/me/vadik/knigopis/App.kt

@@ -3,7 +3,9 @@ package me.vadik.knigopis
 import android.app.Application
 import com.google.gson.GsonBuilder
 import me.vadik.knigopis.api.gson.ImageThumbnailDeserializer
+import me.vadik.knigopis.api.gson.NotesTypeAdapter
 import me.vadik.knigopis.model.ImageThumbnail
+import me.vadik.knigopis.model.Notes
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
@@ -17,7 +19,12 @@ class App : Application() {
     Retrofit.Builder()
         .baseUrl(MAIN_API_URL)
         .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-        .addConverterFactory(GsonConverterFactory.create())
+        .addConverterFactory(GsonConverterFactory.create(
+            GsonBuilder().registerTypeAdapter(
+                Notes::class.java,
+                NotesTypeAdapter()
+            ).create()
+        ))
         .build()
   }
 

app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -12,6 +12,7 @@ import me.vadik.knigopis.api.Endpoint
 import me.vadik.knigopis.api.ImageEndpoint
 import me.vadik.knigopis.auth.KAuthImpl
 import me.vadik.knigopis.model.FinishedBookToSend
+import me.vadik.knigopis.model.Notes
 import me.vadik.knigopis.model.PlannedBookToSend
 
 private const val IMAGE_PRELOAD_COUNT = 3
@@ -74,7 +75,10 @@ class BookActivity : AppCompatActivity() {
             repository.saveBook(bookId, PlannedBookToSend(
                 titleEditText.text.toString(),
                 authorEditText.text.toString(),
-                notesTextArea.text.toString()
+                Notes(
+                    notesTextArea.text.toString(),
+                    0 // todo: actual progress
+                )
             ))
           }.io2main()
               .doOnSubscribe {
@@ -143,7 +147,7 @@ class BookActivity : AppCompatActivity() {
             .io2main()
             .doOnSuccess { plannedBook ->
               readCheckbox.isChecked = false
-              notesTextArea.setText(plannedBook.notes)
+              notesTextArea.setText(plannedBook.notes.text)
             }
       }.subscribe({ book ->
         titleEditText.setText(book.title)

app/src/main/java/me/vadik/knigopis/model/PlannedBook.kt

@@ -8,5 +8,5 @@ class PlannedBook(
     override val title: String,
     override val author: String,
     val priority: Int,
-    val notes: String
+    val notes: Notes
 ) : Book

app/src/main/java/me/vadik/knigopis/model/PlannedBookToSend.kt

@@ -3,6 +3,6 @@ package me.vadik.knigopis.model
 class PlannedBookToSend(
     val title: String,
     val author: String,
-    val notes: String,
+    val notes: Notes,
     val priority: Int = 99 // todo: logic for setting priority
 )