Avoid to change network with 421

2 files changed, 931 insertions, 854 deletions

diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index aa8836935..261c451ec 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -14,961 +14,999 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="5dp"
-    android:layout_marginLeft="5dp"
-    android:layout_marginEnd="5dp"
-    android:layout_marginRight="5dp"
-    android:background="@drawable/border_bottom"
-    android:divider="@null"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    android:layout_height="wrap_content">
+
+    <View
+        android:id="@+id/status_reply_indicator_top"
+        android:visibility="gone"
+        android:layout_width="2dp"
+
+        android:layout_height="0dp"
+        android:background="?colorAccent"
+        app:layout_constraintBottom_toBottomOf="@id/reply_indicator_dot"
+        app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
+        app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:visibility="gone"
+        android:id="@+id/reply_indicator_dot"
+        android:layout_width="8dp"
+        android:layout_height="8dp"
+        android:layout_marginStart="11sp"
+        android:background="?colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:visibility="gone"
+        android:id="@+id/status_reply_indicator_bottom"
+        android:layout_width="2dp"
+        android:layout_height="0dp"
+
+        android:background="?colorAccent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/reply_indicator_dot"
+        app:layout_constraintStart_toStartOf="@id/reply_indicator_dot"
+        app:layout_constraintTop_toTopOf="@id/reply_indicator_dot" />
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="2dp"
+        android:layout_marginBottom="4dp"
+        style="?attr/cardStyleOver"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/reply_indicator_dot"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_goneMarginStart="2dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/status_pp_section"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <!-- Profile picture of a normal toot -->
-            <ImageView
-                android:id="@+id/status_account_profile"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_margin="5dp"
-                android:contentDescription="@string/profile_picture"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!-- PP or a grouped PPs of a conversations (DM etc.) -->
-            <LinearLayout
-                android:id="@+id/conversation_pp"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/status_boosted_by_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:visibility="gone"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/status"
                 app:layout_constraintTop_toTopOf="parent">
 
                 <ImageView
-                    android:id="@+id/conversation_pp_1"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
+                    android:id="@+id/status_account_profile_boost_by"
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:layout_margin="5dp"
                     android:contentDescription="@string/profile_picture"
-                    android:scaleType="centerCrop" />
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                <LinearLayout
-                    android:id="@+id/conversation_pp_2_container"
+                <TextView
+                    android:id="@+id/status_account_displayname"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:ellipsize="end"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/status_boosted_time"
+                    app:layout_constraintStart_toEndOf="@id/status_account_profile_boost_by"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/status_boosted_time"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="?attr/cardStyle"
+                app:layout_constraintTop_toBottomOf="@id/status_boosted_by_info">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="6dp">
+
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/guide_profile_images_end"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintGuide_begin="40dp" />
+
+                    <androidx.constraintlayout.widget.Guideline
+                        android:id="@+id/guide_profile_images_bottom"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layout_constraintGuide_begin="40dp" />
 
                     <ImageView
-                        android:id="@+id/conversation_pp_2"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"
-                        android:adjustViewBounds="true"
+                        android:id="@+id/status_account_profile"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
                         android:contentDescription="@string/profile_picture"
-                        android:scaleType="centerCrop" />
+                        app:layout_constraintBottom_toTopOf="@id/guide_profile_images_bottom"
+                        app:layout_constraintEnd_toStartOf="@id/guide_profile_images_end"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
+                    <ImageView
+                        android:id="@+id/status_account_bot"
+                        android:layout_width="18dp"
+                        android:layout_height="18dp"
+                        android:background="@drawable/bot_background_round_corner"
+                        android:padding="3dp"
+                        android:src="@drawable/ic_bot"
+                        android:visibility="gone"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <!-- Todo -->
                     <LinearLayout
-                        android:id="@+id/conversation_pp_3_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_weight="1"
-                        android:baselineAligned="false"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
+                        android:id="@+id/conversation_pp"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:orientation="horizontal"
+                        android:visibility="gone"
+                        app:layout_constraintBottom_toTopOf="@id/guide_profile_images_bottom"
+                        app:layout_constraintEnd_toStartOf="@id/guide_profile_images_end"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent">
 
                         <ImageView
