Skip to content
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

Jump to bottom

[useAnimatedKeyboard][Android] Filter keyboard events #5740

Merged
merged 9 commits into from
Mar 1, 2024
Merged

[useAnimatedKeyboard][Android] Filter keyboard events #5740

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c8566f7
Refactor keyboard
piaskowyk Feb 14, 2024
da30268
Java lint
piaskowyk Feb 14, 2024
813dec5
Java lint part 2
piaskowyk Feb 14, 2024
431b4cf
Improvements after revie
piaskowyk Feb 27, 2024
b2973a5
Rename jsCallbackWrapper
piaskowyk Feb 27, 2024
fd1f083
Add static to finals in Keyboard class
piaskowyk Feb 27, 2024
b0e088d
Add m prefix
piaskowyk Feb 28, 2024
8ca4215
Add m prefix to windowsInsetsManager
piaskowyk Feb 28, 2024
f231d32
Filter keyboard events
piaskowyk Feb 28, 2024
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
27 changes: 23 additions & 4 deletions android/src/main/java/com/swmansion/reanimated/keyboard/KeyboardAnimationCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class KeyboardAnimationCallback extends WindowInsetsAnimationCompat.Callback {
private final Keyboard mKeyboard;
private final NotifyAboutKeyboardChangeFunction mNotifyAboutKeyboardChange;
private static final int CONTENT_TYPE_MASK = WindowInsetsCompat.Type.ime();

public KeyboardAnimationCallback(
Keyboard keyboard, NotifyAboutKeyboardChangeFunction notifyAboutKeyboardChange) {
Expand All @@ -21,6 +22,9 @@ public KeyboardAnimationCallback(
public WindowInsetsAnimationCompat.BoundsCompat onStart(
@NonNull WindowInsetsAnimationCompat animation,
@NonNull WindowInsetsAnimationCompat.BoundsCompat bounds) {
if (!isKeyboardAnimation(animation)) {
return bounds;
}
mKeyboard.onAnimationStart();
mNotifyAboutKeyboardChange.call();
return super.onStart(animation, bounds);
Expand All @@ -31,14 +35,29 @@ public WindowInsetsAnimationCompat.BoundsCompat onStart(
public WindowInsetsCompat onProgress(
@NonNull WindowInsetsCompat insets,
@NonNull List<WindowInsetsAnimationCompat> runningAnimations) {
mKeyboard.updateHeight(insets);
mNotifyAboutKeyboardChange.call();
boolean isAnyKeyboardAnimationRunning = false;
for (WindowInsetsAnimationCompat animation : runningAnimations) {
if (isKeyboardAnimation(animation)) {
isAnyKeyboardAnimationRunning = true;
break;
}
}
if (isAnyKeyboardAnimationRunning) {
mKeyboard.updateHeight(insets);
mNotifyAboutKeyboardChange.call();
}
return insets;
}

@Override
public void onEnd(@NonNull WindowInsetsAnimationCompat animation) {
mKeyboard.onAnimationEnd();
mNotifyAboutKeyboardChange.call();
if (isKeyboardAnimation(animation)) {
mKeyboard.onAnimationEnd();
mNotifyAboutKeyboardChange.call();
}
}

private static boolean isKeyboardAnimation(@NonNull WindowInsetsAnimationCompat animation) {
return (animation.getTypeMask() & CONTENT_TYPE_MASK) != 0;
}
}
Loading