react-native-keyboard-controller 1.18.5 → 1.18.6

package/android/src/main/java/com/reactnativekeyboardcontroller/extensions/View.kt

@@ -1,9 +1,9 @@
 package com.reactnativekeyboardcontroller.extensions
 
+import android.annotation.SuppressLint
 import android.graphics.Rect
 import android.os.Build
 import android.view.View
-import androidx.annotation.RequiresApi
 import com.reactnativekeyboardcontroller.log.Logger
 
 /**
@@ -11,6 +11,7 @@ import com.reactnativekeyboardcontroller.log.Logger
  * to ensure that insets are always received.
  * @see https://stackoverflow.com/a/61909205/9272042
  */
+@SuppressLint("ObsoleteSdkInt")
 fun View.requestApplyInsetsWhenAttached() {
   // https://chris.banes.dev/2019/04/12/insets-listeners-to-layouts/
   if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT && isAttachedToWindow) {
@@ -38,14 +39,16 @@ private val tmpIntArr = IntArray(2)
 /**
  * Function which updates the given [rect] with this view's position and bounds in its window.
  */
-@RequiresApi(Build.VERSION_CODES.KITKAT)
+@SuppressLint("ObsoleteSdkInt")
 fun View.copyBoundsInWindow(rect: Rect) {
-  if (isAttachedToWindow) {
-    rect.set(0, 0, width, height)
-    getLocationInWindow(tmpIntArr)
-    rect.offset(tmpIntArr[0], tmpIntArr[1])
-  } else {
-    Logger.w("View.copyBoundsInWindow", "Can not copy bounds as view is not attached to window")
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+    if (isAttachedToWindow) {
+      rect.set(0, 0, width, height)
+      getLocationInWindow(tmpIntArr)
+      rect.offset(tmpIntArr[0], tmpIntArr[1])
+    } else {
+      Logger.w("View.copyBoundsInWindow", "Can not copy bounds as view is not attached to window")
+    }
   }
 }
 

package/android/src/main/java/com/reactnativekeyboardcontroller/modules/statusbar/StatusBarManagerCompatModuleImpl.kt

@@ -2,9 +2,9 @@ package com.reactnativekeyboardcontroller.modules.statusbar
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.facebook.react.bridge.ReactApplicationContext
@@ -37,37 +37,39 @@ class StatusBarManagerCompatModuleImpl(
     }
   }
 
-  @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+  @SuppressLint("ObsoleteSdkInt")
   fun setColor(
     color: Int,
     animated: Boolean,
   ) {
-    if (!isEnabled()) {
-      return original.setColor(color.toDouble(), animated)
-    }
-
-    val activity = mReactContext.currentActivity
-    if (activity == null) {
-      Logger.w(
-        TAG,
-        "StatusBarManagerCompatModule: Ignored status bar change, current activity is null.",
-      )
-      return
-    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      if (!isEnabled()) {
+        return original.setColor(color.toDouble(), animated)
+      }
 
-    UiThreadUtil.runOnUiThread {
-      val window = activity.window
+      val activity = mReactContext.currentActivity
+      if (activity == null) {
+        Logger.w(
+          TAG,
+          "StatusBarManagerCompatModule: Ignored status bar change, current activity is null.",
+        )
+        return
+      }
 
-      if (animated) {
-        val curColor: Int = window.statusBarColor
-        val colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), curColor, color)
-        colorAnimation.addUpdateListener { animator ->
-          window.statusBarColor = animator.animatedValue as Int
+      UiThreadUtil.runOnUiThread {
+        val window = activity.window
+
+        if (animated) {
+          val curColor: Int = window.statusBarColor
+          val colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), curColor, color)
+          colorAnimation.addUpdateListener { animator ->
+            window.statusBarColor = animator.animatedValue as Int
+          }
+          colorAnimation.setDuration(DEFAULT_ANIMATION_TIME).startDelay = 0
+          colorAnimation.start()
+        } else {
+          window.statusBarColor = color
         }
-        colorAnimation.setDuration(DEFAULT_ANIMATION_TIME).startDelay = 0
-        colorAnimation.start()
-      } else {
-        window.statusBarColor = color
       }
     }
   }

