Fix divider issue

2 files changed, 716 insertions, 707 deletions

diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 3ea85c2f6..a9adf8b53 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -27,847 +27,854 @@
     android:layout_marginEnd="5dp"
     android:layout_marginLeft="5dp"
     android:layout_marginRight="5dp"
-    android:orientation="horizontal"
+    android:orientation="vertical"
+    android:divider="?android:dividerHorizontal"
+    android:showDividers="end"
     >
-
         <LinearLayout
-            android:layout_width="60dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <RelativeLayout
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                >
-                <ImageView
-                    android:visibility="gone"
-                    android:layout_width="15dp"
-                    android:layout_height="15dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true"
-                    android:src="@drawable/ic_bot"
-                    android:id="@+id/status_account_bot"
-                    android:layout_alignParentStart="true" />
-                <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_centerHorizontal="true"
-                    android:id="@+id/status_account_profile"
-                    android:contentDescription="@string/profile_picture"/>
-                <LinearLayout
-                    android:id="@+id/conversation_pp"
-                    android:visibility="gone"
-                    android:layout_centerHorizontal="true"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <RelativeLayout
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    >
                     <ImageView
-                        android:id="@+id/conversation_pp_1"
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:scaleType="centerCrop"
-                        android:adjustViewBounds="true"
-                        android:layout_height="match_parent"
-                        android:contentDescription="@string/profile_picture" />
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_centerHorizontal="true"
+                        android:id="@+id/status_account_profile"
+                        android:contentDescription="@string/profile_picture"/>
                     <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="center_vertical"
-                        android:id="@+id/conversation_pp_2_container"
-                        android:orientation="vertical"
-                        >
+                        android:id="@+id/conversation_pp"
+                        android:visibility="gone"
+                        android:layout_centerHorizontal="true"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:orientation="horizontal">
                         <ImageView
-                            android:id="@+id/conversation_pp_2"
-                            android:scaleType="centerCrop"
-                            android:layout_height="0dp"
-                            android:layout_width="match_parent"
+                            android:id="@+id/conversation_pp_1"
+                            android:layout_width="0dp"
                             android:layout_weight="1"
+                            android:scaleType="centerCrop"
                             android:adjustViewBounds="true"
+                            android:layout_height="match_parent"
                             android:contentDescription="@string/profile_picture" />
                         <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
+                            android:layout_width="0dp"
                             android:layout_weight="1"
+                            android:layout_height="match_parent"
                             android:layout_gravity="center_vertical"
                             android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:id="@+id/conversation_pp_3_container"
-                            android:baselineAligned="false">
+                            android:id="@+id/conversation_pp_2_container"
+                            android:orientation="vertical"
+                            >
                             <ImageView
-                                android:id="@+id/conversation_pp_3"
-                                android:layout_width="0dp"
-                                android:layout_weight="1"
+                                android:id="@+id/conversation_pp_2"
                                 android:scaleType="centerCrop"
-                                android:adjustViewBounds="true"
-                                android:layout_height="wrap_content"
-                                android:contentDescription="@string/profile_picture" />
-                            <ImageView
-                                android:id="@+id/conversation_pp_4"
-                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_width="match_parent"
                                 android:layout_weight="1"
-                                android:scaleType="centerCrop"
                                 android:adjustViewBounds="true"
-                                android:layout_height="wrap_content"
                                 android:contentDescription="@string/profile_picture" />
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:layout_gravity="center_vertical"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal"
+                                android:id="@+id/conversation_pp_3_container"
+                                android:baselineAligned="false">
+                                <ImageView
+                                    android:id="@+id/conversation_pp_3"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:scaleType="centerCrop"
+                                    android:adjustViewBounds="true"
+                                    android:layout_height="wrap_content"
+                                    android:contentDescription="@string/profile_picture" />
+                                <ImageView
+                                    android:id="@+id/conversation_pp_4"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:scaleType="centerCrop"
+                                    android:adjustViewBounds="true"
+                                    android:layout_height="wrap_content"
+                                    android:contentDescription="@string/profile_picture" />
+                            </LinearLayout>
                         </LinearLayout>
