diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 6b2e1772..d0a73f36 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -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(), ConversationInfoView { @@ -33,6 +35,8 @@ class ConversationInfoActivity : QkThemedActivity(), 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(), 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(), return } + recipientAdapter.data = state.recipients + archive.title = getString(when(state.archived) { true -> R.string.info_unarchive false -> R.string.info_archive diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt index 566f18a8..c45eae6f 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt @@ -18,7 +18,10 @@ */ package presentation.feature.conversationinfo +import data.model.Recipient + data class ConversationInfoState( + val recipients: List = listOf(), val archived: Boolean = false, val hasError: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt index af87e3b6..60b696d4 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -67,6 +67,12 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel 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 } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt new file mode 100644 index 00000000..07b2b8a0 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * 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 . + */ +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() { + + 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() + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/drawable/ic_person_add_black_24dp.xml b/qksms/src/main/res/drawable/ic_person_add_black_24dp.xml new file mode 100644 index 00000000..3aaf1bfd --- /dev/null +++ b/qksms/src/main/res/drawable/ic_person_add_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index 6622d564..4d71971b 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -19,6 +19,7 @@ --> @@ -33,9 +34,20 @@ + android:orientation="vertical"> + + + + + + + + + + + + + + + + \ No newline at end of file