Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Show a bomb badge on the send button when disappearing messages is active

Browse Source
This commit is contained in:
Torsten Grote
2020-12-15 17:23:08 -03:00
parent 9947a6aa1b
commit dceb38b777
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/view/CompositeSendButton.java
View File

@@ -5,6 +5,7 @@ import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ProgressBar;
import org.briarproject.briar.R;
@@ -19,9 +20,10 @@ import static java.util.Objects.requireNonNull;
public class CompositeSendButton extends FrameLayout {
private final AppCompatImageButton sendButton, imageButton;
private final ImageView bombBadge;
private final ProgressBar progressBar;
private boolean hasImageSupport = false;
private boolean hasImageSupport = false, bombVisible = false;
public CompositeSendButton(@NonNull Context context,
@Nullable AttributeSet attrs) {
@@ -32,6 +34,7 @@ public class CompositeSendButton extends FrameLayout {
sendButton = findViewById(R.id.sendButton);
imageButton = findViewById(R.id.imageButton);
bombBadge = findViewById(R.id.bombBadge);
progressBar = findViewById(R.id.progressBar);
}
@@ -71,6 +74,11 @@ public class CompositeSendButton extends FrameLayout {
return hasImageSupport;
}
public void setBombVisible(boolean visible) {
bombVisible = visible;
bombBadge.setVisibility(visible ? VISIBLE : INVISIBLE);
}
public void showImageButton(boolean showImageButton, boolean sendEnabled) {
if (showImageButton) {
imageButton.setVisibility(VISIBLE);
@@ -78,6 +86,7 @@ public class CompositeSendButton extends FrameLayout {
sendButton.clearAnimation();
sendButton.animate().alpha(0f).withEndAction(() -> {
sendButton.setVisibility(INVISIBLE);
bombBadge.setVisibility(INVISIBLE);
imageButton.setEnabled(true);
}).start();
imageButton.clearAnimation();
@@ -88,7 +97,9 @@ public class CompositeSendButton extends FrameLayout {
sendButton.setEnabled(sendEnabled);
imageButton.setEnabled(false);
sendButton.clearAnimation();
sendButton.animate().alpha(1f).start();
sendButton.animate().alpha(1f).withEndAction(() -> {
if (bombVisible) bombBadge.setVisibility(VISIBLE);
}).start();
imageButton.clearAnimation();
imageButton.animate().alpha(0f).withEndAction(() ->
imageButton.setVisibility(INVISIBLE)

12
briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
View File

@@ -7,6 +7,7 @@ import com.google.android.material.snackbar.Snackbar;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.android.conversation.ConversationActivity;
import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener;
import org.briarproject.briar.api.attachment.AttachmentHeader;
@@ -60,15 +61,26 @@ public class TextSendController implements TextInputListener {
updateViewState();
}
/**
* Sets the current auto delete timer and updates the UI accordingly.
* <p>
* Attention: Works only in {@link ConversationActivity}.
*/
public void setAutoDeleteTimer(long timer) {
// this will need to be adapted when other screens
// besides the private conversation use auto delete timers
CompositeSendButton sendButton =
(CompositeSendButton) compositeSendButton;
// update hint
if (timer == NO_AUTO_DELETE_TIMER) {
textInput.setHint(defaultHint);
sendButton.setBombVisible(false);
} else {
// this might need to be adapted when other screens
// besides the private conversation use auto delete timers
defaultHint = textInput.getHint();
textInput.setHint(R.string.message_hint_auto_delete);
sendButton.setBombVisible(true);
}
}