Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Glide to use ksp, drop kapt.

Browse Source 
Resolves #13381
This commit is contained in:
Jameson Williams
2024-01-24 02:54:09 -06:00
committed by Nicholas Tinsley
parent aa33fd44b8
commit ec96b4e3aa
132 changed files with 755 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/megaphone/BasicMegaphoneView.java
View File

@@ -60,9 +60,9 @@ public class BasicMegaphoneView extends FrameLayout {
if (megaphone.getImageRes() != 0) {
image.setVisibility(VISIBLE);
image.setImageResource(megaphone.getImageRes());
} else if (megaphone.getImageRequest() != null) {
} else if (megaphone.getImageRequestBuilder() != null) {
image.setVisibility(VISIBLE);
megaphone.getImageRequest().into(image);
megaphone.getImageRequestBuilder().into(image);
} else if (megaphone.getLottieRes() != 0) {
image.setVisibility(VISIBLE);
image.setAnimation(megaphone.getLottieRes());

17
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphone.java
View File

@@ -9,8 +9,9 @@ import androidx.annotation.Nullable;
import androidx.annotation.RawRes;
import androidx.annotation.StringRes;
import com.bumptech.glide.RequestBuilder;
import org.thoughtcrime.securesms.megaphone.Megaphones.Event;
import org.thoughtcrime.securesms.mms.GlideRequest;
/**
* For guidance on creating megaphones, see {@link Megaphones}.
@@ -27,7 +28,7 @@ public class Megaphone {
private final MegaphoneText bodyText;
private final int imageRes;
private final int lottieRes;
private final GlideRequest<Drawable> imageRequest;
private final RequestBuilder<Drawable> requestBuilder;
private final MegaphoneText buttonText;
private final EventListener buttonListener;
private final EventListener snoozeListener;
@@ -43,7 +44,7 @@ public class Megaphone {
this.bodyText = builder.bodyText;
this.imageRes = builder.imageRes;
this.lottieRes = builder.lottieRes;
this.imageRequest = builder.imageRequest;
this.requestBuilder = builder.requestBuilder;
this.buttonText = builder.buttonText;
this.buttonListener = builder.buttonListener;
this.snoozeListener = builder.snoozeListener;
@@ -80,8 +81,8 @@ public class Megaphone {
return imageRes;
}
public @Nullable GlideRequest<Drawable> getImageRequest() {
return imageRequest;
public @Nullable RequestBuilder<Drawable> getImageRequestBuilder() {
return requestBuilder;
}
public @Nullable MegaphoneText getButtonText() {
@@ -126,7 +127,7 @@ public class Megaphone {
private MegaphoneText bodyText;
private int imageRes;
private int lottieRes;
private GlideRequest<Drawable> imageRequest;
private RequestBuilder<Drawable> requestBuilder;
private MegaphoneText buttonText;
private EventListener buttonListener;
private EventListener snoozeListener;
@@ -181,8 +182,8 @@ public class Megaphone {
return this;
}
public @NonNull Builder setImageRequest(@Nullable GlideRequest<Drawable> imageRequest) {
this.imageRequest = imageRequest;
public @NonNull Builder setImageRequestBuilder(@Nullable RequestBuilder<Drawable> requestBuilder) {
this.requestBuilder = requestBuilder;
return this;
}

4
app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java
View File

@@ -11,6 +11,7 @@ import androidx.annotation.WorkerThread;
import androidx.core.app.NotificationManagerCompat;
import com.annimon.stream.Stream;
import com.bumptech.glide.Glide;
import org.signal.core.util.MapUtil;
import org.signal.core.util.SetUtil;
@@ -28,7 +29,6 @@ import org.thoughtcrime.securesms.lock.SignalPinReminderDialog;
import org.thoughtcrime.securesms.lock.SignalPinReminders;
import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity;
import org.thoughtcrime.securesms.lock.v2.SvrMigrationActivity;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.notifications.TurnOnNotificationsBottomSheet;
import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -273,7 +273,7 @@ public final class Megaphones {
.setBody(record.getBody());
if (record.getImageUri() != null) {
builder.setImageRequest(GlideApp.with(context).asDrawable().load(record.getImageUri()));
builder.setImageRequestBuilder(Glide.with(context).asDrawable().load(record.getImageUri()));
}
if (record.hasPrimaryAction()) {

4
app/src/main/java/org/thoughtcrime/securesms/megaphone/PopupMegaphoneView.java
View File

@@ -55,9 +55,9 @@ public class PopupMegaphoneView extends FrameLayout {
this.megaphone = megaphone;
this.megaphoneListener = megaphoneListener;
if (megaphone.getImageRequest() != null) {
if (megaphone.getImageRequestBuilder() != null) {
image.setVisibility(VISIBLE);
megaphone.getImageRequest().into(image);
megaphone.getImageRequestBuilder().into(image);
} else if (megaphone.getLottieRes() != 0) {
image.setVisibility(VISIBLE);
image.setAnimation(megaphone.getLottieRes());