Explorar o código

Improved notes layout

Vadik Sirekanyan %!s(int64=7) %!d(string=hai) anos
pai
achega
c9d5af8b6d

+ 21 - 23
app/src/main/java/me/vadik/knigopis/adapters/notes/NoteViewHolder.kt

@@ -1,32 +1,30 @@
 package me.vadik.knigopis.adapters.notes
 
 import android.support.v7.widget.RecyclerView
+import android.text.format.DateUtils
 import android.view.View
 import kotlinx.android.synthetic.main.note.view.*
 
 class NoteViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 
-    var nickname: String
-        get() = view.userNickname.text.toString()
-        set(value) {
-            view.userNickname.text = value
-        }
-
-    var date: CharSequence
-        get() = view.userDate.text
-        set(value) {
-            view.userDate.text = value
-        }
-
-    var notes: String
-        get() = view.userNotes.text.toString()
-        set(value) {
-            view.userNotes.text = value
-        }
-
-    var title: String
-        get() = view.bookTitle.text.toString()
-        set(value) {
-            view.bookTitle.text = value
-        }
+    fun setTitle(title: String) {
+        view.bookTitle.text = title
+    }
+
+    fun setAuthor(author: String) {
+        view.bookAuthor.text = author
+    }
+
+    fun setNotes(notes: String) {
+        view.userNotes.text = notes
+    }
+
+    fun setTimestamp(timestamp: Long) {
+        view.userDate.text = DateUtils.getRelativeTimeSpanString(timestamp)
+    }
+
+    fun setNickname(nickname: String) {
+        view.userNickname.text = nickname
+    }
+
 }

+ 6 - 5
app/src/main/java/me/vadik/knigopis/adapters/notes/NotesAdapter.kt

@@ -1,7 +1,6 @@
 package me.vadik.knigopis.adapters.notes
 
 import android.support.v7.widget.RecyclerView
-import android.text.format.DateUtils
 import android.view.ViewGroup
 import me.vadik.knigopis.R
 import me.vadik.knigopis.Router
@@ -24,12 +23,14 @@ class NotesAdapter(
 
     override fun onBindViewHolder(holder: NoteViewHolder, position: Int) {
         val note = notes[position]
-        holder.nickname = note.user.nickname
-        holder.date = DateUtils.getRelativeTimeSpanString(note.fixedCreatedAt.time)
-        holder.notes = note.notes
-        holder.title = "// \"${note.title}\" (${note.author})"
+        holder.setTitle(note.title)
+        holder.setAuthor(note.author)
+        holder.setNotes(note.notes)
+        holder.setTimestamp(note.fixedCreatedAt.time)
+        holder.setNickname(note.user.nickname)
         holder.view.setOnClickListener {
             router.openUserScreen(note.user)
         }
     }
+
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 30 - 27
app/src/main/res/layout/note.xml


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
app/src/main/res/layout/user_book.xml


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

@@ -46,6 +46,9 @@
     <!-- following -->
     <string name="user_new_books_count" translatable="false"><![CDATA[<sup><small>+%d</small><sup>]]></string>
 
+    <!-- notes -->
+    <string name="note_date_delimiter" translatable="false">/</string>
+
     <!-- about -->
     <string name="about_idea">API:\nhttp://knigopis.com</string>
     <string name="about_developer">Development:\nvadik@sirekanyan.com</string>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio