From 5432a9ff8c96f08bb475d0bdfb9ae2d24d0f8fd6 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 16 Aug 2019 14:31:31 +0200
Subject: [PATCH] Some ripples in the water

---
 .../eu/faircode/email/AdapterMessage.java     | 23 +++++++++++++++----
 .../main/res/layout/item_message_compact.xml  | 14 +++--------
 .../main/res/layout/item_message_normal.xml   | 14 +++--------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 1d253305af..df653b3ef3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -20,6 +20,7 @@ package eu.faircode.email;
 */
 
 import android.Manifest;
+import android.animation.Animator;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Dialog;
@@ -68,9 +69,11 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
+import android.view.ViewAnimationUtils;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.ViewStub;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.webkit.DownloadListener;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -226,8 +229,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     public class ViewHolder extends RecyclerView.ViewHolder implements
             View.OnClickListener, View.OnLongClickListener, BottomNavigationView.OnNavigationItemSelectedListener, View.OnKeyListener {
+        private View card;
         private View view;
-        private View vwRipple;
 
         private View vwColor;
         private ImageView ivExpander;
@@ -332,8 +335,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         ViewHolder(final View itemView) {
             super(itemView);
 
+            card = itemView.findViewById(R.id.card);
             view = itemView.findViewById(R.id.clItem);
-            vwRipple = itemView.findViewById(R.id.vwRipple);
 
             vwColor = itemView.findViewById(R.id.vwColor);
             ivExpander = itemView.findViewById(R.id.ivExpander);
@@ -1472,8 +1475,20 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onToggleMessage(message);
                 }
             } else {
-                vwRipple.setPressed(true);
-                vwRipple.setPressed(false);
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                    // Unreveal
+                    int cx = card.getWidth() / 2;
+                    int cy = card.getHeight() / 2;
+                    int r = Math.max(card.getWidth(), card.getHeight());
+                    Animator anim = ViewAnimationUtils.createCircularReveal(card, cx, cy, r, 0);
+                    anim.setInterpolator(new AccelerateDecelerateInterpolator());
+                    anim.setDuration(context.getResources().getInteger(android.R.integer.config_mediumAnimTime));
+                    anim.start();
+                } else {
+                    // selectableItemBackground
+                    card.setClickable(true);
+                    card.setPressed(true);
+                }
 
                 if (EntityFolder.DRAFTS.equals(message.folderType) && message.visible == 1)
                     context.startActivity(
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 4690e8e33b..fb30866d70 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -5,8 +5,10 @@
     android:layout_height="wrap_content">
 
     <eu.faircode.email.ViewCardOptional
+        android:id="@+id/card"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackground">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
@@ -25,16 +27,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <View
-                android:id="@+id/vwRipple"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="?android:attr/selectableItemBackground"
-                app:layout_constraintBottom_toBottomOf="@id/inHeader"
-                app:layout_constraintEnd_toEndOf="@id/inHeader"
-                app:layout_constraintStart_toStartOf="@id/inHeader"
-                app:layout_constraintTop_toTopOf="@id/inHeader" />
-
             <ViewStub
                 android:id="@+id/vsBody"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 896927540e..1a799f9a93 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -5,8 +5,10 @@
     android:layout_height="wrap_content">
 
     <eu.faircode.email.ViewCardOptional
+        android:id="@+id/card"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackground">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/clItem"
@@ -25,16 +27,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <View
-                android:id="@+id/vwRipple"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:background="?android:attr/selectableItemBackground"
-                app:layout_constraintBottom_toBottomOf="@id/inHeader"
-                app:layout_constraintEnd_toEndOf="@id/inHeader"
-                app:layout_constraintStart_toStartOf="@id/inHeader"
-                app:layout_constraintTop_toTopOf="@id/inHeader" />
-
             <ViewStub
                 android:id="@+id/vsBody"
                 android:layout_width="match_parent"