kopia lustrzana https://github.com/ryukoposting/Signal-Android
Remove GIF button from attachment keyboard.
We've had it there for ~45 days for education purposes, but we can remove it now.fork-5.53.8
rodzic
94658e9090
commit
09904e7a16
|
@ -445,14 +445,6 @@ public class InputPanel extends LinearLayout
|
|||
microphoneRecorderView.unlockAction();
|
||||
}
|
||||
|
||||
public void showGifMovedTooltip() {
|
||||
TooltipPopup.forTarget(mediaKeyboard)
|
||||
.setBackgroundTint(ContextCompat.getColor(getContext(), R.color.signal_accent_primary))
|
||||
.setTextColor(getResources().getColor(R.color.core_white))
|
||||
.setText(R.string.ConversationActivity__gifs_are_now_here)
|
||||
.show(TooltipPopup.POSITION_ABOVE);
|
||||
}
|
||||
|
||||
public void setVoiceNoteDraft(@Nullable DraftDatabase.Draft voiceNoteDraft) {
|
||||
if (voiceNoteDraft != null) {
|
||||
voiceNoteDraftView.setDraft(voiceNoteDraft);
|
||||
|
|
|
@ -28,7 +28,6 @@ public class AttachmentKeyboard extends FrameLayout implements InputAwareLayout.
|
|||
|
||||
private static final List<AttachmentKeyboardButton> DEFAULT_BUTTONS = Arrays.asList(
|
||||
AttachmentKeyboardButton.GALLERY,
|
||||
AttachmentKeyboardButton.GIF,
|
||||
AttachmentKeyboardButton.FILE,
|
||||
AttachmentKeyboardButton.PAYMENT,
|
||||
AttachmentKeyboardButton.CONTACT,
|
||||
|
|
|
@ -8,7 +8,6 @@ import org.thoughtcrime.securesms.R;
|
|||
public enum AttachmentKeyboardButton {
|
||||
|
||||
GALLERY(R.string.AttachmentKeyboard_gallery, R.drawable.ic_photo_album_outline_32),
|
||||
GIF(R.string.AttachmentKeyboard_gif, R.drawable.ic_gif_outline_32),
|
||||
FILE(R.string.AttachmentKeyboard_file, R.drawable.ic_file_outline_32),
|
||||
PAYMENT(R.string.AttachmentKeyboard_payment, R.drawable.ic_payments_32),
|
||||
CONTACT(R.string.AttachmentKeyboard_contact, R.drawable.ic_contact_circle_outline_32),
|
||||
|
|
|
@ -83,7 +83,7 @@ class AttachmentKeyboardButtonAdapter extends RecyclerView.Adapter<AttachmentKey
|
|||
this.title = itemView.findViewById(R.id.attachment_button_title);
|
||||
}
|
||||
|
||||
void bind(@NonNull AttachmentKeyboardButton button,boolean wallpaperEnabled, @NonNull Listener listener) {
|
||||
void bind(@NonNull AttachmentKeyboardButton button, boolean wallpaperEnabled, @NonNull Listener listener) {
|
||||
image.setImageResource(button.getIconRes());
|
||||
title.setText(button.getTitleRes());
|
||||
|
||||
|
|
|
@ -1143,14 +1143,6 @@ public class ConversationActivity extends PassphraseRequiredActivity
|
|||
case GALLERY:
|
||||
AttachmentManager.selectGallery(this, MEDIA_SENDER, recipient.get(), composeText.getTextTrimmed(), sendButton.getSelectedTransport());
|
||||
break;
|
||||
case GIF:
|
||||
new MaterialAlertDialogBuilder(this)
|
||||
.setTitle(R.string.ConversationActivity_gifs_have_moved)
|
||||
.setMessage(R.string.ConversationActivity_look_for_gifs_next_to_emoji_and_stickers)
|
||||
.setPositiveButton(android.R.string.ok, null)
|
||||
.setOnDismissListener(unused -> inputPanel.showGifMovedTooltip())
|
||||
.show();
|
||||
break;
|
||||
case FILE:
|
||||
AttachmentManager.selectDocument(this, PICK_DOCUMENT);
|
||||
break;
|
||||
|
|
|
@ -72,7 +72,6 @@
|
|||
|
||||
<!-- AttachmentKeyboard -->
|
||||
<string name="AttachmentKeyboard_gallery">Gallery</string>
|
||||
<string name="AttachmentKeyboard_gif">GIF</string>
|
||||
<string name="AttachmentKeyboard_file">File</string>
|
||||
<string name="AttachmentKeyboard_contact">Contact</string>
|
||||
<string name="AttachmentKeyboard_location">Location</string>
|
||||
|
@ -288,10 +287,6 @@
|
|||
|
||||
<string name="ConversationActivity__reported_as_spam_and_blocked">Reported as spam and blocked.</string>
|
||||
|
||||
<string name="ConversationActivity_gifs_have_moved">GIFs have moved</string>
|
||||
<string name="ConversationActivity_look_for_gifs_next_to_emoji_and_stickers">Look for GIFs next to emoji and stickers.</string>
|
||||
<string name="ConversationActivity__gifs_are_now_here">GIFs are now here.</string>
|
||||
|
||||
<!-- ConversationAdapter -->
|
||||
<plurals name="ConversationAdapter_n_unread_messages">
|
||||
<item quantity="one">%d unread message</item>
|
||||
|
|
Ładowanie…
Reference in New Issue