From 7ac5d8c1f6754f0ef90ce623e848ff4c2f5a131e Mon Sep 17 00:00:00 2001
From: Kasun <k-a-s-u-n@tuta.io>
Date: Mon, 13 May 2019 00:09:46 +0530
Subject: layout changes in side butons of a toot

---
 .../etalab/mastodon/drawers/StatusListAdapter.java |  3 +-
 app/src/main/res/layout/drawer_status.xml          | 87 +++++++++++++---------
 2 files changed, 54 insertions(+), 36 deletions(-)

(limited to 'app/src')

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 facaec09a..b2c60a0a4 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
@@ -340,7 +340,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         ImageView status_pin;
         ImageView status_remove;
         ImageView status_privacy;
-        ImageButton status_translate, status_bookmark;
+        ImageView status_translate;
+        ImageView status_bookmark;
         LinearLayout status_container2;
         LinearLayout status_container3;
         LinearLayout main_container;
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 8ce2486fd..4b6a3ce63 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -58,6 +58,7 @@
                 <LinearLayout
                     android:id="@+id/conversation_pp"
                     android:visibility="gone"
+                    android:layout_centerHorizontal="true"
                     android:layout_width="50dp"
                     android:layout_height="50dp"
                     android:orientation="horizontal">
@@ -139,37 +140,60 @@
                 android:id="@+id/left_buttons"
                 android:orientation="vertical"
                 android:layout_width="60dp"
-                android:paddingEnd="10dp"
-                android:paddingRight="10dp"
+                android:paddingLeft="3dp"
+                android:paddingRight="3dp"
                 android:layout_height="wrap_content">
-                <ImageView
-                    android:id="@+id/new_element"
-                    android:layout_gravity="center_horizontal"
-                    android:src="@drawable/ic_fiber_new"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:contentDescription="@string/new_toot" />
-                <ImageButton
-                    android:id="@+id/status_translate"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:src="@drawable/ic_translate"
-                    android:contentDescription="@string/translate"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                    />
-                <ImageButton
-                    android:id="@+id/status_bookmark"
-                    android:gravity="center"
-                    android:layout_gravity="center_horizontal"
-                    android:tint="@android:color/white"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:contentDescription="@string/bookmarks"
-                    android:src="@drawable/ic_bookmark_border"
                     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_remove"
                     android:gravity="center"
@@ -206,13 +230,6 @@
                 android:layout_marginBottom="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-                <ImageView
-                    android:id="@+id/cached_status"
-                    android:visibility="gone"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:src="@drawable/ic_cached_black"
-                    android:contentDescription="@string/cached_status" />
                 <TextView
                     android:id="@+id/status_account_displayname_owner"
                     android:maxLines="1"
-- 
cgit v1.2.3