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

simplify delivery-icon

Browse Source
This commit is contained in:
B. Petersen
2019-03-29 02:08:22 +01:00
parent 979d2c663d
commit e48d0f4029
7 changed files with 56 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/conversation_item_footer.xml
+7 -5
View File
@@ -28,10 +28,12 @@
android:textColor="?conversation_item_outgoing_text_secondary_color"
tools:text="30 mins"/>
<org.thoughtcrime.securesms.components.DeliveryStatusView
android:id="@+id/footer_delivery_status"
android:layout_width="20dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"/>
<ImageView android:id="@+id/delivery_indicator"
android:layout_width="20dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:tint="?attr/conversation_item_outgoing_text_secondary_color"
android:paddingLeft="2dp"
android:visibility="gone" />
</merge>
res/layout/conversation_list_item_view.xml
+9 -7
View File
@@ -101,7 +101,7 @@
<LinearLayout
android:orientation="horizontal"
android:minHeight="20dp"
android:minHeight="21dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -117,12 +117,14 @@
android:textColor="?attr/conversation_list_item_date_color"
android:background="@drawable/archived_indicator_background" />
<org.thoughtcrime.securesms.components.DeliveryStatusView
android:id="@+id/delivery_status"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:iconColor="?attr/conversation_list_item_delivery_icon_color"/>
<ImageView android:id="@+id/delivery_indicator"
android:layout_marginTop="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:paddingLeft="2dp"
android:tint="?attr/conversation_item_outgoing_text_secondary_color"
android:visibility="gone" />
<ImageView android:id="@+id/unread_indicator"
android:layout_width="24dp"
res/layout/delivery_status_view.xml
-38
View File
@@ -2,44 +2,6 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<ImageView
android:id="@+id/pending_indicator"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginRight="2dp"
android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_delivery_status_sending"
android:visibility="gone" />
<ImageView android:id="@+id/sent_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_delivery_status_sent"
android:paddingLeft="2dp"
android:visibility="gone"
android:contentDescription="@string/message_delivered" />
<ImageView android:id="@+id/read_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_delivery_status_read"
android:paddingLeft="2dp"
android:visibility="gone"
android:contentDescription="@string/message_read"
android:tint="@color/core_blue"
tools:visibility="visible"/>
<ImageView android:id="@+id/failed_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:src="@drawable/ic_delivery_status_failed"
android:paddingLeft="2dp"
android:visibility="gone"
android:contentDescription="@string/error"
android:tint="@color/core_blue"
tools:visibility="visible"/>
</merge>
res/values/attrs.xml
-4
View File
@@ -170,10 +170,6 @@
<attr name="thumbnail_radius" format="dimension" />
</declare-styleable>
<declare-styleable name="DeliveryStatusView">
<attr name="iconColor" format="color" />
</declare-styleable>
<declare-styleable name="AudioView">
<attr name="widgetBackground" format="color"/>
<attr name="foregroundTintColor" format="color" />