Update gradle and fix tests

Author: tamo

app/build.gradle

@@ -38,6 +38,7 @@ android {
     testOptions {
         unitTests.returnDefaultValues = true
         unitTests.includeAndroidResources = true
+        animationsDisabled = true
     }
 }
 

app/src/androidTest/java/jp/deadend/noname/skk/SKKSettingsActivityUITest.kt

@@ -12,6 +12,7 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.NoMatchingViewException
+import androidx.test.espresso.action.EspressoKey
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.pressKey
 import androidx.test.espresso.action.ViewActions.swipeUp
@@ -242,7 +243,14 @@ class SKKSettingsActivityUITest {
             .perform(click())
         repeat(3) {
             Thread.sleep(1000)
-            onView(withText("全角英数キー")).perform(pressKey(KeyEvent.KEYCODE_Z, KeyEvent.META_SHIFT_LEFT_ON))
+            onView(withText("全角英数キー")).perform(
+                pressKey(
+                    EspressoKey.Builder()
+                        .withKeyCode(KeyEvent.KEYCODE_Z)
+                        .withShiftPressed(true)
+                        .build()
+                )
+            )
         }
         onView(withText("全角英数キー")).check(matches(hasSibling(withText("SHIFT+Z"))))
         assert(skkPrefs.zenkakuKey == (KeyEvent.KEYCODE_Z shl 4 or 1))
@@ -257,6 +265,12 @@ class SKKSettingsActivityUITest {
         }
         onView(withText("Abbrevキー")).check(matches(hasSibling(withText("PERIOD"))))
         assert(skkPrefs.abbrevKey == (KeyEvent.KEYCODE_PERIOD shl 4))
+
+        // Revert them all
+        skkPrefs.kanaKey = KeyEvent.KEYCODE_J shl 4 or /* CTRL_PRESSED */ 4
+        skkPrefs.katakanaKey = KeyEvent.KEYCODE_Q shl 4
+        skkPrefs.asciiKey = KeyEvent.KEYCODE_L shl 4
+        skkPrefs.zenkakuKey = KeyEvent.KEYCODE_L shl 4 or 1
     }
 
     @Test

app/src/main/java/jp/deadend/noname/skk/SKKPrefs.kt

@@ -71,19 +71,31 @@ class SKKPrefs(context: Context) {
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_cancel_key), value) }
 
     var katakanaKey: Int
-        get() = prefs.getInt(res.getString(R.string.pref_katakana_key), 720) // 720はq (KEYCODE_Q=45, shl 4)
+        get() = prefs.getInt(
+            res.getString(R.string.pref_katakana_key),
+            720
+        ) // 720はq (KEYCODE_Q=45, shl 4)
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_katakana_key), value) }
 
     var asciiKey: Int
-        get() = prefs.getInt(res.getString(R.string.pref_ascii_key), 640) // 640はl (KEYCODE_L=40, shl 4)
+        get() = prefs.getInt(
+            res.getString(R.string.pref_ascii_key),
+            640
+        ) // 640はl (KEYCODE_L=40, shl 4)
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_ascii_key), value) }
 
     var zenkakuKey: Int
-        get() = prefs.getInt(res.getString(R.string.pref_zenkaku_key), 641) // 641はShift+L (40 shl 4 | 1)
+        get() = prefs.getInt(
+            res.getString(R.string.pref_zenkaku_key),
+            641
+        ) // 641はShift+L (40 shl 4 | 1)
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_zenkaku_key), value) }
 
     var abbrevKey: Int
-        get() = prefs.getInt(res.getString(R.string.pref_abbrev_key), 1216) // 1216はSlash (KEYCODE_SLASH=76, shl 4)
+        get() = prefs.getInt(
+            res.getString(R.string.pref_abbrev_key),
+            1216
+        ) // 1216はSlash (KEYCODE_SLASH=76, shl 4)
         set(value) = prefs.edit { putInt(res.getString(R.string.pref_abbrev_key), value) }
 
     var useCandidatesView: Boolean

app/src/main/java/jp/deadend/noname/skk/engine/SKKEngine.kt

@@ -138,7 +138,7 @@ class SKKEngine(
     fun processKey(keyCode: Int) = state.processKey(this, keyCode)
 
     fun handleKanaKey() = state.handleKanaKey(this)
- 
+
     fun handleKatakanaKey() {
         when (state) {
             SKKHiraganaState -> changeState(SKKKatakanaState)

app/src/main/res/xml/prefs_hard_key.xml

@@ -34,7 +34,7 @@
         <androidx.preference.Preference
             app:iconSpaceReserved="false"
             app:key="@string/pref_ascii_key"
-            app:title="直接入力キー" />
+            app:title="ASCIIキー" />
         <androidx.preference.Preference
             app:iconSpaceReserved="false"
             app:key="@string/pref_zenkaku_key"

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        agp_version = '9.1.1'
+        agp_version = '9.2.0'
         kotlin_version = '2.2.21'
     }
     repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jan 29 13:15:47 JST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME