archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Completion sound

Browse Source
pull/1718/head
Alex Baker 2 years ago
parent fe48285be8
commit 21db56c4e9
9 changed files with 127 additions and 30 deletions
Show Stats Download Patch File Download Diff File

25
app/src/main/java/com/todoroo/astrid/service/TaskCompleter.kt
Unescape Escape View File

@ -1,16 +1,25 @@
package com.todoroo.astrid.service
import android.app.NotificationManager
import android.app.NotificationManager.INTERRUPTION_FILTER_ALL
import android.content.Context
import android.media.MediaPlayer
import com.todoroo.andlib.utility.DateUtilities
import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.data.Task
import dagger.hilt.android.qualifiers.ApplicationContext
import org.tasks.data.GoogleTaskDao
import org.tasks.preferences.Preferences
import timber.log.Timber
import javax.inject.Inject
class TaskCompleter @Inject internal constructor(
private val taskDao: TaskDao,
private val googleTaskDao: GoogleTaskDao) {
@ApplicationContext private val context: Context,
private val taskDao: TaskDao,
private val googleTaskDao: GoogleTaskDao,
private val preferences: Preferences,
private val notificationManager: NotificationManager,
) {
suspend fun setComplete(taskId: Long) =
taskDao
.fetch(taskId)
@ -43,5 +52,15 @@ class TaskCompleter @Inject internal constructor(
}
taskDao.save(task)
}
if (
tasks.size == 1 &&
completionDate > 0 &&
notificationManager.currentInterruptionFilter == INTERRUPTION_FILTER_ALL
) {
preferences
.completionSound
?.takeUnless { preferences.isCurrentlyQuietHours }
?.let { MediaPlayer.create(context, it).start() }
}
}
}

9
app/src/main/java/org/tasks/extensions/Context.kt
Unescape Escape View File

@ -1,11 +1,13 @@
package org.tasks.extensions
import android.content.ActivityNotFoundException
import android.content.ContentResolver
import android.content.Context
import android.content.Intent
import android.content.Intent.ACTION_VIEW
import android.net.Uri
import android.widget.Toast
import androidx.annotation.AnyRes
import androidx.browser.customtabs.CustomTabsIntent
import org.tasks.R
@ -46,4 +48,11 @@ object Context {
fun Context.toast(text: String?, duration: Int = Toast.LENGTH_LONG) =
text?.let { Toast.makeText(this, it, duration).show() }
fun Context.getResourceUri(@AnyRes res: Int) =
Uri.Builder()
.scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(packageName)
.path(res.toString())
.build()
}

5
app/src/main/java/org/tasks/injection/ApplicationModule.kt
Unescape Escape View File

@ -1,5 +1,6 @@
package org.tasks.injection
import android.app.NotificationManager
import android.content.Context
import com.todoroo.astrid.dao.Database
import dagger.Module
@ -113,4 +114,8 @@ class ApplicationModule {
fun providesCoroutineScope(
@DefaultDispatcher defaultDispatcher: CoroutineDispatcher
): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
@Provides
fun providesNotificationManager(@ApplicationContext context: Context) =
context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
}

26
app/src/main/java/org/tasks/preferences/Preferences.kt
Unescape Escape View File

