From b13fa0dc2aaad3c367883cc84ad4b07c3e373a57 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 25 Apr 2018 11:19:25 +0200
Subject: [PATCH] Fixes issue #346 - Adds application name

---
 .../mastodon/drawers/StatusListAdapter.java   |  2 +
 app/src/main/res/layout/drawer_status.xml     | 13 ++++
 .../main/res/layout/drawer_status_focused.xml | 61 +++++++++++--------
 3 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index e50932720..c6f745cb0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -282,6 +282,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         FrameLayout status_cardview_video;
         WebView status_cardview_webview;
         ImageView hide_preview;
+        TextView status_toot_app;
 
         public View getView(){
             return itemView;
@@ -341,6 +342,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             status_cardview_video = itemView.findViewById(R.id.status_cardview_video);
             status_cardview_webview = itemView.findViewById(R.id.status_cardview_webview);
             hide_preview = itemView.findViewById(R.id.hide_preview);
+            status_toot_app = itemView.findViewById(R.id.status_toot_app);
         }
     }
 
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 722597cb0..258f51250 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -180,6 +180,19 @@
                     android:layout_marginTop="10dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
+                <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_marginTop="10dp"
+                    android:textStyle="italic"
+                    />
                 <LinearLayout
                     android:id="@+id/status_content_translated_container"
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index a8e622954..43e728e73 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -111,30 +111,6 @@
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_marginRight="10dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginEnd="10dp">
-        <android.support.design.widget.FloatingActionButton
-            android:visibility="gone"
-            android:id="@+id/status_translate"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center_horizontal"
-            app:fabSize="mini"
-            android:layout_marginTop="10dp"
-            android:src="@drawable/ic_translate" />
-        <android.support.design.widget.FloatingActionButton
-            android:id="@+id/status_bookmark"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center_horizontal"
-            app:fabSize="mini"
-            android:layout_marginTop="10dp"
-            android:src="@drawable/ic_bookmark_border" />
-    </LinearLayout>
     <LinearLayout
         android:id="@+id/status_spoiler_container"
         android:layout_width="match_parent"
@@ -179,6 +155,31 @@
             android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+            <android.support.design.widget.FloatingActionButton
+                android:visibility="gone"
+                android:id="@+id/status_translate"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_horizontal"
+                app:fabSize="mini"
+                android:layout_marginTop="10dp"
+                android:src="@drawable/ic_translate" />
+            <android.support.design.widget.FloatingActionButton
+                android:id="@+id/status_bookmark"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_horizontal"
+                app:fabSize="mini"
+                android:layout_marginTop="10dp"
+                android:src="@drawable/ic_bookmark_border" />
+        </LinearLayout>
         <LinearLayout
             android:id="@+id/status_content_translated_container"
             android:visibility="gone"
@@ -422,6 +423,18 @@
         android:layout_marginTop="10dp"
         android:textStyle="italic"
         />
+    <TextView
+        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_marginTop="10dp"
+        android:textStyle="italic"
+        />
     <LinearLayout
         android:id="@+id/status_action_container"
         android:layout_width="match_parent"