From 67213a6211e66dfaf8220cfb1ac10eb0d3f6ad88 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Tue, 13 Nov 2018 07:50:15 +0100
Subject: [PATCH] Fix translator button issue

---
 .../gouv/etalab/mastodon/drawers/StatusListAdapter.java  | 9 ++++++++-
 app/src/main/res/layout/drawer_status.xml                | 7 +------
 2 files changed, 9 insertions(+), 7 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 9368d4add..2fcbc5e89 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
@@ -910,7 +910,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     } else {
                         holder.status_translate.setVisibility(View.GONE);
                     }
-                }else {
+                }else if( status.getReblog() != null && status.getReblog().getSpoiler_text() != null && status.getReblog().getSpoiler_text().length() > 0) {
+                    if (status.isSpoilerShown() || getItemViewType(position) == FOCUSED_STATUS) {
+                        holder.status_translate.setVisibility(View.VISIBLE);
+                    } else {
+                        holder.status_translate.setVisibility(View.GONE);
+                    }
+                }
+                else {
                     holder.status_translate.setVisibility(View.VISIBLE);
                 }
             }else {
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 4c97b03a7..2a8e9dfa9 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -226,7 +226,6 @@
                 android:layout_width="60dp"
                 android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_gravity="center_horizontal"
                     android:id="@+id/new_element"
                     android:visibility="gone"
                     android:src="@drawable/ic_fiber_new"
@@ -234,14 +233,11 @@
                     android:layout_height="wrap_content"
                     tools:ignore="ContentDescription" />
                 <ImageButton
-
                     android:id="@+id/status_translate"
-                    android:gravity="center"
-                    style="?attr/borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_translate"
-                    android:layout_gravity="center_horizontal"
+                    style="?attr/borderless"
                     />
                 <ImageButton
 
@@ -254,7 +250,6 @@
                     android:layout_height="wrap_content"
                     android:src="@drawable/ic_bookmark_border"
                     android:layout_marginTop="5dp"
-                    android:layout_gravity="center_horizontal"
                     />
             </LinearLayout>
             <LinearLayout