From 35930fb23a1b5da79092e097033dcbe33e79d085 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 26 May 2021 20:06:57 -0300 Subject: [PATCH] Fix several ChatColors issues. --- .../securesms/conversation/ConversationItem.java | 5 +++-- .../colors/ui/ChatColorSelectionRepository.kt | 2 +- .../conversation/colors/ui/ChatColorSelectionState.kt | 2 +- .../org/thoughtcrime/securesms/recipients/Recipient.java | 2 +- .../securesms/wallpaper/ChatWallpaperFragment.java | 8 ++++---- .../securesms/wallpaper/ChatWallpaperRepository.java | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 34f23c495..b81af5cb2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -1531,8 +1531,9 @@ public final class ConversationItem extends RelativeLayout implements BindableCo public @NonNull List getColorizerProjections() { List projections = new LinkedList<>(); - if (messageRecord.isOutgoing() && - !hasNoBubble(messageRecord) && + if (messageRecord.isOutgoing() && + !hasNoBubble(messageRecord) && + !messageRecord.isRemoteDelete() && bodyBubbleCorners != null) { projections.add(Projection.relativeToViewRoot(bodyBubble, bodyBubbleCorners).translateX(bodyBubble.getTranslationX())); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt index 375c0c341..147c70f91 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionRepository.kt @@ -51,7 +51,7 @@ sealed class ChatColorSelectionRepository(context: Context) { if (wallpaper != null) { consumer(wallpaper.autoChatColors) } else { - consumer(ChatColorsPalette.Bubbles.default) + consumer(ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto)) } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionState.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionState.kt index 4b4f1343d..c4d94eebd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorSelectionState.kt @@ -30,7 +30,7 @@ data class ChatColorSelectionState( ) } else { ChatColorMappingModel( - ChatColorsPalette.Bubbles.default, + ChatColorsPalette.Bubbles.default.withId(ChatColors.Id.Auto), chatColors?.id == ChatColors.Id.Auto, true ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index 1352aac86..4fd0fec46 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -927,7 +927,7 @@ public class Recipient { } else if (getWallpaper() != null) { return getWallpaper().getAutoChatColors(); } else { - return ChatColorsPalette.Bubbles.getDefault(); + return ChatColorsPalette.Bubbles.getDefault().withId(ChatColors.Id.Auto.INSTANCE); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java index 7d7cf36a0..f22cb55c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperFragment.java @@ -116,13 +116,13 @@ public class ChatWallpaperFragment extends Fragment { viewModel.saveWallpaperSelection(); dialog.dismiss(); }) - .setNeutralButton(R.string.ChatWallpaperFragment__reset_all_wallpapers, (dialog, which) -> { + .setNegativeButton(R.string.ChatWallpaperFragment__reset_all_wallpapers, (dialog, which) -> { viewModel.setWallpaper(null); viewModel.setDimInDarkTheme(true); viewModel.resetAllWallpaper(); dialog.dismiss(); }) - .setNegativeButton(android.R.string.cancel, (dialog, which) -> { + .setNeutralButton(android.R.string.cancel, (dialog, which) -> { dialog.dismiss(); }) .show(); @@ -136,11 +136,11 @@ public class ChatWallpaperFragment extends Fragment { viewModel.clearChatColor(); dialog.dismiss(); }) - .setNeutralButton(R.string.ChatWallpaperFragment__reset_all_colors, (dialog, which) -> { + .setNegativeButton(R.string.ChatWallpaperFragment__reset_all_colors, (dialog, which) -> { viewModel.resetAllChatColors(); dialog.dismiss(); }) - .setNegativeButton(android.R.string.cancel, (dialog, which) -> { + .setNeutralButton(android.R.string.cancel, (dialog, which) -> { dialog.dismiss(); }) .show(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java index 73d55a5bd..47dc0d06d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/wallpaper/ChatWallpaperRepository.java @@ -44,7 +44,7 @@ class ChatWallpaperRepository { } else if (SignalStore.wallpaper().hasWallpaperSet()) { return Objects.requireNonNull(SignalStore.wallpaper().getWallpaper()).getAutoChatColors(); } else { - return ChatColorsPalette.Bubbles.getDefault(); + return ChatColorsPalette.Bubbles.getDefault().withId(ChatColors.Id.Auto.INSTANCE); } }