From 62f5088553c0727451607fcebab9d7f940cf2595 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 6 Jan 2022 16:32:04 -0500 Subject: [PATCH] Delete old megaphones. --- .../app/chats/ChatsSettingsRepository.kt | 4 - .../LinkPreviewsMegaphoneView.java | 48 -------- .../securesms/megaphone/Megaphone.java | 6 - .../megaphone/MegaphoneRepository.java | 5 - .../megaphone/MegaphoneViewBuilder.java | 25 ----- .../securesms/megaphone/Megaphones.java | 88 --------------- .../megaphone/ResearchMegaphoneDialog.java | 41 ------- .../MessageRequestMegaphoneActivity.java | 1 - .../reactions/ReactionsMegaphoneView.java | 37 ------ .../securesms/util/LocaleFeatureFlags.java | 7 -- .../ic_group_calls_megaphone.webp | Bin 1272 -> 0 bytes .../ic_group_calls_megaphone.webp | Bin 2524 -> 0 bytes .../ic_group_calls_megaphone.webp | Bin 3962 -> 0 bytes .../drawable/ic_megaphone_link_previews.xml | 27 ----- .../res/drawable/ic_research_megaphone.xml | 30 ----- .../reactions_megaphone_background.xml | 10 -- .../res/layout/link_previews_megaphone.xml | 105 ------------------ .../main/res/layout/reactions_megaphone.xml | 100 ----------------- .../res/layout/research_megaphone_dialog.xml | 61 ---------- app/src/main/res/values/strings.xml | 23 ---- 20 files changed, 618 deletions(-) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewsMegaphoneView.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/megaphone/ResearchMegaphoneDialog.java delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsMegaphoneView.java delete mode 100644 app/src/main/res/drawable-mdpi/ic_group_calls_megaphone.webp delete mode 100644 app/src/main/res/drawable-xhdpi/ic_group_calls_megaphone.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_group_calls_megaphone.webp delete mode 100644 app/src/main/res/drawable/ic_megaphone_link_previews.xml delete mode 100644 app/src/main/res/drawable/ic_research_megaphone.xml delete mode 100644 app/src/main/res/drawable/reactions_megaphone_background.xml delete mode 100644 app/src/main/res/layout/link_previews_megaphone.xml delete mode 100644 app/src/main/res/layout/reactions_megaphone.xml delete mode 100644 app/src/main/res/layout/research_megaphone_dialog.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt index 641c5ab5ae..e79b3f4211 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsRepository.kt @@ -6,7 +6,6 @@ import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.dependencies.ApplicationDependencies import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.megaphone.Megaphones import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.TextSecurePreferences @@ -29,9 +28,6 @@ class ChatsSettingsRepository { isLinkPreviewsEnabled ) ) - if (isLinkPreviewsEnabled) { - ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.LINK_PREVIEWS) - } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewsMegaphoneView.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewsMegaphoneView.java deleted file mode 100644 index 5842323ef9..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewsMegaphoneView.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.thoughtcrime.securesms.linkpreview; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.FrameLayout; - -import androidx.annotation.NonNull; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.thoughtcrime.securesms.megaphone.Megaphone; -import org.thoughtcrime.securesms.megaphone.MegaphoneActionController; - -public class LinkPreviewsMegaphoneView extends FrameLayout { - - private View yesButton; - private View noButton; - - public LinkPreviewsMegaphoneView(Context context) { - super(context); - initialize(context); - } - - public LinkPreviewsMegaphoneView(Context context, AttributeSet attrs) { - super(context, attrs); - initialize(context); - } - - private void initialize(@NonNull Context context) { - inflate(context, R.layout.link_previews_megaphone, this); - - this.yesButton = findViewById(R.id.linkpreview_megaphone_ok); - this.noButton = findViewById(R.id.linkpreview_megaphone_disable); - } - - public void present(@NonNull Megaphone megaphone, @NonNull MegaphoneActionController listener) { - this.yesButton.setOnClickListener(v -> { - SignalStore.settings().setLinkPreviewsEnabled(true); - listener.onMegaphoneCompleted(megaphone.getEvent()); - }); - - this.noButton.setOnClickListener(v -> { - SignalStore.settings().setLinkPreviewsEnabled(false); - listener.onMegaphoneCompleted(megaphone.getEvent()); - }); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphone.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphone.java index 2456833a6d..2eeabd949b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphone.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphone.java @@ -215,12 +215,6 @@ public class Megaphone { } enum Style { - /** Specialized style for announcing reactions. */ - REACTIONS, - - /** Specialized style for announcing link previews. */ - LINK_PREVIEWS, - /** Specialized style for onboarding. */ ONBOARDING, 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 d7a72dabf5..54128712f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneRepository.java @@ -50,11 +50,6 @@ public class MegaphoneRepository { @AnyThread public void onFirstEverAppLaunch() { executor.execute(() -> { - database.markFinished(Event.REACTIONS); - database.markFinished(Event.MESSAGE_REQUESTS); - database.markFinished(Event.LINK_PREVIEWS); - database.markFinished(Event.RESEARCH); - database.markFinished(Event.GROUP_CALLING); database.markFinished(Event.CHAT_COLORS); database.markFinished(Event.ADD_A_PROFILE_PHOTO); database.markFinished(Event.NOTIFICATION_PROFILES); diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder.java index 4923185349..8fd5b77ae3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/MegaphoneViewBuilder.java @@ -6,9 +6,6 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.thoughtcrime.securesms.linkpreview.LinkPreviewsMegaphoneView; -import org.thoughtcrime.securesms.reactions.ReactionsMegaphoneView; - public class MegaphoneViewBuilder { public static @Nullable View build(@NonNull Context context, @@ -20,10 +17,6 @@ public class MegaphoneViewBuilder { return buildBasicMegaphone(context, megaphone, listener); case FULLSCREEN: return null; - case REACTIONS: - return buildReactionsMegaphone(context, megaphone, listener); - case LINK_PREVIEWS: - return buildLinkPreviewsMegaphone(context, megaphone, listener); case ONBOARDING: return buildOnboardingMegaphone(context, megaphone, listener); case POPUP: @@ -42,24 +35,6 @@ public class MegaphoneViewBuilder { return view; } - private static @NonNull View buildReactionsMegaphone(@NonNull Context context, - @NonNull Megaphone megaphone, - @NonNull MegaphoneActionController listener) - { - ReactionsMegaphoneView view = new ReactionsMegaphoneView(context); - view.present(megaphone, listener); - return view; - } - - private static @NonNull View buildLinkPreviewsMegaphone(@NonNull Context context, - @NonNull Megaphone megaphone, - @NonNull MegaphoneActionController listener) - { - LinkPreviewsMegaphoneView view = new LinkPreviewsMegaphoneView(context); - view.present(megaphone, listener); - return view; - } - private static @NonNull View buildOnboardingMegaphone(@NonNull Context context, @NonNull Megaphone megaphone, @NonNull MegaphoneActionController listener) 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 74f96b4e67..3d3d7c3dea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -96,14 +96,9 @@ public final class Megaphones { */ private static Map buildDisplayOrder(@NonNull Context context) { return new LinkedHashMap() {{ - put(Event.REACTIONS, ALWAYS); put(Event.PINS_FOR_ALL, new PinsForAllSchedule()); put(Event.PIN_REMINDER, new SignalPinReminderSchedule()); - put(Event.MESSAGE_REQUESTS, shouldShowMessageRequestsMegaphone() ? ALWAYS : NEVER); - put(Event.LINK_PREVIEWS, shouldShowLinkPreviewsMegaphone(context) ? ALWAYS : NEVER); put(Event.CLIENT_DEPRECATED, SignalStore.misc().isClientDeprecated() ? ALWAYS : NEVER); - put(Event.RESEARCH, shouldShowResearchMegaphone(context) ? ShowForDurationSchedule.showForDays(7) : NEVER); - put(Event.GROUP_CALLING, shouldShowGroupCallingMegaphone() ? ALWAYS : NEVER); put(Event.ONBOARDING, shouldShowOnboardingMegaphone(context) ? ALWAYS : NEVER); put(Event.NOTIFICATIONS, shouldShowNotificationsMegaphone(context) ? RecurringSchedule.every(TimeUnit.DAYS.toMillis(30)) : NEVER); put(Event.CHAT_COLORS, ALWAYS); @@ -115,22 +110,12 @@ public final class Megaphones { private static @NonNull Megaphone forRecord(@NonNull Context context, @NonNull MegaphoneRecord record) { switch (record.getEvent()) { - case REACTIONS: - return buildReactionsMegaphone(); case PINS_FOR_ALL: return buildPinsForAllMegaphone(record); case PIN_REMINDER: return buildPinReminderMegaphone(context); - case MESSAGE_REQUESTS: - return buildMessageRequestsMegaphone(context); - case LINK_PREVIEWS: - return buildLinkPreviewsMegaphone(); case CLIENT_DEPRECATED: return buildClientDeprecatedMegaphone(context); - case RESEARCH: - return buildResearchMegaphone(context); - case GROUP_CALLING: - return buildGroupCallingMegaphone(context); case ONBOARDING: return buildOnboardingMegaphone(); case NOTIFICATIONS: @@ -148,12 +133,6 @@ public final class Megaphones { } } - private static @NonNull Megaphone buildReactionsMegaphone() { - return new Megaphone.Builder(Event.REACTIONS, Megaphone.Style.REACTIONS) - .setPriority(Megaphone.Priority.DEFAULT) - .build(); - } - private static @NonNull Megaphone buildPinsForAllMegaphone(@NonNull MegaphoneRecord record) { if (PinsForAllSchedule.shouldDisplayFullScreen(record.getFirstVisible(), System.currentTimeMillis())) { return new Megaphone.Builder(Event.PINS_FOR_ALL, Megaphone.Style.FULLSCREEN) @@ -213,24 +192,6 @@ public final class Megaphones { .build(); } - @SuppressWarnings("CodeBlock2Expr") - private static @NonNull Megaphone buildMessageRequestsMegaphone(@NonNull Context context) { - return new Megaphone.Builder(Event.MESSAGE_REQUESTS, Megaphone.Style.FULLSCREEN) - .disableSnooze() - .setPriority(Megaphone.Priority.HIGH) - .setOnVisibleListener(((megaphone, listener) -> { - listener.onMegaphoneNavigationRequested(new Intent(context, MessageRequestMegaphoneActivity.class), - ConversationListFragment.MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME); - })) - .build(); - } - - private static @NonNull Megaphone buildLinkPreviewsMegaphone() { - return new Megaphone.Builder(Event.LINK_PREVIEWS, Megaphone.Style.LINK_PREVIEWS) - .setPriority(Megaphone.Priority.HIGH) - .build(); - } - private static @NonNull Megaphone buildClientDeprecatedMegaphone(@NonNull Context context) { return new Megaphone.Builder(Event.CLIENT_DEPRECATED, Megaphone.Style.FULLSCREEN) .disableSnooze() @@ -239,34 +200,6 @@ public final class Megaphones { .build(); } - private static @NonNull Megaphone buildResearchMegaphone(@NonNull Context context) { - return new Megaphone.Builder(Event.RESEARCH, Megaphone.Style.BASIC) - .disableSnooze() - .setTitle(R.string.ResearchMegaphone_tell_signal_what_you_think) - .setBody(R.string.ResearchMegaphone_to_make_signal_the_best_messaging_app_on_the_planet) - .setImage(R.drawable.ic_research_megaphone) - .setActionButton(R.string.ResearchMegaphone_learn_more, (megaphone, controller) -> { - controller.onMegaphoneCompleted(megaphone.getEvent()); - controller.onMegaphoneDialogFragmentRequested(new ResearchMegaphoneDialog()); - }) - .setSecondaryButton(R.string.ResearchMegaphone_dismiss, (megaphone, controller) -> controller.onMegaphoneCompleted(megaphone.getEvent())) - .setPriority(Megaphone.Priority.DEFAULT) - .build(); - } - - private static @NonNull Megaphone buildGroupCallingMegaphone(@NonNull Context context) { - return new Megaphone.Builder(Event.GROUP_CALLING, Megaphone.Style.BASIC) - .disableSnooze() - .setTitle(R.string.GroupCallingMegaphone__introducing_group_calls) - .setBody(R.string.GroupCallingMegaphone__open_a_new_group_to_start) - .setImage(R.drawable.ic_group_calls_megaphone) - .setActionButton(android.R.string.ok, (megaphone, controller) -> { - controller.onMegaphoneCompleted(megaphone.getEvent()); - }) - .setPriority(Megaphone.Priority.DEFAULT) - .build(); - } - private static @NonNull Megaphone buildOnboardingMegaphone() { return new Megaphone.Builder(Event.ONBOARDING, Megaphone.Style.ONBOARDING) .setPriority(Megaphone.Priority.DEFAULT) @@ -359,14 +292,6 @@ public final class Megaphones { .build(); } - private static boolean shouldShowMessageRequestsMegaphone() { - return Recipient.self().getProfileName() == ProfileName.EMPTY; - } - - private static boolean shouldShowResearchMegaphone(@NonNull Context context) { - return VersionTracker.getDaysSinceFirstInstalled(context) > 7 && LocaleFeatureFlags.isInResearchMegaphone(); - } - private static boolean shouldShowDonateMegaphone(@NonNull Context context) { return VersionTracker.getDaysSinceFirstInstalled(context) >= 3 && LocaleFeatureFlags.isInDonateMegaphone() && @@ -378,14 +303,6 @@ public final class Megaphones { .noneMatch(badge -> badge.getCategory() == Badge.Category.Donor); } - private static boolean shouldShowLinkPreviewsMegaphone(@NonNull Context context) { - return TextSecurePreferences.wereLinkPreviewsEnabled(context) && !SignalStore.settings().isLinkPreviewsEnabled(); - } - - private static boolean shouldShowGroupCallingMegaphone() { - return Build.VERSION.SDK_INT > 19; - } - private static boolean shouldShowOnboardingMegaphone(@NonNull Context context) { return SignalStore.onboarding().hasOnboarding(context); } @@ -424,14 +341,9 @@ public final class Megaphones { } public enum Event { - REACTIONS("reactions"), PINS_FOR_ALL("pins_for_all"), PIN_REMINDER("pin_reminder"), - MESSAGE_REQUESTS("message_requests"), - LINK_PREVIEWS("link_previews"), CLIENT_DEPRECATED("client_deprecated"), - RESEARCH("research"), - GROUP_CALLING("group_calling"), ONBOARDING("onboarding"), NOTIFICATIONS("notifications"), CHAT_COLORS("chat_colors"), diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ResearchMegaphoneDialog.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/ResearchMegaphoneDialog.java deleted file mode 100644 index 12842b490f..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/ResearchMegaphoneDialog.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.thoughtcrime.securesms.megaphone; - -import android.os.Bundle; -import android.text.Html; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.components.FullScreenDialogFragment; -import org.thoughtcrime.securesms.util.CommunicationActions; - -public class ResearchMegaphoneDialog extends FullScreenDialogFragment { - - private static final String SURVEY_URL = "https://surveys.signalusers.org/s3"; - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - TextView content = view.findViewById(R.id.research_megaphone_content); - content.setText(Html.fromHtml(requireContext().getString(R.string.ResearchMegaphoneDialog_we_believe_in_privacy))); - - view.findViewById(R.id.research_megaphone_dialog_take_the_survey) - .setOnClickListener(v -> CommunicationActions.openBrowserLink(requireContext(), SURVEY_URL)); - - view.findViewById(R.id.research_megaphone_dialog_no_thanks) - .setOnClickListener(v -> dismissAllowingStateLoss()); - } - - @Override - protected @StringRes int getTitle() { - return R.string.ResearchMegaphoneDialog_signal_research; - } - - @Override - protected int getDialogLayoutResource() { - return R.layout.research_megaphone_dialog; - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java index ec29acca6b..4388a9e544 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestMegaphoneActivity.java @@ -54,7 +54,6 @@ public class MessageRequestMegaphoneActivity extends PassphraseRequiredActivity if (requestCode == EDIT_PROFILE_REQUEST_CODE && resultCode == RESULT_OK && Recipient.self().getProfileName() != ProfileName.EMPTY) { - ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.MESSAGE_REQUESTS); setResult(RESULT_OK); finish(); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsMegaphoneView.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsMegaphoneView.java deleted file mode 100644 index 90e9eaa40b..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsMegaphoneView.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.thoughtcrime.securesms.reactions; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.FrameLayout; - -import androidx.annotation.NonNull; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.megaphone.Megaphone; -import org.thoughtcrime.securesms.megaphone.MegaphoneActionController; - -public class ReactionsMegaphoneView extends FrameLayout { - - private View closeButton; - - public ReactionsMegaphoneView(Context context) { - super(context); - initialize(context); - } - - public ReactionsMegaphoneView(Context context, AttributeSet attrs) { - super(context, attrs); - initialize(context); - } - - private void initialize(@NonNull Context context) { - inflate(context, R.layout.reactions_megaphone, this); - - this.closeButton = findViewById(R.id.reactions_megaphone_x); - } - - public void present(@NonNull Megaphone megaphone, @NonNull MegaphoneActionController listener) { - this.closeButton.setOnClickListener(v -> listener.onMegaphoneCompleted(megaphone.getEvent())); - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java index e57c00b41e..81c9698b25 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/LocaleFeatureFlags.java @@ -30,13 +30,6 @@ public final class LocaleFeatureFlags { private static final String COUNTRY_WILDCARD = "*"; private static final int NOT_FOUND = -1; - /** - * In research megaphone group for given country code - */ - public static boolean isInResearchMegaphone() { - return false; - } - /** * In donate megaphone group for given country code */ diff --git a/app/src/main/res/drawable-mdpi/ic_group_calls_megaphone.webp b/app/src/main/res/drawable-mdpi/ic_group_calls_megaphone.webp deleted file mode 100644 index bf363d11d784816e36d6436d07b28b27a7eac95b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1272 zcmV&Uv{+G4pH=Rz>K@jFIu&6Xohv27$tlGcyiyPm47{QNg@sy`1D5&fTlV0Hh!k#VG<1V9wu==&-Vk?OwR0g>|F z?tpt0tbT7~tQ9*Z@Vg46+VAXzu&?enGE%;pz&()r?k~apMr!2`;x~}pU$iG;wPbAJ zuLGf7$rGI^(LPzu4?SY#E+=Ow5_^;dzxU9L&XxETp1Fs(vv-jRCAukFA~7g{)F3Z_ za2fMdHWM&+WwS({NI|Aa0rZ?$9HyO{X-3y#mL-t)f&xg=0)Q~IkbU_+0q+UgCjf1x zM6{QYumB7J$&QpFv$>rB%*~AVteGcEe1O~({EQQJQ}#a5Z8Bl0wC6});IIQ?>V0ZD zVwTc4bnKO+oW7tGoy-&2md%qmL}H)bBn5KHW{G(sP@X87} z*;ChwbWg{1uY?6nBEj}NOrM5-^&GefMeD)=9Wx0*hkH}qL*`mM5b ze8%I)?+IC&NxC(R=IWAunQ-!ppjxsU;V=#t*I*V2 z&+u&F;Yb2IIVlmjj!ZF*h%tRtOQn{oRV|f`Gp$6z>);pwP-h0_{SBehvSmAolx?U> z2w930Ty}m^L}t{PKpH(>8bXcc@N*5Ilus5Jl0$Wth`nM^8s=(>{?+*Z@>S{Ou diff --git a/app/src/main/res/drawable-xhdpi/ic_group_calls_megaphone.webp b/app/src/main/res/drawable-xhdpi/ic_group_calls_megaphone.webp deleted file mode 100644 index 313d8f8a606afe399365cfdf278f992648afabaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2524 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 diff --git a/app/src/main/res/drawable-xxhdpi/ic_group_calls_megaphone.webp b/app/src/main/res/drawable-xxhdpi/ic_group_calls_megaphone.webp deleted file mode 100644 index 4c646ed66e8691adc44d49011a1a404b8072ca25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3962 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 U@#k+Li`cGx-t%DBr7~Wc1B(iBZvX%Q diff --git a/app/src/main/res/drawable/ic_megaphone_link_previews.xml b/app/src/main/res/drawable/ic_megaphone_link_previews.xml deleted file mode 100644 index b40dd02faa..0000000000 --- a/app/src/main/res/drawable/ic_megaphone_link_previews.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_research_megaphone.xml b/app/src/main/res/drawable/ic_research_megaphone.xml deleted file mode 100644 index 308238f571..0000000000 --- a/app/src/main/res/drawable/ic_research_megaphone.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/reactions_megaphone_background.xml b/app/src/main/res/drawable/reactions_megaphone_background.xml deleted file mode 100644 index 8fa1174e69..0000000000 --- a/app/src/main/res/drawable/reactions_megaphone_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/layout/link_previews_megaphone.xml b/app/src/main/res/layout/link_previews_megaphone.xml deleted file mode 100644 index 8a09db0ef0..0000000000 --- a/app/src/main/res/layout/link_previews_megaphone.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - -