#1075 - Rewrite message layout and adapter

This addresses the following issues
- Message layout doesn't use ConstraintLayout
- Images don't have individual bubbles
- Image bubbles don't have the correct bubble grouping
This commit is contained in:
Moez Bhatti
2018-04-22 19:18:08 -04:00
parent af19fbd05d
commit a37e06d38e
8 changed files with 327 additions and 322 deletions
@@ -0,0 +1,110 @@
/*
* 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 common.widget
import android.content.Context
import android.graphics.Canvas
import android.graphics.Path
import android.graphics.RectF
import android.util.AttributeSet
import android.widget.ImageView
import common.util.extensions.dpToPx
class BubbleImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
enum class Style(val topLeft: Boolean, val topRight: Boolean, val bottomRight: Boolean, val bottomLeft: Boolean) {
ONLY(true, true, true, true),
IN_FIRST(true, true, true, false),
IN_MIDDLE(false, true, true, false),
IN_LAST(false, true, true, true),
OUT_FIRST(true, true, false, true),
OUT_MIDDLE(true, false, false, true),
OUT_LAST(true, false, true, true)
}
var bubbleStyle = Style.ONLY
set(value) {
field = value
setPath()
invalidate()
}
private val path = Path()
private val radiusSmall = 4.dpToPx(context).toFloat()
private val radiusLarge = 18.dpToPx(context).toFloat()
override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
super.onSizeChanged(w, h, oldw, oldh)
setPath()
}
override fun onDraw(canvas: Canvas) {
if (!path.isEmpty) {
canvas.clipPath(path)
}
super.onDraw(canvas)
}
private fun setPath() {
path.rewind()
val width = width.toFloat()
val height = height.toFloat()
val cornerRectSmall = RectF().apply { set(-radiusSmall, -radiusSmall, radiusSmall, radiusSmall) }
val cornerRectLarge = RectF().apply { set(-radiusLarge, -radiusLarge, radiusLarge, radiusLarge) }
if (bubbleStyle.topLeft) {
cornerRectLarge.offsetTo(0f, 0f)
path.arcTo(cornerRectLarge, 180f, 90f)
} else {
cornerRectSmall.offsetTo(0f, 0f)
path.arcTo(cornerRectSmall, 180f, 90f)
}
if (bubbleStyle.topRight) {
cornerRectLarge.offsetTo(width - radiusLarge * 2, 0f)
path.arcTo(cornerRectLarge, 270f, 90f)
} else {
cornerRectSmall.offsetTo(width - radiusSmall * 2, 0f)
path.arcTo(cornerRectSmall, 270f, 90f)
}
if (bubbleStyle.bottomRight) {
cornerRectLarge.offsetTo(width - radiusLarge * 2, height - radiusLarge * 2)
path.arcTo(cornerRectLarge, 0f, 90f)
} else {
cornerRectSmall.offsetTo(width - radiusSmall * 2, height - radiusSmall * 2)
path.arcTo(cornerRectSmall, 0f, 90f)
}
if (bubbleStyle.bottomLeft) {
cornerRectLarge.offsetTo(0f, height - radiusLarge * 2)
path.arcTo(cornerRectLarge, 90f, 90f)
} else {
cornerRectSmall.offsetTo(0f, height - radiusSmall * 2)
path.arcTo(cornerRectSmall, 90f, 90f)
}
path.close()
}
}
@@ -1,82 +0,0 @@
/*
* 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 common.widget
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import com.moez.QKSMS.R
import common.Navigator
import common.util.GlideApp
import common.util.extensions.setVisible
import injection.appComponent
import kotlinx.android.synthetic.main.mms_preview_list_item.view.*
import model.MmsPart
import util.extensions.hasThumbnails
import util.extensions.isImage
import util.extensions.isVideo
import javax.inject.Inject
class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
@Inject lateinit var navigator: Navigator
private val layoutInflater = LayoutInflater.from(context)
var parts: List<MmsPart> = ArrayList()
set(value) {
field = value
updateView()
}
init {
if (!isInEditMode) {
appComponent.inject(this)
}
orientation = LinearLayout.VERTICAL
}
private fun updateView() {
val media = parts.filter { it.hasThumbnails() }
setVisible(media.isNotEmpty())
if (childCount > 0) {
removeAllViews()
}
media.forEach { part ->
val view = layoutInflater.inflate(R.layout.mms_preview_list_item, this, false)
view.video.setVisible(part.isVideo())
GlideApp.with(context).load(part.getUri()).fitCenter().into(view.thumbnail)
setOnClickListener {
when {
part.isImage() -> navigator.showImage(part.id)
part.isVideo() -> navigator.showVideo(part.getUri(), part.type)
}
}
addView(view)
}
}
}