diff --git a/android/src/main/assets/pixel_font.ttf b/android/src/main/assets/pixel_font.ttf new file mode 100644 index 000000000..98f2951dc Binary files /dev/null and b/android/src/main/assets/pixel_font.ttf differ diff --git a/android/src/main/assets/pixelfont.ttf b/android/src/main/assets/pixelfont.ttf deleted file mode 100644 index b9d9a6230..000000000 Binary files a/android/src/main/assets/pixelfont.ttf and /dev/null differ diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java index 4cf32eed5..f8555183e 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java @@ -212,8 +212,9 @@ public class AndroidPlatformSupport extends PlatformSupport { if (systemfont){ basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.absolute("/system/fonts/DroidSans.ttf")); } else { - //FIXME need to add currency symbols - basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixelfont.ttf")); + //FIXME should probably add more latin/cyrillic glyphs to this + //and go over translations + basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("pixel_font.ttf")); } //android 7.0+. Finally back to normalcy, everything nicely in one .ttc diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java index 29f41eda9..74059e77b 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/windows/WndAndroidTextInput.java @@ -98,7 +98,7 @@ public class WndAndroidTextInput extends Window { textInput = new EditText((AndroidApplication)Gdx.app); textInput.setText( initialValue ); if (!SPDSettings.systemFont()){ - textInput.setTypeface( Typeface.createFromAsset(AndroidLauncher.instance.getAssets(), "pixelfont.ttf") ); + textInput.setTypeface( Typeface.createFromAsset(AndroidLauncher.instance.getAssets(), "pixel_font.ttf") ); } textInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)}); textInput.setInputType( InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES );