TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-17 21:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable quick capture on popup

Browse Source 
Closes #3568
// FREEBIE
This commit is contained in:
Jake McGinty
2015-07-08 17:33:03 -07:00
committed by Moxie Marlinspike
parent bc787f20e3
commit 44df1128af
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@@ -174,14 +174,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private View composePanel; private View composePanel;
private View composeBubble; private View composeBubble;
private AttachmentTypeSelectorAdapter attachmentAdapter; private AttachmentTypeSelectorAdapter attachmentAdapter;
private AttachmentManager attachmentManager; private AttachmentManager attachmentManager;
private BroadcastReceiver securityUpdateReceiver; private BroadcastReceiver securityUpdateReceiver;
private BroadcastReceiver groupUpdateReceiver; private BroadcastReceiver groupUpdateReceiver;
private Optional<EmojiPopup> emojiPopup = Optional.absent(); private Optional<EmojiPopup> emojiPopup = Optional.absent();
private EmojiToggle emojiToggle; private EmojiToggle emojiToggle;
private HidingImageButton quickAttachmentToggle; protected HidingImageButton quickAttachmentToggle;
private QuickAttachmentDrawer quickAttachmentDrawer; private QuickAttachmentDrawer quickAttachmentDrawer;
private Recipients recipients; private Recipients recipients;
private long threadId; private long threadId;
@@ -848,7 +848,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
quickAttachmentDrawer.setListener(this); quickAttachmentDrawer.setListener(this);
quickAttachmentToggle.setOnClickListener(new QuickAttachmentToggleListener()); quickAttachmentToggle.setOnClickListener(new QuickAttachmentToggleListener());
} else { } else {
quickAttachmentToggle.setVisibility(View.GONE); quickAttachmentToggle.disable();
} }
} }

1
src/org/thoughtcrime/securesms/ConversationPopupActivity.java
View File

@@ -56,6 +56,7 @@ public class ConversationPopupActivity extends ConversationActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
composeText.requestFocus(); composeText.requestFocus();
quickAttachmentToggle.disable();
} }
@Override @Override

7
src/org/thoughtcrime/securesms/components/camera/HidingImageButton.java
View File

@@ -26,6 +26,7 @@ public class HidingImageButton extends ImageButton {
} }
public void hide() { public void hide() {
if (!isEnabled()) return;
final Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_to_right); final Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_to_right);
animation.setAnimationListener(new AnimationListener() { animation.setAnimationListener(new AnimationListener() {
@Override public void onAnimationStart(Animation animation) {} @Override public void onAnimationStart(Animation animation) {}
@@ -38,6 +39,7 @@ public class HidingImageButton extends ImageButton {
} }
public void show() { public void show() {
if (!isEnabled()) return;
setVisibility(VISIBLE); setVisibility(VISIBLE);
animateWith(AnimationUtils.loadAnimation(getContext(), R.anim.slide_from_right)); animateWith(AnimationUtils.loadAnimation(getContext(), R.anim.slide_from_right));
} }
@@ -47,4 +49,9 @@ public class HidingImageButton extends ImageButton {
animation.setInterpolator(new FastOutSlowInInterpolator()); animation.setInterpolator(new FastOutSlowInInterpolator());
startAnimation(animation); startAnimation(animation);
} }
public void disable() {
setVisibility(GONE);
setEnabled(false);
}
} }