Преглед на файлове

Added notes on edit-book screen

sirekanyan преди 8 години
родител
ревизия
29f859c32a

+ 5 - 2
app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -42,6 +42,7 @@ class BookActivity : AppCompatActivity() {
   private val yearEditText by lazy { findView<TextView>(R.id.book_year_edit_text) }
   private val readCheckbox by lazy { findView<CheckBox>(R.id.book_read_checkbox) }
   private val coverImageView by lazy { findView<ImageView>(R.id.cover_image_view) }
+  private val notesTextArea by lazy { findView<TextView>(R.id.notes_text_area) }
   private val dateInputViews by lazy {
     arrayOf<View>(
         findView(R.id.book_day_input),
@@ -67,12 +68,14 @@ class BookActivity : AppCompatActivity() {
                 authorEditText.text.toString(),
                 dayEditText.text.toString(),
                 monthEditText.text.toString(),
-                yearEditText.text.toString()
+                yearEditText.text.toString(),
+                notesTextArea.text.toString()
             ))
           } else {
             api.postPlannedBook(auth.getAccessToken(), PlannedBookToSend(
                 titleEditText.text.toString(),
-                authorEditText.text.toString()
+                authorEditText.text.toString(),
+                notesTextArea.text.toString()
             ))
           }.io2main().subscribe(
               { finish() },

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

@@ -73,7 +73,7 @@ class BooksAdapter(
             .subscribe({ coverUrl ->
               Glide.with(context)
                   .load(coverUrl)
-                  .apply(RequestOptions.circleCropTransform())
+                  .apply(RequestOptions.centerCropTransform())
                   .into(this)
             }, {
               logError("cannot load thumbnail", it)

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

@@ -6,5 +6,5 @@ class FinishedBookToSend(
     val readDay: String,
     val readMonth: String,
     val readYear: String,
-    val notes: String = "// todo"
+    val notes: String
 )

+ 2 - 2
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 priority: Int = 99,
-    val notes: String = "// todo"
+    val notes: String,
+    val priority: Int = 99 // todo: logic for setting priority
 )

+ 18 - 1
app/src/main/res/layout/book_edit.xml

@@ -128,6 +128,23 @@
         app:layout_constraintTop_toBottomOf="@id/book_year_input"
         tools:checked="true" />
 
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/notes_text_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        app:layout_constraintTop_toBottomOf="@id/book_read_checkbox">
+
+        <EditText
+            android:id="@+id/notes_text_area"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/book_hint_notes"
+            android:inputType="textCapSentences"
+            tools:text="Неистово плюсую" />
+
+    </android.support.design.widget.TextInputLayout>
+
     <ImageView
         android:id="@+id/cover_image_view"
         android:layout_width="0dp"
@@ -136,7 +153,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/book_read_checkbox"
+        app:layout_constraintTop_toBottomOf="@id/notes_text_input"
         tools:ignore="ContentDescription"
         tools:src="@color/colorAccent" />
 

+ 1 - 0
app/src/main/res/values-ru/strings.xml

@@ -32,4 +32,5 @@
     <string name="book_cancel_delete">Отмена</string>
     <string name="book_confirm_delete">Удалить</string>
     <string name="cannot_delete_book">Не получилось удалить</string>
+    <string name="book_hint_notes">Примечания</string>
 </resources>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -32,4 +32,5 @@
     <string name="book_cancel_delete">Cancel</string>
     <string name="book_confirm_delete">Delete</string>
     <string name="cannot_delete_book">Cannot delete book</string>
+    <string name="book_hint_notes">Notes</string>
 </resources>