From 5c7208276a86465f1dcd628ce8f5185da6e9e769 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 26 Sep 2018 15:34:08 +0200
Subject: [PATCH] Improve media activity

---
 .../mastodon/activities/MediaActivity.java    | 43 +++++++++++++------
 app/src/main/res/layout/activity_media.xml    | 15 +++----
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
index 52811f29c..7a040a68f 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
@@ -33,6 +33,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.Toolbar;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.MediaController;
 import android.widget.ProgressBar;
@@ -103,8 +104,8 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
         POP
     }
 
-    private FloatingActionButton media_save, media_close;
-    private boolean scheduleHidden;
+    private ImageButton media_save, media_close;
+    private boolean scheduleHidden, scheduleHiddenDescription;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -175,18 +176,26 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             }
         });
         Handler h = new Handler();
-        scheduleHidden = true;
+        scheduleHidden = scheduleHiddenDescription = true;
         h.postDelayed(new Runnable() {
 
             @Override
             public void run() {
                 // DO DELAYED STUFF
-                media_close.hide();
-                media_save.hide();
-                media_description.setVisibility(View.GONE);
+                media_close.setVisibility(View.GONE);
+                media_save.setVisibility(View.GONE);
                 scheduleHidden = false;
             }
         }, 2000);
+        h.postDelayed(new Runnable() {
+
+            @Override
+            public void run() {
+                // DO DELAYED STUFF
+                media_description.setVisibility(View.GONE);
+                scheduleHiddenDescription = false;
+            }
+        }, 6000);
         canSwipe = true;
         loader = findViewById(R.id.loader);
         imageView = findViewById(R.id.media_picture);
@@ -243,8 +252,20 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
 
         if( event.getAction() == MotionEvent.ACTION_DOWN && !scheduleHidden){
             scheduleHidden = true;
-            media_close.show();
-            media_save.show();
+            media_close.setVisibility(View.VISIBLE);
+            media_save.setVisibility(View.VISIBLE);
+            Handler handler = new Handler();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    media_close.setVisibility(View.GONE);
+                    media_save.setVisibility(View.GONE);
+                    scheduleHidden = false;
+                }
+            }, 2000);
+        }
+        if( event.getAction() == MotionEvent.ACTION_DOWN && !scheduleHiddenDescription){
+            scheduleHiddenDescription = true;
             if( attachment != null && attachment.getDescription() != null && !attachment.getDescription().equals("null")){
                 media_description.setText(attachment.getDescription());
                 media_description.setVisibility(View.VISIBLE);
@@ -256,12 +277,10 @@ public class MediaActivity extends BaseActivity implements OnDownloadInterface {
             handler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    media_close.hide();
-                    media_save.hide();
                     media_description.setVisibility(View.GONE);
-                    scheduleHidden = false;
+                    scheduleHiddenDescription = false;
                 }
-            }, 2000);
+            }, 6000);
         }
         if( !canSwipe || mediaPosition > attachments.size() || mediaPosition < 1 || attachments.size() <= 1)
             return super.dispatchTouchEvent(event);
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index 04ad2f674..f0c0ba300 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -116,32 +116,31 @@
 
 
 
-        <android.support.design.widget.FloatingActionButton
+        <ImageButton
             android:id="@+id/media_close"
-            app:fabSize="mini"
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             app:layout_anchorGravity="top|left"
             android:layout_marginStart="10dp"
+            android:background="@color/transparent"
             android:layout_marginLeft="10dp"
             android:layout_marginTop="5dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:backgroundTint="?colorAccent"
             android:src="@drawable/ic_close"
             />
 
-        <android.support.design.widget.FloatingActionButton
+        <ImageButton
             android:id="@+id/media_save"
-            app:fabSize="mini"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
+            app:layout_anchorGravity="top|left"
+            android:layout_marginStart="10dp"
+            android:background="@color/transparent"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="5dp"
-            app:backgroundTint="?colorAccent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_save_white"