Merge remote-tracking branch 'origin/trz/rename' into trz/rebase

5 files changed, 38 insertions, 28 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 4ea7d7cf..317dcc78 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -69,6 +69,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
 		ImageView notificationStatus = (ImageView) view.findViewById(R.id.notification_status);
+        TextView txtUnreadCount = (TextView) view.findViewById(R.id.conversation_unreadcount);
 
         if (Settings.SHOW_ONLINE_STATUS) {
             int color = ConversationsPlusColors.offline();
@@ -85,11 +86,15 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		Message message = conversation.getLatestMessage();
 
+        int txtUnreadCountVisibility = View.INVISIBLE;
 		if (!conversation.isRead()) {
 			convName.setTypeface(null, Typeface.BOLD);
+            txtUnreadCountVisibility = View.VISIBLE;
+            txtUnreadCount.setText(String.valueOf(conversation.unreadCount()));
 		} else {
 			convName.setTypeface(null, Typeface.NORMAL);
 		}
+        txtUnreadCount.setVisibility(txtUnreadCountVisibility);
 
 		if ((null != message.getFileParams() && message.getFileParams().getWidth() > 0) // TODO: Use FileParams.getMimeType()
 				&& (message.getTransferable() == null
@@ -113,19 +118,19 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             }
             String lastMessagePreview = ((null == msgPrefix || msgPrefix.isEmpty()) ? "" : (msgPrefix + ": ")) + msgText;
             mLastMessage.setText(lastMessagePreview);
-			if (preview.second) {
+            int lastMessageTypeface = Typeface.NORMAL;
             if (conversation.isRead()) {
-					mLastMessage.setTypeface(null, Typeface.ITALIC);
-				} else {
-					mLastMessage.setTypeface(null,Typeface.BOLD_ITALIC);
+                if (preview.second) {
+                    lastMessageTypeface = Typeface.ITALIC;
                 }
             } else {
-				if (conversation.isRead()) {
-					mLastMessage.setTypeface(null,Typeface.NORMAL);
+                if (preview.second) {
+                    lastMessageTypeface = Typeface.BOLD_ITALIC;
                 } else {
-					mLastMessage.setTypeface(null,Typeface.BOLD);
+                    lastMessageTypeface = Typeface.BOLD;
                 }
             }
+            mLastMessage.setTypeface(null, lastMessageTypeface);
         }
 
 		long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index d562dd5e..0e0e086f 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -76,15 +76,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	private OnContactPictureClicked mOnContactPictureClickedListener;
 	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
 
-	private OnLongClickListener openContextMenu = new OnLongClickListener() {
-
-		@Override
-		public boolean onLongClick(View v) {
-			v.showContextMenu();
-			return true;
-		}
-	};
-
 	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
 		super(activity, 0, messages);
 		this.activity = activity;
@@ -376,7 +367,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 		viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
 		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
-		viewHolder.messageBody.setOnLongClickListener(openContextMenu);
 	}
 
     /**
@@ -454,7 +444,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				openDownloadable(message);
 			}
 		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
 	private void displayLocationMessage(ViewHolder viewHolder, final Message message) {
@@ -469,7 +458,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				showLocation(message);
 			}
 		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
 	}
 
 	private void displayImageMessage(ViewHolder viewHolder,
@@ -504,7 +492,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				openDownloadable(message);
 			}
 		});
-		viewHolder.image.setOnLongClickListener(openContextMenu);
 	}
 
     private View displayStatusMessage(final Message message, ViewHolder viewHolder) {
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 74e84593..41fd1b90 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -25,7 +25,7 @@
             android:layout_height="wrap_content"
             android:background="?android:selectableItemBackground"
             android:orientation="horizontal"
-            android:padding="8dp"
+            android:padding="4dp"
             android:id="@+id/conversationListRowContent">
 
             <com.makeramen.roundedimageview.RoundedImageView
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toRightOf="@+id/conversation_image"
-                android:paddingLeft="8dp">
+                android:paddingLeft="4dp">
 
                 <TextView
                     android:id="@+id/conversation_name"
@@ -77,7 +77,8 @@
                         android:layout_alignParentLeft="true"
                         android:layout_centerVertical="true"
                         android:layout_toLeftOf="@+id/notification_status"
-                                  android:orientation="vertical">
+                        android:orientation="vertical"
+                        android:id="@+id/conversation_last">
 
                         <github.ankushsachdeva.emojicon.EmojiconTextView
                             android:id="@+id/conversation_lastmsg"
@@ -103,11 +104,22 @@
                         android:id="@+id/notification_status"
                         android:layout_width="16sp"
                         android:layout_height="16sp"
-                        android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="4dp"
-                        android:src="@drawable/ic_notifications_grey600_24dp"
-                        />
+						android:layout_toLeftOf="@+id/conversation_unreadcount"
+                        android:src="@drawable/ic_notifications_grey600_24dp" />
+
+                    <TextView
+                        android:id="@+id/conversation_unreadcount"
+                        android:layout_width="16sp"
+                        android:layout_height="16sp"
+                        android:layout_centerVertical="true"
+                        android:layout_alignParentRight="true"
+                        android:gravity="right"
+                        android:text="1"
+                        android:textColor="@color/secondaryText"
+                        android:textSize="?attr/TextSizeInfo"
+                        android:textStyle="bold"
+                        android:visibility="invisible"/>
                 </RelativeLayout>
 
                 <TextView
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index d331b3ef..029b0d74 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -46,7 +46,8 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
-                android:background="@color/black87"
+                android:longClickable="true"
+                android:background="@color/primaryText"
                 android:scaleType="centerCrop" />
 
             <github.ankushsachdeva.emojicon.EmojiconTextView
@@ -54,6 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
+                android:longClickable="true"
                 android:textColor="@color/primaryText"
                 android:textSize="?attr/TextSizeBody"
                 app:emojiconSize="?attr/EmojiconSizeBody" />
@@ -61,6 +63,7 @@
             <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
+                android:longClickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 30003309..f59c51f3 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -48,6 +48,7 @@
                 android:layout_marginBottom="4dp"
                 android:adjustViewBounds="true"
                 android:background="@color/primaryText"
+                android:longClickable="true"
                 android:scaleType="centerCrop" />
 
             <github.ankushsachdeva.emojicon.EmojiconTextView
@@ -55,6 +56,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="web|phone|email"
+                android:longClickable="true"
                 android:textColor="@color/primaryText"
                 android:textSize="?attr/TextSizeBody"
                 app:emojiconSize="?attr/EmojiconSizeBody"/>
@@ -62,6 +64,7 @@
             <Button
                 android:id="@+id/download_button"
                 style="?android:attr/buttonStyleSmall"
+                android:longClickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone" />