mirror of
https://github.com/SimpleMobileTools/Simple-Keyboard.git
synced 2025-02-16 20:00:36 +01:00
changing Keyboard to MyKeyboard on the remaining places
This commit is contained in:
parent
850878cfe8
commit
49ec711a60
@ -193,11 +193,7 @@ class MyKeyboard {
|
|||||||
|
|
||||||
constructor(res: Resources, parent: MyKeyboard, parser: XmlResourceParser?) {
|
constructor(res: Resources, parent: MyKeyboard, parser: XmlResourceParser?) {
|
||||||
this.parent = parent
|
this.parent = parent
|
||||||
var a = res.obtainAttributes(
|
var a = res.obtainAttributes(Xml.asAttributeSet(parser), R.styleable.Keyboard)
|
||||||
Xml.asAttributeSet(parser),
|
|
||||||
R.styleable.Keyboard
|
|
||||||
)
|
|
||||||
|
|
||||||
defaultWidth = getDimensionOrFraction(a, R.styleable.Keyboard_keyWidth, parent.mDisplayWidth, parent.mDefaultWidth)
|
defaultWidth = getDimensionOrFraction(a, R.styleable.Keyboard_keyWidth, parent.mDisplayWidth, parent.mDefaultWidth)
|
||||||
defaultHeight = getDimensionOrFraction(a, R.styleable.Keyboard_keyHeight, parent.mDisplayHeight, parent.mDefaultHeight)
|
defaultHeight = getDimensionOrFraction(a, R.styleable.Keyboard_keyHeight, parent.mDisplayHeight, parent.mDefaultHeight)
|
||||||
defaultHorizontalGap = getDimensionOrFraction(a, R.styleable.Keyboard_horizontalGap, parent.mDisplayWidth, parent.mDefaultHorizontalGap)
|
defaultHorizontalGap = getDimensionOrFraction(a, R.styleable.Keyboard_horizontalGap, parent.mDisplayWidth, parent.mDefaultHorizontalGap)
|
||||||
@ -522,7 +518,6 @@ class MyKeyboard {
|
|||||||
val dm = context.resources.displayMetrics
|
val dm = context.resources.displayMetrics
|
||||||
mDisplayWidth = dm.widthPixels
|
mDisplayWidth = dm.widthPixels
|
||||||
mDisplayHeight = dm.heightPixels
|
mDisplayHeight = dm.heightPixels
|
||||||
//Log.v(TAG, "keyboard's display metrics:" + dm);
|
|
||||||
mDefaultHorizontalGap = 0
|
mDefaultHorizontalGap = 0
|
||||||
mDefaultWidth = mDisplayWidth / 10
|
mDefaultWidth = mDisplayWidth / 10
|
||||||
mDefaultVerticalGap = 0
|
mDefaultVerticalGap = 0
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package com.simplemobiletools.keyboard.services
|
package com.simplemobiletools.keyboard.services
|
||||||
|
|
||||||
import android.inputmethodservice.InputMethodService
|
import android.inputmethodservice.InputMethodService
|
||||||
import android.inputmethodservice.Keyboard
|
|
||||||
import android.text.TextUtils
|
import android.text.TextUtils
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
@ -5,7 +5,6 @@ import android.content.Context
|
|||||||
import android.graphics.*
|
import android.graphics.*
|
||||||
import android.graphics.Paint.Align
|
import android.graphics.Paint.Align
|
||||||
import android.graphics.drawable.Drawable
|
import android.graphics.drawable.Drawable
|
||||||
import android.inputmethodservice.Keyboard
|
|
||||||
import android.media.AudioManager
|
import android.media.AudioManager
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Message
|
import android.os.Message
|
||||||
@ -22,7 +21,7 @@ import com.simplemobiletools.keyboard.helpers.MyKeyboard
|
|||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A view that renders a virtual [Keyboard]. It handles rendering of keys and
|
* A view that renders a virtual [MyKeyboard]. It handles rendering of keys and
|
||||||
* detecting key presses and touch movements.
|
* detecting key presses and touch movements.
|
||||||
*
|
*
|
||||||
* @attr ref android.R.styleable#KeyboardView_keyBackground
|
* @attr ref android.R.styleable#KeyboardView_keyBackground
|
||||||
@ -383,7 +382,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
|||||||
/**
|
/**
|
||||||
* Attaches a keyboard to this view. The keyboard can be switched at any time and the
|
* Attaches a keyboard to this view. The keyboard can be switched at any time and the
|
||||||
* view will re-layout itself to accommodate the keyboard.
|
* view will re-layout itself to accommodate the keyboard.
|
||||||
* @see Keyboard
|
* @see MyKeyboard
|
||||||
*
|
*
|
||||||
* @see .getKeyboard
|
* @see .getKeyboard
|
||||||
* @param keyboard the keyboard to display in this view
|
* @param keyboard the keyboard to display in this view
|
||||||
@ -912,7 +911,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
|
|||||||
* Invalidates a key so that it will be redrawn on the next repaint. Use this method if only
|
* Invalidates a key so that it will be redrawn on the next repaint. Use this method if only
|
||||||
* one key is changing it's content. Any changes that affect the position or size of the key
|
* one key is changing it's content. Any changes that affect the position or size of the key
|
||||||
* may not be honored.
|
* may not be honored.
|
||||||
* @param keyIndex the index of the key in the attached [Keyboard].
|
* @param keyIndex the index of the key in the attached [MyKeyboard].
|
||||||
* @see .invalidateAllKeys
|
* @see .invalidateAllKeys
|
||||||
*/
|
*/
|
||||||
fun invalidateKey(keyIndex: Int) {
|
fun invalidateKey(keyIndex: Int) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
|
<MyKeyboard xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:keyWidth="10%"
|
android:keyWidth="10%"
|
||||||
android:keyHeight="60dp"
|
android:keyHeight="60dp"
|
||||||
android:keyBackground="@color/color_primary_dark"
|
android:keyBackground="@color/color_primary_dark"
|
||||||
@ -126,4 +126,4 @@
|
|||||||
android:keyEdgeFlags="right"
|
android:keyEdgeFlags="right"
|
||||||
android:keyIcon="@drawable/ic_enter_vector" />
|
android:keyIcon="@drawable/ic_enter_vector" />
|
||||||
</Row>
|
</Row>
|
||||||
</Keyboard>
|
</MyKeyboard>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user