nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed possible crash in MessagesAdapter.

Browse source
This commit is contained in:
Felix Ableitner 2015-08-27 23:58:08 +02:00
parent 61b13da957
commit 6999234d7e
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/layout/item_message.xml
View file

@ -4,11 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:id="@+id/root"
android:paddingRight="10dp"
android:paddingStart="10dp"
android:paddingLeft="10dp"
android:paddingEnd="10dp">
android:id="@+id/root">
<LinearLayout
android:layout_height="wrap_content"

21
app/src/main/scala/com/nutomic/ensichat/views/MessagesAdapter.scala
View file

@ -1,16 +1,14 @@
package com.nutomic.ensichat.views
import java.text.DateFormat
import java.util.Date
import android.content.Context
import android.database.Cursor
import android.view._
import android.widget._
import com.mobsandgeeks.adapters.{SimpleSectionAdapter, ViewHandler, InstantCursorAdapter}
import com.mobsandgeeks.adapters.{InstantCursorAdapter, SimpleSectionAdapter, ViewHandler}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.protocol.body.Text
import com.nutomic.ensichat.protocol.header.ContentHeader
import com.nutomic.ensichat.protocol.{Address, Message}
import com.nutomic.ensichat.util.Database
@ -23,10 +21,8 @@ import com.nutomic.ensichat.util.Database
class MessagesAdapter(context: Context, cursor: Cursor, remoteAddress: Address) extends
InstantCursorAdapter[Message](context, R.layout.item_message, classOf[Message], cursor) {
/**
* Free space to the right/left to a message depending on who sent it, in dip.
*/
private val MessageMargin = 50
private val MessagePaddingLarge = 50
private val MessagePaddingSmall = 10
setViewHandler(R.id.root, new ViewHandler[Message] {
override def handleView(adapter: ListAdapter, parent: View, view: View, msg: Message,
@ -42,20 +38,17 @@ class MessagesAdapter(context: Context, cursor: Cursor, remoteAddress: Address)
.format(msg.header.time.get)
time.setText(formattedDate)
val lp = new LinearLayout.LayoutParams(view.getLayoutParams)
val margin = (MessageMargin * context.getResources.getDisplayMetrics.density).toInt
val paddingLarge = (MessagePaddingLarge * context.getResources.getDisplayMetrics.density).toInt
val paddingSmall = (MessagePaddingSmall * context.getResources.getDisplayMetrics.density).toInt
if (msg.header.origin != remoteAddress) {
container.setGravity(Gravity.RIGHT)
root.setGravity(Gravity.RIGHT)
lp.setMargins(margin, 0, 0, 0)
root.setPadding(paddingLarge, 0, paddingSmall, 0)
} else {
container.setGravity(Gravity.LEFT)
root.setGravity(Gravity.LEFT)
lp.setMargins(0, 0, margin, 0)
root.setPadding(paddingSmall, 0, paddingLarge, 0)
}
view.setLayoutParams(lp)
view
}
})