-                    </LinearLayout>
 
-                </LinearLayout>
-                <ImageView
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerHorizontal="true"
-                    android:visibility="gone"
-                    android:id="@+id/status_account_profile_boost"
-                    android:contentDescription="@string/profile_picture"/>
-                <ImageView
-                    android:id="@+id/status_account_profile_boost_by"
-                    android:layout_height="30dp"
-                    android:layout_width="30dp"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginTop="25dp"
-                    style="?attr/shapeBorder"
-                    android:visibility="gone"
-                    android:contentDescription="@string/profile_picture" />
-            </RelativeLayout>
-            <LinearLayout
-                android:id="@+id/left_buttons"
-                android:orientation="vertical"
-                android:layout_width="60dp"
-                android:paddingLeft="3dp"
-                android:paddingRight="3dp"
-                android:layout_height="wrap_content">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
+                    </LinearLayout>
                     <ImageView
-                        android:id="@+id/cached_status"
+                        android:layout_width="50dp"
+                        android:layout_height="50dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentLeft="true"
+                        android:layout_centerHorizontal="true"
                         android:visibility="gone"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginRight="3dp"
-                        android:layout_marginEnd="3dp"
-                        android:src="@drawable/ic_cached_black"
-                        android:contentDescription="@string/cached_status" />
+                        android:id="@+id/status_account_profile_boost"
+                        android:contentDescription="@string/profile_picture"/>
                     <ImageView
-                        android:id="@+id/new_element"
-                        android:src="@drawable/ic_fiber_new"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:contentDescription="@string/new_toot" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
+                        android:id="@+id/status_account_profile_boost_by"
+                        android:layout_height="30dp"
+                        android:layout_width="30dp"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginTop="25dp"
+                        style="?attr/shapeBorder"
+                        android:visibility="gone"
+                        android:contentDescription="@string/profile_picture" />
                     <ImageView
-                        android:id="@+id/status_translate"
-                        android:padding="2dp"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginRight="3dp"
-                        android:layout_marginEnd="3dp"
-                        android:background="#FF2b90d9"
-                        android:src="@drawable/ic_translate"
-                        android:contentDescription="@string/translate" />
+                        android:visibility="gone"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:layout_marginTop="5dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentLeft="true"
+                        android:src="@drawable/ic_bot"
+                        android:id="@+id/status_account_bot"
+                        android:layout_alignParentStart="true" />
+                </RelativeLayout>
+                <LinearLayout
+                    android:id="@+id/left_buttons"
+                    android:orientation="vertical"
+                    android:layout_width="60dp"
+                    android:paddingLeft="3dp"
+                    android:paddingRight="3dp"
+                    android:layout_height="wrap_content">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:gravity="center_horizontal"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:id="@+id/cached_status"
+                            android:visibility="gone"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:layout_marginRight="3dp"
+                            android:layout_marginEnd="3dp"
+                            android:src="@drawable/ic_cached_black"
+                            android:contentDescription="@string/cached_status" />
+                        <ImageView
+                            android:id="@+id/new_element"
+                            android:src="@drawable/ic_fiber_new"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/new_toot" />
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:gravity="center_horizontal"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:id="@+id/status_translate"
+                            android:padding="2dp"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:layout_marginRight="3dp"
+                            android:layout_marginEnd="3dp"
+                            android:background="#FF2b90d9"
+                            android:src="@drawable/ic_translate"
+                            android:contentDescription="@string/translate" />
+                        <ImageView
+                            android:id="@+id/status_bookmark"
+                            android:tint="@android:color/white"
+                            android:padding="2dp"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:layout_marginRight="3dp"
+                            android:layout_marginEnd="3dp"
+                            android:background="#FF2b90d9"
+                            android:contentDescription="@string/bookmarks"
+                            android:src="@drawable/ic_bookmark_border" />
+                    </LinearLayout>
+
                     <ImageView
