migrate conversation list row to binder

1 files changed, 166 insertions, 160 deletions

diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 23ba4ac9d..3d03c3906 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -1,193 +1,199 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:descendantFocusability="blocksDescendants">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
-        android:id="@+id/frame"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/color_background_secondary">
+        android:descendantFocusability="blocksDescendants">
 
-        <RelativeLayout
+        <FrameLayout
+            android:id="@+id/frame"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="?android:selectableItemBackground"
-            android:orientation="horizontal"
-            android:padding="8dp">
-
-            <com.makeramen.roundedimageview.RoundedImageView
-                android:id="@+id/conversation_image"
-                android:layout_width="56dp"
-                android:layout_height="56dp"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentLeft="true"
-                android:padding="1dp"
-                android:scaleType="centerCrop"
-                app:riv_corner_radius="@dimen/rounded_image_border" />
+            android:background="?attr/color_background_secondary">
 
             <RelativeLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@+id/conversation_image"
-                android:layout_toRightOf="@+id/conversation_image"
-                android:paddingStart="@dimen/avatar_item_distance"
-                android:paddingLeft="@dimen/avatar_item_distance">
-
-                <TextView
-                    android:id="@+id/conversation_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignStart="@+id/conversation_lastwrapper"
-                    android:layout_alignLeft="@+id/conversation_lastwrapper"
-                    android:layout_toStartOf="@+id/conversation_failed"
-                    android:layout_toLeftOf="@+id/conversation_failed"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:paddingEnd="4dp"
-                    android:paddingRight="4dp"
-                    android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+                android:background="?android:selectableItemBackground"
+                android:orientation="horizontal"
+                android:padding="8dp">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:id="@+id/conversation_image"
+                    android:layout_width="56dp"
+                    android:layout_height="56dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentLeft="true"
+                    android:padding="1dp"
+                    android:scaleType="centerCrop"
+                    app:riv_corner_radius="@dimen/rounded_image_border" />
 
                 <RelativeLayout
-                    android:id="@+id/conversation_lastwrapper"
-                    android:layout_width="match_parent"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@id/conversation_name"
-                    android:layout_marginTop="4dp">
+                    android:layout_centerVertical="true"
+                    android:layout_toEndOf="@+id/conversation_image"
+                    android:layout_toRightOf="@+id/conversation_image"
+                    android:paddingStart="@dimen/avatar_item_distance"
+                    android:paddingLeft="@dimen/avatar_item_distance">
 
                     <TextView
-                        android:id="@+id/sender_name"
+                        android:id="@+id/conversation_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="5sp"
-                        android:layout_marginRight="5sp"
-                        android:gravity="center_vertical"
-                        android:minHeight="?attr/IconSize"
-                        android:text="@string/me"
-                        android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"
-                        android:visibility="visible" />
-
-                    <LinearLayout
+                        android:layout_alignStart="@+id/conversation_lastwrapper"
+                        android:layout_alignLeft="@+id/conversation_lastwrapper"
+                        android:layout_toStartOf="@+id/failed_count"
+                        android:layout_toLeftOf="@+id/failed_count"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:paddingEnd="4dp"
+                        android:paddingRight="4dp"
+                        android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+
+                    <RelativeLayout
+                        android:id="@+id/conversation_lastwrapper"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentStart="false"
-                        android:layout_alignParentLeft="false"
-                        android:layout_centerVertical="true"
-                        android:layout_toStartOf="@+id/indicators"
-                        android:layout_toLeftOf="@+id/indicators"
-                        android:layout_toEndOf="@+id/sender_name"
-                        android:layout_toRightOf="@+id/sender_name"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/conversation_lastmsg_img"
-                            android:layout_width="?attr/IconSize"
-                            android:layout_height="?attr/IconSize"
-                            android:layout_marginEnd="?attr/TextSeparation"
-                            android:layout_marginRight="?attr/TextSeparation" />
+                        android:layout_below="@id/conversation_name"
+                        android:layout_marginTop="4dp">
 
                         <TextView
