Release 1.5.0
This commit is contained in:
parent
7c9913a9b6
commit
301430c612
|
@ -1,3 +1,9 @@
|
|||
1.5.0:
|
||||
- Fix setting device to vibrate/silent on Android 6.0+
|
||||
- Split full screen preference into three options: disabled, during session and always
|
||||
- Obey volume preference when playing sounds in the Settings screen
|
||||
- Remove 'Turn screen off' option as it requires device administrator privileges
|
||||
|
||||
1.4.9:
|
||||
- Fix crash when starting session on Android 8.0+
|
||||
|
||||
|
|
|
@ -8,8 +8,8 @@ android {
|
|||
minSdkVersion 16
|
||||
targetSdkVersion 27
|
||||
|
||||
versionCode 149
|
||||
versionName "1.4.9"
|
||||
versionCode 150
|
||||
versionName "1.5.0"
|
||||
|
||||
applicationId "sh.ftp.rocketninelabs.meditationassistant"
|
||||
manifestPlaceholders = [
|
||||
|
|
|
@ -382,13 +382,6 @@ public class MeditationAssistant extends Application {
|
|||
public void playSound(int soundresource, String soundpath, boolean restoreVolume) {
|
||||
WakeLocker.acquire(getApplicationContext(), false);
|
||||
Thread soundThread = new Thread(() -> {
|
||||
String soundLabel = soundpath;
|
||||
if (soundLabel.equals("")) {
|
||||
soundLabel = String.valueOf(soundresource);
|
||||
}
|
||||
|
||||
Log.d("MA", "Play sound: " + soundLabel);
|
||||
|
||||
MediaPlayer soundPlayer = null;
|
||||
try {
|
||||
if (!soundpath.equals("")) {
|
||||
|
@ -401,10 +394,16 @@ public class MeditationAssistant extends Application {
|
|||
}
|
||||
|
||||
if (soundPlayer == null) {
|
||||
Log.e("MA", "Failed to load sound: " + soundLabel);
|
||||
String soundLabel = soundpath;
|
||||
if (soundLabel.equals("")) {
|
||||
soundLabel = String.valueOf(soundresource);
|
||||
}
|
||||
Log.e("MeditationAssistant", "Failed to load sound: " + soundLabel);
|
||||
|
||||
if (restoreVolume) {
|
||||
restoreVolume();
|
||||
}
|
||||
|
||||
WakeLocker.release();
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -2,44 +2,44 @@ package sh.ftp.rocketninelabs.meditationassistant;
|
|||
|
||||
public class MeditationSounds {
|
||||
public static int getMeditationSound(String sound) {
|
||||
if (sound.equals("gong")) {
|
||||
return R.raw.gong;
|
||||
} else if (sound.equals("gong_burmese")) {
|
||||
return R.raw.gong_burmese;
|
||||
} else if (sound.equals("gong_metal")) {
|
||||
return R.raw.gong_metal;
|
||||
} else if (sound.equals("gong_heavy")) {
|
||||
return R.raw.gong_heavy;
|
||||
} else if (sound.equals("bell_indian")) {
|
||||
return R.raw.bell_indian;
|
||||
} else if (sound.equals("bell_temple")) {
|
||||
return R.raw.bell_temple;
|
||||
} else if (sound.equals("tinsha")) {
|
||||
return R.raw.tinsha;
|
||||
} else if (sound.equals("None")) {
|
||||
return 0;
|
||||
switch (sound) {
|
||||
case "gong_burmese":
|
||||
return R.raw.gong_burmese;
|
||||
case "gong_metal":
|
||||
return R.raw.gong_metal;
|
||||
case "gong_heavy":
|
||||
return R.raw.gong_heavy;
|
||||
case "bell_indian":
|
||||
return R.raw.bell_indian;
|
||||
case "bell_temple":
|
||||
return R.raw.bell_temple;
|
||||
case "tinsha":
|
||||
return R.raw.tinsha;
|
||||
case "None":
|
||||
return 0;
|
||||
default:
|
||||
return R.raw.gong;
|
||||
}
|
||||
return R.raw.gong;
|
||||
}
|
||||
|
||||
public static String getMeditationSoundName(String sound) { // TODO: Localize
|
||||
if (sound.equals("gong")) {
|
||||
return "Gong";
|
||||
} else if (sound.equals("gong_burmese")) {
|
||||
return "Burmese gong";
|
||||
} else if (sound.equals("gong_metal")) {
|
||||
return "Metal gong";
|
||||
} else if (sound.equals("gong_heavy")) {
|
||||
return "Heavy gong";
|
||||
} else if (sound.equals("bell_indian")) {
|
||||
return "Indian bell";
|
||||
} else if (sound.equals("bell_temple")) {
|
||||
return "Temple bell";
|
||||
} else if (sound.equals("tinsha")) {
|
||||
return "Three Tinsha";
|
||||
} else if (sound.equals("none")) {
|
||||
return "";
|
||||
switch (sound) {
|
||||
case "gong_burmese":
|
||||
return "Burmese gong";
|
||||
case "gong_metal":
|
||||
return "Metal gong";
|
||||
case "gong_heavy":
|
||||
return "Heavy gong";
|
||||
case "bell_indian":
|
||||
return "Indian bell";
|
||||
case "bell_temple":
|
||||
return "Temple bell";
|
||||
case "tinsha":
|
||||
return "Three Tinsha";
|
||||
case "none":
|
||||
return "";
|
||||
default:
|
||||
return "Gong";
|
||||
}
|
||||
return "Gong";
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue