yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

remove group icon from chatlist

Browse source
This commit is contained in:
B. Petersen 2019-10-05 19:32:30 +02:00
parent 52bcbc344e
commit e7871a66e3
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
4 changed files with 11 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

40
res/layout/conversation_list_item_view.xml
View file

@ -38,36 +38,18 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <org.thoughtcrime.securesms.components.FromTextView
android:orientation="horizontal" android:id="@+id/from_text"
android:layout_marginBottom="2dp" style="@style/Signal.Text.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
<ImageView android:drawablePadding="5dp"
android:id="@+id/group_indicator" android:ellipsize="end"
android:layout_width="16dp" android:fontFamily="sans-serif-medium"
android:layout_height="16dp" android:maxLines="1"
android:layout_gravity="center_vertical" android:textColor="?attr/conversation_list_item_contact_color"
android:src="@drawable/ic_group_white_24dp" tools:text="Jules Bonnot" />
android:visibility="gone"
android:layout_marginTop="1dp"
android:layout_marginRight="5dp"
android:layout_marginEnd="5dp" />
<org.thoughtcrime.securesms.components.FromTextView
android:id="@+id/from_text"
style="@style/Signal.Text.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="5dp"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:maxLines="1"
android:textColor="?attr/conversation_list_item_contact_color"
tools:text="Jules Bonnot" />
</LinearLayout>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/subject" android:id="@+id/subject"

1
res/values/attrs.xml
View file

@ -109,7 +109,6 @@
<attr name="menu_lock_icon" format="reference" /> <attr name="menu_lock_icon" format="reference" />
<attr name="menu_lock_icon_small" format="reference" /> <attr name="menu_lock_icon_small" format="reference" />
<attr name="menu_trash_icon" format="reference" /> <attr name="menu_trash_icon" format="reference" />
<attr name="menu_group_icon" format="reference" />
<attr name="menu_map_icon" format="reference" /> <attr name="menu_map_icon" format="reference" />
<attr name="menu_accept_icon" format="reference" /> <attr name="menu_accept_icon" format="reference" />
<attr name="menu_copy_icon" format="reference" /> <attr name="menu_copy_icon" format="reference" />

2
res/values/themes.xml
View file

@ -184,7 +184,6 @@
<item name="import_export_item_card_background">@drawable/clickable_card_light</item> <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
<item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item> <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
<item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
<item name="menu_map_icon">@android:drawable/ic_dialog_map</item> <item name="menu_map_icon">@android:drawable/ic_dialog_map</item>
<item name="menu_search_icon">@drawable/ic_search_white_24dp</item> <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
<item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item> <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
@ -331,7 +330,6 @@
<item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item> <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
<item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item> <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
<item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
<item name="menu_map_icon">@android:drawable/ic_dialog_map</item> <item name="menu_map_icon">@android:drawable/ic_dialog_map</item>
<item name="menu_search_icon">@drawable/ic_search_white_24dp</item> <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
<item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item> <item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>

9
src/org/thoughtcrime/securesms/ConversationListItem.java
View file

@ -80,7 +80,6 @@ public class ConversationListItem extends RelativeLayout
private TextView archivedView; private TextView archivedView;
private DeliveryStatusView deliveryStatusIndicator; private DeliveryStatusView deliveryStatusIndicator;
private ImageView unreadIndicator; private ImageView unreadIndicator;
private ImageView groupIndicator;
private int unreadCount; private int unreadCount;
private AvatarImageView contactPhotoImage; private AvatarImageView contactPhotoImage;
@ -103,7 +102,6 @@ public class ConversationListItem extends RelativeLayout
this.contactPhotoImage = findViewById(R.id.contact_photo_image); this.contactPhotoImage = findViewById(R.id.contact_photo_image);
this.archivedView = findViewById(R.id.archived); this.archivedView = findViewById(R.id.archived);
this.unreadIndicator = findViewById(R.id.unread_indicator); this.unreadIndicator = findViewById(R.id.unread_indicator);
this.groupIndicator = findViewById(R.id.group_indicator);
ViewUtil.setTextViewGravityStart(this.fromView, getContext()); ViewUtil.setTextViewGravityStart(this.fromView, getContext());
ViewUtil.setTextViewGravityStart(this.subjectView, getContext()); ViewUtil.setTextViewGravityStart(this.subjectView, getContext());
@ -178,11 +176,6 @@ public class ConversationListItem extends RelativeLayout
0, 0,
thread.isVerified()? R.drawable.ic_verified : 0, thread.isVerified()? R.drawable.ic_verified : 0,
0); 0);
boolean isGroup = recipient.isGroupRecipient();
groupIndicator.setVisibility(isGroup ? VISIBLE : GONE);
int color = ResUtil.getColor(getContext(), R.attr.conversation_list_item_contact_color);
groupIndicator.setColorFilter(color);
} }
public void bind(@NonNull DcContact contact, public void bind(@NonNull DcContact contact,
@ -202,7 +195,6 @@ public class ConversationListItem extends RelativeLayout
archivedView.setVisibility(GONE); archivedView.setVisibility(GONE);
unreadIndicator.setVisibility(GONE); unreadIndicator.setVisibility(GONE);
deliveryStatusIndicator.setNone(); deliveryStatusIndicator.setNone();
groupIndicator.setVisibility(GONE);
setBatchState(false); setBatchState(false);
setBgColor(); setBgColor();
@ -235,7 +227,6 @@ public class ConversationListItem extends RelativeLayout
archivedView.setVisibility(GONE); archivedView.setVisibility(GONE);
unreadIndicator.setVisibility(GONE); unreadIndicator.setVisibility(GONE);
deliveryStatusIndicator.setNone(); deliveryStatusIndicator.setNone();
groupIndicator.setVisibility(GONE);
setBatchState(false); setBatchState(false);
setBgColor(); setBgColor();