diff --git a/android/app/build.gradle b/android/app/build.gradle
index fa56b475b947fe38815dcf124054886df40ae966..6348b76bbed3ac2a079044c72c63b4ab7d68dc49 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,6 +138,7 @@ android {
}
dependencies {
+ compile project(':react-native-push-notification')
compile project(':react-native-vector-icons')
compile project(':react-native-fs')
compile project(':react-native-document-picker')
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4654ff4cc640a1d3c8ea52fa96976c184aed1060..207d90aa0bc07961fc8de65cd883b8580827c910 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,15 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+ <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+ <permission
+ android:name="${applicationId}.permission.C2D_MESSAGE"
+ android:protectionLevel="signature" />
+
+ <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
<application
android:name=".MainApplication"
@@ -30,6 +39,46 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" />
</provider>
+ <meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_name"
+ android:value="drip-notification"/>
+ <meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_description"
+ android:value="notifications from drip"/>
+ <!-- Change the resource name to your App's accent color - or any other color you want -->
+ <meta-data android:name="com.dieam.reactnativepushnotification.notification_color"
+ android:resource="@android:color/white"/>
+
+ <!-- < Only if you're using GCM or localNotificationSchedule() > -->
+ <receiver
+ android:name="com.google.android.gms.gcm.GcmReceiver"
+ android:exported="true"
+ android:permission="com.google.android.c2dm.permission.SEND" >
+ <intent-filter>
+ <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+ <category android:name="${applicationId}" />
+ </intent-filter>
+ </receiver>
+ <!-- < Only if you're using GCM or localNotificationSchedule() > -->
+
+ <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
+ <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
+ <intent-filter>
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ </intent-filter>
+ </receiver>
+ <service android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationRegistrationService"/>
+ <service
+ android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
+ android:exported="false" >
+ <intent-filter>
+ <!-- < Only if you're using GCM or localNotificationSchedule() > -->
+ <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+ <!-- < Only if you're using GCM or localNotificationSchedule() > -->
+
+ <!-- <Else> -->
+ <action android:name="com.google.firebase.MESSAGING_EVENT" />
+ <!-- </Else> -->
+ </intent-filter>
+ </service>
</application>
diff --git a/android/app/src/main/java/com/drip/MainApplication.java b/android/app/src/main/java/com/drip/MainApplication.java
index 4dc63a4e890ef14381f722b9a044c3114945f809..da1f79f0f32e9cadcd14ebc8a84617d867c3333e 100644
--- a/android/app/src/main/java/com/drip/MainApplication.java
+++ b/android/app/src/main/java/com/drip/MainApplication.java
@@ -3,6 +3,7 @@ package com.drip;
import android.app.Application;
import com.facebook.react.ReactApplication;
+import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.rnfs.RNFSPackage;
import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
@@ -29,6 +30,7 @@ public class MainApplication extends Application implements ReactApplication, Sh
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
+ new ReactNativePushNotificationPackage(),
new VectorIconsPackage(),
new RNFSPackage(),
new ReactNativeDocumentPicker(),
diff --git a/android/settings.gradle b/android/settings.gradle
index 6a9c8c84200f3d0b63b9697454df468f2d5e1484..fe009fa9e1231ffd0c4187396c2d24a4a417a9e0 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,4 +1,6 @@
rootProject.name = 'drip'
+include ':react-native-push-notification'
+project(':react-native-push-notification').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-push-notification/android')
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-fs'
diff --git a/components/app.js b/components/app.js
index 91b21a37b78998190b452131c66152f64913273a..827b11e390b9eecdc7fb91bd1a2f7352470243de 100644
--- a/components/app.js
+++ b/components/app.js
@@ -21,6 +21,7 @@ export default class App extends Component {
currentPage: 'Home'
}
this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress)
+ setupNotifications(this.navigate)
}
componentWillUnmount() {
@@ -62,5 +63,3 @@ export default class App extends Component {
)
}
}
-
-setupNotifications()
\ No newline at end of file
diff --git a/components/labels.js b/components/labels.js
index a70e66f93f254c2fb48af3745ac41de70d58b1a8..7066663253e9e9bd802618b752b2e28e54d18072 100644
--- a/components/labels.js
+++ b/components/labels.js
@@ -46,7 +46,8 @@ export const settings = {
tempReminder: {
title: 'Temperature reminder',
noTimeSet: 'Set a time for a daily reminder to take your temperature',
- timeSet: time => `Daily reminder set for ${time}`
+ timeSet: time => `Daily reminder set for ${time}`,
+ notification: 'Record your morning temperature'
}
}
diff --git a/lib/notifications.js b/lib/notifications.js
index 033d4ad13a29fa221e2ad1e01ee72c5b6125ed59..3d346610f76809e86df19bfa8fd1039fed886111 100644
--- a/lib/notifications.js
+++ b/lib/notifications.js
@@ -1,27 +1,32 @@
import {tempReminderObservable} from '../local-storage'
-import { LocalTime, ChronoUnit } from 'js-joda'
-import {NotificationsAndroid} from 'react-native-notifications'
+import Notification from 'react-native-push-notification'
+import { LocalDate } from 'js-joda'
+import { settings as labels } from '../components/labels'
+import { getOrCreateCycleDay } from '../db'
-let stopCheckingTheTime = () => {}
-
-export default function setupNotifications() {
- tempReminderObservable(reminder => {
- stopCheckingTheTime()
- if (reminder.enabled) {
- stopCheckingTheTime = notifyAt(reminder.time)
+export default function setupNotifications(navigate) {
+ Notification.configure({
+ onNotification: () => {
+ const todayDateString = LocalDate.now().toString()
+ const cycleDay = getOrCreateCycleDay(todayDateString)
+ navigate('TemperatureEditView', { cycleDay })
}
})
-}
-function notifyAt(time) {
- const id = setInterval(() => {
- const now = LocalTime.now().truncatedTo(ChronoUnit.MINUTES).toString()
- if (now === time) {
- NotificationsAndroid.localNotification({
- title: 'yo',
- body: 'much notification'
+ tempReminderObservable(reminder => {
+ Notification.cancelAllLocalNotifications()
+ if (reminder.enabled) {
+ const date = new Date()
+ const [hours, minutes] = reminder.time.split(':')
+ date.setHours(parseInt(hours))
+ date.setMinutes(parseInt(minutes))
+ date.setSeconds(0)
+ Notification.localNotificationSchedule({
+ message: labels.tempReminder.notification,
+ date,
+ vibrate: false,
+ repeatType: 'day'
})
}
- }, 60 * 1000)
- return () => clearInterval(id)
+ })
}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9c136b0698ab5253985f05dbd76fa1c0b0b0b39a..a481c2234c0c828dce598c5d74853e9507bdcc72 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3721,8 +3721,8 @@
"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
"optional": true,
"requires": {
- "nan": "2.10.0",
- "node-pre-gyp": "0.10.0"
+ "nan": "^2.9.2",
+ "node-pre-gyp": "^0.10.0"
},
"dependencies": {
"abbrev": {
@@ -3744,21 +3744,19 @@
"bundled": true,
"optional": true,
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.3.6"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"balanced-match": {
"version": "1.0.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
- "optional": true,
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -3769,18 +3767,15 @@
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"concat-map": {
"version": "0.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"core-util-is": {
"version": "1.0.2",
@@ -3815,7 +3810,7 @@
"bundled": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"fs.realpath": {
@@ -3828,14 +3823,14 @@
"bundled": true,
"optional": true,
"requires": {
- "aproba": "1.2.0",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
}
},
"glob": {
@@ -3843,12 +3838,12 @@
"bundled": true,
"optional": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"has-unicode": {
@@ -3861,7 +3856,7 @@
"bundled": true,
"optional": true,
"requires": {
- "safer-buffer": "2.1.2"
+ "safer-buffer": "^2.1.0"
}
},
"ignore-walk": {
@@ -3869,7 +3864,7 @@
"bundled": true,
"optional": true,
"requires": {
- "minimatch": "3.0.4"
+ "minimatch": "^3.0.4"
}
},
"inflight": {
@@ -3877,14 +3872,13 @@
"bundled": true,
"optional": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
"version": "2.0.3",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"ini": {
"version": "1.3.5",
@@ -3894,9 +3888,8 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
- "optional": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"isarray": {
@@ -3907,23 +3900,20 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
- "optional": true,
"requires": {
- "brace-expansion": "1.1.11"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
- "optional": true,
"requires": {
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.0"
}
},
"minizlib": {
@@ -3931,13 +3921,12 @@
"bundled": true,
"optional": true,
"requires": {
- "minipass": "2.2.4"
+ "minipass": "^2.2.1"
}
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -3952,9 +3941,9 @@
"bundled": true,
"optional": true,
"requires": {
- "debug": "2.6.9",
- "iconv-lite": "0.4.21",
- "sax": "1.2.4"
+ "debug": "^2.1.2",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
}
},
"node-pre-gyp": {
@@ -3962,16 +3951,16 @@
"bundled": true,
"optional": true,
"requires": {
- "detect-libc": "1.0.3",
- "mkdirp": "0.5.1",
- "needle": "2.2.0",
- "nopt": "4.0.1",
- "npm-packlist": "1.1.10",
- "npmlog": "4.1.2",
- "rc": "1.2.7",
- "rimraf": "2.6.2",
- "semver": "5.5.0",
- "tar": "4.4.1"
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.0",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
}
},
"nopt": {
@@ -3979,8 +3968,8 @@
"bundled": true,
"optional": true,
"requires": {
- "abbrev": "1.1.1",
- "osenv": "0.1.5"
+ "abbrev": "1",
+ "osenv": "^0.1.4"
}
},
"npm-bundled": {
@@ -3993,8 +3982,8 @@
"bundled": true,
"optional": true,
"requires": {
- "ignore-walk": "3.0.1",
- "npm-bundled": "1.0.3"
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1"
}
},
"npmlog": {
@@ -4002,16 +3991,15 @@
"bundled": true,
"optional": true,
"requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
}
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"object-assign": {
"version": "4.1.1",
@@ -4021,9 +4009,8 @@
"once": {
"version": "1.4.0",
"bundled": true,
- "optional": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"os-homedir": {
@@ -4041,8 +4028,8 @@
"bundled": true,
"optional": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@@ -4060,10 +4047,10 @@
"bundled": true,
"optional": true,
"requires": {
- "deep-extend": "0.5.1",
- "ini": "1.3.5",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "^0.5.1",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -4078,13 +4065,13 @@
"bundled": true,
"optional": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.1.1",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.1.1",
+ "util-deprecate": "~1.0.1"
}
},
"rimraf": {
@@ -4092,7 +4079,7 @@
"bundled": true,
"optional": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"safe-buffer": {
@@ -4127,11 +4114,10 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
- "optional": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string_decoder": {
@@ -4139,14 +4125,14 @@
"bundled": true,
"optional": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -4159,13 +4145,13 @@
"bundled": true,
"optional": true,
"requires": {
- "chownr": "1.0.1",
- "fs-minipass": "1.2.5",
- "minipass": "2.2.4",
- "minizlib": "1.1.0",
- "mkdirp": "0.5.1",
- "safe-buffer": "5.1.1",
- "yallist": "3.0.2"
+ "chownr": "^1.0.1",
+ "fs-minipass": "^1.2.5",
+ "minipass": "^2.2.4",
+ "minizlib": "^1.1.0",
+ "mkdirp": "^0.5.0",
+ "safe-buffer": "^5.1.1",
+ "yallist": "^3.0.2"
}
},
"util-deprecate": {
@@ -4178,7 +4164,7 @@
"bundled": true,
"optional": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "^1.0.2"
}
},
"wrappy": {
@@ -6685,6 +6671,11 @@
}
}
},
+ "react-native-push-notification": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/react-native-push-notification/-/react-native-push-notification-3.1.1.tgz",
+ "integrity": "sha512-4+4yQXNPqh5IVvpSBmR4Cy/UeMjTcfE8KIJgEuT7pME97WK+aGPn6W3ybhOoXC1n+ZWKfrAlsHydLE4xfBZDJg=="
+ },
"react-native-safe-area-view": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz",
diff --git a/package.json b/package.json
index 2c492c51a618b2257a136bf069e9554ad20e37bc..66497ad42e99d6d9754a5dab83f3c15787c7663e 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"react-native-document-picker": "^2.1.0",
"react-native-fs": "^2.10.14",
"react-native-modal-datetime-picker-nevo": "^4.11.0",
+ "react-native-push-notification": "^3.1.1",
"react-native-share": "^1.1.0",
"react-native-simple-radio-button": "^2.7.1",
"react-native-vector-icons": "^5.0.0",