Miroirs/emu48android
1
0
Fork 0
mirror of https://github.com/dgis/emu48android synced 2024-11-16 07:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaces the haptic feedback switch with a slider to adjust the vibration duration.

Browse source
This commit is contained in:
dgis 2020-10-30 00:14:00 +01:00
parent f674c90993
commit 9b995adc51
11 changed files with 123 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ReadMe.txt
View file

@ -63,11 +63,12 @@ LINKS
CHANGES
Version 1.91 (2020-10-XX)
Version 2.0 (2020-11-XX)
- For the HP49/50 port 2, it is now possible to load a new Flash ROM file (It fully replaces the ROM).
- Replaces the haptic feedback switch with a slider to adjust the vibration duration.
- Fix transparency issue (RGB -> BGR).
- Fix a printer issue from Christoph Gießelink's HP82240B Printer Simulator version 1.12.
- For the HP49/50 port 2, it is now possible to load a new Flash ROM file (It fully replaces the ROM).
Version 1.9 (2020-09-07)

4
app/build.gradle
View file

@ -33,8 +33,8 @@ android {
applicationId "org.emulator.forty.eight"
minSdkVersion 19
targetSdkVersion 29
versionCode 16
versionName "1.9"
versionCode 17
versionName "2.0"
setProperty("archivesBaseName", "Emu48-v$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {

3
app/src/main/AndroidManifest.xml
View file

@ -2,7 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.emulator.forty.eight">
<application
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:name="org.emulator.calculator.EmuApplication"
android:allowBackup="true"
android:label="@string/app_name"

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

@ -63,11 +63,12 @@ LINKS
CHANGES
Version 1.91 (2020-10-XX)
Version 2.0 (2020-11-XX)
- For the HP49/50 port 2, it is now possible to load a new Flash ROM file (It fully replaces the ROM).
- Replaces the haptic feedback switch with a slider to adjust the vibration duration.
- Fix transparency issue (RGB -> BGR).
- Fix a printer issue from Christoph Gießelink's HP82240B Printer Simulator version 1.12.
- For the HP49/50 port 2, it is now possible to load a new Flash ROM file (It fully replaces the ROM).
Version 1.9 (2020-09-07)

5
app/src/main/cpp/win32-layer.c
View file

@ -1858,7 +1858,10 @@ BOOL PatBlt(HDC hdcDest, int x, int y, int w, int h, DWORD rop) {
destinationStride = (float)(4 * ((destinationWidth * hBitmapDestination->bitmapInfoHeader->biBitCount + 31) / 32));
}
HPALETTE palette = hdcDest->realizedPalette;
x -= hdcDest->windowOriginX;
y -= hdcDest->windowOriginY; // TODO DSTINVERT in screen does not work!!!
HPALETTE palette = hdcDest->realizedPalette;
if(!palette)
palette = hdcDest->selectedPalette;
PALETTEENTRY * palPalEntry = palette && palette->paletteLog && palette->paletteLog->palPalEntry ?

25
app/src/main/java/org/emulator/calculator/Settings.java
View file

@ -90,7 +90,7 @@ public class Settings extends PreferenceDataStore {
}
private void putValue(String key, @Nullable Object value) {
if(applicationSettingKeys.indexOf(key) != -1)
if(applicationSettingKeys.contains(key))
applicationSettings.put(key, value);
else if(isCommonSettings)
commonSettings.put(key, value);
@ -105,7 +105,7 @@ public class Settings extends PreferenceDataStore {
if(!isCommonSettings)
value = embeddedStateSettings.get(key);
if(value == null) {
if(applicationSettingKeys.indexOf(key) != -1)
if(applicationSettingKeys.contains(key))
value = applicationSettings.get(key);
else
value = commonSettings.get(key);
@ -113,6 +113,27 @@ public class Settings extends PreferenceDataStore {
return value;
}
public void removeValue(String key) {
if(applicationSettingKeys.contains(key))
applicationSettings.remove(key);
else if(isCommonSettings)
commonSettings.remove(key);
else
embeddedStateSettings.remove(key);
if(oneKeyChangedListener != null)
oneKeyChangedListener.onOneKeyChanged(key);
}
public boolean hasValue(String key) {
if(debug) Log.d(TAG, "has(key: '" + key + "')");
if(applicationSettingKeys.contains(key))
return applicationSettings.containsKey(key);
else if(isCommonSettings)
return commonSettings.containsKey(key);
else
return embeddedStateSettings.containsKey(key);
}
public boolean getIsDefaultSettings() {
return isCommonSettings;
}

13
app/src/main/java/org/emulator/calculator/Utils.java
View file

@ -24,6 +24,8 @@ import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.VibrationEffect;
import android.os.Vibrator;
import android.provider.OpenableColumns;
import android.util.Log;
import android.util.TypedValue;
@ -200,4 +202,15 @@ public class Utils {
listView.setLayoutParams(params);
listView.requestLayout();
}
public static void vibrate(Vibrator vibrator, int durationInMilliSecond) {
if(vibrator != null && durationInMilliSecond > 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
// https://developer.android.com/reference/android/os/Vibrator#vibrate(android.os.VibrationEffect,%20android.media.AudioAttributes)
vibrator.vibrate(VibrationEffect.createOneShot(durationInMilliSecond, VibrationEffect.DEFAULT_AMPLITUDE));
else
//deprecated in API 26
vibrator.vibrate(durationInMilliSecond);
}
}
}

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

@ -29,9 +29,9 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.os.Vibrator;
import android.util.Log;
import android.util.SparseArray;
import android.view.HapticFeedbackConstants;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@ -39,7 +39,6 @@ import android.view.SubMenu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView;
@ -104,8 +103,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
private MainScreenView mainScreenView;
private LCDOverlappingView lcdOverlappingView;
private ImageButton imageButtonMenu;
private Vibrator vibrator;
public static final int INTENT_GETOPENFILENAME = 1;
public static final int INTENT_GETOPENFILENAME = 1;
public static final int INTENT_GETSAVEFILENAME = 2;
public static final int INTENT_OBJECT_LOAD = 3;
public static final int INTENT_OBJECT_SAVE = 4;
@ -163,6 +164,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
settings = EmuApplication.getSettings();
settings.setIsDefaultSettings(true);
vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
ViewGroup mainScreenContainer = findViewById(R.id.main_screen_container);
mainScreenView = new MainScreenView(this);
@ -1481,6 +1483,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
}
private void migrateDeprecatedSettings() {
if(settings.hasValue("settings_haptic_feedback")) {
settings.removeValue("settings_haptic_feedback");
settings.putInt("settings_haptic_feedback_duration", 25);
}
}
private void onFileOpen(String url, Intent intent, String openWithKMLScriptFolder) {
// Eventually, close the previous state file
@ -1494,6 +1503,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
settings.clearEmbeddedStateSettings();
settings.loadFromStateFile(this, url);
migrateDeprecatedSettings();
if(intent != null)
// Make this file persistable to allow a next access to this same file.
Utils.makeUriPersistable(this, intent, Uri.parse(url));
@ -1986,11 +1997,15 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
@SuppressWarnings("UnusedDeclaration")
public void performHapticFeedback() {
if(settings.getBoolean("settings_haptic_feedback", true))
mainScreenView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
// if(settings.getBoolean("settings_haptic_feedback", true))
// //mainScreenView.performHapticFeedback(HapticFeedbackConstants.CONTEXT_CLICK, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
// mainScreenView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
// //mainScreenView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS, HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
Utils.vibrate(vibrator, settings.getInt("settings_haptic_feedback_duration", 25));
}
@SuppressWarnings("UnusedDeclaration")
@SuppressWarnings("UnusedDeclaration")
public void sendByteUdp(int byteSent) {
printerSimulator.write(byteSent);
}
@ -2109,9 +2124,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
NativeLib.setConfiguration("settings_sound_volume", isDynamicValue, volumeOption, 0, null);
break;
}
case "settings_haptic_feedback":
// Nothing to do
break;
case "settings_haptic_feedback":
case "settings_haptic_feedback_duration":
// Nothing to do
break;
case "settings_background_kml_color":
mainScreenView.setBackgroundKmlColor(settings.getBoolean("settings_background_kml_color", false));

37
app/src/main/java/org/emulator/forty/eight/SettingsFragment.java
View file

@ -16,6 +16,7 @@ package org.emulator.forty.eight;
import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.BlendMode;
@ -25,6 +26,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Vibrator;
import android.text.InputType;
import android.util.Log;
import android.view.LayoutInflater;
@ -213,6 +215,41 @@ public class SettingsFragment extends AppCompatDialogFragment {
}
}
// Haptic feedback settings
Vibrator vibrator = (Vibrator) requireContext().getSystemService(Context.VIBRATOR_SERVICE);
SeekBarPreference preferenceHapticFeedbackDuration = findPreference("settings_haptic_feedback_duration");
if(preferenceHapticFeedbackDuration != null) {
preferenceHapticFeedbackDuration.setOnPreferenceChangeListener((preference, newValue) -> {
if(newValue instanceof Integer)
Utils.vibrate(vibrator, (int)newValue);
return true;
});
preferenceHapticFeedbackDuration.setOnPreferenceClickListener(preference -> {
AlertDialog.Builder alert = new AlertDialog.Builder(requireContext());
alert.setTitle(R.string.settings_haptic_feedback_dialog_title);
final EditText input = new EditText(getContext());
input.setInputType(InputType.TYPE_CLASS_NUMBER);
input.setRawInputType(Configuration.KEYBOARD_12KEY);
input.setFocusable(true);
input.setText(String.format(Locale.US,"%d", preferenceHapticFeedbackDuration.getValue()));
alert.setView(input);
alert.setPositiveButton(R.string.message_ok, (dialog, whichButton) -> {
String newValueText = input.getText().toString();
try {
int newValue = Integer.parseInt(newValueText);
if(newValue >= preferenceHapticFeedbackDuration.getMin() && newValue <= preferenceHapticFeedbackDuration.getMax()) {
preferenceHapticFeedbackDuration.setValue(newValue);
Utils.vibrate(vibrator, newValue);
}
} catch (NumberFormatException ignored) {}
});
alert.setNegativeButton(R.string.message_cancel, (dialog, whichButton) -> {});
alert.show();
return true;
});
}
// Background color settings
Preference preferenceBackgroundFallbackColor = findPreference("settings_background_fallback_color");

4
app/src/main/res/values/strings.xml
View file

@ -160,7 +160,9 @@
<string name="settings_hide_button_menu">Hide the button menu</string>
<string name="settings_sound_volume_title">Sound Volume</string>
<string name="settings_sound_volume_dialog_title">Sound Volume (0-255)</string>
<string name="settings_haptic_feedback_title">Allow haptic feedback</string>
<string name="settings_haptic_feedback_title">Haptic feedback</string>
<string name="settings_haptic_feedback_summary">Duration of vibration when a key is touched. Between 1ms and 50ms. 0ms for no vibration.</string>
<string name="settings_haptic_feedback_dialog_title">Duration of Vibration (0-50ms)</string>
<string name="settings_category_background_title">Background Color</string>
<string name="settings_background_kml_color_title">Use KML color</string>

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

@ -82,10 +82,14 @@
android:min="0"
android:max="255"
app:showSeekBarValue="true" />
<SwitchPreference
android:key="settings_haptic_feedback"
android:title="@string/settings_haptic_feedback_title"
android:defaultValue="true" />
<SeekBarPreference
android:key="settings_haptic_feedback_duration"
android:title="@string/settings_haptic_feedback_title"
android:summary="@string/settings_haptic_feedback_summary"
android:defaultValue="25"
android:min="0"
android:max="50"
app:showSeekBarValue="true" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_category_background_title">