Skip to content

add boolean return value to SparkEventListener that controls animation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connyduck merged 2 commits into from
Mar 2, 2020
Merged

add boolean return value to SparkEventListener that controls animation #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e0d112
add boolean return value to SparkEventListener that controls animation
connyduck Feb 7, 2020
1a5f845
Merge branch 'master' into make_event_listener_conditional
connyduck Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,25 +254,26 @@ public void setEventListener(SparkEventListener listener) {

@Override
public void onClick(View v) {
if (imageResourceIdInactive != INVALID_RESOURCE_ID) {
isChecked = !isChecked;
boolean shouldPlayAnimation = listener == null || listener.onEvent(this, isChecked);

imageView.setImageResource(isChecked ? imageResourceIdActive : imageResourceIdInactive);
if(shouldPlayAnimation) {
if (imageResourceIdInactive != INVALID_RESOURCE_ID) {
isChecked = !isChecked;

if (animatorSet != null) {
animatorSet.cancel();
}
if (isChecked) {
sparkAnimationView.setVisibility(VISIBLE);
playAnimation();
imageView.setImageResource(isChecked ? imageResourceIdActive : imageResourceIdInactive);

if (animatorSet != null) {
animatorSet.cancel();
}
if (isChecked) {
sparkAnimationView.setVisibility(VISIBLE);
playAnimation();
} else {
sparkAnimationView.setVisibility(INVISIBLE);
}
} else {
sparkAnimationView.setVisibility(INVISIBLE);
playAnimation();
}
} else {
playAnimation();
}
if (listener != null) {
listener.onEvent(this, isChecked);
}
}

Expand Down
2 changes: 1 addition & 1 deletion sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
import androidx.annotation.NonNull;

public interface SparkEventListener {
void onEvent(@NonNull SparkButton button, boolean buttonState);
boolean onEvent(@NonNull SparkButton button, boolean buttonState);
}