show icon in conversations overview when notifications are disabled
|
@ -59,6 +59,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
|
||||||
TextView mLastMessage = (TextView) view.findViewById(R.id.conversation_lastmsg);
|
TextView mLastMessage = (TextView) view.findViewById(R.id.conversation_lastmsg);
|
||||||
TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
|
TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
|
||||||
ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
|
ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
|
||||||
|
ImageView notificationStatus = (ImageView) view.findViewById(R.id.notification_status);
|
||||||
|
|
||||||
Message message = conversation.getLatestMessage();
|
Message message = conversation.getLatestMessage();
|
||||||
|
|
||||||
|
@ -94,6 +95,17 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
|
||||||
|
if (muted_till == Long.MAX_VALUE) {
|
||||||
|
notificationStatus.setVisibility(View.VISIBLE);
|
||||||
|
notificationStatus.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
|
||||||
|
} else if (muted_till >= System.currentTimeMillis()) {
|
||||||
|
notificationStatus.setVisibility(View.VISIBLE);
|
||||||
|
notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
|
||||||
|
} else {
|
||||||
|
notificationStatus.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
|
mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
|
||||||
ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
|
ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
|
||||||
loadAvatar(conversation,profilePicture);
|
loadAvatar(conversation,profilePicture);
|
||||||
|
|
BIN
src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
Normal file
After Width: | Height: | Size: 364 B |
BIN
src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
Normal file
After Width: | Height: | Size: 462 B |
After Width: | Height: | Size: 440 B |
BIN
src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
Normal file
After Width: | Height: | Size: 276 B |
BIN
src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
Normal file
After Width: | Height: | Size: 336 B |
After Width: | Height: | Size: 323 B |
BIN
src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
Normal file
After Width: | Height: | Size: 469 B |
After Width: | Height: | Size: 485 B |
After Width: | Height: | Size: 482 B |
BIN
src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
Normal file
After Width: | Height: | Size: 630 B |
After Width: | Height: | Size: 697 B |
After Width: | Height: | Size: 790 B |
BIN
src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
Normal file
After Width: | Height: | Size: 777 B |
After Width: | Height: | Size: 990 B |
After Width: | Height: | Size: 972 B |
|
@ -43,35 +43,55 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignLeft="@+id/conversation_lastwrapper"
|
android:layout_alignLeft="@+id/conversation_lastwrapper"
|
||||||
android:layout_toLeftOf="@+id/conversation_lastupdate"
|
android:layout_toLeftOf="@+id/conversation_lastupdate"
|
||||||
|
android:paddingRight="4dp"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
|
android:text="Awesome groupchat"
|
||||||
android:textColor="@color/black87"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:typeface="sans"/>
|
android:typeface="sans"/>
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:id="@+id/conversation_lastwrapper"
|
android:id="@+id/conversation_lastwrapper"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/conversation_name"
|
android:layout_below="@id/conversation_name"
|
||||||
android:orientation="vertical"
|
android:layout_marginTop="4dp">
|
||||||
android:paddingTop="3dp" >
|
|
||||||
|
|
||||||
|
<LinearLayout android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_toLeftOf="@+id/notification_status"
|
||||||
|
android:orientation="vertical">
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/conversation_lastmsg"
|
android:id="@+id/conversation_lastmsg"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scrollHorizontally="false"
|
android:scrollHorizontally="false"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
|
android:text="This is a placeholder text to show the last messages"
|
||||||
android:textColor="@color/black87"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<ImageView
|
<com.makeramen.roundedimageview.RoundedImageView
|
||||||
android:id="@+id/conversation_lastimage"
|
android:id="@+id/conversation_lastimage"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="36dp"
|
android:layout_height="36dp"
|
||||||
android:background="@color/black87"
|
android:background="@color/black87"
|
||||||
android:scaleType="centerCrop" />
|
android:scaleType="centerCrop"
|
||||||
|
android:visibility="gone"
|
||||||
|
app:riv_corner_radius="2dp"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
<ImageView
|
||||||
|
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"
|
||||||
|
/>
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/conversation_lastupdate"
|
android:id="@+id/conversation_lastupdate"
|
||||||
|
@ -80,6 +100,7 @@
|
||||||
android:layout_alignBaseline="@+id/conversation_name"
|
android:layout_alignBaseline="@+id/conversation_name"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:gravity="right"
|
android:gravity="right"
|
||||||
|
android:text="23:42"
|
||||||
android:textColor="@color/black54"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"/>
|
android:textSize="?attr/TextSizeInfo"/>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|