diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-03 11:43:06 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-03 11:43:06 +0200 |
| commit | 32648ec859f2e8e31a0b165fe9808fe62412c053 (patch) | |
| tree | 9d60921adcd7605571de34b4d1761a3b96b7c3d8 | |
| parent | 655ce108432a4b696df38c9c8576bc0406e03c1f (diff) | |
| parent | e02ae4cde20eaacd006609b1545a0e5da3b9d4e3 (diff) | |
Merge branch 'development'
| -rw-r--r-- | res/layout/message_recieved.xml | 4 | ||||
| -rw-r--r-- | res/layout/message_sent.xml | 4 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ContactsActivity.java | 7 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/utils/UIHelper.java | 1 |
4 files changed, 10 insertions, 6 deletions
diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml index 6e4577fb..3b3df9e8 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_recieved.xml @@ -19,7 +19,8 @@ android:layout_height="fill_parent" android:background="#ededed" android:orientation="vertical" - android:padding="5dp" > + android:gravity="center_vertical" + android:padding="3dp" > <ImageView android:id="@+id/message_image" @@ -70,7 +71,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:paddingTop="1dp" android:text="@string/sending" android:textColor="#8e8e8e" android:textSize="12sp" /> diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index ebba6ac5..fbc95898 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -19,7 +19,8 @@ android:layout_height="fill_parent" android:background="#ededed" android:orientation="vertical" - android:padding="5dp" > + android:gravity="center_vertical" + android:padding="3dp" > <ImageView android:id="@+id/message_image" @@ -52,7 +53,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:paddingTop="1dp" android:text="@string/sending" android:textColor="#8e8e8e" android:textSize="12sp" /> diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java index 811ae876..fee3de7a 100644 --- a/src/eu/siacs/conversations/ui/ContactsActivity.java +++ b/src/eu/siacs/conversations/ui/ContactsActivity.java @@ -485,8 +485,11 @@ public class ContactsActivity extends XmppActivity { } private boolean isMuc(Contact contact) { - String server = contact.getJid().split("@")[1]; - return getMucServers().contains(server); + String[] parts = contact.getJid().split("@"); + if (parts.length != 2) { + return false; + } + return getMucServers().contains(parts[1]); } public void startConversation(Contact contact, Account account, boolean muc) { diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java index 15bb8969..529d2b4c 100644 --- a/src/eu/siacs/conversations/utils/UIHelper.java +++ b/src/eu/siacs/conversations/utils/UIHelper.java @@ -129,6 +129,7 @@ public class UIHelper { int textColor, int left, int top, int right, int bottom) { Paint tilePaint = new Paint(), textPaint = new Paint(); tilePaint.setColor(tileColor); + textPaint.setFlags(Paint.ANTI_ALIAS_FLAG); textPaint.setColor(textColor); textPaint.setTypeface(Typeface.create("sans-serif-light", Typeface.NORMAL)); |