diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index cb02621..66847c5 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -32,6 +32,7 @@ android { buildFeatures { viewBinding = true + buildConfig = true } compileOptions { @@ -226,20 +227,20 @@ play { dependencies { implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.recyclerview:recyclerview:1.3.1") + implementation("androidx.recyclerview:recyclerview:1.3.2") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.fragment:fragment-ktx:1.6.1") + implementation("androidx.fragment:fragment-ktx:1.6.2") implementation("androidx.documentfile:documentfile:1.0.1") - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("io.coil-kt:coil:2.2.2") implementation("androidx.core:core-splashscreen:1.0.1") - implementation("androidx.window:window:1.2.0-beta03") + implementation("androidx.window:window:1.2.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - implementation("androidx.navigation:navigation-fragment-ktx:2.7.4") - implementation("androidx.navigation:navigation-ui-ktx:2.7.4") + implementation("androidx.navigation:navigation-fragment-ktx:2.7.7") + implementation("androidx.navigation:navigation-ui-ktx:2.7.7") implementation("info.debatty:java-string-similarity:2.0.0") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0") } diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt index e058067..c2d302b 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt @@ -8,14 +8,14 @@ import android.os.Handler import android.os.Looper import android.view.KeyEvent import android.view.View -import android.view.WindowInsets import android.view.inputmethod.InputMethodManager import androidx.annotation.Keep import androidx.core.view.ViewCompat -import java.io.Serializable +import androidx.core.view.WindowInsetsCompat import org.yuzu.yuzu_emu.NativeLibrary import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.applets.keyboard.ui.KeyboardDialogFragment +import java.io.Serializable @Keep object SoftwareKeyboard { @@ -35,7 +35,7 @@ object SoftwareKeyboard { val overlayView = emulationActivity!!.findViewById(R.id.surface_input_overlay) val im = overlayView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - im.showSoftInput(overlayView, InputMethodManager.SHOW_FORCED) + im.showSoftInput(overlayView, 0) // There isn't a good way to know that the IMM is dismissed, so poll every 500ms to submit inline keyboard result. val handler = Handler(Looper.myLooper()!!) @@ -44,7 +44,7 @@ object SoftwareKeyboard { object : Runnable { override fun run() { val insets = ViewCompat.getRootWindowInsets(overlayView) - val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime()) + val isKeyboardVisible = insets!!.isVisible(WindowInsetsCompat.Type.ime()) if (isKeyboardVisible) { handler.postDelayed(this, delayMs.toLong()) return diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index 6b47205..e83ddf9 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts @@ -17,6 +17,6 @@ buildscript { google() } dependencies { - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7") } } diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 4fca1b5..f9ece34 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -14,7 +14,5 @@ android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kotlin.parallel.tasks.in.project=true -android.defaults.buildfeatures.buildconfig=true - # Android Gradle plugin 8.0.2 android.suppressUnsupportedCompileSdk=34