-                            android:id="@+id/conversation_pp_3"
+                            android:id="@+id/conversation_pp_1"
                             android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_weight="1"
                             android:adjustViewBounds="true"
                             android:contentDescription="@string/profile_picture"
                             android:scaleType="centerCrop" />
 
-                        <ImageView
-                            android:id="@+id/conversation_pp_4"
+                        <LinearLayout
+                            android:id="@+id/conversation_pp_2_container"
                             android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_weight="1"
-                            android:adjustViewBounds="true"
-                            android:contentDescription="@string/profile_picture"
-                            android:scaleType="centerCrop" />
-                    </LinearLayout>
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <!-- PP of original tooter of a boosted toot -->
-            <ImageView
-                android:id="@+id/status_account_profile_boost"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_margin="5dp"
-                android:contentDescription="@string/profile_picture"
-                android:visibility="gone"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!-- PP of the booster of a boost toot -->
-            <ImageView
-                android:id="@+id/status_account_profile_boost_by"
-                style="?attr/shapeBorder"
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginLeft="30dp"
-                android:layout_marginTop="30dp"
-                android:contentDescription="@string/profile_picture"
-                android:visibility="gone"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!-- Bot icon -->
-            <ImageView
-                android:id="@+id/status_account_bot"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:background="@drawable/bot_background_round_corner"
-                android:padding="3dp"
-                android:src="@drawable/ic_bot"
-                android:visibility="gone"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!-- New badge -->
-            <ImageView
-                android:id="@+id/new_element"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginTop="41dp"
-                android:contentDescription="@string/new_toot"
-                android:src="@drawable/ic_fiber_new"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <!-- Barrier for features button
-            <android.support.constraint.Barrier
-                android:id="@+id/features_btn_top_barrier"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="bottom"
-                app:constraint_referenced_ids="status_account_profile,conversation_pp,status_account_profile_boost,status_account_profile_boost_by,new_element" />
-            -->
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <!-- Fedilab Features button -->
-        <ImageButton
-            android:id="@+id/fedilab_features"
-            style="@style/Widget.AppCompat.Button.Colored"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:background="@color/mastodonC4"
-            android:contentDescription="@string/app_features"
-            android:padding="2dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_logo_button"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/status_pp_section"
-            app:layout_constraintStart_toStartOf="@id/status_pp_section"
-            app:layout_constraintTop_toBottomOf="@id/status_pp_section"
-            app:layout_constraintVertical_bias="0" />
-
-        <ImageView
-            android:id="@+id/cached_status"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:contentDescription="@string/cached_status"
-            android:padding="5dp"
-            android:src="@drawable/ic_cached_black"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/status_pp_section"
-            app:layout_constraintStart_toStartOf="@id/status_pp_section"
-            app:layout_constraintTop_toBottomOf="@id/status_pp_section"
-            app:layout_constraintVertical_bias="0" />
-
-        <!-- Remove status button (Pleroma admin only) -->
-        <ImageView
-            android:id="@+id/status_remove"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:layout_marginTop="5dp"
-            android:contentDescription="@string/delete"
-            android:src="@drawable/ic_clear_toot"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@id/fedilab_features"
-            app:layout_constraintStart_toStartOf="@id/fedilab_features"
-            app:layout_constraintTop_toBottomOf="@id/fedilab_features" />
-
-        <LinearLayout
-            android:id="@+id/status_content_section"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/status_pp_section"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:id="@+id/status_account_displayname"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="-2dp"
-                android:layout_marginLeft="-2dp"
-                android:layout_marginTop="-2dp"
-                android:layout_marginBottom="3dp"
-                android:drawablePadding="2dp"
-                android:maxLines="1"
-                android:textStyle="bold" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/status_account_displayname_owner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawablePadding="2dp"
-                    android:maxLines="1"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:id="@+id/status_account_username"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/status_toot_date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginStart="2dp"
-                    android:layout_marginLeft="2dp"
-                    android:layout_weight="0"
-                    android:gravity="end"
-                    android:maxLines="1"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/status_spoiler_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
+                            android:orientation="vertical">
 