-                        android:id="@+id/status_bookmark"
-                        android:tint="@android:color/white"
-                        android:padding="2dp"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginRight="3dp"
-                        android:layout_marginEnd="3dp"
-                        android:background="#FF2b90d9"
-                        android:contentDescription="@string/bookmarks"
-                        android:src="@drawable/ic_bookmark_border" />
+                        android:id="@+id/status_remove"
+                        android:gravity="center"
+                        android:visibility="gone"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:contentDescription="@string/delete"
+                        android:src="@drawable/ic_clear_toot"
+                        android:layout_marginTop="5dp"
+                        />
                 </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/status_remove"
-                    android:gravity="center"
-                    android:visibility="gone"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:contentDescription="@string/delete"
-                    android:src="@drawable/ic_clear_toot"
-                    android:layout_marginTop="5dp"
-                    />
             </LinearLayout>
-        </LinearLayout>
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content">
-            <TextView
-                android:layout_marginBottom="3dp"
-                android:id="@+id/status_account_displayname"
-                android:maxLines="1"
-                android:drawablePadding="2dp"
-                android:layout_marginTop="-2dp"
-                android:layout_marginStart="-2dp"
-                android:layout_marginLeft="-2dp"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
             <LinearLayout
-                android:orientation="horizontal"
-                android:layout_marginBottom="10dp"
-                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_marginStart="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:id="@+id/status_account_displayname_owner"
+                    android:layout_marginBottom="3dp"
+                    android:id="@+id/status_account_displayname"
                     android:maxLines="1"
-                    android:textStyle="bold"
                     android:drawablePadding="2dp"
+                    android:layout_marginTop="-2dp"
+                    android:layout_marginStart="-2dp"
+                    android:layout_marginLeft="-2dp"
+                    android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content" />
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginStart="5dp"
-                    android:textSize="12sp"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:id="@+id/status_account_username"
-                    android:layout_height="wrap_content"
-                     />
-                <TextView
-                    android:layout_marginStart="2dp"
-                    android:layout_marginLeft="2dp"
-                    android:id="@+id/status_toot_date"
-                    android:layout_width="wrap_content"
-                    android:layout_weight="0"
-                    android:maxLines="1"
-                    android:textSize="12sp"
-                    android:layout_gravity="end"
-                    android:gravity="end"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/status_spoiler_container"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:visibility="gone"
-                android:layout_height="wrap_content">
-                <app.fedilab.android.helper.CustomTextView
-                    android:id="@+id/status_spoiler"
-                    android:layout_marginBottom="10dp"
-                    android:textIsSelectable="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-                <Button
-                    android:id="@+id/status_spoiler_button"
-                    android:textAllCaps="false"
-                    android:drawableLeft="@drawable/ic_remove_red_eye"
-                    android:drawableStart="@drawable/ic_remove_red_eye"
-                    android:gravity="center_vertical"
-                    android:drawablePadding="5dp"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:maxLines="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="?attr/borderless"
-                    android:text="@string/load_attachment_spoiler" />
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/status_content_container"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                android:layout_height="wrap_content">
-                <app.fedilab.android.helper.CustomTextView
-                    android:id="@+id/status_content"
-                    android:textIsSelectable="true"
-                    android:layout_marginBottom="10dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-                <Button
-                    android:layout_marginTop="-10dp"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:id="@+id/status_show_more_content"
-                    android:visibility="gone"
-                    android:textAllCaps="false"
-                    android:drawableLeft="@drawable/ic_more_toot_content"
-                    android:drawableStart="@drawable/ic_more_toot_content"
-                    android:gravity="center_vertical"
-                    android:drawablePadding="5dp"
-                    android:maxLines="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="?attr/borderless"
-                    android:text="@string/display_toot_truncate" />
-                <TextView
-                    android:visibility="gone"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    android:id="@+id/status_toot_app"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:layout_gravity="end"
-                    android:gravity="end"
-                    android:layout_marginBottom="10dp"
-                    android:textStyle="italic"
-                    />
                 <LinearLayout
