build(deps): bump compileSdk to 37

AnkiDroid/build.gradle

@@ -65,6 +65,7 @@ android {
     namespace = "com.ichi2.anki"
 
     compileSdk = libs.versions.compileSdk.get().toInteger()
+    compileSdkMinor = libs.versions.compileSdkMinor.get().toInteger()
 
     buildFeatures {
         buildConfig = true

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/FlagAdapter.kt

@@ -17,11 +17,9 @@
 
 package com.ichi2.anki.dialogs
 
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -31,6 +29,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputEditText
 import com.ichi2.anki.Flag
+import com.ichi2.anki.compat.showSoftInput
 import com.ichi2.anki.databinding.ItemEditFlagBinding
 import com.ichi2.utils.moveCursorToEnd
 import kotlinx.coroutines.CoroutineScope
@@ -86,8 +85,7 @@ class FlagAdapter(
             holder.flagNameEditLayout.visibility = View.VISIBLE
             holder.flagNameEdit.requestFocus()
             holder.flagNameEdit.moveCursorToEnd()
-            val inputMethodManager = holder.flagNameEdit.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            inputMethodManager.showSoftInput(holder.flagNameEdit, InputMethodManager.SHOW_IMPLICIT)
+            holder.flagNameEdit.showSoftInput()
         }
 
         holder.saveButton.setOnClickListener {

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

@@ -21,6 +21,7 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
+import com.ichi2.anki.compat.showSoftInput
 
 object AndroidUiUtils {
     /**
@@ -31,8 +32,7 @@ object AndroidUiUtils {
      */
     fun Activity?.showSoftInput() {
         val currentFocus = this?.currentFocus ?: return
-        val imm = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.showSoftInput(currentFocus, InputMethodManager.SHOW_IMPLICIT)
+        currentFocus.showSoftInput()
     }
 
     /**
@@ -61,8 +61,7 @@ object AndroidUiUtils {
         //  Required on some Android 9, 10 devices to show keyboard: https://stackoverflow.com/a/7784904
         view.postDelayed({
             view.requestFocus()
-            val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
+            view.showSoftInput()
             runnable?.run()
         }, 200)
     }

api/src/test/java/com/ichi2/anki/api/ApiUtilsTest.kt

@@ -5,6 +5,7 @@ package com.ichi2.anki.api
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
@@ -19,6 +20,7 @@ import kotlin.test.assertNull
  * Slack: bresan
  */
 @RunWith(RobolectricTestRunner::class)
+@Config(sdk = [35])
 internal class ApiUtilsTest {
     @Test
     fun joinFieldsShouldJoinWhenListIsValid() {

baselineprofile/build.gradle.kts

@@ -13,6 +13,10 @@ configure<TestExtension> {
         libs.versions.compileSdk
             .get()
             .toInt()
+    compileSdkMinor =
+        libs.versions.compileSdkMinor
+            .get()
+            .toInt()
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17

buildSrc/src/main/kotlin/ankidroid.android.api.gradle.kts

@@ -20,6 +20,7 @@ plugins {
 
 extensions.configure<LibraryExtension> {
     compileSdk = libsVersionFor("compileSdk").toInt()
+    compileSdkMinor = libsVersionFor("compileSdkMinor").toInt()
 
     compileOptions {
         // API remains on VERSION_11 for consumer compatibility.

buildSrc/src/main/kotlin/ankidroid.android.library.gradle.kts

@@ -16,6 +16,7 @@ plugins {
 
 extensions.configure<LibraryExtension> {
     compileSdk = libsVersionFor("compileSdk").toInt()
+    compileSdkMinor = libsVersionFor("compileSdkMinor").toInt()
 
     defaultConfig {
         minSdk = libsVersionFor("minSdk").toInt()

common/android/src/test/java/com/ichi2/anki/common/utils/android/ColorUtilsTest.kt

@@ -6,10 +6,12 @@ import android.graphics.Color
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 
 /** Tests for [darkenColor] and [lightenColorAbsolute] */
 @RunWith(AndroidJUnit4::class)
+@Config(sdk = [35])
 class ColorUtilsTest {
     @Test
     fun darkenColor_withNoChange_returnsSameColor() {

common/android/src/test/java/com/ichi2/anki/common/utils/android/KeyUtilsTest.kt

@@ -14,11 +14,13 @@ import android.view.KeyEvent.KEYCODE_STAR
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 
 /** Tests for [KeyEvent.digit]. */
 @RunWith(AndroidJUnit4::class)
+@Config(sdk = [35])
 class KeyUtilsTest {
     @Test
     fun `digit returns the digit for 0-9 keys`() {

compat/src/main/java/com/ichi2/anki/compat/BaseCompat.kt

@@ -23,6 +23,7 @@ import android.provider.MediaStore
 import android.view.View
 import android.view.Window
 import android.view.WindowManager
+import android.view.inputmethod.InputMethodManager
 import androidx.annotation.AnimRes
 import androidx.appcompat.widget.TooltipCompat
 import com.ichi2.anki.common.utils.annotation.KotlinCleanup
@@ -54,6 +55,12 @@ open class BaseCompat : Compat {
         )
     }
 
+    // Until API36, SHOW_IMPLICIT marks the request as one the system may ignore
+    override fun showSoftInput(view: View): Boolean {
+        val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        return imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
+    }
+
     override fun overrideTransition(
         activity: Activity,
         @AnimRes enter: Int,

compat/src/main/java/com/ichi2/anki/compat/Compat.kt

@@ -80,6 +80,23 @@ interface Compat {
 
     fun hideStatusBar(window: Window)
 
+    /**
+     * Request that the current input method's soft input area be shown to the
+     * user, if needed.
+     *
+     * Below Android 16, this is an implicit request: the window may not be
+     * shown, for example if a hardware keyboard is connected.
+     *
+     * @param view The currently focused view, which would like to receive soft keyboard input.
+     *   Note that this view is only considered focused here if both it itself has
+     *   [view focus][View.isFocused], and its containing window has
+     *   [window focus][View.hasWindowFocus]. Otherwise the call fails and returns `false`.
+     * @return `true` if a request was sent to system_server, `false` otherwise. Note:
+     *   this does not return result of the request.
+     * @see android.view.inputmethod.InputMethodManager.showSoftInput
+     */
+    fun showSoftInput(view: View): Boolean
+
     fun overrideTransition(
         activity: Activity,
         @AnimRes enter: Int,

compat/src/main/java/com/ichi2/anki/compat/CompatHelper.kt

@@ -40,6 +40,7 @@ class CompatHelper private constructor() {
     @SuppressLint("NewApi")
     private val compatValue: Compat =
         when {
+            sdkVersion >= Build.VERSION_CODES.BAKLAVA -> CompatV36()
             sdkVersion >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -> CompatV34()
             sdkVersion >= Build.VERSION_CODES.TIRAMISU -> CompatV33()
             sdkVersion >= Build.VERSION_CODES.S -> CompatV31()
@@ -209,6 +210,13 @@ class CompatHelper private constructor() {
  */
 fun View.setTooltipTextCompat(tooltipText: CharSequence?) = TooltipCompat.setTooltipText(this, tooltipText)
 
+/**
+ * Request that the current input method's soft input area be shown to the user, if needed.
+ *
+ * @see Compat.showSoftInput
+ */
+fun View.showSoftInput(): Boolean = compat.showSoftInput(this)
+
 inline fun <reified T : Serializable> Bundle.requireSerializableCompat(key: String): T =
     requireNotNull(compat.getSerializable(this, key, T::class.java)) {
         "key: '$key' not found or null"

compat/src/main/java/com/ichi2/anki/compat/CompatV30.kt

@@ -5,7 +5,8 @@ package com.ichi2.anki.compat
 
 import android.view.Window
 import androidx.annotation.RequiresApi
-import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat.Type.statusBars
 
 @RequiresApi(30)
 @Suppress("ktlint:standard:property-naming")
@@ -21,7 +22,6 @@ open class CompatV30 : CompatV29() {
         if (view == null) {
             return
         }
-        val controller = view.windowInsetsController
-        controller?.hide(WindowInsetsCompat.Type.statusBars())
+        WindowCompat.getInsetsController(window, view).hide(statusBars())
     }
 }

compat/src/main/java/com/ichi2/anki/compat/CompatV36.kt

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package com.ichi2.anki.compat
+
+import android.content.Context
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import androidx.annotation.RequiresApi
+
+@RequiresApi(36)
+open class CompatV36 : CompatV34() {
+    // From API36, SHOW_IMPLICIT is a no-op (and deprecated in API37)
+    override fun showSoftInput(view: View): Boolean {
+        val imm = view.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        return imm.showSoftInput(view, 0)
+    }
+}

gradle/libs.versions.toml

@@ -1,5 +1,6 @@
 [versions]
-compileSdk = "36"
+compileSdk = "37"
+compileSdkMinor = "0"
 
 # Changing minSdk means newer AnkiDroid versions will not support older devices.
 # However the Play Store will keep old AnkiDroid versions available for older