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

[WIP] Handle status bar without is status bar translucent android option #5889

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[WIP] Handle status bar without is status bar translucent android option #5889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
568e4a3
Fix calculating keyboard height
maciekstosio Mar 29, 2024
45db10f
Apply default insets and add bottom padding
maciekstosio Apr 2, 2024
b83179a
Add bottom padding when isStatusBarTranslucent
maciekstosio Apr 3, 2024
41b9246
Handle status bar without isStatusBarTranslucentAndroid flag
maciekstosio Apr 11, 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
8 changes: 2 additions & 6 deletions android/src/main/java/com/swmansion/reanimated/keyboard/Keyboard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.swmansion.reanimated.keyboard;

import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import androidx.core.view.WindowInsetsCompat;
import com.facebook.react.uimanager.PixelUtil;

Expand All @@ -23,9 +21,7 @@ public int getHeight() {
public void updateHeight(WindowInsetsCompat insets) {
int contentBottomInset = insets.getInsets(CONTENT_TYPE_MASK).bottom;
int systemBarBottomInset = insets.getInsets(SYSTEM_BAR_TYPE_MASK).bottom;
boolean hasNavigationBar = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME);
int keyboardHeightDip =
hasNavigationBar ? contentBottomInset - systemBarBottomInset : contentBottomInset;
int keyboardHeightDip = contentBottomInset - systemBarBottomInset;
int keyboardHeight = (int) PixelUtil.toDIPFromPixel(Math.max(0, keyboardHeightDip));
if (keyboardHeight == 0 && mState == KeyboardState.OPEN) {
/*
Expand All @@ -35,7 +31,7 @@ public void updateHeight(WindowInsetsCompat insets) {
*/
return;
}
mHeight = (int) PixelUtil.toDIPFromPixel(keyboardHeightDip);
mHeight = keyboardHeight;
}

public void onAnimationStart() {
Expand Down
57 changes: 41 additions & 16 deletions android/src/main/java/com/swmansion/reanimated/keyboard/WindowsInsetsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,47 @@
package com.swmansion.reanimated.keyboard;

import android.graphics.Color;
import android.os.Handler;
import android.os.Looper;
import android.view.View;
import android.view.ViewTreeObserver;
import android.view.Window;
import android.widget.FrameLayout;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import com.facebook.react.bridge.ReactApplicationContext;
import com.swmansion.reanimated.BuildConfig;
import java.lang.ref.WeakReference;

public class WindowsInsetsManager {

private boolean mIsStatusBarTranslucent = false;

private int statusBarHeight = 0;
private int paddingTop = 0;

private int paddingBottom = 0;
private final WeakReference<ReactApplicationContext> mReactContext;
private final Keyboard mKeyboard;
private final NotifyAboutKeyboardChangeFunction mNotifyAboutKeyboardChange;

private final ViewTreeObserver.OnDrawListener statusBarChangeListener =
new ViewTreeObserver.OnDrawListener() {
@Override
public void onDraw() {
View statusBar = getStatusBarView();
int currentStatusBarHeight = statusBar.getHeight();
boolean isStatusBarTranslucent = getWindow().getStatusBarColor() == Color.TRANSPARENT;

if (isStatusBarTranslucent != mIsStatusBarTranslucent
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fired few times during the changes so I don't want to do update multiple times (it blocks the UI).

|| currentStatusBarHeight != statusBarHeight) {
mIsStatusBarTranslucent = isStatusBarTranslucent;
statusBarHeight = currentStatusBarHeight;
updateInsets(paddingTop, paddingBottom);
}
}
};

public WindowsInsetsManager(
WeakReference<ReactApplicationContext> reactContext,
Keyboard keyboard,
Expand All @@ -36,20 +59,27 @@ private View getRootView() {
return getWindow().getDecorView();
}

private View getStatusBarView() {
return getWindow().findViewById(android.R.id.statusBarBackground);
}

public void startObservingChanges(
KeyboardAnimationCallback keyboardAnimationCallback, boolean isStatusBarTranslucent) {
mIsStatusBarTranslucent = isStatusBarTranslucent;
updateWindowDecor(false);

getStatusBarView().getViewTreeObserver().addOnDrawListener(statusBarChangeListener);
ViewCompat.setOnApplyWindowInsetsListener(getRootView(), this::onApplyWindowInsetsListener);
ViewCompat.setWindowInsetsAnimationCallback(getRootView(), keyboardAnimationCallback);
}

public void stopObservingChanges() {
updateWindowDecor(!mIsStatusBarTranslucent);
updateInsets(0, 0);
View rootView = getRootView();
ViewCompat.setWindowInsetsAnimationCallback(rootView, null);
ViewCompat.setOnApplyWindowInsetsListener(rootView, null);

getStatusBarView().getViewTreeObserver().removeOnDrawListener(statusBarChangeListener);
ViewCompat.setWindowInsetsAnimationCallback(getRootView(), null);
ViewCompat.setOnApplyWindowInsetsListener(getRootView(), null);
}

private void updateWindowDecor(boolean decorFitsSystemWindow) {
Expand All @@ -58,24 +88,19 @@ private void updateWindowDecor(boolean decorFitsSystemWindow) {
}

private WindowInsetsCompat onApplyWindowInsetsListener(View view, WindowInsetsCompat insets) {
WindowInsetsCompat defaultInsets = ViewCompat.onApplyWindowInsets(view, insets);
if (mKeyboard.getState() == KeyboardState.OPEN) {
mKeyboard.updateHeight(insets);
mNotifyAboutKeyboardChange.call();
}
setWindowInsets(insets);
return insets;
setWindowInsets(defaultInsets);
return defaultInsets;
}

private void setWindowInsets(WindowInsetsCompat insets) {
int paddingBottom = 0;
boolean isOldPaperImplementation =
!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && BuildConfig.REACT_NATIVE_MINOR_VERSION < 70;
if (isOldPaperImplementation) {
int navigationBarTypeMask = WindowInsetsCompat.Type.navigationBars();
paddingBottom = insets.getInsets(navigationBarTypeMask).bottom;
}
int systemBarsTypeMask = WindowInsetsCompat.Type.systemBars();
int paddingTop = insets.getInsets(systemBarsTypeMask).top;
paddingTop = insets.getInsets(systemBarsTypeMask).top;
paddingBottom = insets.getInsets(systemBarsTypeMask).bottom;
updateInsets(paddingTop, paddingBottom);
}

Expand All @@ -94,8 +119,8 @@ private FrameLayout.LayoutParams getLayoutParams(int paddingTop, int paddingBott
int matchParentFlag = FrameLayout.LayoutParams.MATCH_PARENT;
FrameLayout.LayoutParams params =
new FrameLayout.LayoutParams(matchParentFlag, matchParentFlag);
if (mIsStatusBarTranslucent) {
params.setMargins(0, 0, 0, 0);
if (mIsStatusBarTranslucent || statusBarHeight == 0) {
params.setMargins(0, 0, 0, paddingBottom);
} else {
params.setMargins(0, paddingTop, 0, paddingBottom);
}
Expand Down
Loading