fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-09 08:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

add the actual vibration, disabled by default

Browse Source
This commit is contained in:
tibbi 2016-11-26 11:38:06 +01:00
parent d6f8ca66db
commit 446453d907
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -4,6 +4,7 @@
package="com.simplemobiletools.calendar"> package="com.simplemobiletools.calendar">
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<application <application
android:name=".App" android:name=".App"

2
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Config.kt
View File

@ -35,7 +35,7 @@ class Config(context: Context) {
set(displayWeekNumbers) = mPrefs.edit().putBoolean(WEEK_NUMBERS, displayWeekNumbers).apply() set(displayWeekNumbers) = mPrefs.edit().putBoolean(WEEK_NUMBERS, displayWeekNumbers).apply()
var vibrateOnReminder: Boolean var vibrateOnReminder: Boolean
get() = mPrefs.getBoolean(VIBRATE, true) get() = mPrefs.getBoolean(VIBRATE, false)
set(vibrate) = mPrefs.edit().putBoolean(VIBRATE, vibrate).apply() set(vibrate) = mPrefs.edit().putBoolean(VIBRATE, vibrate).apply()
var storedView: Int var storedView: Int

13
app/src/main/kotlin/com/simplemobiletools/calendar/receivers/NotificationReceiver.kt
View File

@ -10,6 +10,7 @@ import android.media.RingtoneManager
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.extensions.scheduleNextEvent import com.simplemobiletools.calendar.extensions.scheduleNextEvent
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.DBHelper import com.simplemobiletools.calendar.helpers.DBHelper
import com.simplemobiletools.calendar.helpers.EVENT_ID import com.simplemobiletools.calendar.helpers.EVENT_ID
import com.simplemobiletools.calendar.helpers.Formatter import com.simplemobiletools.calendar.helpers.Formatter
@ -30,14 +31,14 @@ class NotificationReceiver : BroadcastReceiver() {
val startTime = Formatter.getTime(event.startTS) val startTime = Formatter.getTime(event.startTS)
val endTime = Formatter.getTime(event.endTS) val endTime = Formatter.getTime(event.endTS)
val title = event.title val title = event.title
val notification = getNotification(context, pendingIntent, getEventTime(startTime, endTime) + " " + title) val notification = getNotification(context, pendingIntent, "${getEventTime(startTime, endTime)} $title")
notificationManager.notify(id, notification) notificationManager.notify(id, notification)
if (event.repeatInterval != 0) if (event.repeatInterval != 0)
context.scheduleNextEvent(event) context.scheduleNextEvent(event)
} }
private fun getEventTime(startTime: String, endTime: String) = if (startTime == endTime) startTime else ("$startTime - $endTime") private fun getEventTime(startTime: String, endTime: String) = if (startTime == endTime) startTime else "$startTime - $endTime"
private fun getPendingIntent(context: Context, event: Event): PendingIntent { private fun getPendingIntent(context: Context, event: Event): PendingIntent {
val intent = Intent(context, EventActivity::class.java) val intent = Intent(context, EventActivity::class.java)
@ -47,7 +48,7 @@ class NotificationReceiver : BroadcastReceiver() {
private fun getNotification(context: Context, pendingIntent: PendingIntent, content: String): Notification { private fun getNotification(context: Context, pendingIntent: PendingIntent, content: String): Notification {
val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
return Notification.Builder(context) val builder = Notification.Builder(context)
.setContentTitle(context.resources.getString(R.string.app_name)) .setContentTitle(context.resources.getString(R.string.app_name))
.setContentText(content) .setContentText(content)
.setSmallIcon(R.mipmap.calendar) .setSmallIcon(R.mipmap.calendar)
@ -55,6 +56,10 @@ class NotificationReceiver : BroadcastReceiver() {
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setSound(soundUri) .setSound(soundUri)
.build()
if (Config.newInstance(context).vibrateOnReminder)
builder.setVibrate(longArrayOf(0, 500))
return builder.build()
} }
} }