diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index 93a07dc15..dfe61a632 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -30,6 +30,7 @@ import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; @@ -66,6 +67,7 @@ import android.widget.TimePicker; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.core.app.ActivityCompat; @@ -75,7 +77,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.preference.PreferenceManager; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.smarteist.autoimageslider.IndicatorAnimations; import com.smarteist.autoimageslider.SliderAnimations; @@ -1805,11 +1807,16 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu Glide.with(imageView.getContext()) .asBitmap() .load(url) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { imageView.setImageBitmap(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); imageView.setTag(attachment.getId()); diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index c3af9e280..f3734a780 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -45,6 +45,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; import androidx.core.content.ContextCompat; @@ -57,7 +58,7 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.appbar.AppBarLayout; import com.google.android.material.tabs.TabLayout; @@ -322,12 +323,17 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt Glide.with(banner_pp.getContext()) .asBitmap() .load(urlHeader) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { banner_pp.setImageBitmap(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } } diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 3313323b2..6bc81d741 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -31,6 +31,7 @@ import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; @@ -76,6 +77,7 @@ import android.widget.TimePicker; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; @@ -90,7 +92,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.github.irshulx.Editor; import com.github.irshulx.EditorListener; @@ -1312,11 +1314,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, Glide.with(imageView.getContext()) .asBitmap() .load(fileName) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { imageView.setImageBitmap(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } } @@ -1327,7 +1334,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, .asBitmap() .load(url) .error(Glide.with(imageView).asBitmap().load(R.drawable.ic_audio_wave)) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { imageView.setImageBitmap(resource); @@ -1345,6 +1352,11 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, } } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } @@ -2324,13 +2336,18 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, Glide.with(TootActivity.this) .asBitmap() .load(attachment.getUrl()) - .into(new SimpleTarget() { + .into(new CustomTarget() { @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { media_picture.setImageBitmap(resource); media_picture.setImageAlpha(60); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss()); @@ -3010,11 +3027,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, Glide.with(imageView.getContext()) .asBitmap() .load(url) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { imageView.setImageBitmap(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); imageView.setTag(attachment.getId()); imageView.setOnClickListener(view -> { @@ -3153,11 +3175,16 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, Glide.with(imageView.getContext()) .asBitmap() .load(url) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { imageView.setImageBitmap(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); imageView.setTag(attachment.getId()); imageView.setOnClickListener(view -> { diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java index dd3fbb6ec..947bcb492 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java @@ -42,7 +42,7 @@ import androidx.annotation.Nullable; import androidx.preference.PreferenceManager; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import org.jetbrains.annotations.NotNull; @@ -217,7 +217,7 @@ public class Account implements Parcelable { Glide.with(context) .asDrawable() .load(disableAnimatedEmoji ? emoji.getStatic_url() : emoji.getUrl()) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { final String targetedEmoji = ":" + emoji.getShortcode() + ":"; @@ -237,6 +237,11 @@ public class Account implements Parcelable { } } + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } catch (Exception ignored) { @@ -955,7 +960,7 @@ public class Account implements Parcelable { Glide.with(context) .asDrawable() .load(disableAnimatedEmoji ? emoji.getStatic_url() : emoji.getUrl()) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { final String targetedEmoji = ":" + emoji.getShortcode() + ":"; @@ -1020,6 +1025,11 @@ public class Account implements Parcelable { } } + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } + }); } catch (Exception ignored) { } diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java index 75ce599e1..965f01e86 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java @@ -15,41 +15,10 @@ package app.fedilab.android.client.Entities; -import android.app.Activity; -import android.content.Context; -import android.content.SharedPreferences; -import android.graphics.Bitmap; -import android.graphics.drawable.Drawable; import android.os.Parcel; import android.os.Parcelable; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.style.ImageSpan; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.SimpleTarget; -import com.bumptech.glide.request.target.Target; -import com.bumptech.glide.request.transition.Transition; -import com.github.penfeizhou.animation.apng.APNGDrawable; -import com.github.penfeizhou.animation.apng.decode.APNGParser; -import com.github.penfeizhou.animation.gif.GifDrawable; -import com.github.penfeizhou.animation.gif.decode.GifParser; - -import java.io.File; import java.util.Date; -import java.util.List; -import app.fedilab.android.R; -import app.fedilab.android.helper.Helper; -import app.fedilab.android.interfaces.OnRetrieveEmojiInterface; - -import static app.fedilab.android.helper.Helper.drawableToBitmap; /** * Created by Thomas on 23/04/2017. diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java index 02948752e..fe2f4abc3 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java @@ -55,7 +55,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; @@ -883,7 +883,7 @@ public class Status implements Parcelable { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { final String targetedEmoji = ":" + emoji.getShortcode() + ":"; @@ -918,6 +918,11 @@ public class Status implements Parcelable { } } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } @@ -951,7 +956,7 @@ public class Status implements Parcelable { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { final String targetedEmoji = ":" + emoji.getShortcode() + ":"; @@ -972,6 +977,11 @@ public class Status implements Parcelable { } } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } @@ -1008,7 +1018,7 @@ public class Status implements Parcelable { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { @@ -1031,6 +1041,11 @@ public class Status implements Parcelable { } } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } @@ -1074,7 +1089,7 @@ public class Status implements Parcelable { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { final String targetedEmoji = ":" + emoji.getShortcode() + ":"; @@ -1099,6 +1114,11 @@ public class Status implements Parcelable { listener.onRetrieveEmoji(status, true); } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } diff --git a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java index 7fb421f31..3a5321a48 100644 --- a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java @@ -28,7 +28,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import java.util.List; @@ -86,12 +86,17 @@ public class CustomEmojiAdapter extends BaseAdapter { Glide.with(parent.getContext()) .load(!disableAnimatedEmoji ? emoji.getUrl() : emoji.getStatic_url()) .thumbnail(0.1f) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { emoji.setDrawable(resource); imageView.setImageDrawable(emoji.getDrawable()); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); // } return convertView; diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index f6ebbe28c..9c09ddf02 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -20,7 +20,6 @@ import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.AsyncTask; @@ -64,7 +63,6 @@ import com.varunest.sparkbutton.SparkButton; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -552,6 +550,9 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On poll_item_text.setText(pollOption.getTitle(), TextView.BufferType.SPANNABLE); poll_item_value.setProgress((int)value); holder.rated.addView(item); + if( pollOption.getVotes_count() == greaterValue ){ + poll_item_value.setScaleY(2f); + } if (ownvotes.contains(j)) { Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_check_poll); assert img != null; diff --git a/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java index 47909e168..37ec990cd 100644 --- a/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java @@ -19,6 +19,7 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; @@ -32,11 +33,12 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AlertDialog; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.smarteist.autoimageslider.SliderViewAdapter; @@ -143,13 +145,18 @@ public class SliderAdapter extends SliderViewAdapter() { + .into(new CustomTarget() { @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN) @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { media_picture.setImageBitmap(resource); media_picture.setImageAlpha(60); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); builderInner.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss()); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 4d09c529e..a0bbc2158 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; -import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -72,6 +71,7 @@ import android.widget.TimePicker; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.SwitchCompat; @@ -87,7 +87,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.github.stom79.mytransl.MyTransL; import com.github.stom79.mytransl.client.HttpsConnectionException; @@ -102,9 +102,7 @@ import com.varunest.sparkbutton.SparkButton; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; -import java.util.Collections; import java.util.Date; import java.util.GregorianCalendar; import java.util.Iterator; @@ -763,6 +761,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct poll_item_text.setText(pollOption.getTitle(), TextView.BufferType.SPANNABLE); poll_item_value.setProgress((int)value); holder.rated.addView(item); + if( pollOption.getVotes_count() == greaterValue ){ + poll_item_value.setScaleY(2f); + } if (ownvotes.contains(j)) { Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_check_poll); assert img != null; @@ -3318,13 +3319,18 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10))) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { DrawableTransitionOptions.withCrossFade(); imageView.setImageBitmap(resource); status.setMedia_height(container.getHeight()); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } else { Glide.with(imageView.getContext()) @@ -3332,12 +3338,16 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave) .thumbnail(0.1f) .apply(new RequestOptions().transform(new BlurTransformation(50, 3), new RoundedCorners(10))) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { DrawableTransitionOptions.withCrossFade(); imageView.setImageBitmap(resource); } + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } } diff --git a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java index c6eb1a712..cdb7f0461 100644 --- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java @@ -21,6 +21,7 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.RectF; +import android.graphics.drawable.Drawable; import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; @@ -39,11 +40,12 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.cleveroad.audiovisualization.DbmHandler; import com.cleveroad.audiovisualization.GLAudioVisualizationView; @@ -184,7 +186,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl Glide.with(context) .asBitmap() .load(preview_url).into( - new SimpleTarget() { + new CustomTarget() { @Override public void onResourceReady(@NonNull final Bitmap resource, Transition transition) { Bitmap imageCompressed = Helper.compressImageIfNeeded(context, resource); @@ -192,7 +194,7 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl Glide.with(context) .asBitmap() .load(url).into( - new SimpleTarget() { + new CustomTarget() { @Override public void onResourceReady(@NonNull final Bitmap resource, Transition transition) { loader.setVisibility(View.GONE); @@ -210,9 +212,19 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl } }); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } } ); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } } ); } else { diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index f4ee2a858..9d8eff475 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -110,7 +110,7 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.google.android.material.navigation.NavigationView; @@ -1330,24 +1330,34 @@ public class Helper { Glide.with(navigationView.getContext()) .asBitmap() .load(account.getAvatar()) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { Drawable drawable = new BitmapDrawable(activity.getResources(), resource); item.setIcon(drawable); item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); else Glide.with(navigationView.getContext()) .asBitmap() .load(R.drawable.missing_peertube) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { item.setIcon(new BitmapDrawable(activity.getResources(), resource)); item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); item.setOnMenuItemClickListener(item1 -> { @@ -1726,11 +1736,16 @@ public class Helper { } }) .load(!disableGif ? accountChoice.getAvatar() : accountChoice.getAvatar_static()) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, Transition transition) { finalIcon.setImageDrawable(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); MenuFloating.Builder actionButtonAccBuild = new MenuFloating.Builder(activity); if (theme == THEME_LIGHT) { @@ -1780,11 +1795,16 @@ public class Helper { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, Transition transition) { itemIconAcc.setImageDrawable(resource); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); if (accounts.size() > 2) { @@ -1895,7 +1915,7 @@ public class Helper { Glide.with(activity) .asDrawable() .load(urlHeader) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable resource, Transition transition) { @@ -1907,6 +1927,11 @@ public class Helper { } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } } @@ -3916,11 +3941,16 @@ public class Helper { Glide.with(context) .asFile() .load(url) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NotNull File file, Transition transition) { Helper.notifyDownload(context, url, file, share); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } diff --git a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java index 90f98ed04..91d02e183 100644 --- a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java +++ b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java @@ -20,6 +20,7 @@ import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; @@ -30,7 +31,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.evernote.android.job.Job; @@ -320,7 +321,7 @@ public class NotificationsSyncJob extends Job { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { notify_user(getContext(), account, intent, resource, finalNotifType, finalTitle, message); @@ -331,6 +332,11 @@ public class NotificationsSyncJob extends Job { editor.apply(); } } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); mainHandler.post(myRunnable); diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java index 7f5badaef..88e7c451f 100644 --- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java +++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java @@ -24,6 +24,7 @@ import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -43,7 +44,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; @@ -452,12 +453,17 @@ public class LiveNotificationDelayedService extends Service { return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { Helper.notify_user(LiveNotificationDelayedService.this, account, intent, resource, finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } } diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java index 36f39a30c..987a1449c 100644 --- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java +++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java @@ -25,6 +25,7 @@ import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -44,7 +45,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.request.RequestListener; -import com.bumptech.glide.request.target.SimpleTarget; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.koushikdutta.async.http.AsyncHttpClient; @@ -468,12 +469,17 @@ public class LiveNotificationService extends Service implements NetworkStateRece return false; } }) - .into(new SimpleTarget() { + .into(new CustomTarget() { @Override public void onResourceReady(@NonNull Bitmap resource, Transition transition) { Helper.notify_user(LiveNotificationService.this, account, intent, resource, finalNotifType, "@" + notification.getAccount().getAcct(), finalMessage); } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + + } }); } }; diff --git a/app/src/main/res/drawable/ic_check_poll.xml b/app/src/main/res/drawable/ic_check_poll.xml index 7cdc15de0..17aca2af1 100644 --- a/app/src/main/res/drawable/ic_check_poll.xml +++ b/app/src/main/res/drawable/ic_check_poll.xml @@ -1,5 +1,5 @@ - +