diff options
| author | Allan Wang <me@allanwang.ca> | 2017-09-16 20:53:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 20:53:49 -0400 |
| commit | 2fe3422895c19d93fdb515b72ae497f4263e77bc (patch) | |
| tree | 08a71aeccddd371d67e9797999a6560d541e54ed /app/src/main/kotlin/com/pitchedapps/frost/services | |
| parent | 9c4ff0063812e373cd5730ff77840ff7227a3300 (diff) | |
| download | frost-2fe3422895c19d93fdb515b72ae497f4263e77bc.tar.gz frost-2fe3422895c19d93fdb515b72ae497f4263e77bc.tar.bz2 frost-2fe3422895c19d93fdb515b72ae497f4263e77bc.zip | |
Feature/contextual overlays (#295)
* Update theme
* Update theme
* Compile compacts
* Update changelog
* Update theme
* Add overlay context items and their bindings
* Replace default with null and add changelog
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/services')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt index 810e5f97..800fe492 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt @@ -21,11 +21,9 @@ import com.pitchedapps.frost.BuildConfig import com.pitchedapps.frost.R import com.pitchedapps.frost.activities.FrostWebActivity import com.pitchedapps.frost.dbflow.CookieModel +import com.pitchedapps.frost.enums.OverlayContext import com.pitchedapps.frost.facebook.formattedFbUrl -import com.pitchedapps.frost.utils.ARG_USER_ID -import com.pitchedapps.frost.utils.L -import com.pitchedapps.frost.utils.Prefs -import com.pitchedapps.frost.utils.withRoundIcon +import com.pitchedapps.frost.utils.* import org.jetbrains.anko.runOnUiThread /** @@ -96,6 +94,7 @@ data class NotificationContent(val data: CookieModel, val text: String, val timestamp: Long, val profileUrl: String) { + fun createNotification(context: Context) = createNotification(context, FROST_NOTIFICATION_GROUP) fun createMessageNotification(context: Context) = createNotification(context, FROST_MESSAGE_NOTIFICATION_GROUP) @@ -104,6 +103,8 @@ data class NotificationContent(val data: CookieModel, val intent = Intent(context, FrostWebActivity::class.java) intent.data = Uri.parse(href.formattedFbUrl) intent.putExtra(ARG_USER_ID, data.id) + val overlayContext = if (groupPrefix == FROST_MESSAGE_NOTIFICATION_GROUP) OverlayContext.MESSAGE else OverlayContext.NOTIFICATION + intent.putExtra(ARG_OVERLAY_CONTEXT, overlayContext) val group = "${groupPrefix}_${data.id}" val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0) val ringtone = if (groupPrefix == FROST_MESSAGE_NOTIFICATION_GROUP) Prefs.messageRingtone else Prefs.notificationRingtone |