narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

show icon in conversations overview when notifications are disabled

Browse source
This commit is contained in:
Daniel Gultsch 2016-01-08 14:41:55 +01:00
parent 5dd5685885
commit 0bb3ae37f0
17 changed files with 109 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View file

@ -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
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 364 B

BIN
src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 462 B

BIN
src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 440 B

BIN
src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

BIN
src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 336 B

BIN
src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 323 B

BIN
src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 469 B

BIN
src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 485 B

BIN
src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 482 B

BIN
src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 630 B

BIN
src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 697 B

BIN
src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 790 B

BIN
src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 777 B

BIN
src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 990 B

BIN
src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 972 B

173
src/main/res/layout/conversation_list_row.xml
View file

@ -1,88 +1,109 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"> android:descendantFocusability="blocksDescendants">
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/primary"/> android:background="@color/primary"/>
<FrameLayout <FrameLayout
android:id="@+id/swipeable_item" android:id="@+id/swipeable_item"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/grey50"> android:background="@color/grey50">
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp" > android:padding="8dp">
<com.makeramen.roundedimageview.RoundedImageView <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/conversation_image" android:id="@+id/conversation_image"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:riv_corner_radius="2dp" /> app:riv_corner_radius="2dp"/>
<RelativeLayout <RelativeLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@+id/conversation_image" android:layout_toRightOf="@+id/conversation_image"
android:paddingLeft="8dp" > android:paddingLeft="8dp">
<TextView <TextView
android:id="@+id/conversation_name" android:id="@+id/conversation_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
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:singleLine="true" android:paddingRight="4dp"
android:textColor="@color/black87" android:singleLine="true"
android:textSize="?attr/TextSizeHeadline" android:text="Awesome groupchat"
android:typeface="sans" /> android:textColor="@color/black87"
android:textSize="?attr/TextSizeHeadline"
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" >
<TextView <LinearLayout android:layout_width="match_parent"
android:id="@+id/conversation_lastmsg" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:layout_alignParentLeft="true"
android:layout_height="wrap_content" android:layout_centerVertical="true"
android:scrollHorizontally="false" android:layout_toLeftOf="@+id/notification_status"
android:singleLine="true" android:orientation="vertical">
android:textColor="@color/black87" <TextView
android:textSize="?attr/TextSizeBody" /> android:id="@+id/conversation_lastmsg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
android:text="This is a placeholder text to show the last messages"
android:textColor="@color/black87"
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"
</LinearLayout> android:visibility="gone"
app:riv_corner_radius="2dp"/>
</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"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
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:textColor="@color/black54" android:text="23:42"
android:textSize="?attr/TextSizeInfo" /> android:textColor="@color/black54"
</RelativeLayout> android:textSize="?attr/TextSizeInfo"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </RelativeLayout>
</FrameLayout>
</FrameLayout> </FrameLayout>