fade in images and avatars

6 files changed, 37 insertions, 0 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index e31eba559..fe808c218 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -22,6 +22,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -799,6 +801,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 cancelPotentialWork(user, imageView);
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(this, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
             } else {
                 String seed = user.getRealJid() != null ? user.getRealJid().asBareJid().toString() : null;
                 imageView.setBackgroundColor(UIHelper.getColorForName(seed == null ? user.getName() : seed));
@@ -806,6 +810,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(this, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.execute(user);
                 } catch (final RejectedExecutionException ignored) {
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index ef531f5fe..d524d8f89 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -46,6 +46,8 @@ import android.util.Pair;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
@@ -1095,6 +1097,8 @@ public abstract class XmppActivity extends ActionBarActivity {
             cancelPotentialWork(message, imageView);
             imageView.setImageBitmap(bm);
             imageView.setBackgroundColor(0x00000000);
+            Animation myFadeInAnimation = AnimationUtils.loadAnimation(this, R.animator.fade_in);
+            imageView.startAnimation(myFadeInAnimation);
         } else {
             if (cancelPotentialWork(message, imageView)) {
                 imageView.setBackgroundColor(0xff333333);
@@ -1103,6 +1107,8 @@ public abstract class XmppActivity extends ActionBarActivity {
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(
                         getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(this, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.execute(message);
                 } catch (final RejectedExecutionException ignored) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
index 37d15f782..e2d63716e 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java
@@ -10,6 +10,8 @@ import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -122,12 +124,16 @@ public class AccountAdapter extends ArrayAdapter<Account> {
                 cancelPotentialWork(account, imageView);
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
             } else {
                 imageView.setBackgroundColor(UIHelper.getColorForName(account.getJid().asBareJid().toString()));
                 imageView.setImageDrawable(null);
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.executeOnExecutor(BitmapWorkerTask.THREAD_POOL_EXECUTOR, account);
                 } catch (final RejectedExecutionException ignored) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index abb84a51a..3514b4a3e 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -16,6 +16,8 @@ import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -324,12 +326,16 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
                 cancelPotentialWork(conversation, imageView);
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
             } else {
                 imageView.setBackgroundColor(UIHelper.getColorForName(conversation.getName().toString()));
                 imageView.setImageDrawable(null);
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.executeOnExecutor(BitmapWorkerTask.THREAD_POOL_EXECUTOR, conversation);
                 } catch (final RejectedExecutionException ignored) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index 75d105484..f2847b0ae 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -11,6 +11,8 @@ import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -165,6 +167,8 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
                 cancelPotentialWork(item, imageView);
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(0x00000000);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
             } else {
                 String seed = item.getJid() != null ? item.getJid().asBareJid().toString() : item.getDisplayName();
                 imageView.setBackgroundColor(UIHelper.getColorForName(seed));
@@ -172,6 +176,8 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.executeOnExecutor(BitmapWorkerTask.THREAD_POOL_EXECUTOR, item);
                 } catch (final RejectedExecutionException ignored) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 0c2238cdb..cd54c333f 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -1,6 +1,7 @@
 package de.pixart.messenger.ui.adapter;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
@@ -37,6 +38,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -1147,6 +1150,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
                 cancelPotentialWork(message, imageView);
                 imageView.setImageBitmap(bm);
                 imageView.setBackgroundColor(Color.TRANSPARENT);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
             } else {
                 @ColorInt int bg;
                 if (message.getType() == Message.TYPE_STATUS && message.getCounterparts() != null && message.getCounterparts().size() > 1) {
@@ -1159,6 +1164,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView, size);
                 final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
+                Animation myFadeInAnimation = AnimationUtils.loadAnimation(activity, R.animator.fade_in);
+                imageView.startAnimation(myFadeInAnimation);
                 try {
                     task.executeOnExecutor(BitmapWorkerTask.THREAD_POOL_EXECUTOR, message);
                 } catch (final RejectedExecutionException ignored) {