fenix
/
Simple-Clock
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing some colons

This commit is contained in:
tibbi 2020-08-19 23:48:45 +02:00
parent db6ceae5c5
commit 9bba1b74ec
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/kotlin/com/simplemobiletools/clock/activities/ReminderActivity.kt
View File

@ -31,7 +31,7 @@ class ReminderActivity : SimpleActivity() {
private var didVibrate = false
private var alarm: Alarm? = null
private var mediaPlayer: MediaPlayer? = null
private var vibrator: Vibrator? = null;
private var vibrator: Vibrator? = null
private var lastVolumeValue = 0.1f
private var dragDownX = 0f
@ -162,18 +162,18 @@ class ReminderActivity : SimpleActivity() {
lastVolumeValue = 1f
}
val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate;
val doVibrate = if (alarm != null) alarm!!.vibrate else config.timerVibrate
if (doVibrate) {
val pattern = LongArray(2){ 500 };
vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator;
val pattern = LongArray(2) { 500 }
vibrator = getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
vibrator?.vibrate(VibrationEffect.createWaveform(pattern, 0))
} else {
vibrator?.vibrate(pattern, 0);
vibrator?.vibrate(pattern, 0)
}
}
val soundUri = if (alarm != null) alarm!!.soundUri else config.timerSoundUri;
val soundUri = if (alarm != null) alarm!!.soundUri else config.timerSoundUri
if (soundUri != SILENT) {
try {
mediaPlayer = MediaPlayer().apply {
@ -219,8 +219,8 @@ class ReminderActivity : SimpleActivity() {
mediaPlayer?.stop()
mediaPlayer?.release()
mediaPlayer = null
vibrator?.cancel();
vibrator = null;
vibrator?.cancel()
vibrator = null
}
private fun snoozeAlarm() {

2
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -355,7 +355,7 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No
builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
if (soundUri != SILENT) {
builder.setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM);
builder.setSound(Uri.parse(soundUri), STREAM_ALARM)
}
if (alarm.vibrate) {