-                <app.fedilab.android.helper.CustomTextView
-                    android:id="@+id/status_spoiler"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:textIsSelectable="true" />
+                            <ImageView
+                                android:id="@+id/conversation_pp_2"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:adjustViewBounds="true"
+                                android:contentDescription="@string/profile_picture"
+                                android:scaleType="fitCenter" />
 
-                <Button
-                    android:id="@+id/status_spoiler_button"
-                    style="?attr/borderless"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_remove_red_eye"
-                    android:drawableLeft="@drawable/ic_remove_red_eye"
-                    android:drawablePadding="5dp"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"
-                    android:text="@string/load_attachment_spoiler"
-                    android:textAllCaps="false" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/status_content_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                            <LinearLayout
+                                android:id="@+id/conversation_pp_3_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="0dp"
+                                android:layout_weight="1"
+                                android:baselineAligned="false"
+                                android:orientation="horizontal">
 
-                <app.fedilab.android.helper.CustomTextView
-                    android:id="@+id/status_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true" />
+                                <ImageView
+                                    android:id="@+id/conversation_pp_3"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:adjustViewBounds="true"
+                                    android:contentDescription="@string/profile_picture"
+                                    android:scaleType="fitCenter" />
 
-                <Button
-                    android:id="@+id/status_show_more_content"
-                    style="?attr/borderless"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="-10dp"
-                    android:drawableStart="@drawable/ic_more_toot_content"
-                    android:drawableLeft="@drawable/ic_more_toot_content"
-                    android:drawablePadding="5dp"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:text="@string/display_toot_truncate"
-                    android:textAllCaps="false"
-                    android:visibility="gone" />
+                                <ImageView
+                                    android:id="@+id/conversation_pp_4"
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_weight="1"
+                                    android:adjustViewBounds="true"
+                                    android:contentDescription="@string/profile_picture"
+                                    android:scaleType="fitCenter" />
+                            </LinearLayout>
+                        </LinearLayout>
 
-                <TextView
-                    android:id="@+id/status_toot_app"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginBottom="10dp"
-                    android:gravity="end"
-                    android:maxLines="1"
-                    android:textStyle="italic"
-                    android:visibility="gone" />
-
-                <LinearLayout
-                    android:id="@+id/status_content_translated_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:orientation="vertical"
-                    android:visibility="gone">
+                    </LinearLayout>
 
                     <TextView
-                        android:id="@+id/status_content_translated"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:id="@+id/status_account_displayname_owner"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="5dp"
+                        android:drawablePadding="2dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textStyle="bold"
+                        app:layout_constraintEnd_toStartOf="@id/cached_status"
+                        app:layout_constraintStart_toEndOf="@id/guide_profile_images_end"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <TextView
-                        android:id="@+id/yandex_translate"
-                        android:layout_width="match_parent"
+                        android:id="@+id/status_account_username"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:gravity="end"
-                        android:padding="2dp"
-                        android:text="Powered by Yandex.Translate"
-                        tools:ignore="HardcodedText" />
-                </LinearLayout>
-
-
-                <LinearLayout
-                    android:id="@+id/status_cardview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
-                    android:background="@drawable/card_border_light"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:visibility="gone">
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="5dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textSize="12sp"
+                        app:layout_constraintEnd_toStartOf="@id/status_toot_date"
+                        app:layout_constraintStart_toEndOf="@id/guide_profile_images_end"
+                        app:layout_constraintTop_toBottomOf="@id/status_account_displayname_owner" />
 
                     <ImageView