-                    android:id="@+id/status_content_translated_container"
-                    android:visibility="gone"
+                    android:orientation="horizontal"
                     android:layout_marginBottom="10dp"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content">
                     <TextView
-                        android:id="@+id/status_content_translated"
-                        android:layout_width="match_parent"
+                        android:id="@+id/status_account_displayname_owner"
+                        android:maxLines="1"
+                        android:textStyle="bold"
+                        android:drawablePadding="2dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                     <TextView
-                        android:id="@+id/yandex_translate"
-                        android:layout_width="match_parent"
-                        android:padding="2dp"
-                        android:gravity="end"
-                        android:text="Powered by Yandex.Translate"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginStart="5dp"
+                        android:textSize="12sp"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:id="@+id/status_account_username"
                         android:layout_height="wrap_content"
-                        tools:ignore="HardcodedText" />
+                        />
+                    <TextView
+                        android:layout_marginStart="2dp"
+                        android:layout_marginLeft="2dp"
+                        android:id="@+id/status_toot_date"
+                        android:layout_width="wrap_content"
+                        android:layout_weight="0"
+                        android:maxLines="1"
+                        android:textSize="12sp"
+                        android:layout_gravity="end"
+                        android:gravity="end"
+                        android:layout_height="wrap_content" />
                 </LinearLayout>
-
-
                 <LinearLayout
-                    android:id="@+id/status_cardview"
+                    android:id="@+id/status_spoiler_container"
+                    android:layout_width="match_parent"
+                    android:orientation="vertical"
                     android:visibility="gone"
-                    android:layout_marginBottom="5dp"
-                    android:background="@drawable/card_border_light"
+                    android:layout_height="wrap_content">
+                    <app.fedilab.android.helper.CustomTextView
+                        android:id="@+id/status_spoiler"
+                        android:layout_marginBottom="10dp"
+                        android:textIsSelectable="true"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                    <Button
+                        android:id="@+id/status_spoiler_button"
+                        android:textAllCaps="false"
+                        android:drawableLeft="@drawable/ic_remove_red_eye"
+                        android:drawableStart="@drawable/ic_remove_red_eye"
+                        android:gravity="center_vertical"
+                        android:drawablePadding="5dp"
+                        android:paddingTop="5dp"
+                        android:paddingBottom="5dp"
+                        android:maxLines="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="?attr/borderless"
+                        android:text="@string/load_attachment_spoiler" />
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/status_content_container"
                     android:layout_width="match_parent"
-                    android:gravity="center_vertical"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <ImageView
-                        android:padding="1dp"
-                        android:layout_gravity="center"
-                        android:id="@+id/status_cardview_image"
-                        android:layout_width="60dp"
-                        android:gravity="center"
-                        android:scaleType="centerCrop"
-                        android:layout_height="60dp"
-                        android:contentDescription="@string/card_view_image" />
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="0dp"
-                        android:padding="5dp"
+                    android:orientation="vertical"
+                    android:layout_height="wrap_content">
+                    <app.fedilab.android.helper.CustomTextView
+                        android:id="@+id/status_content"
+                        android:textIsSelectable="true"
+                        android:layout_marginBottom="10dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                    <Button
+                        android:layout_marginTop="-10dp"
+                        android:paddingTop="2dp"
+                        android:paddingBottom="2dp"
+                        android:id="@+id/status_show_more_content"
+                        android:visibility="gone"
+                        android:textAllCaps="false"
+                        android:drawableLeft="@drawable/ic_more_toot_content"
+                        android:drawableStart="@drawable/ic_more_toot_content"
                         android:gravity="center_vertical"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginStart="5dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:textSize="14sp"
