kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce duplicate logic.

Browse Source 
I'd rather duplicate the SDK version check, not the math.
This commit is contained in:
player-03
2024-07-07 13:20:06 -04:00
committed by GitHub
parent 24ac93a18a
commit 99ff0afeab
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
templates/android/template/app/src/main/java/org/haxe/lime/GameActivity.java
View File

@@ -386,46 +386,36 @@ public class GameActivity extends SDLActivity {
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (period == 0) {
if (period == 0) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate (VibrationEffect.createOneShot (duration, VibrationEffect.DEFAULT_AMPLITUDE));
} else {
int periodMS = Math.max (1, (int)Math.ceil (period / 2.0));
int count = Math.max (1, (int)Math.ceil ((duration / (double) period) * 2));
long[] pattern = new long[count];
for (int i = 0; i < count; i++) {
pattern[i] = periodMS;
}
vibrator.vibrate (VibrationEffect.createWaveform (pattern, -1));
vibrator.vibrate (duration);
}
} else {
if (period == 0) {
int periodMS = Math.max (1, (int)Math.ceil (period / 2.0));
int count = Math.max (1, (int)Math.ceil ((duration / (double) period) * 2));
long[] pattern = new long[count];
vibrator.vibrate (duration);
for (int i = 0; i < count; i++) {
pattern[i] = periodMS;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator.vibrate (VibrationEffect.createWaveform (pattern, -1));
} else {
int periodMS = (int)Math.ceil (period / 2);
int count = (int)Math.ceil ((duration / period) * 2);
long[] pattern = new long[count];
for (int i = 0; i < count; i++) {
pattern[i] = periodMS;
}
vibrator.vibrate (pattern, -1);
}