diff --git a/android/app/build.gradle b/android/app/build.gradle index fa56b47..6348b76 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 4654ff4..207d90a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -3,6 +3,15 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/java/com/drip/MainApplication.java b/android/app/src/main/java/com/drip/MainApplication.java index 4dc63a4..da1f79f 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 getPackages() { return Arrays.asList( new MainReactPackage(), + new ReactNativePushNotificationPackage(), new VectorIconsPackage(), new RNFSPackage(), new ReactNativeDocumentPicker(), diff --git a/android/settings.gradle b/android/settings.gradle index 6a9c8c8..fe009fa 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 dbd3cfb..827b11e 100644 --- a/components/app.js +++ b/components/app.js @@ -10,6 +10,7 @@ import Chart from './chart/chart' import Settings from './settings' import Stats from './stats' import {headerTitles as titles} from './labels' +import setupNotifications from '../lib/notifications' const isSymptomView = name => Object.keys(symptomViews).indexOf(name) > -1 @@ -20,6 +21,7 @@ export default class App extends Component { currentPage: 'Home' } this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress) + setupNotifications(this.navigate) } componentWillUnmount() { @@ -60,4 +62,4 @@ export default class App extends Component { ) } -} \ No newline at end of file +} diff --git a/components/labels.js b/components/labels.js index b249e37..7066663 100644 --- a/components/labels.js +++ b/components/labels.js @@ -42,6 +42,12 @@ export const settings = { max: 'Max', loadError: 'Could not load saved temperature scale settings', saveError: 'Could not save temperature scale settings' + }, + tempReminder: { + title: 'Temperature reminder', + noTimeSet: 'Set a time for a daily reminder to take your temperature', + timeSet: time => `Daily reminder set for ${time}`, + notification: 'Record your morning temperature' } } diff --git a/components/settings.js b/components/settings.js index f03aec9..aac1a65 100644 --- a/components/settings.js +++ b/components/settings.js @@ -4,53 +4,66 @@ import { TouchableOpacity, ScrollView, Alert, - Text + Text, + Switch } from 'react-native' +import DateTimePicker from 'react-native-modal-datetime-picker-nevo' import Slider from '@ptomasroos/react-native-multi-slider' import Share from 'react-native-share' import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker' import rnfs from 'react-native-fs' import styles, { secondaryColor } from '../styles/index' import config from '../config' -import { settings as settingsLabels, shared as sharedLabels } from './labels' +import { settings as labels, shared as sharedLabels } from './labels' import getDataAsCsvDataUri from '../lib/import-export/export-to-csv' import importCsv from '../lib/import-export/import-from-csv' -import { scaleObservable, saveTempScale } from '../local-storage' +import { + scaleObservable, + saveTempScale, + tempReminderObservable, + saveTempReminder +} from '../local-storage' export default class Settings extends Component { + constructor(props) { + super(props) + this.state = {} + } + render() { return ( + - {settingsLabels.tempScale.segmentTitle} + {labels.tempScale.segmentTitle} - {settingsLabels.tempScale.segmentExplainer} + {labels.tempScale.segmentExplainer} - {settingsLabels.export.button} + {labels.export.button} - {settingsLabels.export.segmentExplainer} + {labels.export.segmentExplainer} - {settingsLabels.export.button} + {labels.export.button} - {settingsLabels.import.button} + {labels.import.button} - {settingsLabels.import.segmentExplainer} + {labels.import.segmentExplainer} - {settingsLabels.import.button} + {labels.import.button} @@ -59,6 +72,66 @@ export default class Settings extends Component { } } +class TempReminderPicker extends Component { + constructor(props) { + super(props) + this.state = Object.assign({}, tempReminderObservable.value) + } + + render() { + return ( + this.setState({ isTimePickerVisible: true })} + > + + {labels.tempReminder.title} + + + + {this.state.time && this.state.enabled ? + {labels.tempReminder.timeSet(this.state.time)} + : + {labels.tempReminder.noTimeSet} + } + + { + this.setState({ enabled: switchOn }) + if (switchOn && !this.state.time) { + this.setState({ isTimePickerVisible: true }) + } + if (!switchOn) saveTempReminder({ enabled: false }) + }} + onTintColor={secondaryColor} + /> + { + const time = padWithZeros(`${jsDate.getHours()}:${jsDate.getMinutes()}`) + this.setState({ + time, + isTimePickerVisible: false, + enabled: true + }) + saveTempReminder({ + time, + enabled: true + }) + }} + onCancel={() => { + this.setState({ isTimePickerVisible: false }) + if (!this.state.time) this.setState({enabled: false}) + }} + /> + + + ) + } +} + class TempSlider extends Component { constructor(props) { super(props) @@ -80,15 +153,15 @@ class TempSlider extends Component { try { saveTempScale(this.state) } catch(err) { - alertError(settingsLabels.tempScale.saveError) + alertError(labels.tempScale.saveError) } } render() { return ( - - {`${settingsLabels.tempScale.min} ${this.state.min}`} - {`${settingsLabels.tempScale.max} ${this.state.max}`} + + {`${labels.tempScale.min} ${this.state.min}`} + {`${labels.tempScale.max} ${this.state.max}`} getFileContentAndImport({ deleteExisting: false }) }, { - text: settingsLabels.import.deleteOption, + text: labels.import.deleteOption, onPress: () => getFileContentAndImport({ deleteExisting: true }) }, { text: sharedLabels.cancel, style: 'cancel', onPress: () => { } @@ -180,12 +253,12 @@ async function getFileContentAndImport({ deleteExisting }) { try { fileContent = await rnfs.readFile(fileInfo.uri, 'utf8') } catch (err) { - return importError(settingsLabels.import.errors.couldNotOpenFile) + return importError(labels.import.errors.couldNotOpenFile) } try { await importCsv(fileContent, deleteExisting) - Alert.alert(sharedLabels.successTitle, settingsLabels.import.success.message) + Alert.alert(sharedLabels.successTitle, labels.import.success.message) } catch(err) { importError(err.message) } @@ -196,6 +269,16 @@ function alertError(msg) { } function importError(msg) { - const postFixed = `${msg}\n\n${settingsLabels.import.errors.postFix}` + const postFixed = `${msg}\n\n${labels.import.errors.postFix}` alertError(postFixed) } + +function padWithZeros(time) { + const vals = time.split(':') + return vals.map(val => { + if (parseInt(val) < 10) { + val = `0${val}` + } + return val + }).join(':') +} \ No newline at end of file diff --git a/lib/notifications.js b/lib/notifications.js new file mode 100644 index 0000000..dc1a7a5 --- /dev/null +++ b/lib/notifications.js @@ -0,0 +1,38 @@ +import {tempReminderObservable} from '../local-storage' +import Notification from 'react-native-push-notification' +import { LocalDate } from 'js-joda' +import Moment from 'moment' +import { settings as labels } from '../components/labels' +import { getOrCreateCycleDay } from '../db' + +export default function setupNotifications(navigate) { + Notification.configure({ + onNotification: () => { + const todayDateString = LocalDate.now().toString() + const cycleDay = getOrCreateCycleDay(todayDateString) + navigate('TemperatureEditView', { cycleDay }) + } + }) + + tempReminderObservable(reminder => { + Notification.cancelAllLocalNotifications() + if (reminder.enabled) { + const [hours, minutes] = reminder.time.split(':') + let target = new Moment() + .hours(parseInt(hours)) + .minutes(parseInt(minutes)) + .seconds(0) + + if(target.isBefore(new Moment())) { + target = target.add(1, 'd') + } + + Notification.localNotificationSchedule({ + message: labels.tempReminder.notification, + date: target.toDate(), + vibrate: false, + repeatType: 'day' + }) + } + }) +} \ No newline at end of file diff --git a/local-storage/index.js b/local-storage/index.js index 50d886f..6296271 100644 --- a/local-storage/index.js +++ b/local-storage/index.js @@ -3,20 +3,25 @@ import Observable from 'obv' import config from '../config' export const scaleObservable = Observable() -setTempScaleInitially() +setObvWithInitValue('tempScale', scaleObservable, { + min: config.temperatureScale.defaultLow, + max: config.temperatureScale.defaultHigh +}) -async function setTempScaleInitially() { - const result = await AsyncStorage.getItem('tempScale') +export const tempReminderObservable = Observable() +setObvWithInitValue('tempReminder', tempReminderObservable, { + enabled: false +}) + +async function setObvWithInitValue(key, obv, defaultValue) { + const result = await AsyncStorage.getItem(key) let value if (result) { value = JSON.parse(result) } else { - value = { - min: config.temperatureScale.defaultLow, - max: config.temperatureScale.defaultHigh - } + value = defaultValue } - scaleObservable.set(value) + obv.set(value) } export async function saveTempScale(scale) { @@ -24,3 +29,7 @@ export async function saveTempScale(scale) { scaleObservable.set(scale) } +export async function saveTempReminder(reminder) { + await AsyncStorage.setItem('tempReminder', JSON.stringify(reminder)) + tempReminderObservable.set(reminder) +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 9c136b0..a481c22 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 2c492c5..11c62a8 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "isobject": "^3.0.1", "js-base64": "^2.4.8", "js-joda": "^1.8.2", - "moment": "^2.22.1", + "moment": "^2.22.2", "object-path": "^0.11.4", "obv": "0.0.1", "react": "16.4.1", @@ -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",