diff --git a/app/src/main/assets/ReadMe.txt b/app/src/main/assets/ReadMe.txt index 7c145df..5147d52 100644 --- a/app/src/main/assets/ReadMe.txt +++ b/app/src/main/assets/ReadMe.txt @@ -26,6 +26,7 @@ QUICK START NOTES +- The Help menu displays Emu48's original help HTML page and may not accurately reflect the behavior of this Android version. - When using a custom KML script by selecting a folder, you must take care of the case sensitivity of its dependency files. - Starting with the version 1.4, a RAM card generator for the port 2 of the HP48SX and HP48GX has been added. Like with the MKSHARED.EXE on Windows, you can generate the card in a file (i.e.: SHARED.BIN). @@ -123,7 +124,7 @@ Version 1.0 (2019-02-28) LICENSES -Android version by Régis COSNIER. +Android version by Régis COSNIER. This program is based on Emu48 for Windows version, copyrighted by Christoph Gießelink & Sébastien Carlier, with the addition of a win32 layer to run on Android. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. diff --git a/app/src/main/java/org/emulator/forty/eight/MainActivity.java b/app/src/main/java/org/emulator/forty/eight/MainActivity.java index d9f66a5..c343cf1 100644 --- a/app/src/main/java/org/emulator/forty/eight/MainActivity.java +++ b/app/src/main/java/org/emulator/forty/eight/MainActivity.java @@ -1378,9 +1378,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On // sharedPreferences.getBoolean("settings_allow_sound", true) ? 64 : 0, 0, null); // break; case "settings_sound_volume": { - float volumeOption = sharedPreferences.getInt("settings_sound_volume", 25); - int volumeValue = (int)((volumeOption * 255.0f) / 100.0f); - NativeLib.setConfiguration("settings_sound_volume", isDynamicValue, volumeValue, 0, null); + int volumeOption = sharedPreferences.getInt("settings_sound_volume", 64); + NativeLib.setConfiguration("settings_sound_volume", isDynamicValue, volumeOption, 0, null); break; } case "settings_haptic_feedback": diff --git a/app/src/main/java/org/emulator/forty/eight/MainScreenView.java b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java index 67eae17..0c5fe26 100644 --- a/app/src/main/java/org/emulator/forty/eight/MainScreenView.java +++ b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java @@ -243,7 +243,7 @@ public class MainScreenView extends PanAndScaleView { } protected void updateLayout() { - if(bitmapMainScreen != null) { + if(bitmapMainScreen != null && virtualSizeHeight > 1) { if (virtualSizeWidth > 0.0f && viewSizeWidth > 0.0f) { float imageRatio = virtualSizeHeight / virtualSizeWidth; float viewRatio = viewSizeHeight / viewSizeWidth; diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 72a3579..003750b 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -63,9 +63,9 @@