-                            android:id="@+id/conversation_lastmsg"
-                            android:layout_width="match_parent"
+                            android:id="@+id/sender_name"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:ellipsize="end"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_centerVertical="true"
+                            android:layout_marginEnd="?attr/TextSeparation"
+                            android:layout_marginRight="?attr/TextSeparation"
                             android:gravity="center_vertical"
-                            android:maxLines="1"
                             android:minHeight="?attr/IconSize"
-                            android:scrollHorizontally="false"
-                            android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-                    </LinearLayout>
+                            android:text="@string/me"
+                            android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"
+                            android:visibility="visible" />
 
-                    <LinearLayout
-                        android:id="@+id/indicators"
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_alignWithParentIfMissing="true"
+                            android:layout_centerVertical="true"
+                            android:layout_toStartOf="@+id/indicators"
+                            android:layout_toLeftOf="@+id/indicators"
+                            android:layout_toEndOf="@+id/sender_name"
+                            android:layout_toRightOf="@+id/sender_name"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/conversation_lastmsg_img"
+                                android:layout_width="?attr/IconSize"
+                                android:layout_height="?attr/IconSize"
+                                android:layout_marginEnd="?attr/TextSeparation"
+                                android:layout_marginRight="?attr/TextSeparation" />
+
+                            <TextView
+                                android:id="@+id/conversation_lastmsg"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:ellipsize="end"
+                                android:gravity="center_vertical"
+                                android:maxLines="1"
+                                android:minHeight="?attr/IconSize"
+                                android:scrollHorizontally="false"
+                                android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/indicators"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentStart="false"
+                            android:layout_alignParentLeft="false"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:layout_marginStart="?attr/TextSeparation"
+                            android:layout_marginLeft="?attr/TextSeparation"
+                            android:orientation="horizontal">
+
+                            <ImageView
+                                android:id="@+id/indicator_received"
+                                android:layout_width="?attr/TextSizeInfo"
+                                android:layout_height="?attr/TextSizeInfo"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="4dp"
+                                android:layout_marginLeft="4dp"
+                                android:gravity="center_vertical"
+                                android:src="@drawable/ic_received_indicator" />
+
+                            <ImageView
+                                android:id="@+id/indicator_read"
+                                android:layout_width="?attr/TextSizeInfo"
+                                android:layout_height="?attr/TextSizeInfo"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginStart="-8dp"
+                                android:layout_marginLeft="-8dp"
+                                android:adjustViewBounds="false"
+                                android:gravity="center_vertical"
+                                android:src="@drawable/ic_read_indicator" />
+
+                            <ImageView
+                                android:id="@+id/notification_status"
+                                android:layout_width="?attr/IconSize"
+                                android:layout_height="?attr/IconSize"
+                                android:layout_marginStart="4dp"
+                                android:layout_marginLeft="4dp"
+                                android:alpha="?attr/icon_alpha"
+                                android:src="@drawable/ic_notifications_grey600_24dp" />
+                        </LinearLayout>
+                    </RelativeLayout>
+
+                    <de.pixart.messenger.ui.widget.UnreadCountCustomView
+                        android:id="@+id/unread_count"
+                        android:layout_width="?attr/IconSize"
+                        android:layout_height="?attr/IconSize"
+                        android:layout_margin="1dp"
+                        android:layout_toStartOf="@+id/conversation_lastupdate"
+                        android:layout_toLeftOf="@+id/conversation_lastupdate"
+                        android:paddingStart="4dp"
+                        android:paddingLeft="4dp"
+                        android:paddingEnd="4dp"
+                        android:paddingRight="4dp"
+                        android:paddingBottom="2dp"
+                        android:visibility="gone"
+                        app:backgroundColor="?attr/colorAccent" />
+
+                    <de.pixart.messenger.ui.widget.FailedCountCustomView
+                        android:id="@+id/failed_count"
+                        android:layout_width="?attr/IconSize"
+                        android:layout_height="?attr/IconSize"
+                        android:layout_margin="1dp"
+                        android:layout_toStartOf="@+id/unread_count"
+                        android:layout_toLeftOf="@+id/unread_count"
+                        android:paddingStart="4dp"
+                        android:paddingLeft="4dp"
+                        android:paddingEnd="4dp"
+                        android:paddingRight="4dp"
+                        android:paddingBottom="2dp"
+                        android:visibility="gone"
+                        app:backgroundColor="?attr/color_warning" />
+
+                    <TextView
+                        android:id="@+id/conversation_lastupdate"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentStart="false"
-                        android:layout_alignParentLeft="false"
+                        android:layout_alignBaseline="@+id/conversation_name"
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:orientation="horizontal">
-
-                        <ImageView
-                            android:id="@+id/indicator_received"
-                            android:layout_width="?attr/TextSizeInfo"
-                            android:layout_height="?attr/TextSizeInfo"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="4sp"
-                            android:layout_marginLeft="4sp"
-                            android:gravity="center_vertical"
-                            android:src="@drawable/ic_received_indicator" />
-
-                        <ImageView
-                            android:id="@+id/indicator_read"
-                            android:layout_width="?attr/TextSizeInfo"
-                            android:layout_height="?attr/TextSizeInfo"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginStart="-8sp"
-                            android:layout_marginLeft="-8sp"
-                            android:adjustViewBounds="false"
-                            android:gravity="center_vertical"
-                            android:src="@drawable/ic_read_indicator" />
-
-                        <ImageView
-                            android:id="@+id/notification_status"
-                            android:layout_width="?attr/IconSize"
-                            android:layout_height="?attr/IconSize"
-                            android:layout_marginStart="4dp"
-                            android:layout_marginLeft="4dp"
-                            android:alpha="?attr/icon_alpha"
-                            android:src="@drawable/ic_notifications_grey600_24dp" />
-                    </LinearLayout>
+                        android:gravity="end"
+                        android:paddingStart="4dp"
+                        android:paddingLeft="4dp"
+                        android:paddingEnd="4dp"
+                        android:paddingRight="4dp"
+                        android:textAppearance="@style/TextAppearance.Conversations.Caption" />
                 </RelativeLayout>
