From 49a1214ef54cc9b3a130b2e0bedd2951ef9c7421 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Sun, 29 Oct 2017 17:40:35 +0100
Subject: [PATCH] Some improvements + updates change to tablets

---
 .../drawers/AccountsFollowRequestAdapter.java |  6 ++++
 .../main/res/layout-sw600dp/activity_toot.xml | 29 +++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
index ed2d6648d..b4923afa6 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsFollowRequestAdapter.java
@@ -111,6 +111,12 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
                 new PostActionAsyncTask(context, API.StatusAction.REJECT, account.getId(), AccountsFollowRequestAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         });
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+        if( theme == Helper.THEME_LIGHT) {
+            holder.btn_reject.setTextColor(ContextCompat.getColor(context, R.color.white));
+            holder.btn_authorize.setTextColor(ContextCompat.getColor(context, R.color.white));
+        }
     }
 
     @Override
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index d338b0b0c..e2de91b61 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -53,6 +53,29 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
+            <RelativeLayout
+                android:visibility="gone"
+                android:id="@+id/progress_bar_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <ProgressBar
+                    style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
+                    android:indeterminate="false"
+                    android:id="@+id/upload_progress"
+                    android:layout_width="match_parent"
+                    android:max="100"
+                    android:progress="0"
+                    android:layout_height="wrap_content"
+                    />
+                <TextView
+                    android:id="@+id/toolbar_text"
+                    android:layout_width="match_parent"
+                    android:textColor="@color/dark_text"
+                    android:gravity="center"
+                    android:textSize="12sp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
             <HorizontalScrollView
                 android:id="@+id/picture_scrollview"
                 android:visibility="gone"
@@ -69,12 +92,6 @@
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
                     >
-                    <ProgressBar
-                        android:id="@+id/loading_picture"
-                        android:visibility="gone"
-                        android:layout_width="50dp"
-                        android:layout_height="50dp"
-                        android:indeterminate="true" />
                 </LinearLayout>
             </HorizontalScrollView>
             <LinearLayout