Fix getsize() and getMatrix Depreciation

Author: jainv4156

AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/Toolbar.kt

@@ -21,9 +21,11 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Insets
 import android.graphics.Paint
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Build
 import android.util.AttributeSet
 import android.util.DisplayMetrics
 import android.util.TypedValue
@@ -33,6 +35,7 @@ import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowInsets
 import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.annotation.ColorInt
@@ -234,10 +237,25 @@ class Toolbar : FrameLayout {
     private val screenWidth: Int
         get() {
             val displayMetrics = DisplayMetrics()
-            (context as Activity)
-                .windowManager
-                .defaultDisplay
-                .getMetrics(displayMetrics)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                val windowMetrics =
+                    (context as Activity)
+                        .windowManager
+                        .currentWindowMetrics
+                val windowInsets: WindowInsets = windowMetrics.getWindowInsets()
+                val insets: Insets =
+                    windowInsets.getInsetsIgnoringVisibility(
+                        WindowInsets.Type.navigationBars()
+                            or WindowInsets.Type.displayCutout(),
+                    )
+                val insetsWidth: Int = insets.right + insets.left
+                displayMetrics.widthPixels = windowMetrics.bounds.width() - insetsWidth
+            } else {
+                (context as Activity)
+                    .windowManager
+                    .defaultDisplay
+                    .getMetrics(displayMetrics)
+            }
             return displayMetrics.widthPixels
         }
 

AnkiDroid/src/main/java/com/ichi2/utils/DisplayUtils.kt

@@ -17,18 +17,38 @@
 package com.ichi2.utils
 
 import android.content.Context
+import android.graphics.Insets
 import android.graphics.Point
+import android.os.Build
 import android.view.Window
+import android.view.WindowInsets
 import android.view.WindowManager
+import android.view.WindowMetrics
 import com.ichi2.anki.AnkiDroidApp
 import kotlin.math.roundToInt
 
 object DisplayUtils {
     @Suppress("DEPRECATION") // #9333: defaultDisplay & getSize
     fun getDisplayDimensions(wm: WindowManager): Point {
-        val display = wm.defaultDisplay
         val point = Point()
-        display.getSize(point)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            val windowMetrics: WindowMetrics = wm.currentWindowMetrics
+            val bounds = windowMetrics.bounds
+            val windowInsets: WindowInsets = windowMetrics.getWindowInsets()
+            val insets: Insets =
+                windowInsets.getInsetsIgnoringVisibility(
+                    WindowInsets.Type.navigationBars()
+                        or WindowInsets.Type.displayCutout(),
+                )
+
+            val insetsWidth: Int = insets.right + insets.left
+            val insetsHeight: Int = insets.top + insets.bottom
+            point.x = bounds.width() - (insetsWidth)
+            point.y = bounds.height() - (insetsHeight)
+        } else {
+            val display = wm.defaultDisplay
+            display.getSize(point)
+        }
         return point
     }