-
-                <de.pixart.messenger.ui.widget.UnreadCountCustomView
-                    android:id="@+id/conversation_unread"
-                    android:layout_width="?attr/IconSize"
-                    android:layout_height="?attr/IconSize"
-                    android:layout_margin="1dp"
-                    android:layout_toStartOf="@+id/conversation_lastupdate"
-                    android:layout_toLeftOf="@+id/conversation_lastupdate"
-                    android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
-                    android:paddingEnd="4dp"
-                    android:paddingRight="4dp"
-                    android:paddingBottom="2dp"
-                    android:visibility="gone"
-                    app:backgroundColor="?attr/colorAccent" />
-
-                <de.pixart.messenger.ui.widget.FailedCountCustomView
-                    android:id="@+id/conversation_failed"
-                    android:layout_width="?attr/IconSize"
-                    android:layout_height="?attr/IconSize"
-                    android:layout_margin="1dp"
-                    android:layout_toStartOf="@+id/conversation_unread"
-                    android:layout_toLeftOf="@+id/conversation_unread"
-                    android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
-                    android:paddingEnd="4dp"
-                    android:paddingRight="4dp"
-                    android:paddingBottom="2dp"
-                    android:visibility="gone"
-                    app:backgroundColor="?attr/color_warning" />
-
-                <TextView
-                    android:id="@+id/conversation_lastupdate"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignBaseline="@+id/conversation_name"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:gravity="end"
-                    android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
-                    android:textAppearance="@style/TextAppearance.Conversations.Caption" />
             </RelativeLayout>
-        </RelativeLayout>
+        </FrameLayout>
     </FrameLayout>
-</FrameLayout>
\ No newline at end of file
+</layout>
\ No newline at end of file