awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
adbenitez
2021-07-30 19:19:23 -04:00
parent d7620a817a 72acc5fffc
commit 195c71af9a
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/drawable/badge_divider.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:height="0dp"
android:width="5dp" />
</shape>
res/layout/conversation_list_item_view.xml
+15 -1
View File
@@ -88,10 +88,24 @@
<LinearLayout
android:orientation="horizontal"
android:minHeight="21dp"
android:showDividers="middle"
android:divider="@drawable/badge_divider"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/badge"
<TextView android:id="@+id/request_badge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="1dp"
android:paddingBottom="1dp"
style="@style/Signal.Text.Caption"
android:text="@string/chat_request_label"
android:textColor="?attr/conversation_list_item_date_color"
android:background="@drawable/archived_indicator_background" />
<TextView android:id="@+id/archived_badge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="5dp"
src/org/thoughtcrime/securesms/ConversationListItem.java
+14 -13
View File
@@ -75,7 +75,8 @@ public class ConversationListItem extends RelativeLayout
private TextView subjectView;
private FromTextView fromView;
private TextView dateView;
private TextView badgeView;
private TextView archivedBadgeView;
private TextView requestBadgeView;
private DeliveryStatusView deliveryStatusIndicator;
private ImageView unreadIndicator;
@@ -97,7 +98,8 @@ public class ConversationListItem extends RelativeLayout
this.dateView = findViewById(R.id.date);
this.deliveryStatusIndicator = new DeliveryStatusView(findViewById(R.id.delivery_indicator));
this.contactPhotoImage = findViewById(R.id.contact_photo_image);
this.badgeView = findViewById(R.id.badge);
this.archivedBadgeView = findViewById(R.id.archived_badge);
this.requestBadgeView = findViewById(R.id.request_badge);
this.unreadIndicator = findViewById(R.id.unread_indicator);
ViewUtil.setTextViewGravityStart(this.fromView, getContext());
@@ -187,7 +189,8 @@ public class ConversationListItem extends RelativeLayout
subjectView.setText(getHighlightedSpan(locale, contact.getAddr(), highlightSubstring));
dateView.setText("");
dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
badgeView.setVisibility(GONE);
archivedBadgeView.setVisibility(GONE);
requestBadgeView.setVisibility(GONE);
unreadIndicator.setVisibility(GONE);
deliveryStatusIndicator.setNone();
@@ -218,7 +221,8 @@ public class ConversationListItem extends RelativeLayout
dateView.setText("");
}
dateView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
badgeView.setVisibility(GONE);
archivedBadgeView.setVisibility(GONE);
requestBadgeView.setVisibility(GONE);
unreadIndicator.setVisibility(GONE);
deliveryStatusIndicator.setNone();
@@ -245,24 +249,21 @@ public class ConversationListItem extends RelativeLayout
private void setStatusIcons(int visibility, int state, int unreadCount, boolean isContactRequest) {
if (visibility==DcChat.DC_CHAT_VISIBILITY_ARCHIVED)
{
badgeView.setVisibility(View.VISIBLE);
if (isContactRequest) {
badgeView.setText(getContext().getString(R.string.chat_archived_label) + " " + getContext().getString(R.string.chat_request_label));
} else {
badgeView.setText(R.string.chat_archived_label);
}
archivedBadgeView.setVisibility(View.VISIBLE);
requestBadgeView.setVisibility(isContactRequest ? View.VISIBLE : View.GONE);
deliveryStatusIndicator.setNone();
unreadIndicator.setVisibility(View.GONE);
}
else if (isContactRequest) {
badgeView.setVisibility(View.VISIBLE);
badgeView.setText(R.string.chat_request_label);
requestBadgeView.setVisibility(View.VISIBLE);
archivedBadgeView.setVisibility(View.GONE);
deliveryStatusIndicator.setNone();
unreadIndicator.setVisibility(View.GONE);
}
else
{
this.badgeView.setVisibility(View.GONE);
requestBadgeView.setVisibility(View.GONE);
archivedBadgeView.setVisibility(View.GONE);
if (state==DcMsg.DC_STATE_IN_FRESH || state==DcMsg.DC_STATE_IN_NOTICED)
{
deliveryStatusIndicator.setNone();