From 191f5923e3ae9fac8574056a4517a26554caa2c8 Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Thu, 23 May 2024 23:22:24 +0200
Subject: [PATCH] Fix overflow due to navigation on the right and cutouts

Take display cutouts and navigation bars when computing the keyboard
width on SDK >= 30.
---
 srcs/juloo.keyboard2/Keyboard2View.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 40def60..1c659db 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -3,6 +3,7 @@ package juloo.keyboard2;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.graphics.Canvas;
+import android.graphics.Insets;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -13,6 +14,9 @@ import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
 import java.util.Arrays;
 
 public class Keyboard2View extends View
@@ -256,6 +260,17 @@ public class Keyboard2View extends View
     int height =
       (int)(_config.keyHeight * _keyboard.keysHeight
           + _config.marginTop + _config.margin_bottom);
+    // Compatibility with display cutouts and navigation on the right
+    if (VERSION.SDK_INT >= 30)
+    {
+      WindowMetrics metrics =
+        ((WindowManager)getContext().getSystemService(Context.WINDOW_SERVICE))
+        .getCurrentWindowMetrics();
+      Insets insets = metrics.getWindowInsets().getInsetsIgnoringVisibility(
+          WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars()
+          | WindowInsets.Type.displayCutout());
+      width = metrics.getBounds().width() - insets.right - insets.left;
+    }
     setMeasuredDimension(width, height);
     _keyWidth = (width - (_config.horizontal_margin * 2)) / _keyboard.keysWidth;
   }