Merge branch 'development'
This commit is contained in:
commit
32648ec859
|
@ -19,7 +19,8 @@
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="#ededed"
|
android:background="#ededed"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="5dp" >
|
android:gravity="center_vertical"
|
||||||
|
android:padding="3dp" >
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/message_image"
|
android:id="@+id/message_image"
|
||||||
|
@ -70,7 +71,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:paddingTop="1dp"
|
|
||||||
android:text="@string/sending"
|
android:text="@string/sending"
|
||||||
android:textColor="#8e8e8e"
|
android:textColor="#8e8e8e"
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp" />
|
||||||
|
|
|
@ -19,7 +19,8 @@
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="#ededed"
|
android:background="#ededed"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="5dp" >
|
android:gravity="center_vertical"
|
||||||
|
android:padding="3dp" >
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/message_image"
|
android:id="@+id/message_image"
|
||||||
|
@ -52,7 +53,6 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:paddingTop="1dp"
|
|
||||||
android:text="@string/sending"
|
android:text="@string/sending"
|
||||||
android:textColor="#8e8e8e"
|
android:textColor="#8e8e8e"
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp" />
|
||||||
|
|
|
@ -485,8 +485,11 @@ public class ContactsActivity extends XmppActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isMuc(Contact contact) {
|
private boolean isMuc(Contact contact) {
|
||||||
String server = contact.getJid().split("@")[1];
|
String[] parts = contact.getJid().split("@");
|
||||||
return getMucServers().contains(server);
|
if (parts.length != 2) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return getMucServers().contains(parts[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startConversation(Contact contact, Account account, boolean muc) {
|
public void startConversation(Contact contact, Account account, boolean muc) {
|
||||||
|
|
|
@ -129,6 +129,7 @@ public class UIHelper {
|
||||||
int textColor, int left, int top, int right, int bottom) {
|
int textColor, int left, int top, int right, int bottom) {
|
||||||
Paint tilePaint = new Paint(), textPaint = new Paint();
|
Paint tilePaint = new Paint(), textPaint = new Paint();
|
||||||
tilePaint.setColor(tileColor);
|
tilePaint.setColor(tileColor);
|
||||||
|
textPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
|
||||||
textPaint.setColor(textColor);
|
textPaint.setColor(textColor);
|
||||||
textPaint.setTypeface(Typeface.create("sans-serif-light",
|
textPaint.setTypeface(Typeface.create("sans-serif-light",
|
||||||
Typeface.NORMAL));
|
Typeface.NORMAL));
|
||||||
|
|
Loading…
Reference in New Issue