-                        android:id="@+id/status_cardview_image"
-                        android:layout_width="60dp"
-                        android:layout_height="60dp"
-                        android:layout_gravity="center"
-                        android:contentDescription="@string/card_view_image"
-                        android:gravity="center"
-                        android:padding="1dp"
-                        android:scaleType="centerCrop" />
+                        android:id="@+id/cached_status"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:contentDescription="@string/cached_status"
+                        android:src="@drawable/ic_cached_black"
+                        android:visibility="gone"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/status_toot_date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:textSize="12sp"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/status_account_displayname_owner"
+                        app:layout_constraintVertical_bias="0" />
+
+                    <androidx.constraintlayout.widget.Barrier
+                        android:id="@+id/barrier_status_account_info"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:barrierDirection="bottom"
+                        app:constraint_referenced_ids="status_toot_date,status_account_username,conversation_pp,status_account_profile" />
 
                     <LinearLayout
-                        android:layout_width="0dp"
+                        app:layout_constraintTop_toBottomOf="@id/barrier_status_account_info"
+                        android:id="@+id/status_spoiler_container"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="5dp"
-                        android:layout_marginLeft="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
                         android:orientation="vertical"
-                        android:padding="5dp">
-
-                        <TextView
-                            android:id="@+id/status_cardview_title"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:maxLines="1"
-                            android:singleLine="true"
-                            android:textSize="14sp"
-                            android:textStyle="bold" />
+                        android:visibility="gone">
 
-                        <TextView
-                            android:id="@+id/status_cardview_content"
+                        <app.fedilab.android.helper.CustomTextView
+                            android:id="@+id/status_spoiler"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:maxLines="3"
-                            android:textSize="12sp" />
+                            android:layout_marginTop="10dp"
+                            android:textIsSelectable="true" />
 
-                        <TextView
-                            android:id="@+id/status_cardview_url"
+                        <Button
+                            android:id="@+id/status_spoiler_button"
+                            style="?attr/borderless"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
+                            android:drawableStart="@drawable/ic_remove_red_eye"
+                            android:drawableLeft="@drawable/ic_remove_red_eye"
+                            android:drawablePadding="5dp"
+                            android:gravity="center_vertical"
                             android:maxLines="1"
-                            android:textSize="12sp" />
+                            android:paddingStart="10dp"
+                            android:paddingLeft="10dp"
+                            android:paddingTop="5dp"
+                            android:paddingEnd="10dp"
+                            android:paddingRight="10dp"
+                            android:paddingBottom="5dp"
+                            android:text="@string/load_attachment_spoiler"
+                            android:textAllCaps="false" />
                     </LinearLayout>
-                </LinearLayout>
 
-                <FrameLayout
-                    android:id="@+id/status_cardview_video"
-                    android:layout_width="match_parent"
-                    android:layout_height="220dp"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="10dp"
-                    android:visibility="gone">
-
-                    <RelativeLayout
-                        android:id="@+id/webview_preview"
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent">
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        app:layout_constraintTop_toBottomOf="@id/status_spoiler_container">
 
-                        <ImageView
-                            android:id="@+id/webview_preview_card"
+                        <LinearLayout
+                            android:id="@+id/status_content_container"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:scaleType="centerCrop" />
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="5dp"
+                            android:orientation="vertical">
 
-                        <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:layout_centerInParent="true"
-                            android:contentDescription="@string/videos"
-                            android:src="@drawable/video_preview" />
+                            <app.fedilab.android.helper.CustomTextView
+                                android:id="@+id/status_content"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:textIsSelectable="true" />
 
-                    </RelativeLayout>
+                            <Button
+                                android:id="@+id/status_show_more_content"
+                                style="?attr/borderless"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:drawableStart="@drawable/ic_more_toot_content"
+                                android:drawableLeft="@drawable/ic_more_toot_content"
+                                android:drawablePadding="5dp"
+                                android:gravity="center_vertical"
+                                android:maxLines="1"
+                                android:paddingTop="2dp"
+                                android:paddingBottom="2dp"
+                                android:text="@string/display_toot_truncate"
+                                android:textAllCaps="false"
+                                android:visibility="gone" />
 
-                    <app.fedilab.android.webview.CustomWebview
-                        android:id="@+id/status_cardview_webview"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone" />
-                </FrameLayout>
+                            <LinearLayout
+                                android:id="@+id/status_content_translated_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:visibility="gone">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                                <TextView
+                                    android:id="@+id/status_content_translated"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content" />
 
-                    <Relat