From 85cecbb7e9b1a451b46a10570bbb284a4ca9c4e1 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 11 May 2022 10:17:21 -0400 Subject: [PATCH] Remove the chat colors megaphone. --- .../megaphone/MegaphoneRepository.java | 1 - .../securesms/megaphone/Megaphones.java | 19 ------------------- app/src/main/res/raw/color_bubble_64.json | 1 - app/src/main/res/values/strings.xml | 6 ------ 4 files changed, 27 deletions(-) delete mode 100644 app/src/main/res/raw/color_bubble_64.json diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java index da83a816d..eb817d3de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java @@ -49,7 +49,6 @@ public class MegaphoneRepository { @AnyThread public void onFirstEverAppLaunch() { executor.execute(() -> { - database.markFinished(Event.CHAT_COLORS); database.markFinished(Event.ADD_A_PROFILE_PHOTO); resetDatabaseCache(); }); diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index 2da720511..6dad0eb12 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -109,7 +109,6 @@ public final class Megaphones { put(Event.PIN_REMINDER, new SignalPinReminderSchedule()); // Feature-introduction megaphones should *probably* be added below this divider - put(Event.CHAT_COLORS, ALWAYS); put(Event.ADD_A_PROFILE_PHOTO, shouldShowAddAProfilePhotoMegaphone(context) ? ALWAYS : NEVER); }}; } @@ -126,8 +125,6 @@ public final class Megaphones { return buildOnboardingMegaphone(); case NOTIFICATIONS: return buildNotificationsMegaphone(context); - case CHAT_COLORS: - return buildChatColorsMegaphone(context); case ADD_A_PROFILE_PHOTO: return buildAddAProfilePhotoMegaphone(context); case BECOME_A_SUSTAINER: @@ -233,21 +230,6 @@ public final class Megaphones { .build(); } - private static @NonNull Megaphone buildChatColorsMegaphone(@NonNull Context context) { - return new Megaphone.Builder(Event.CHAT_COLORS, Megaphone.Style.BASIC) - .setTitle(R.string.ChatColorsMegaphone__new_chat_colors) - .setBody(R.string.ChatColorsMegaphone__we_switched_up_chat_colors) - .setLottie(R.raw.color_bubble_64) - .setActionButton(R.string.ChatColorsMegaphone__appearance, (megaphone, listener) -> { - listener.onMegaphoneNavigationRequested(ChatWallpaperActivity.createIntent(context)); - listener.onMegaphoneCompleted(Event.CHAT_COLORS); - }) - .setSecondaryButton(R.string.ChatColorsMegaphone__not_now, (megaphone, listener) -> { - listener.onMegaphoneCompleted(Event.CHAT_COLORS); - }) - .build(); - } - private static @NonNull Megaphone buildAddAProfilePhotoMegaphone(@NonNull Context context) { return new Megaphone.Builder(Event.ADD_A_PROFILE_PHOTO, Megaphone.Style.BASIC) .setTitle(R.string.AddAProfilePhotoMegaphone__add_a_profile_photo) @@ -373,7 +355,6 @@ public final class Megaphones { CLIENT_DEPRECATED("client_deprecated"), ONBOARDING("onboarding"), NOTIFICATIONS("notifications"), - CHAT_COLORS("chat_colors"), ADD_A_PROFILE_PHOTO("add_a_profile_photo"), BECOME_A_SUSTAINER("become_a_sustainer"), VALENTINES_DONATIONS_2022("valentines_donations_2022"), diff --git a/app/src/main/res/raw/color_bubble_64.json b/app/src/main/res/raw/color_bubble_64.json deleted file mode 100644 index 4a329bea1..000000000 --- a/app/src/main/res/raw/color_bubble_64.json +++ /dev/null @@ -1 +0,0 @@ -{"v":"5.5.10","fr":60,"ip":0,"op":900,"w":64,"h":64,"nm":"Comp 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[32,32,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[64,64],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"gf","o":{"a":0,"k":100,"ix":10},"r":1,"bm":0,"g":{"p":3,"k":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[0,0.267,0.173,0.929,0.5,0.616,0.253,0.653,1,0.965,0.333,0.376]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":90,"s":[0,0.027,0.451,0.263,0.5,0.496,0.392,0.32,1,0.965,0.333,0.376]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":180,"s":[0,0.027,0.451,0.263,0.5,0.106,0.514,0.357,1,0.184,0.576,0.451]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":270,"s":[0,0.925,0.075,0.867,0.5,0.555,0.325,0.659,1,0.184,0.576,0.451]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":360,"s":[0,0.925,0.075,0.867,0.5,0.516,0.143,0.822,1,0.106,0.212,0.776]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":450,"s":[0,0.173,0.4,0.627,0.5,0.139,0.306,0.702,1,0.106,0.212,0.776]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":540,"s":[0,0.173,0.4,0.627,0.5,0.229,0.48,0.729,1,0.286,0.561,0.831]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":630,"s":[0,0.471,0.471,0.569,0.5,0.378,0.516,0.7,1,0.286,0.561,0.831]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":720,"s":[0,0.471,0.471,0.569,0.5,0.322,0.322,0.398,1,0.173,0.173,0.227]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":810,"s":[0,0.267,0.173,0.929,0.5,0.22,0.173,0.578,1,0.173,0.173,0.227]},{"t":900,"s":[0,0.267,0.173,0.929,0.5,0.616,0.253,0.653,1,0.965,0.333,0.376]}],"ix":9}},"s":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[-32,32],"to":[5.333,0],"ti":[-10.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":225,"s":[0,32],"to":[10.667,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":450,"s":[32,32],"to":[0,0],"ti":[10.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":675,"s":[0,32],"to":[-10.667,0],"ti":[5.333,0]},{"t":900,"s":[-32,32]}],"ix":5},"e":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[32,-32],"to":[-5.333,0],"ti":[10.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":225,"s":[0,-32],"to":[-10.667,0],"ti":[0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":450,"s":[-32,-32],"to":[0,0],"ti":[-10.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":675,"s":[0,-32],"to":[10.667,0],"ti":[-5.333,0]},{"t":900,"s":[32,-32]}],"ix":6},"t":1,"nm":"Gradient Fill 1","mn":"ADBE Vector Graphic - G-Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-0.218,0.157],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":900,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c37dca3a..a91f99c05 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3898,12 +3898,6 @@ Auto matches the color to the wallpaper Drag to change the direction of the gradient - - New Chat Colors - We switched up chat colors to give you more options and make chats easier to read. - Appearance - Not now - Add a profile photo Choose a look and color or customize your initials.