-                            android:maxLines="1"
-                            android:textStyle="bold"
-                            android:singleLine="true"
-                            android:id="@+id/status_cardview_title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                        android:drawablePadding="5dp"
+                        android:maxLines="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="?attr/borderless"
+                        android:text="@string/display_toot_truncate" />
+                    <TextView
+                        android:visibility="gone"
+                        android:layout_marginEnd="10dp"
+                        android:layout_marginRight="10dp"
+                        android:id="@+id/status_toot_app"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:layout_gravity="end"
+                        android:gravity="end"
+                        android:layout_marginBottom="10dp"
+                        android:textStyle="italic"
+                        />
+                    <LinearLayout
+                        android:id="@+id/status_content_translated_container"
+                        android:visibility="gone"
+                        android:layout_marginBottom="10dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
                         <TextView
-                            android:layout_marginTop="5dp"
-                            android:id="@+id/status_cardview_content"
+                            android:id="@+id/status_content_translated"
                             android:layout_width="match_parent"
-                            android:textSize="12sp"
-                            android:maxLines="3"
                             android:layout_height="wrap_content" />
                         <TextView
-                            android:id="@+id/status_cardview_url"
-                            android:layout_marginTop="5dp"
-                            android:textSize="12sp"
-                            android:maxLines="1"
+                            android:id="@+id/yandex_translate"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            android:padding="2dp"
+                            android:gravity="end"
+                            android:text="Powered by Yandex.Translate"
+                            android:layout_height="wrap_content"
+                            tools:ignore="HardcodedText" />
                     </LinearLayout>
-                </LinearLayout>
-                <FrameLayout
-                    android:visibility="gone"
-                    android:layout_gravity="center"
-                    android:id="@+id/status_cardview_video"
-                    android:layout_width="match_parent"
-                    android:layout_height="220dp"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="10dp"
-                    >
-                    <RelativeLayout
-                        android:id="@+id/webview_preview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-                        <ImageView
-                            android:id="@+id/webview_preview_card"
-                            android:layout_width="match_parent"
-                            android:scaleType="centerCrop"
-                            android:layout_height="match_parent" />
-                        <ImageView
-                            android:layout_centerInParent="true"
-                            android:layout_width="30dp"
-                            android:src="@drawable/video_preview"
-                            android:layout_height="30dp"
-                            android:contentDescription="@string/videos"/>
 
-                    </RelativeLayout>
-                    <WebView
-                        android:visibility="gone"
-                        android:id="@+id/status_cardview_webview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
-                </FrameLayout>
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    >
-                    <RelativeLayout
-                        android:id="@+id/status_horizontal_document_container"
+
+                    <LinearLayout
+                        android:id="@+id/status_cardview"
                         android:visibility="gone"
-                        android:layout_marginBottom="10dp"
+                        android:layout_marginBottom="5dp"
+                        android:background="@drawable/card_border_light"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
+                        android:gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <ImageView
+                            android:padding="1dp"
+                            android:layout_gravity="center"
+                            android:id="@+id/status_cardview_image"
+                            android:layout_width="60dp"
+                            android:gravity="center"
+                            android:scaleType="centerCrop"
+                            android:layout_height="60dp"
+                            android:contentDescription="@string/card_view_image" />
                         <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
                             android:orientation="vertical"
-                            >
-                            <LinearLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="center_vertical"
-                                android:orientation="horizontal"
-                                android:baselineAligned="false">
-                                <RelativeLayout
-                                    android:layout_width="0dp"
-                                    android:layout_weight="1"
-                                    android:layout_height="match_parent"
-                                    >
-                                    <ImageView
-                                        android:id="@+id/status_prev1_h"
-                                        android:layout_width="match_parent"
-                                        android:scaleType="fitCenter"
-                                        android:adjustViewBounds="true"
-                                        android:layout_height="match_parent"
-                                        />
-                                    <ImageView
-                                        android:id="@+id/status_prev1_play_h"
-