瀏覽代碼

Separated text view for book title

sirekanyan 7 年之前
父節點
當前提交
46e2538e3d

+ 6 - 0
app/src/main/java/me/vadik/knigopis/adapters/notes/NoteViewHolder.kt

@@ -23,4 +23,10 @@ class NoteViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         set(value) {
             view.userNotes.text = value
         }
+
+    var title: String
+        get() = view.bookTitle.text.toString()
+        set(value) {
+            view.bookTitle.text = value
+        }
 }

+ 2 - 1
app/src/main/java/me/vadik/knigopis/adapters/notes/NotesAdapter.kt

@@ -26,7 +26,8 @@ class NotesAdapter(
         val note = notes[position]
         holder.nickname = note.user.nickname
         holder.date = DateUtils.getRelativeTimeSpanString(note.fixedCreatedAt.time)
-        holder.notes = "${note.notes} // \"${note.title}\" (${note.author})"
+        holder.notes = note.notes
+        holder.title = "// \"${note.title}\" (${note.author})"
         holder.view.setOnClickListener {
             router.openUserScreen(note.user)
         }

+ 1 - 2
app/src/main/java/me/vadik/knigopis/adapters/users/UsersAdapter.kt

@@ -25,9 +25,8 @@ class UsersAdapter(
         val user = users[position]
         with(user.subUser) {
             holder.avatarUrl = photo
-            val booksRead = "$booksCount (+${booksCount - user.lastBooksCount})"
+            val booksRead = "$booksCount (+${user.recentBooksCount})"
             holder.nickname = nickname + " // " + booksRead
-            holder.profile = profile ?: identity ?: ""
         }
         holder.view.setOnClickListener {
             router.openUserScreen(user)

+ 4 - 2
app/src/main/java/me/vadik/knigopis/model/subscription/Subscription.kt

@@ -2,5 +2,7 @@ package me.vadik.knigopis.model.subscription
 
 class Subscription(
     val subUser: SubUser,
-    val lastBooksCount: Int
-)
+    private val lastBooksCount: Int
+) {
+    val recentBooksCount get() = subUser.booksCount - lastBooksCount
+}

File diff suppressed because it is too large
+ 1 - 1
app/src/main/res/layout/note.xml


Some files were not shown because too many files changed in this diff