kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix issue where compose views still display under draft.
rodzic
a361fcc8f3
commit
d9228bd911
|
@ -55,6 +55,7 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
||||||
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
||||||
import org.whispersystems.libsignal.util.guava.Optional;
|
import org.whispersystems.libsignal.util.guava.Optional;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
@ -456,14 +457,7 @@ public class InputPanel extends LinearLayout
|
||||||
if (voiceNoteDraft != null) {
|
if (voiceNoteDraft != null) {
|
||||||
voiceNoteDraftView.setDraft(voiceNoteDraft);
|
voiceNoteDraftView.setDraft(voiceNoteDraft);
|
||||||
voiceNoteDraftView.setVisibility(VISIBLE);
|
voiceNoteDraftView.setVisibility(VISIBLE);
|
||||||
|
hideNormalComposeViews();
|
||||||
if (emojiVisible) {
|
|
||||||
mediaKeyboard.setVisibility(View.INVISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
composeText.setVisibility(View.INVISIBLE);
|
|
||||||
quickCameraToggle.setVisibility(View.INVISIBLE);
|
|
||||||
quickAudioToggle.setVisibility(View.INVISIBLE);
|
|
||||||
} else {
|
} else {
|
||||||
voiceNoteDraftView.clearDraft();
|
voiceNoteDraftView.clearDraft();
|
||||||
ViewUtil.fadeOut(voiceNoteDraftView, FADE_TIME);
|
ViewUtil.fadeOut(voiceNoteDraftView, FADE_TIME);
|
||||||
|
@ -475,6 +469,29 @@ public class InputPanel extends LinearLayout
|
||||||
return voiceNoteDraftView.getDraft();
|
return voiceNoteDraftView.getDraft();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void hideNormalComposeViews() {
|
||||||
|
if (emojiVisible) {
|
||||||
|
Animation animation = mediaKeyboard.getAnimation();
|
||||||
|
if (animation != null) {
|
||||||
|
animation.cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
mediaKeyboard.setVisibility(View.INVISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Animation animation : Arrays.asList(composeText.getAnimation(), quickCameraToggle.getAnimation(), quickAudioToggle.getAnimation())) {
|
||||||
|
if (animation != null) {
|
||||||
|
animation.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
buttonToggle.animate().cancel();
|
||||||
|
|
||||||
|
composeText.setVisibility(View.INVISIBLE);
|
||||||
|
quickCameraToggle.setVisibility(View.INVISIBLE);
|
||||||
|
quickAudioToggle.setVisibility(View.INVISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
private void fadeInNormalComposeViews() {
|
private void fadeInNormalComposeViews() {
|
||||||
if (emojiVisible) {
|
if (emojiVisible) {
|
||||||
ViewUtil.fadeIn(mediaKeyboard, FADE_TIME);
|
ViewUtil.fadeIn(mediaKeyboard, FADE_TIME);
|
||||||
|
|
Ładowanie…
Reference in New Issue