summaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authortom79 <tschneider.ac@gmail.com>2020-04-09 14:59:36 +0200
committertom79 <tschneider.ac@gmail.com>2020-04-09 14:59:36 +0200
commit59bf752b06ca8036a5ff291e38ccd456683ae1db (patch)
treed7a6ee83b130c2ffdf8823fbd16be1c69a8d1d2d /app/src/main/java
parent1e779ddfc4dba7aab1f3669d21b81cf38a16cfac (diff)
Remove deprecated calls
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java11
-rw-r--r--app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java10
-rw-r--r--app/src/main/java/app/fedilab/android/activities/TootActivity.java39
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Account.java16
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Notification.java31
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Status.java30
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java9
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java5
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/SliderAdapter.java11
-rw-r--r--app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java22
-rw-r--r--app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java18
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java44
-rw-r--r--app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java10
-rw-r--r--app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java10
-rw-r--r--app/src/main/java/app/fedilab/android/services/LiveNotificationService.java10
15 files changed, 199 insertions, 77 deletions
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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Drawable>() {
+ .into(new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> 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<Drawable>() {
+ .into(new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> 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<Drawable>() {
+ .into(new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> 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<Drawable>() {
+ .into(new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Drawable>() {
+ .into(new CustomTarget<Drawable>() {
@Override
public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> 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<SliderAdapter.SliderAdapter
Glide.with(contextWeakReference.get())
.asBitmap()
.load(attachment.getUrl())
- .into(new SimpleTarget<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ .into(new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull final Bitmap resource, Transition<? super Bitmap> 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<Bitmap>() {
+ new CustomTarget<Bitmap>() {
@Override
public void onResourceReady(@NonNull final Bitmap resource, Transition<? super Bitmap> 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