Miroirs/emu48android
1
0
Fork 0
mirror of https://github.com/dgis/emu48android synced 2024-12-28 09:58:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor issues.

Browse source
This commit is contained in:
dgis 2019-06-07 22:41:34 +02:00
parent e2898d4cad
commit 556b9d6489
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/assets/ReadMe.txt
View file

@ -26,6 +26,7 @@ QUICK START
NOTES 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. - 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. - 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). 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 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 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. 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.

5
app/src/main/java/org/emulator/forty/eight/MainActivity.java
View file

@ -1378,9 +1378,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
// sharedPreferences.getBoolean("settings_allow_sound", true) ? 64 : 0, 0, null); // sharedPreferences.getBoolean("settings_allow_sound", true) ? 64 : 0, 0, null);
// break; // break;
case "settings_sound_volume": { case "settings_sound_volume": {
float volumeOption = sharedPreferences.getInt("settings_sound_volume", 25); int volumeOption = sharedPreferences.getInt("settings_sound_volume", 64);
int volumeValue = (int)((volumeOption * 255.0f) / 100.0f); NativeLib.setConfiguration("settings_sound_volume", isDynamicValue, volumeOption, 0, null);
NativeLib.setConfiguration("settings_sound_volume", isDynamicValue, volumeValue, 0, null);
break; break;
} }
case "settings_haptic_feedback": case "settings_haptic_feedback":

2
app/src/main/java/org/emulator/forty/eight/MainScreenView.java
View file

@ -243,7 +243,7 @@ public class MainScreenView extends PanAndScaleView {
} }
protected void updateLayout() { protected void updateLayout() {
if(bitmapMainScreen != null) { if(bitmapMainScreen != null && virtualSizeHeight > 1) {
if (virtualSizeWidth > 0.0f && viewSizeWidth > 0.0f) { if (virtualSizeWidth > 0.0f && viewSizeWidth > 0.0f) {
float imageRatio = virtualSizeHeight / virtualSizeWidth; float imageRatio = virtualSizeHeight / virtualSizeWidth;
float viewRatio = viewSizeHeight / viewSizeWidth; float viewRatio = viewSizeHeight / viewSizeWidth;

4
app/src/main/res/xml/pref_general.xml
View file

@ -63,9 +63,9 @@
<SeekBarPreference <SeekBarPreference
android:key="settings_sound_volume" android:key="settings_sound_volume"
android:title="@string/settings_sound_volume_title" android:title="@string/settings_sound_volume_title"
android:defaultValue="25" android:defaultValue="64"
android:min="0" android:min="0"
android:max="100" android:max="255"
app:showSeekBarValue="true" /> app:showSeekBarValue="true" />
<SwitchPreference <SwitchPreference
android:key="settings_haptic_feedback" android:key="settings_haptic_feedback"