From 873e1f31b5133be5d6331ccb940287a5e58c0160 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 4 Jun 2018 20:52:17 +0200 Subject: Revert "fade in images and avatars" because of strange flickering This reverts commit 6bf3ef887a57d7427d4b4cccac3a1c1adcb14377. --- .../java/de/pixart/messenger/ui/ConferenceDetailsActivity.java | 6 ------ src/main/java/de/pixart/messenger/ui/XmppActivity.java | 6 ------ src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java | 6 ------ .../java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 6 ------ src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java | 6 ------ src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 7 ------- 6 files changed, 37 deletions(-) (limited to 'src/main/java/de') diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index fe808c218..e31eba559 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -22,8 +22,6 @@ 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; @@ -801,8 +799,6 @@ 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)); @@ -810,8 +806,6 @@ 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 d524d8f89..ef531f5fe 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -46,8 +46,6 @@ 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; @@ -1097,8 +1095,6 @@ 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); @@ -1107,8 +1103,6 @@ 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 e2d63716e..37d15f782 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java @@ -10,8 +10,6 @@ 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; @@ -124,16 +122,12 @@ public class AccountAdapter extends ArrayAdapter { 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 3514b4a3e..abb84a51a 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -16,8 +16,6 @@ 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; @@ -326,16 +324,12 @@ public class ConversationAdapter extends RecyclerView.Adapter { 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)); @@ -176,8 +172,6 @@ public class ListItemAdapter extends ArrayAdapter { 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 cd54c333f..0c2238cdb 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -1,7 +1,6 @@ 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; @@ -38,8 +37,6 @@ 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; @@ -1150,8 +1147,6 @@ public class MessageAdapter extends ArrayAdapter 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) { @@ -1164,8 +1159,6 @@ public class MessageAdapter extends ArrayAdapter 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) { -- cgit v1.2.3