@ -10,6 +10,7 @@ import android.media.RingtoneManager
import android.net.Uri
import android.os.Binder
import androidx.core.app.NotificationCompat
import androidx.core.net.toUri
import androidx.documentfile.provider.DocumentFile
import androidx.preference.PreferenceManager
import com.todoroo.andlib.utility.DateUtilities
@ -25,6 +26,7 @@ import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
import org.tasks.billing.Purchase
import org.tasks.data.TaskAttachment
import org.tasks.extensions.Context.getResourceUri
import org.tasks.themes.ColorProvider
import org.tasks.themes.ThemeBase
import org.tasks.time.DateTime
@ -141,13 +143,25 @@ class Preferences @JvmOverloads constructor(
}
val ringtone: Uri?
get() {
val ringtone = getStringValue(R.string.p_rmd_ringtone)
?: return RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
return if ("" == ringtone) {
null
} else Uri.parse(ringtone)
get() = getRingtone(
R.string.p_rmd_ringtone,
RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
)
val completionSound: Uri?
get() = getRingtone(
R.string.p_completion_ringtone,
context.getResourceUri(R.raw.long_rising_tone)
)
private fun getRingtone(pref: Int, default: Uri): Uri? {
val ringtone = getStringValue(pref)
return when {
ringtone == null -> default
ringtone.isNotBlank() -> ringtone.toUri()
else -> null
}
}
val isTrackingEnabled: Boolean
get() = getBoolean(R.string.p_collect_statistics, true)

85
app/src/main/java/org/tasks/preferences/fragments/Notifications.kt
Unescape Escape View File

@ -9,6 +9,7 @@ import android.os.Bundle
import android.os.PowerManager
import android.provider.Settings
import android.speech.tts.TextToSpeech
import androidx.core.net.toUri
import androidx.lifecycle.lifecycleScope
import androidx.preference.Preference
import androidx.preference.SwitchPreferenceCompat
@ -21,6 +22,7 @@ import org.tasks.LocalBroadcastManager
import org.tasks.R
import org.tasks.activities.FilterSelectionActivity
import org.tasks.dialogs.MyTimePickerDialog.Companion.newTimePicker
import org.tasks.extensions.Context.getResourceUri
import org.tasks.injection.InjectingPreferenceFragment
import org.tasks.preferences.DefaultFilterProvider
import org.tasks.preferences.Preferences
@ -37,6 +39,7 @@ private const val REQUEST_DEFAULT_REMIND = 10003
private const val REQUEST_BADGE_LIST = 10004
private const val REQUEST_CODE_ALERT_RINGTONE = 10005
private const val REQUEST_CODE_TTS_CHECK = 10006
private const val REQUEST_CODE_COMPLETION_SOUND = 10007
@AndroidEntryPoint
class Notifications : InjectingPreferenceFragment() {
@ -59,6 +62,7 @@ class Notifications : InjectingPreferenceFragment() {
rescheduleNotificationsOnChange(true, R.string.p_bundle_notifications)
initializeRingtonePreference()
initializeCompletionSoundPreference()
initializeTimePreference(getDefaultRemindTimePreference()!!, REQUEST_DEFAULT_REMIND)
initializeTimePreference(getQuietStartPreference()!!, REQUEST_QUIET_START)
initializeTimePreference(getQuietEndPreference()!!, REQUEST_QUIET_END)
@ -175,19 +179,27 @@ class Notifications : InjectingPreferenceFragment() {
}
override fun onPreferenceTreeClick(preference: Preference?): Boolean =
if (preference!!.key == getString(R.string.p_rmd_ringtone)) {
when (preference!!.key) {
getString(R.string.p_rmd_ringtone),
getString(R.string.p_completion_ringtone) -> {
val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_TYPE,
RingtoneManager.TYPE_NOTIFICATION
)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true)
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
Settings.System.DEFAULT_NOTIFICATION_URI
)
val existingValue: String? = preferences.getStringValue(R.string.p_rmd_ringtone)
val existingValue: String? = preferences.getStringValue(preference.key)
if (existingValue != null) {
if (existingValue.isEmpty()) {
intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, null as Uri?)
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
null as Uri?
)
} else {
intent.putExtra(
RingtoneManager.EXTRA_RINGTONE_EXISTING_URI,
@ -200,11 +212,20 @@ class Notifications : InjectingPreferenceFragment() {
Settings.System.DEFAULT_NOTIFICATION_URI
)
}
startActivityForResult(intent, REQUEST_CODE_ALERT_RINGTONE)
startActivityForResult(
intent,
if (preference.key == getString(R.string.p_rmd_ringtone)) {
REQUEST_CODE_ALERT_RINGTONE
} else {
REQUEST_CODE_COMPLETION_SOUND
}
)
true
} else {
}
else -> {
super.onPreferenceTreeClick(preference)
}
}
private fun getQuietStartPreference(): TimePreference? =
getTimePreference(R.string.p_rmd_quietStart)
@ -227,29 +248,41 @@ class Notifications : InjectingPreferenceFragment() {
}
}
private fun initializeRingtonePreference() {
private fun initializeRingtonePreference() =
initializeRingtonePreference(
R.string.p_rmd_ringtone,
R.string.silent,
)
private fun initializeCompletionSoundPreference() =
initializeRingtonePreference(
R.string.p_completion_ringtone,
R.string.none,
requireContext().getResourceUri(R.raw.long_rising_tone)
)
private fun initializeRingtonePreference(pref: Int, noneRes: Int, default: Uri? = null) {
val ringtoneChangedListener =
Preference.OnPreferenceChangeListener { preference: Preference, value: Any? ->
if ("" == value) {
preference.setSummary(R.string.silent)
preference.setSummary(noneRes)
} else {
val ringtone = RingtoneManager.getRingtone(
context,
if (value == null) Settings.System.DEFAULT_NOTIFICATION_URI else Uri.parse(
value as String?
)
)
preference.summary = if (ringtone == null) "" else ringtone.getTitle(context)
val uri =
(value as? String?)?.toUri()
?: default
?: Settings.System.DEFAULT_RINGTONE_URI
preference.summary = if (uri == default) {
getString(R.string.settings_default)
} else {
RingtoneManager.getRingtone(context, uri).getTitle(context)
}
}
true
}
val ringtoneKey = R.string.p_rmd_ringtone
val ringtonePreference: Preference = findPreference(ringtoneKey)
val ringtonePreference = findPreference(pref)
ringtonePreference.onPreferenceChangeListener = ringtoneChangedListener
ringtoneChangedListener.onPreferenceChange(
ringtonePreference,
preferences.getStringValue(ringtoneKey)
)
ringtoneChangedListener
.onPreferenceChange(ringtonePreference, preferences.getStringValue(pref))
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@ -264,6 +297,16 @@ class Notifications : InjectingPreferenceFragment() {
}
initializeRingtonePreference()
}
REQUEST_CODE_COMPLETION_SOUND -> if (resultCode == RESULT_OK && data != null) {
val ringtone: Uri? =
data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI)
if (ringtone != null) {
preferences.setString(R.string.p_completion_ringtone, ringtone.toString())
} else {
preferences.setString(R.string.p_completion_ringtone, "")
}
initializeCompletionSoundPreference()
}
REQUEST_QUIET_START -> if (resultCode == RESULT_OK) {
getQuietStartPreference()!!.handleTimePickerActivityIntent(data)
}

BIN
app/src/main/res/raw/long_rising_tone.m4a
View File

Binary file not shown.

1
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -72,6 +72,7 @@
<!-- ringtone to use for notifications -->
<string name="p_rmd_ringtone">notification_ringtone</string>
<string name="p_completion_ringtone">completion_ringtone</string>
<!-- default random reminder setting (in hours) -->
<string name="p_rmd_default_random_hours">notif_default_reminder</string>

1
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -712,4 +712,5 @@ File %1$s contained %2$s.\n\n
<string name="more_options">More options</string>
<string name="markdown">Markdown</string>
<string name="markdown_description">Enable Markdown in title and description</string>
<string name="completion_sound">Play completion sound</string>
</resources>

5
app/src/main/res/xml/preferences_notifications.xml
Unescape Escape View File

@ -60,6 +60,11 @@
android:key="@string/p_rmd_ringtone"
android:title="@string/sound" />
<Preference
android:defaultValue="content://settings/system/notification_sound"
android:key="@string/p_completion_ringtone"
android:title="@string/completion_sound" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:dependency="@string/p_rmd_enabled"

Write Preview
Loading…
Cancel
Save