From bb5e226c26abeeeba417c7aa7d143a5475384cba Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 18 May 2021 17:52:06 +0200
Subject: [PATCH] Bigger plus

---
 .../eu/faircode/email/FragmentAccounts.java   | 18 ++++++++++-----
 .../eu/faircode/email/FragmentIdentities.java | 22 +++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
index 20e554e20d..f8bf40ac08 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java
@@ -202,7 +202,7 @@ public class FragmentAccounts extends FragmentBase {
         });
 
         animator = ObjectAnimator.ofFloat(fab, "alpha", 0.5f, 1.0f);
-        animator.setDuration(500L);
+        animator.setDuration(750L);
         animator.setRepeatCount(ValueAnimator.INFINITE);
         animator.setRepeatMode(ValueAnimator.REVERSE);
         animator.addUpdateListener(new ObjectAnimator.AnimatorUpdateListener() {
@@ -238,7 +238,8 @@ public class FragmentAccounts extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        DB db = DB.getInstance(getContext());
+        final Context context = getContext();
+        final DB db = DB.getInstance(context);
 
         // Observe accounts
         db.account().liveAccountsEx(settings)
@@ -261,10 +262,15 @@ public class FragmentAccounts extends FragmentBase {
                         pbWait.setVisibility(View.GONE);
                         grpReady.setVisibility(View.VISIBLE);
 
-                        if (accounts.size() == 0)
-                            animator.start();
-                        else
-                            animator.end();
+                        if (accounts.size() == 0) {
+                            fab.setCustomSize(Helper.dp2pixels(context, 3 * 56 / 2));
+                            if (!animator.isStarted())
+                                animator.start();
+                        } else {
+                            fab.clearCustomSize();
+                            if (animator.isStarted())
+                                animator.end();
+                        }
                     }
                 });
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
index 020c4a3a69..1edfb90eb2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -104,7 +105,7 @@ public class FragmentIdentities extends FragmentBase {
         });
 
         animator = ObjectAnimator.ofFloat(fab, "alpha", 0.5f, 1.0f);
-        animator.setDuration(500L);
+        animator.setDuration(750L);
         animator.setRepeatCount(ValueAnimator.INFINITE);
         animator.setRepeatMode(ValueAnimator.REVERSE);
         animator.addUpdateListener(new ObjectAnimator.AnimatorUpdateListener() {
@@ -131,8 +132,11 @@ public class FragmentIdentities extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
+        final Context context = getContext();
+        final DB db = DB.getInstance(context);
+
         // Observe identities
-        DB.getInstance(getContext()).identity().liveIdentities().observe(getViewLifecycleOwner(), new Observer<List<TupleIdentityEx>>() {
+        db.identity().liveIdentities().observe(getViewLifecycleOwner(), new Observer<List<TupleIdentityEx>>() {
             @Override
             public void onChanged(@Nullable List<TupleIdentityEx> identities) {
                 if (identities == null)
@@ -143,11 +147,15 @@ public class FragmentIdentities extends FragmentBase {
                 pbWait.setVisibility(View.GONE);
                 grpReady.setVisibility(View.VISIBLE);
 
-
-                if (identities.size() == 0)
-                    animator.start();
-                else
-                    animator.end();
+                if (identities.size() == 0) {
+                    fab.setCustomSize(Helper.dp2pixels(context, 3 * 56 / 2));
+                    if (!animator.isStarted())
+                        animator.start();
+                } else {
+                    fab.clearCustomSize();
+                    if (animator.isStarted())
+                        animator.end();
+                }
             }
         });
     }