diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/keyboards/intkeyboards/ResKeyboardFactory.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/keyboards/intkeyboards/ResKeyboardFactory.java index d8e0e2f..984aec1 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/keyboards/intkeyboards/ResKeyboardFactory.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/addons/keyboards/intkeyboards/ResKeyboardFactory.java @@ -1,15 +1,14 @@ package com.liskovsoft.leankeyboard.addons.keyboards.intkeyboards; import android.content.Context; -import android.graphics.BitmapFactory; import android.graphics.Color; +import android.graphics.Typeface; import android.inputmethodservice.Keyboard; import android.inputmethodservice.Keyboard.Key; import android.text.Layout; import com.liskovsoft.leankeyboard.addons.keyboards.KeyboardBuilder; import com.liskovsoft.leankeyboard.addons.keyboards.KeyboardFactory; import com.liskovsoft.leankeyboard.addons.keyboards.KeyboardInfo; -import com.liskovsoft.leankeyboard.helpers.Helpers; import com.liskovsoft.leankeyboard.ime.LeanbackKeyboardView; import com.liskovsoft.leankeyboard.utils.TextDrawable; @@ -53,7 +52,7 @@ public class ResKeyboardFactory implements KeyboardFactory { String prefix = info.isAzerty() ? "azerty_" : "qwerty_"; int kbResId = mContext.getResources().getIdentifier(prefix + info.getLangCode(), "xml", mContext.getPackageName()); Keyboard keyboard = new Keyboard(mContext, kbResId); - return localizeKeys(keyboard); + return localizeKeys(keyboard, info); }; } @@ -62,23 +61,27 @@ public class ResKeyboardFactory implements KeyboardFactory { return ResKeyboardInfo.needUpdate(); } - private Keyboard localizeKeys(Keyboard keyboard) { + private Keyboard localizeKeys(Keyboard keyboard, KeyboardInfo info) { List keys = keyboard.getKeys(); for (Key key : keys) { if (key.codes[0] == LeanbackKeyboardView.ASCII_SPACE) { - //key.icon = Helpers.writeTextCentered(mContext, key.icon, "Hello World!", 18); - TextDrawable drawable = new TextDrawable(mContext, key.icon); - drawable.setText("TEXT DRAWN IN A CIRCLE"); - drawable.setTextAlign(Layout.Alignment.ALIGN_CENTER); - //Customize text size and color - drawable.setTextColor(Color.WHITE); - drawable.setTextSize(10); - key.icon = drawable; + localizeSpace(key, info); break; } } return keyboard; } + + private void localizeSpace(Key key, KeyboardInfo info) { + TextDrawable drawable = new TextDrawable(mContext, key.icon); + drawable.setText(info.getLangName()); + drawable.setTextAlign(Layout.Alignment.ALIGN_CENTER); + //Customize text size and color + drawable.setTextColor(Color.WHITE); + drawable.setTextSize(10); + drawable.setTypeface(Typeface.SANS_SERIF); + key.icon = drawable; + } } diff --git a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/TextDrawable.java b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/TextDrawable.java index 63614a6..9a6f0c8 100644 --- a/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/TextDrawable.java +++ b/leankeykeyboard/src/main/java/com/liskovsoft/leankeyboard/utils/TextDrawable.java @@ -36,8 +36,12 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.Path; +import android.graphics.PorterDuff; +import android.graphics.PorterDuff.Mode; +import android.graphics.PorterDuffXfermode; import android.graphics.Rect; import android.graphics.Typeface; +import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.text.Layout; import android.text.StaticLayout; @@ -374,7 +378,7 @@ public class TextDrawable extends Drawable { desired = mDrawable.getIntrinsicWidth(); } - mTextLayout = new StaticLayout(mText, mTextPaint, (int)desired, + mTextLayout = new StaticLayout(mText, mTextPaint, (int) desired, mTextAlignment, 1.0f, 0.0f, false); mTextBounds.set(0, 0, mTextLayout.getWidth(), mTextLayout.getHeight()); @@ -391,6 +395,11 @@ public class TextDrawable extends Drawable { int newColor = mTextColors.getColorForState(stateSet, Color.WHITE); if (mTextPaint.getColor() != newColor) { mTextPaint.setColor(newColor); + + // fully transparent text + mTextPaint.setAlpha(1); + mTextPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_OUT)); + return true; } @@ -443,15 +452,26 @@ public class TextDrawable extends Drawable { final Rect bounds = getBounds(); final int count = canvas.save(); - canvas.translate(bounds.left, bounds.top); + //canvas.translate(bounds.left, bounds.top); if (mDrawable != null) { + // scale drawable to fit canvas + Rect clipBounds = canvas.getClipBounds(); + mDrawable.setBounds(clipBounds); + mDrawable.draw(canvas); } if (mTextPath == null) { //Allow the layout to draw the text + + // Center text vertically!! + canvas.translate((bounds.width() / 2f) - (mTextLayout.getWidth() / 2f), (bounds.height() / 2f) - ((mTextLayout.getHeight() / 2f))); + mTextLayout.draw(canvas); + + // Set text transparent + //canvas.drawColor(Color.TRANSPARENT, Mode.CLEAR); } else { //Draw directly on the canvas using the supplied path canvas.drawTextOnPath(mText.toString(), mTextPath, 0, 0, mTextPaint); diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ar.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ar.png deleted file mode 100644 index f6c302d..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ar.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_bg.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_bg.png deleted file mode 100644 index ba88b48..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_bg.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_de.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_de.png deleted file mode 100644 index 98d4974..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_de.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_el.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_el.png deleted file mode 100644 index 0cc1092..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_el.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_en.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_en.png deleted file mode 100644 index a0e5c54..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_en.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_es.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_es.png deleted file mode 100644 index adb9b6f..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_es.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fa.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fa.png deleted file mode 100644 index 2cd8a72..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fa.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fr.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fr.png deleted file mode 100644 index 9acc999..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_fr.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_he.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_he.png deleted file mode 100644 index ab5bbe7..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_he.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_is.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_is.png deleted file mode 100644 index bbad561..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_is.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_it.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_it.png deleted file mode 100644 index 6377850..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_it.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_nl.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_nl.png deleted file mode 100644 index 26e7293..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_nl.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ru.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ru.png deleted file mode 100644 index 0c18c28..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_ru.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_sv.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_sv.png deleted file mode 100644 index e589988..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_sv.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_th.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_th.png deleted file mode 100644 index ee039fe..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_th.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_tr.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_tr.png deleted file mode 100644 index be9e70c..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_tr.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_uk.png b/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_uk.png deleted file mode 100644 index ffa35f2..0000000 Binary files a/leankeykeyboard/src/main/res/drawable-nodpi-v4/ic_ime_space_uk.png and /dev/null differ diff --git a/leankeykeyboard/src/main/res/values/languages.xml b/leankeykeyboard/src/main/res/values/languages.xml index 0700a03..fb63daf 100644 --- a/leankeykeyboard/src/main/res/values/languages.xml +++ b/leankeykeyboard/src/main/res/values/languages.xml @@ -3,23 +3,23 @@ English|en_us English (AZERTY)|en_us|azerty - Russian|ru - Ukrainian|uk - German|de - Bulgarian|bg - Dutch|nl - French|fr - French (AZERTY)|fr|azerty + Русский|ru + Українська|uk + Deutsch|de + Български|bg + Nederlands|nl + Français|fr + Français (AZERTY)|fr|azerty Greek|el - Icelandic|is - Italian|it + Íslenska|is + Italiano|it Swedish|sv - Spanish|es_us + Español|es_us Arabic|ar Hebrew|he Persian|fa Thai|th - Turkish (Q board)|tr - Turkish|tr|azerty + Türkçe (Q board)|tr + Türkçe|tr|azerty \ No newline at end of file diff --git a/leankeykeyboard/src/main/res/xml/azerty_en_us.xml b/leankeykeyboard/src/main/res/xml/azerty_en_us.xml index da4e27c..52f296b 100644 --- a/leankeykeyboard/src/main/res/xml/azerty_en_us.xml +++ b/leankeykeyboard/src/main/res/xml/azerty_en_us.xml @@ -57,7 +57,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/azerty_fr.xml b/leankeykeyboard/src/main/res/xml/azerty_fr.xml index 5978922..51eaefa 100644 --- a/leankeykeyboard/src/main/res/xml/azerty_fr.xml +++ b/leankeykeyboard/src/main/res/xml/azerty_fr.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/azerty_tr.xml b/leankeykeyboard/src/main/res/xml/azerty_tr.xml index 863ca60..40562bd 100644 --- a/leankeykeyboard/src/main/res/xml/azerty_tr.xml +++ b/leankeykeyboard/src/main/res/xml/azerty_tr.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ar.xml b/leankeykeyboard/src/main/res/xml/qwerty_ar.xml index eca176c..41248f5 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_ar.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_ar.xml @@ -58,7 +58,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_bg.xml b/leankeykeyboard/src/main/res/xml/qwerty_bg.xml index 867b4db..2edfe1c 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_bg.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_bg.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_de.xml b/leankeykeyboard/src/main/res/xml/qwerty_de.xml index b8b568a..d0a1db4 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_de.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_de.xml @@ -63,7 +63,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_el.xml b/leankeykeyboard/src/main/res/xml/qwerty_el.xml index 918d319..a6f0784 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_el.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_el.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml b/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml index 22441d1..b0b1482 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_en_us.xml @@ -58,7 +58,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml b/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml index 891f8bd..8d58f78 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_es_us.xml @@ -57,7 +57,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_fa.xml b/leankeykeyboard/src/main/res/xml/qwerty_fa.xml index f99452d..b514e13 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_fa.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_fa.xml @@ -62,7 +62,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_fr.xml b/leankeykeyboard/src/main/res/xml/qwerty_fr.xml index 4965c8f..70854d2 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_fr.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_fr.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_he.xml b/leankeykeyboard/src/main/res/xml/qwerty_he.xml index 1f73773..e852e0e 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_he.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_he.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_is.xml b/leankeykeyboard/src/main/res/xml/qwerty_is.xml index ac16228..514af28 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_is.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_is.xml @@ -62,7 +62,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_it.xml b/leankeykeyboard/src/main/res/xml/qwerty_it.xml index 62e801a..fb952e0 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_it.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_it.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_nl.xml b/leankeykeyboard/src/main/res/xml/qwerty_nl.xml index 35dd84b..cd1d13b 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_nl.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_nl.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_ru.xml b/leankeykeyboard/src/main/res/xml/qwerty_ru.xml index 44e250c..a20c264 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_ru.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_ru.xml @@ -57,7 +57,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_sv.xml b/leankeykeyboard/src/main/res/xml/qwerty_sv.xml index 139e32a..5ae04f7 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_sv.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_sv.xml @@ -57,7 +57,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_th.xml b/leankeykeyboard/src/main/res/xml/qwerty_th.xml index 9aadb78..2e999c7 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_th.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_th.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_tr.xml b/leankeykeyboard/src/main/res/xml/qwerty_tr.xml index 946f553..d5feca3 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_tr.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_tr.xml @@ -61,7 +61,7 @@ - + diff --git a/leankeykeyboard/src/main/res/xml/qwerty_uk.xml b/leankeykeyboard/src/main/res/xml/qwerty_uk.xml index 8f7601c..29d7918 100644 --- a/leankeykeyboard/src/main/res/xml/qwerty_uk.xml +++ b/leankeykeyboard/src/main/res/xml/qwerty_uk.xml @@ -57,7 +57,7 @@ - +