mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 13:10:29 +00:00
fix(native): the sign-in bar's room for the keyboard holds, and Android 7 to 10 see the keyboard
On iOS the keyboard plugin sizes the body and zeroes the scroll inset in a frame update that runs after the keyboard is up, so the room made for it was taken back. The inset is now kept while a sign-in page shows, the body gets its height back after that update, and with the keyboard down the page can scroll past the bar. On Android before 11 the keyboard went unseen in the insets Capacitor passes on, so the bar stayed over the form; it is read off the window's own insets now.
This commit is contained in:
@@ -10,7 +10,6 @@ import android.view.KeyboardShortcutGroup;
|
||||
import android.view.Menu;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.WindowInsets;
|
||||
import android.widget.Button;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
@@ -146,9 +145,14 @@ public class MainActivity extends BridgeActivity {
|
||||
root.addView(bar, params);
|
||||
// Above the gesture bar, and above the keyboard while it is up.
|
||||
bar.setOnApplyWindowInsetsListener((v, insets) -> {
|
||||
boolean modern = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R;
|
||||
int bottom = modern ? insets.getInsets(WindowInsets.Type.systemBars()).bottom : insets.getStableInsetBottom();
|
||||
boolean imeVisible = modern ? insets.isVisible(WindowInsets.Type.ime()) : insets.getSystemWindowInsetBottom() > bottom * 3;
|
||||
// Read off the window's own insets: Capacitor hands the views below the
|
||||
// decor a copy with the system bars zeroed, and before Android 11 that
|
||||
// takes the keyboard with it.
|
||||
androidx.core.view.WindowInsetsCompat window = androidx.core.view.ViewCompat.getRootWindowInsets(getWindow().getDecorView());
|
||||
int bottom = window != null
|
||||
? window.getInsets(androidx.core.view.WindowInsetsCompat.Type.navigationBars()).bottom
|
||||
: insets.getStableInsetBottom();
|
||||
boolean imeVisible = window != null && window.isVisible(androidx.core.view.WindowInsetsCompat.Type.ime());
|
||||
if (imeVisible != keyboardUp) {
|
||||
keyboardUp = imeVisible;
|
||||
updateSignInBar();
|
||||
|
||||
Reference in New Issue
Block a user