package/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.res.Configuration
 import android.os.Handler
 import android.os.Looper
+import android.view.WindowManager
 import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
@@ -153,6 +154,8 @@ class EdgeToEdgeReactViewGroup(
           !isEdgeToEdge,
         )
       }
+      // unclear legacy flag if it was set earlier
+      reactContext.currentActivity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
     }
   }
 

package/android/src/main/java/com/reactnativekeyboardcontroller/views/KeyboardGestureAreaReactViewGroup.kt

@@ -6,7 +6,6 @@ import android.os.Build
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import android.view.ViewConfiguration
-import androidx.annotation.RequiresApi
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.react.uimanager.ThemedReactContext
@@ -50,7 +49,6 @@ class KeyboardGestureAreaReactViewGroup(
 
   private var velocityTracker: VelocityTracker? = null
 
-  @RequiresApi(Build.VERSION_CODES.R)
   override fun dispatchTouchEvent(event: MotionEvent?): Boolean {
     if (velocityTracker == null) {
       // Obtain a VelocityTracker if we don't have one yet
@@ -86,7 +84,6 @@ class KeyboardGestureAreaReactViewGroup(
   // endregion
 
   // region Handlers
-  @RequiresApi(Build.VERSION_CODES.KITKAT)
   private fun onActionDown(event: MotionEvent) {
     velocityTracker?.addMovement(event)
 
@@ -97,7 +94,6 @@ class KeyboardGestureAreaReactViewGroup(
     lastWindowY = bounds.top
   }
 
-  @RequiresApi(Build.VERSION_CODES.R)
   private fun onActionMove(event: MotionEvent) {
     // Since the view is likely to be translated/moved as the WindowInsetsAnimation
     // progresses, we need to make sure we account for that change in our touch
@@ -230,11 +226,14 @@ class KeyboardGestureAreaReactViewGroup(
     else -> false
   }
 
-  @RequiresApi(Build.VERSION_CODES.R)
   private fun getWindowHeight(): Int {
-    val metrics = reactContext.currentActivity?.windowManager?.currentWindowMetrics
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      val metrics = reactContext.currentActivity?.windowManager?.currentWindowMetrics
 
-    return metrics?.bounds?.height() ?: 0
+      return metrics?.bounds?.height() ?: 0
+    }
+
+    return 0
   }
 
   companion object {

package/android/src/paper/java/com/reactnativekeyboardcontroller/StatusBarManagerCompatModule.kt

@@ -1,7 +1,5 @@
 package com.reactnativekeyboardcontroller
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
@@ -22,7 +20,6 @@ class StatusBarManagerCompatModule(
   }
 
   @ReactMethod
-  @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
   private fun setColor(
     color: Int,
     animated: Boolean,

package/jest/index.js

@@ -42,6 +42,21 @@ const state = {
   isVisible: false,
 };
 
+const DefaultKeyboardToolbarTheme = {
+  light: {
+    primary: "#2c2c2c",
+    disabled: "#B0BEC5",
+    background: "#f3f3f4",
+    ripple: "#bcbcbcbc",
+  },
+  dark: {
+    primary: "#fafafa",
+    disabled: "#707070",
+    background: "#2C2C2E",
+    ripple: "#F8F8F888",
+  },
+};
+
 const mock = {
   // hooks
   /// keyboard
@@ -105,6 +120,8 @@ const mock = {
   KeyboardAvoidingView: View,
   KeyboardAwareScrollView: ScrollView,
   KeyboardToolbar: View,
+  // themes
+  DefaultKeyboardToolbarTheme,
 };
 
 module.exports = mock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.18.5",
+  "version": "1.18.6",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",