Show recipients in conversation info

This commit is contained in:
Moez Bhatti
2018-02-24 02:18:07 -05:00
parent 2db4468b19
commit 4024cb83d1
7 changed files with 217 additions and 3 deletions
@@ -19,6 +19,7 @@
package presentation.feature.conversationinfo
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
@@ -26,6 +27,7 @@ import com.uber.autodispose.kotlin.autoDisposable
import common.di.appComponent
import kotlinx.android.synthetic.main.conversation_info_activity.*
import presentation.common.base.QkThemedActivity
import javax.inject.Inject
class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(), ConversationInfoView {
@@ -33,6 +35,8 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
override val archiveIntent by lazy { archive.clicks() }
override val deleteIntent by lazy { delete.clicks() }
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
init {
appComponent.inject(this)
}
@@ -47,6 +51,9 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
colors.background
.autoDisposable(scope())
.subscribe { color -> window.decorView.setBackgroundColor(color) }
recipients.layoutManager = LinearLayoutManager(this)
recipients.adapter = recipientAdapter
}
override fun render(state: ConversationInfoState) {
@@ -55,6 +62,8 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
return
}
recipientAdapter.data = state.recipients
archive.title = getString(when(state.archived) {
true -> R.string.info_unarchive
false -> R.string.info_archive
@@ -18,7 +18,10 @@
*/
package presentation.feature.conversationinfo
import data.model.Recipient
data class ConversationInfoState(
val recipients: List<Recipient> = listOf(),
val archived: Boolean = false,
val hasError: Boolean = false
)
@@ -67,6 +67,12 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
disposables += markUnarchived
disposables += deleteConversation
// Update the recipients whenever they change
disposables += conversation
.map { conversation -> conversation.recipients }
.distinctUntilChanged()
.subscribe { recipients -> newState { it.copy(recipients = recipients) } }
// Update the view's archived state whenever it changes
disposables += conversation
.map { conversation -> conversation.archived }
@@ -0,0 +1,83 @@
/*
* 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/>.
*/
package presentation.feature.conversationinfo
import android.content.Context
import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import common.util.Colors
import common.util.extensions.setTint
import common.util.extensions.setVisible
import data.model.Recipient
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.conversation_recipient_list_item.view.*
import presentation.common.Navigator
import presentation.common.base.QkAdapter
import presentation.common.base.QkViewHolder
import javax.inject.Inject
class ConversationRecipientAdapter @Inject constructor(
private val context: Context,
private val colors: Colors,
private val navigator: Navigator
) : QkAdapter<Recipient>() {
private val disposables = CompositeDisposable()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val layoutInflater = LayoutInflater.from(context)
val view = layoutInflater.inflate(R.layout.conversation_recipient_list_item, parent, false)
disposables += colors.textSecondary
.subscribe { color -> view.add.setTint(color) }
return QkViewHolder(view)
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val recipient = getItem(position)
val view = holder.itemView
view.setOnClickListener {
if (recipient.contact == null) {
navigator.addContact(recipient.address)
} else {
view.avatar.callOnClick()
}
}
view.avatar.contact = recipient.contact
view.name.text = recipient.contact?.name ?: recipient.address
view.address.text = recipient.address
view.address.setVisible(recipient.contact != null)
view.add.setVisible(recipient.contact == null)
}
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
super.onDetachedFromRecyclerView(recyclerView)
disposables.clear()
}
}
@@ -0,0 +1,27 @@
<!--
~ 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/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>
@@ -19,6 +19,7 @@
-->
<LinearLayout 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="match_parent"
android:orientation="vertical">
@@ -33,9 +34,20 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingTop="8dp">
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/recipients"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:layout_height="72dp"
android:paddingBottom="8dp"
android:paddingTop="8dp"
tools:listitem="@layout/conversation_recipient_list_item" />
<presentation.common.widget.Separator
android:layout_width="match_parent"
android:layout_height="1dp" />
<presentation.common.widget.PreferenceView
android:id="@+id/archive"
@@ -0,0 +1,74 @@
<?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:paddingBottom="8dp"
android:paddingEnd="8dp"
android:paddingStart="24dp"
android:paddingTop="8dp">
<presentation.common.widget.AvatarView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<presentation.common.widget.QkTextView
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/address"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:textColor="primary"
tools:text="Moez Bhatti" />
<presentation.common.widget.QkTextView
android:id="@+id/address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/name"
app:layout_constraintTop_toBottomOf="@id/name"
app:textColor="tertiary"
tools:text="(123) 456-7890" />
<ImageView
android:id="@+id/add"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="8dp"
android:src="@drawable/ic_person_add_black_24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:tint="@color/textSecondary" />
</android.support.constraint.ConstraintLayout>