Merge AndroidSKK 3.5.1

.gitignore

@@ -35,7 +35,7 @@ local.properties
 .DS_Store
 /build
 /captures
-/app/release/output.json
+/app/release
 .externalNativeBuild
 
-/svg
+/svg

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "io.github.deton.androidtutcode"
-        minSdkVersion 14
-        targetSdkVersion 30
-        versionCode 5
-        versionName "1.2.0"
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 6
+        versionName "1.3.0"
     }
 
     buildTypes {
@@ -24,12 +24,13 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'jp.deadend.noname.skk'
 }
 
 dependencies {
     implementation files('libs/jdbm-1.0.jar')
 /*    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' */
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.0'
 }
 repositories {

app/src/main/AndroidManifest.xml

@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="jp.deadend.noname.skk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<queries>
+		<intent>
+			<action android:name="android.speech.action.RECOGNIZE_SPEECH"/>
+		</intent>
+		<intent>
+			<action android:name="com.adamrocker.android.simeji.ACTION_INTERCEPT" />
+			<category android:name="com.adamrocker.android.simeji.REPLACE"/>
+		</intent>
+	</queries>
 	<application android:label="@string/ime_name"
 			android:allowBackup="true"
 			android:name=".SKKApplication"
 		>
 		<service android:name=".SKKService"
-			android:permission="android.permission.BIND_INPUT_METHOD" >
+			android:permission="android.permission.BIND_INPUT_METHOD"
+			android:exported="false" >
 			<intent-filter>
 				<action android:name="android.view.InputMethod" />
 			</intent-filter>
@@ -26,9 +35,6 @@
 				  android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
 				  android:label="@string/label_dicmanager_activity" >
 		</activity>
-		<activity android:name=".FileChooser"
-			android:theme="@style/Theme.AppCompat.Light.DarkActionBar" >
-		</activity>
 		<activity android:name=".SKKMushroom"
 			android:label="@string/label_mushroom"
 			android:theme="@style/Theme.AppCompat.Light.Dialog">

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

@@ -1,14 +1,12 @@
 package jp.deadend.noname.skk
 
 import android.content.Context
-import android.inputmethodservice.Keyboard
-import android.inputmethodservice.KeyboardView
 import android.view.KeyEvent
 import android.util.AttributeSet
 
 class AbbrevKeyboardView : KeyboardView, KeyboardView.OnKeyboardActionListener {
     private lateinit var mService: SKKService
-    private val mKeyboard = SKKKeyboard(context, R.xml.abbrev, 5)
+    private val mKeyboard = Keyboard(context, R.xml.abbrev)
 
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
     constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
@@ -27,11 +25,7 @@ class AbbrevKeyboardView : KeyboardView, KeyboardView.OnKeyboardActionListener {
         mService = listener
     }
 
-    fun changeKeyHeight(px: Int) {
-        mKeyboard.changeKeyHeight(px)
-    }
-
-    override fun onKey(primaryCode: Int, keyCodes: IntArray) {
+    override fun onKey(primaryCode: Int) {
         when (primaryCode) {
             Keyboard.KEYCODE_SHIFT -> isShifted = !isShifted
             Keyboard.KEYCODE_DELETE -> {

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

@@ -25,6 +25,7 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import androidx.core.content.res.ResourcesCompat
+import kotlin.math.min
 
 /**
  * Construct a CandidateView for showing suggested words for completion.
@@ -307,7 +308,7 @@ class CandidateView(context: Context, attrs: AttributeSet) : View(context, attrs
         val rightEdge = mScrollX + width
         while (i < count) {
             if (mWordX[i] <= rightEdge && mWordX[i] + mWordWidth[i] >= rightEdge) {
-                targetX = Math.min(mWordX[i], mTotalWidth - width)
+                targetX = min(mWordX[i], mTotalWidth - width)
                 break
             }
             i++

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

@@ -43,6 +43,14 @@ class CandidateViewContainer(screen: Context, attrs: AttributeSet) : LinearLayou
         }
     }
 
+    fun setAlpha(alpha: Int) {
+        background.alpha = alpha
+        binding.candidateLeft.alpha = alpha / 255f
+        binding.candidateRight.alpha = alpha / 255f
+        binding.candidateLeft.background.alpha = alpha
+        binding.candidateRight.background.alpha = alpha
+    }
+
     fun setScrollButtonsEnabled(left: Boolean, right: Boolean) {
         binding.candidateLeft.isEnabled = left
         binding.candidateRight.isEnabled = right