@@ -1012,37 +1012,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
10121012 mMiniKeyboard = miniKeyboardView
10131013 }
10141014
1015- mMiniKeyboard!! .mOnKeyboardActionListener = object : OnKeyboardActionListener {
1016- override fun onKey (code : Int ) {
1017- mOnKeyboardActionListener!! .onKey(code)
1018- dismissPopupKeyboard()
1019- }
1020-
1021- override fun onPress (primaryCode : Int ) {
1022- mOnKeyboardActionListener!! .onPress(primaryCode)
1023- }
1024-
1025- override fun onActionUp () {
1026- mOnKeyboardActionListener!! .onActionUp()
1027- }
1028-
1029- override fun moveCursorLeft () {
1030- mOnKeyboardActionListener!! .moveCursorLeft()
1031- }
1032-
1033- override fun moveCursorRight () {
1034- mOnKeyboardActionListener!! .moveCursorRight()
1035- }
1036-
1037- override fun onText (text : String ) {
1038- mOnKeyboardActionListener!! .onText(text)
1039- }
1040-
1041- override fun reloadKeyboard () {
1042- mOnKeyboardActionListener!! .reloadKeyboard()
1043- }
1044- }
1045-
10461015 val keyboard = if (popupKey.popupCharacters != null ) {
10471016 MyKeyboard (context, popupKeyboardId, popupKey.popupCharacters!! , popupKey.width)
10481017 } else {
@@ -1056,7 +1025,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
10561025 )
10571026 mMiniKeyboardCache[popupKey] = mMiniKeyboardContainer
10581027 } else {
1059- mMiniKeyboard = keyboardPopupBinding !! .miniKeyboardView
1028+ mMiniKeyboard = mMiniKeyboardCache[popupKey]?. let ( KeyboardPopupKeyboardBinding ::bind)? .miniKeyboardView
10601029 }
10611030
10621031 getLocationInWindow(mCoordinates)
0 commit comments