forked from upstream-mirrors/quik
Show media history of conversation in info activity
This commit is contained in:
@@ -33,15 +33,13 @@ import com.klinker.android.send_message.StripAccents
|
|||||||
import common.util.Keys
|
import common.util.Keys
|
||||||
import common.util.MessageUtils
|
import common.util.MessageUtils
|
||||||
import common.util.Preferences
|
import common.util.Preferences
|
||||||
import common.util.extensions.asFlowable
|
import common.util.extensions.*
|
||||||
import common.util.extensions.asMaybe
|
|
||||||
import common.util.extensions.insertOrUpdate
|
|
||||||
import common.util.extensions.map
|
|
||||||
import data.mapper.CursorToConversation
|
import data.mapper.CursorToConversation
|
||||||
import data.mapper.CursorToRecipient
|
import data.mapper.CursorToRecipient
|
||||||
import data.model.*
|
import data.model.*
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import io.reactivex.Maybe
|
import io.reactivex.Maybe
|
||||||
|
import io.reactivex.Observable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxkotlin.Flowables
|
import io.reactivex.rxkotlin.Flowables
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
@@ -185,6 +183,17 @@ class MessageRepository @Inject constructor(
|
|||||||
.findFirst()
|
.findFirst()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getPartsForConversation(threadId: Long): Observable<List<MmsPart>> {
|
||||||
|
return Realm.getDefaultInstance()
|
||||||
|
.where(Message::class.java)
|
||||||
|
.equalTo("threadId", threadId)
|
||||||
|
.isNotEmpty("parts")
|
||||||
|
.sort("date")
|
||||||
|
.findAll()
|
||||||
|
.asObservable()
|
||||||
|
.map { messages -> messages.flatMap { it.parts } }
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the list of messages which should be shown in the notification
|
* Retrieves the list of messages which should be shown in the notification
|
||||||
* for a given conversation
|
* for a given conversation
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* 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.common.widget
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.util.AttributeSet
|
||||||
|
import android.widget.ImageView
|
||||||
|
|
||||||
|
class SquareImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
|
||||||
|
|
||||||
|
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
|
||||||
|
super.onMeasure(widthMeasureSpec, widthMeasureSpec)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+7
-2
@@ -20,7 +20,6 @@ package presentation.feature.conversationinfo
|
|||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.AlertDialog
|
import android.support.v7.app.AlertDialog
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
@@ -40,6 +39,8 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
|||||||
override val confirmDeleteIntent: PublishSubject<Unit> = PublishSubject.create()
|
override val confirmDeleteIntent: PublishSubject<Unit> = PublishSubject.create()
|
||||||
|
|
||||||
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
|
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
|
||||||
|
@Inject lateinit var mediaAdapter: ConversationMediaAdapter
|
||||||
|
@Inject lateinit var itemDecoration: GridSpacingItemDecoration
|
||||||
|
|
||||||
init {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
@@ -56,8 +57,10 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
|||||||
.autoDisposable(scope())
|
.autoDisposable(scope())
|
||||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||||
|
|
||||||
recipients.layoutManager = LinearLayoutManager(this)
|
|
||||||
recipients.adapter = recipientAdapter
|
recipients.adapter = recipientAdapter
|
||||||
|
|
||||||
|
media.adapter = mediaAdapter
|
||||||
|
media.addItemDecoration(itemDecoration)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun render(state: ConversationInfoState) {
|
override fun render(state: ConversationInfoState) {
|
||||||
@@ -72,6 +75,8 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
|||||||
true -> R.string.info_unarchive
|
true -> R.string.info_unarchive
|
||||||
false -> R.string.info_archive
|
false -> R.string.info_archive
|
||||||
})
|
})
|
||||||
|
|
||||||
|
mediaAdapter.data = state.media
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun showDeleteDialog() {
|
override fun showDeleteDialog() {
|
||||||
|
|||||||
@@ -18,10 +18,12 @@
|
|||||||
*/
|
*/
|
||||||
package presentation.feature.conversationinfo
|
package presentation.feature.conversationinfo
|
||||||
|
|
||||||
|
import data.model.MmsPart
|
||||||
import data.model.Recipient
|
import data.model.Recipient
|
||||||
|
|
||||||
data class ConversationInfoState(
|
data class ConversationInfoState(
|
||||||
val recipients: List<Recipient> = listOf(),
|
val recipients: List<Recipient> = listOf(),
|
||||||
val archived: Boolean = false,
|
val archived: Boolean = false,
|
||||||
|
val media: List<MmsPart> = ArrayList(),
|
||||||
val hasError: Boolean = false
|
val hasError: Boolean = false
|
||||||
)
|
)
|
||||||
@@ -80,6 +80,12 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoVi
|
|||||||
.map { conversation -> conversation.archived }
|
.map { conversation -> conversation.archived }
|
||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.subscribe { archived -> newState { it.copy(archived = archived) } }
|
.subscribe { archived -> newState { it.copy(archived = archived) } }
|
||||||
|
|
||||||
|
// Load the attachments from the conversation
|
||||||
|
disposables += messageRepo.getPartsForConversation(threadId)
|
||||||
|
.map { parts -> parts.filter { part -> part.isImage() } }
|
||||||
|
.map { parts -> parts.reversed() }
|
||||||
|
.subscribe { media -> newState { it.copy(media = media) } }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindView(view: ConversationInfoView) {
|
override fun bindView(view: ConversationInfoView) {
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
/*
|
||||||
|
* 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.GlideApp
|
||||||
|
import data.model.MmsPart
|
||||||
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
|
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
|
||||||
|
import presentation.common.Navigator
|
||||||
|
import presentation.common.base.QkAdapter
|
||||||
|
import presentation.common.base.QkViewHolder
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
class ConversationMediaAdapter @Inject constructor(
|
||||||
|
private val context: Context,
|
||||||
|
private val colors: Colors,
|
||||||
|
private val navigator: Navigator
|
||||||
|
) : QkAdapter<MmsPart>() {
|
||||||
|
|
||||||
|
private val disposables = CompositeDisposable()
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
|
||||||
|
val view = LayoutInflater.from(context).inflate(R.layout.conversation_media_list_item, parent, false)
|
||||||
|
|
||||||
|
disposables += colors.separator.subscribe { color -> view.setBackgroundColor(color) }
|
||||||
|
|
||||||
|
return QkViewHolder(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||||
|
val part = getItem(position)
|
||||||
|
val view = holder.itemView
|
||||||
|
|
||||||
|
GlideApp.with(context)
|
||||||
|
.load(part.image)
|
||||||
|
.fitCenter()
|
||||||
|
.into(view.thumbnail)
|
||||||
|
|
||||||
|
view.thumbnail.setOnClickListener {
|
||||||
|
navigator.showImage(part.id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) {
|
||||||
|
disposables.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+47
@@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* 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.graphics.Rect
|
||||||
|
import android.support.v7.widget.RecyclerView
|
||||||
|
import android.view.View
|
||||||
|
import common.util.extensions.dpToPx
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
class GridSpacingItemDecoration @Inject constructor(context: Context) : RecyclerView.ItemDecoration() {
|
||||||
|
|
||||||
|
private val spanCount = 3
|
||||||
|
private val spacing = 2.dpToPx(context)
|
||||||
|
|
||||||
|
override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
|
||||||
|
super.getItemOffsets(outRect, view, parent, state)
|
||||||
|
|
||||||
|
val position = parent.getChildAdapterPosition(view)
|
||||||
|
val column = position % spanCount
|
||||||
|
|
||||||
|
outRect.left = column * spacing / spanCount
|
||||||
|
outRect.right = spacing - (column + 1) * spacing / spanCount
|
||||||
|
|
||||||
|
if (position >= spanCount) {
|
||||||
|
outRect.top = spacing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -31,48 +31,69 @@
|
|||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
|
|
||||||
<LinearLayout
|
<android.support.v4.widget.NestedScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:orientation="vertical"
|
|
||||||
android:paddingBottom="8dp"
|
|
||||||
android:paddingTop="8dp">
|
|
||||||
|
|
||||||
<android.support.v7.widget.RecyclerView
|
<LinearLayout
|
||||||
android:id="@+id/recipients"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
tools:layout_height="56dp"
|
android:orientation="vertical">
|
||||||
tools:listitem="@layout/conversation_recipient_list_item" />
|
|
||||||
|
|
||||||
<presentation.common.widget.Separator
|
<android.support.v7.widget.RecyclerView
|
||||||
android:layout_width="match_parent"
|
android:id="@+id/recipients"
|
||||||
android:layout_height="1dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp" />
|
android:paddingBottom="8dp"
|
||||||
|
android:paddingTop="8dp"
|
||||||
|
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
|
||||||
|
tools:layout_height="72dp"
|
||||||
|
tools:listitem="@layout/conversation_recipient_list_item" />
|
||||||
|
|
||||||
<presentation.common.widget.PreferenceView
|
<presentation.common.widget.Separator
|
||||||
android:id="@+id/notifications"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="1dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginBottom="8dp" />
|
||||||
app:icon="@drawable/ic_notifications_black_24dp"
|
|
||||||
app:title="@string/info_notifications" />
|
|
||||||
|
|
||||||
<presentation.common.widget.PreferenceView
|
<presentation.common.widget.PreferenceView
|
||||||
android:id="@+id/archive"
|
android:id="@+id/notifications"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:icon="@drawable/ic_folder_black_24dp"
|
app:icon="@drawable/ic_notifications_black_24dp"
|
||||||
app:title="@string/info_archive" />
|
app:title="@string/info_notifications" />
|
||||||
|
|
||||||
<presentation.common.widget.PreferenceView
|
<presentation.common.widget.PreferenceView
|
||||||
android:id="@+id/delete"
|
android:id="@+id/archive"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:icon="@drawable/ic_delete_black_24dp"
|
app:icon="@drawable/ic_folder_black_24dp"
|
||||||
app:title="@string/info_delete" />
|
app:title="@string/info_archive" />
|
||||||
|
|
||||||
</LinearLayout>
|
<presentation.common.widget.PreferenceView
|
||||||
|
android:id="@+id/delete"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:icon="@drawable/ic_delete_black_24dp"
|
||||||
|
app:title="@string/info_delete" />
|
||||||
|
|
||||||
|
<presentation.common.widget.Separator
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
android:layout_marginTop="8dp" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.RecyclerView
|
||||||
|
android:id="@+id/media"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:nestedScrollingEnabled="false"
|
||||||
|
app:layoutManager="android.support.v7.widget.GridLayoutManager"
|
||||||
|
app:spanCount="3"
|
||||||
|
tools:listitem="@layout/conversation_media_list_item" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</android.support.v4.widget.NestedScrollView>
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?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/>.
|
||||||
|
-->
|
||||||
|
<presentation.common.widget.SquareImageView android:id="@+id/thumbnail"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
tools:src="@tools:sample/backgrounds/scenic" />
|
||||||
Reference in New Issue
Block a user