From 76e1aef66bef393122d0544a23992c41d9d4a135 Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Thu, 29 Mar 2018 06:42:09 -0400
Subject: [PATCH] Use one layout for all conversation items

---
 .../conversations/ConversationsAdapter.kt     | 22 +++--
 .../layout/conversation_list_item_unread.xml  | 87 -------------------
 2 files changed, 10 insertions(+), 99 deletions(-)
 delete mode 100644 presentation/src/main/res/layout/conversation_list_item_unread.xml

diff --git a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt
index 41e82fa9..78660eec 100644
--- a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt
+++ b/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt
@@ -19,6 +19,7 @@
 package feature.conversations
 
 import android.content.Context
+import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import com.jakewharton.rxbinding2.view.clicks
@@ -28,8 +29,6 @@ import common.base.FlowableAdapter
 import common.base.QkViewHolder
 import common.util.Colors
 import common.util.DateFormatter
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.conversation_list_item.view.*
@@ -47,24 +46,23 @@ class ConversationsAdapter @Inject constructor(
     val clicks: Subject<Long> = PublishSubject.create()
     val longClicks: Subject<Long> = PublishSubject.create()
 
-    private val disposables = CompositeDisposable()
-
     init {
         setHasStableIds(true)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
-        val layoutRes = when (viewType) {
-            0 -> R.layout.conversation_list_item
-            else -> R.layout.conversation_list_item_unread
-        }
-
         val layoutInflater = LayoutInflater.from(context)
-        val view = layoutInflater.inflate(layoutRes, parent, false)
+        val view = layoutInflater.inflate(R.layout.conversation_list_item, parent, false)
 
         if (viewType == 1) {
-            disposables += colors.theme
-                    .subscribe { color -> view.date.setTextColor(color) }
+            view.title.setTypeface(view.title.typeface, Typeface.BOLD)
+
+            view.snippet.setTypeface(view.snippet.typeface, Typeface.BOLD)
+            view.snippet.textColorObservable = colors.textPrimary
+            view.snippet.maxLines = 5
+
+            view.date.setTypeface(view.date.typeface, Typeface.BOLD)
+            view.date.textColorObservable = colors.textPrimary
         }
 
         return QkViewHolder(view)
diff --git a/presentation/src/main/res/layout/conversation_list_item_unread.xml b/presentation/src/main/res/layout/conversation_list_item_unread.xml
deleted file mode 100644
index bda13a28..00000000
--- a/presentation/src/main/res/layout/conversation_list_item_unread.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
-  ~
-  ~ This file is part of QKSMS.
-  ~
-  ~ QKSMS is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ QKSMS is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/ripple"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:paddingBottom="12dp"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="12dp">
-
-    <common.widget.GroupAvatarView
-        android:id="@+id/avatars"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_gravity="top"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0" />
-
-    <common.widget.QkTextView
-        android:id="@+id/title"
-        style="@style/TextPrimary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginStart="16dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/snippet"
-        app:layout_constraintEnd_toStartOf="@id/date"
-        app:layout_constraintStart_toEndOf="@id/avatars"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
-
-    <common.widget.QkTextView
-        android:id="@+id/snippet"
-        style="@style/TextSecondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:ellipsize="end"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:textColor="primary"
-        tools:text="@tools:sample/lorem/random" />
-
-    <common.widget.QkTextView
-        android:id="@+id/date"
-        style="@style/TextTertiary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="100"
-        app:layout_constraintWidth_default="wrap"
-        app:textColor="primary"
-        tools:text="Oct 11" />
-
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file