Merge branch '140-daily-temp-reminder' into 'master'
Resolve "daily temp reminder" Closes #140 See merge request bloodyhealth/drip!63
This commit is contained in:
@@ -138,6 +138,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compile project(':react-native-push-notification')
|
||||||
compile project(':react-native-vector-icons')
|
compile project(':react-native-vector-icons')
|
||||||
compile project(':react-native-fs')
|
compile project(':react-native-fs')
|
||||||
compile project(':react-native-document-picker')
|
compile project(':react-native-document-picker')
|
||||||
|
|||||||
@@ -3,6 +3,15 @@
|
|||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
<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
|
<application
|
||||||
android:name=".MainApplication"
|
android:name=".MainApplication"
|
||||||
@@ -30,6 +39,46 @@
|
|||||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||||
android:resource="@xml/filepaths" />
|
android:resource="@xml/filepaths" />
|
||||||
</provider>
|
</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>
|
</application>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.drip;
|
|||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
||||||
import com.facebook.react.ReactApplication;
|
import com.facebook.react.ReactApplication;
|
||||||
|
import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
|
||||||
import com.oblador.vectoricons.VectorIconsPackage;
|
import com.oblador.vectoricons.VectorIconsPackage;
|
||||||
import com.rnfs.RNFSPackage;
|
import com.rnfs.RNFSPackage;
|
||||||
import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
|
import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
|
||||||
@@ -29,6 +30,7 @@ public class MainApplication extends Application implements ReactApplication, Sh
|
|||||||
protected List<ReactPackage> getPackages() {
|
protected List<ReactPackage> getPackages() {
|
||||||
return Arrays.<ReactPackage>asList(
|
return Arrays.<ReactPackage>asList(
|
||||||
new MainReactPackage(),
|
new MainReactPackage(),
|
||||||
|
new ReactNativePushNotificationPackage(),
|
||||||
new VectorIconsPackage(),
|
new VectorIconsPackage(),
|
||||||
new RNFSPackage(),
|
new RNFSPackage(),
|
||||||
new ReactNativeDocumentPicker(),
|
new ReactNativeDocumentPicker(),
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
rootProject.name = 'drip'
|
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'
|
include ':react-native-vector-icons'
|
||||||
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
|
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
|
||||||
include ':react-native-fs'
|
include ':react-native-fs'
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import Chart from './chart/chart'
|
|||||||
import Settings from './settings'
|
import Settings from './settings'
|
||||||
import Stats from './stats'
|
import Stats from './stats'
|
||||||
import {headerTitles as titles} from './labels'
|
import {headerTitles as titles} from './labels'
|
||||||
|
import setupNotifications from '../lib/notifications'
|
||||||
|
|
||||||
const isSymptomView = name => Object.keys(symptomViews).indexOf(name) > -1
|
const isSymptomView = name => Object.keys(symptomViews).indexOf(name) > -1
|
||||||
|
|
||||||
@@ -20,6 +21,7 @@ export default class App extends Component {
|
|||||||
currentPage: 'Home'
|
currentPage: 'Home'
|
||||||
}
|
}
|
||||||
this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress)
|
this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress)
|
||||||
|
setupNotifications(this.navigate)
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillUnmount() {
|
componentWillUnmount() {
|
||||||
|
|||||||
@@ -42,6 +42,12 @@ export const settings = {
|
|||||||
max: 'Max',
|
max: 'Max',
|
||||||
loadError: 'Could not load saved temperature scale settings',
|
loadError: 'Could not load saved temperature scale settings',
|
||||||
saveError: 'Could not save 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'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+111
-28
@@ -4,53 +4,66 @@ import {
|
|||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
ScrollView,
|
ScrollView,
|
||||||
Alert,
|
Alert,
|
||||||
Text
|
Text,
|
||||||
|
Switch
|
||||||
} from 'react-native'
|
} from 'react-native'
|
||||||
|
import DateTimePicker from 'react-native-modal-datetime-picker-nevo'
|
||||||
import Slider from '@ptomasroos/react-native-multi-slider'
|
import Slider from '@ptomasroos/react-native-multi-slider'
|
||||||
import Share from 'react-native-share'
|
import Share from 'react-native-share'
|
||||||
import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker'
|
import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker'
|
||||||
import rnfs from 'react-native-fs'
|
import rnfs from 'react-native-fs'
|
||||||
import styles, { secondaryColor } from '../styles/index'
|
import styles, { secondaryColor } from '../styles/index'
|
||||||
import config from '../config'
|
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 getDataAsCsvDataUri from '../lib/import-export/export-to-csv'
|
||||||
import importCsv from '../lib/import-export/import-from-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 {
|
export default class Settings extends Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props)
|
||||||
|
this.state = {}
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<ScrollView>
|
<ScrollView>
|
||||||
|
<TempReminderPicker/>
|
||||||
<View style={styles.settingsSegment}>
|
<View style={styles.settingsSegment}>
|
||||||
<Text style={styles.settingsSegmentTitle}>
|
<Text style={styles.settingsSegmentTitle}>
|
||||||
{settingsLabels.tempScale.segmentTitle}
|
{labels.tempScale.segmentTitle}
|
||||||
</Text>
|
</Text>
|
||||||
<Text>{settingsLabels.tempScale.segmentExplainer}</Text>
|
<Text>{labels.tempScale.segmentExplainer}</Text>
|
||||||
<TempSlider/>
|
<TempSlider/>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.settingsSegment}>
|
<View style={styles.settingsSegment}>
|
||||||
<Text style={styles.settingsSegmentTitle}>
|
<Text style={styles.settingsSegmentTitle}>
|
||||||
{settingsLabels.export.button}
|
{labels.export.button}
|
||||||
</Text>
|
</Text>
|
||||||
<Text>{settingsLabels.export.segmentExplainer}</Text>
|
<Text>{labels.export.segmentExplainer}</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress={openShareDialogAndExport}
|
onPress={openShareDialogAndExport}
|
||||||
style={styles.settingsButton}>
|
style={styles.settingsButton}>
|
||||||
<Text style={styles.settingsButtonText}>
|
<Text style={styles.settingsButtonText}>
|
||||||
{settingsLabels.export.button}
|
{labels.export.button}
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
<View style={styles.settingsSegment}>
|
<View style={styles.settingsSegment}>
|
||||||
<Text style={styles.settingsSegmentTitle}>
|
<Text style={styles.settingsSegmentTitle}>
|
||||||
{settingsLabels.import.button}
|
{labels.import.button}
|
||||||
</Text>
|
</Text>
|
||||||
<Text>{settingsLabels.import.segmentExplainer}</Text>
|
<Text>{labels.import.segmentExplainer}</Text>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
onPress={openImportDialogAndImport}
|
onPress={openImportDialogAndImport}
|
||||||
style={styles.settingsButton}>
|
style={styles.settingsButton}>
|
||||||
<Text style={styles.settingsButtonText}>
|
<Text style={styles.settingsButtonText}>
|
||||||
{settingsLabels.import.button}
|
{labels.import.button}
|
||||||
</Text>
|
</Text>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -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 (
|
||||||
|
<TouchableOpacity
|
||||||
|
style={styles.settingsSegment}
|
||||||
|
onPress={() => this.setState({ isTimePickerVisible: true })}
|
||||||
|
>
|
||||||
|
<Text style={styles.settingsSegmentTitle}>
|
||||||
|
{labels.tempReminder.title}
|
||||||
|
</Text>
|
||||||
|
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
|
||||||
|
<View style={{ flex: 1 }}>
|
||||||
|
{this.state.time && this.state.enabled ?
|
||||||
|
<Text>{labels.tempReminder.timeSet(this.state.time)}</Text>
|
||||||
|
:
|
||||||
|
<Text>{labels.tempReminder.noTimeSet}</Text>
|
||||||
|
}
|
||||||
|
</View>
|
||||||
|
<Switch
|
||||||
|
value={this.state.enabled}
|
||||||
|
onValueChange={switchOn => {
|
||||||
|
this.setState({ enabled: switchOn })
|
||||||
|
if (switchOn && !this.state.time) {
|
||||||
|
this.setState({ isTimePickerVisible: true })
|
||||||
|
}
|
||||||
|
if (!switchOn) saveTempReminder({ enabled: false })
|
||||||
|
}}
|
||||||
|
onTintColor={secondaryColor}
|
||||||
|
/>
|
||||||
|
<DateTimePicker
|
||||||
|
mode="time"
|
||||||
|
isVisible={this.state.isTimePickerVisible}
|
||||||
|
onConfirm={jsDate => {
|
||||||
|
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})
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</TouchableOpacity>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class TempSlider extends Component {
|
class TempSlider extends Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props)
|
super(props)
|
||||||
@@ -80,15 +153,15 @@ class TempSlider extends Component {
|
|||||||
try {
|
try {
|
||||||
saveTempScale(this.state)
|
saveTempScale(this.state)
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
alertError(settingsLabels.tempScale.saveError)
|
alertError(labels.tempScale.saveError)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<View style={{alignItems: 'center'}}>
|
<View style={{ alignItems: 'center' }}>
|
||||||
<Text>{`${settingsLabels.tempScale.min} ${this.state.min}`}</Text>
|
<Text>{`${labels.tempScale.min} ${this.state.min}`}</Text>
|
||||||
<Text>{`${settingsLabels.tempScale.max} ${this.state.max}`}</Text>
|
<Text>{`${labels.tempScale.max} ${this.state.max}`}</Text>
|
||||||
<Slider
|
<Slider
|
||||||
values={[this.state.min, this.state.max]}
|
values={[this.state.min, this.state.max]}
|
||||||
min={config.temperatureScale.min}
|
min={config.temperatureScale.min}
|
||||||
@@ -103,7 +176,7 @@ class TempSlider extends Component {
|
|||||||
backgroundColor: 'silver',
|
backgroundColor: 'silver',
|
||||||
}}
|
}}
|
||||||
trackStyle={{
|
trackStyle={{
|
||||||
height:10,
|
height: 10,
|
||||||
}}
|
}}
|
||||||
markerStyle={{
|
markerStyle={{
|
||||||
backgroundColor: secondaryColor,
|
backgroundColor: secondaryColor,
|
||||||
@@ -123,36 +196,36 @@ async function openShareDialogAndExport() {
|
|||||||
try {
|
try {
|
||||||
data = getDataAsCsvDataUri()
|
data = getDataAsCsvDataUri()
|
||||||
if (!data) {
|
if (!data) {
|
||||||
return alertError(settingsLabels.errors.noData)
|
return alertError(labels.errors.noData)
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
return alertError(settingsLabels.errors.couldNotConvert)
|
return alertError(labels.errors.couldNotConvert)
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await Share.open({
|
await Share.open({
|
||||||
title: settingsLabels.export.title,
|
title: labels.export.title,
|
||||||
url: data,
|
url: data,
|
||||||
subject: settingsLabels.export.subject,
|
subject: labels.export.subject,
|
||||||
type: 'text/csv',
|
type: 'text/csv',
|
||||||
showAppsToView: true
|
showAppsToView: true
|
||||||
})
|
})
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err)
|
console.error(err)
|
||||||
return alertError(settingsLabels.export.errors.problemSharing)
|
return alertError(labels.export.errors.problemSharing)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openImportDialogAndImport() {
|
function openImportDialogAndImport() {
|
||||||
Alert.alert(
|
Alert.alert(
|
||||||
settingsLabels.import.title,
|
labels.import.title,
|
||||||
settingsLabels.import.message,
|
labels.import.message,
|
||||||
[{
|
[{
|
||||||
text: settingsLabels.import.replaceOption,
|
text: labels.import.replaceOption,
|
||||||
onPress: () => getFileContentAndImport({ deleteExisting: false })
|
onPress: () => getFileContentAndImport({ deleteExisting: false })
|
||||||
}, {
|
}, {
|
||||||
text: settingsLabels.import.deleteOption,
|
text: labels.import.deleteOption,
|
||||||
onPress: () => getFileContentAndImport({ deleteExisting: true })
|
onPress: () => getFileContentAndImport({ deleteExisting: true })
|
||||||
}, {
|
}, {
|
||||||
text: sharedLabels.cancel, style: 'cancel', onPress: () => { }
|
text: sharedLabels.cancel, style: 'cancel', onPress: () => { }
|
||||||
@@ -180,12 +253,12 @@ async function getFileContentAndImport({ deleteExisting }) {
|
|||||||
try {
|
try {
|
||||||
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return importError(settingsLabels.import.errors.couldNotOpenFile)
|
return importError(labels.import.errors.couldNotOpenFile)
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await importCsv(fileContent, deleteExisting)
|
await importCsv(fileContent, deleteExisting)
|
||||||
Alert.alert(sharedLabels.successTitle, settingsLabels.import.success.message)
|
Alert.alert(sharedLabels.successTitle, labels.import.success.message)
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
importError(err.message)
|
importError(err.message)
|
||||||
}
|
}
|
||||||
@@ -196,6 +269,16 @@ function alertError(msg) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function importError(msg) {
|
function importError(msg) {
|
||||||
const postFixed = `${msg}\n\n${settingsLabels.import.errors.postFix}`
|
const postFixed = `${msg}\n\n${labels.import.errors.postFix}`
|
||||||
alertError(postFixed)
|
alertError(postFixed)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function padWithZeros(time) {
|
||||||
|
const vals = time.split(':')
|
||||||
|
return vals.map(val => {
|
||||||
|
if (parseInt(val) < 10) {
|
||||||
|
val = `0${val}`
|
||||||
|
}
|
||||||
|
return val
|
||||||
|
}).join(':')
|
||||||
|
}
|
||||||
@@ -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'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
+17
-8
@@ -3,20 +3,25 @@ import Observable from 'obv'
|
|||||||
import config from '../config'
|
import config from '../config'
|
||||||
|
|
||||||
export const scaleObservable = Observable()
|
export const scaleObservable = Observable()
|
||||||
setTempScaleInitially()
|
setObvWithInitValue('tempScale', scaleObservable, {
|
||||||
|
min: config.temperatureScale.defaultLow,
|
||||||
|
max: config.temperatureScale.defaultHigh
|
||||||
|
})
|
||||||
|
|
||||||
async function setTempScaleInitially() {
|
export const tempReminderObservable = Observable()
|
||||||
const result = await AsyncStorage.getItem('tempScale')
|
setObvWithInitValue('tempReminder', tempReminderObservable, {
|
||||||
|
enabled: false
|
||||||
|
})
|
||||||
|
|
||||||
|
async function setObvWithInitValue(key, obv, defaultValue) {
|
||||||
|
const result = await AsyncStorage.getItem(key)
|
||||||
let value
|
let value
|
||||||
if (result) {
|
if (result) {
|
||||||
value = JSON.parse(result)
|
value = JSON.parse(result)
|
||||||
} else {
|
} else {
|
||||||
value = {
|
value = defaultValue
|
||||||
min: config.temperatureScale.defaultLow,
|
|
||||||
max: config.temperatureScale.defaultHigh
|
|
||||||
}
|
}
|
||||||
}
|
obv.set(value)
|
||||||
scaleObservable.set(value)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function saveTempScale(scale) {
|
export async function saveTempScale(scale) {
|
||||||
@@ -24,3 +29,7 @@ export async function saveTempScale(scale) {
|
|||||||
scaleObservable.set(scale)
|
scaleObservable.set(scale)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function saveTempReminder(reminder) {
|
||||||
|
await AsyncStorage.setItem('tempReminder', JSON.stringify(reminder))
|
||||||
|
tempReminderObservable.set(reminder)
|
||||||
|
}
|
||||||
Generated
+90
-99
@@ -3721,8 +3721,8 @@
|
|||||||
"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
|
"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"nan": "2.10.0",
|
"nan": "^2.9.2",
|
||||||
"node-pre-gyp": "0.10.0"
|
"node-pre-gyp": "^0.10.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"abbrev": {
|
"abbrev": {
|
||||||
@@ -3744,21 +3744,19 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"delegates": "1.0.0",
|
"delegates": "^1.0.0",
|
||||||
"readable-stream": "2.3.6"
|
"readable-stream": "^2.0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"balanced-match": {
|
"balanced-match": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"balanced-match": "1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3769,18 +3767,15 @@
|
|||||||
},
|
},
|
||||||
"code-point-at": {
|
"code-point-at": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"concat-map": {
|
"concat-map": {
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"console-control-strings": {
|
"console-control-strings": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"core-util-is": {
|
"core-util-is": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
@@ -3815,7 +3810,7 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"minipass": "2.2.4"
|
"minipass": "^2.2.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"fs.realpath": {
|
"fs.realpath": {
|
||||||
@@ -3828,14 +3823,14 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"aproba": "1.2.0",
|
"aproba": "^1.0.3",
|
||||||
"console-control-strings": "1.1.0",
|
"console-control-strings": "^1.0.0",
|
||||||
"has-unicode": "2.0.1",
|
"has-unicode": "^2.0.0",
|
||||||
"object-assign": "4.1.1",
|
"object-assign": "^4.1.0",
|
||||||
"signal-exit": "3.0.2",
|
"signal-exit": "^3.0.0",
|
||||||
"string-width": "1.0.2",
|
"string-width": "^1.0.1",
|
||||||
"strip-ansi": "3.0.1",
|
"strip-ansi": "^3.0.1",
|
||||||
"wide-align": "1.1.2"
|
"wide-align": "^1.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"glob": {
|
"glob": {
|
||||||
@@ -3843,12 +3838,12 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"fs.realpath": "1.0.0",
|
"fs.realpath": "^1.0.0",
|
||||||
"inflight": "1.0.6",
|
"inflight": "^1.0.4",
|
||||||
"inherits": "2.0.3",
|
"inherits": "2",
|
||||||
"minimatch": "3.0.4",
|
"minimatch": "^3.0.4",
|
||||||
"once": "1.4.0",
|
"once": "^1.3.0",
|
||||||
"path-is-absolute": "1.0.1"
|
"path-is-absolute": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"has-unicode": {
|
"has-unicode": {
|
||||||
@@ -3861,7 +3856,7 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"safer-buffer": "2.1.2"
|
"safer-buffer": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ignore-walk": {
|
"ignore-walk": {
|
||||||
@@ -3869,7 +3864,7 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"minimatch": "3.0.4"
|
"minimatch": "^3.0.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"inflight": {
|
"inflight": {
|
||||||
@@ -3877,14 +3872,13 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"once": "1.4.0",
|
"once": "^1.3.0",
|
||||||
"wrappy": "1.0.2"
|
"wrappy": "1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"inherits": {
|
"inherits": {
|
||||||
"version": "2.0.3",
|
"version": "2.0.3",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.5",
|
||||||
@@ -3894,9 +3888,8 @@
|
|||||||
"is-fullwidth-code-point": {
|
"is-fullwidth-code-point": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"number-is-nan": "1.0.1"
|
"number-is-nan": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isarray": {
|
"isarray": {
|
||||||
@@ -3907,23 +3900,20 @@
|
|||||||
"minimatch": {
|
"minimatch": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"brace-expansion": "1.1.11"
|
"brace-expansion": "^1.1.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "0.0.8",
|
"version": "0.0.8",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"minipass": {
|
"minipass": {
|
||||||
"version": "2.2.4",
|
"version": "2.2.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"safe-buffer": "5.1.1",
|
"safe-buffer": "^5.1.1",
|
||||||
"yallist": "3.0.2"
|
"yallist": "^3.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minizlib": {
|
"minizlib": {
|
||||||
@@ -3931,13 +3921,12 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"minipass": "2.2.4"
|
"minipass": "^2.2.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mkdirp": {
|
"mkdirp": {
|
||||||
"version": "0.5.1",
|
"version": "0.5.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"minimist": "0.0.8"
|
"minimist": "0.0.8"
|
||||||
}
|
}
|
||||||
@@ -3952,9 +3941,9 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"debug": "2.6.9",
|
"debug": "^2.1.2",
|
||||||
"iconv-lite": "0.4.21",
|
"iconv-lite": "^0.4.4",
|
||||||
"sax": "1.2.4"
|
"sax": "^1.2.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node-pre-gyp": {
|
"node-pre-gyp": {
|
||||||
@@ -3962,16 +3951,16 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"detect-libc": "1.0.3",
|
"detect-libc": "^1.0.2",
|
||||||
"mkdirp": "0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"needle": "2.2.0",
|
"needle": "^2.2.0",
|
||||||
"nopt": "4.0.1",
|
"nopt": "^4.0.1",
|
||||||
"npm-packlist": "1.1.10",
|
"npm-packlist": "^1.1.6",
|
||||||
"npmlog": "4.1.2",
|
"npmlog": "^4.0.2",
|
||||||
"rc": "1.2.7",
|
"rc": "^1.1.7",
|
||||||
"rimraf": "2.6.2",
|
"rimraf": "^2.6.1",
|
||||||
"semver": "5.5.0",
|
"semver": "^5.3.0",
|
||||||
"tar": "4.4.1"
|
"tar": "^4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nopt": {
|
"nopt": {
|
||||||
@@ -3979,8 +3968,8 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"abbrev": "1.1.1",
|
"abbrev": "1",
|
||||||
"osenv": "0.1.5"
|
"osenv": "^0.1.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npm-bundled": {
|
"npm-bundled": {
|
||||||
@@ -3993,8 +3982,8 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ignore-walk": "3.0.1",
|
"ignore-walk": "^3.0.1",
|
||||||
"npm-bundled": "1.0.3"
|
"npm-bundled": "^1.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"npmlog": {
|
"npmlog": {
|
||||||
@@ -4002,16 +3991,15 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"are-we-there-yet": "1.1.4",
|
"are-we-there-yet": "~1.1.2",
|
||||||
"console-control-strings": "1.1.0",
|
"console-control-strings": "~1.1.0",
|
||||||
"gauge": "2.7.4",
|
"gauge": "~2.7.3",
|
||||||
"set-blocking": "2.0.0"
|
"set-blocking": "~2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"number-is-nan": {
|
"number-is-nan": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"object-assign": {
|
"object-assign": {
|
||||||
"version": "4.1.1",
|
"version": "4.1.1",
|
||||||
@@ -4021,9 +4009,8 @@
|
|||||||
"once": {
|
"once": {
|
||||||
"version": "1.4.0",
|
"version": "1.4.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"wrappy": "1.0.2"
|
"wrappy": "1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"os-homedir": {
|
"os-homedir": {
|
||||||
@@ -4041,8 +4028,8 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"os-homedir": "1.0.2",
|
"os-homedir": "^1.0.0",
|
||||||
"os-tmpdir": "1.0.2"
|
"os-tmpdir": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"path-is-absolute": {
|
"path-is-absolute": {
|
||||||
@@ -4060,10 +4047,10 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"deep-extend": "0.5.1",
|
"deep-extend": "^0.5.1",
|
||||||
"ini": "1.3.5",
|
"ini": "~1.3.0",
|
||||||
"minimist": "1.2.0",
|
"minimist": "^1.2.0",
|
||||||
"strip-json-comments": "2.0.1"
|
"strip-json-comments": "~2.0.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minimist": {
|
"minimist": {
|
||||||
@@ -4078,13 +4065,13 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"core-util-is": "1.0.2",
|
"core-util-is": "~1.0.0",
|
||||||
"inherits": "2.0.3",
|
"inherits": "~2.0.3",
|
||||||
"isarray": "1.0.0",
|
"isarray": "~1.0.0",
|
||||||
"process-nextick-args": "2.0.0",
|
"process-nextick-args": "~2.0.0",
|
||||||
"safe-buffer": "5.1.1",
|
"safe-buffer": "~5.1.1",
|
||||||
"string_decoder": "1.1.1",
|
"string_decoder": "~1.1.1",
|
||||||
"util-deprecate": "1.0.2"
|
"util-deprecate": "~1.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rimraf": {
|
"rimraf": {
|
||||||
@@ -4092,7 +4079,7 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"glob": "7.1.2"
|
"glob": "^7.0.5"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"safe-buffer": {
|
"safe-buffer": {
|
||||||
@@ -4127,11 +4114,10 @@
|
|||||||
"string-width": {
|
"string-width": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"code-point-at": "1.1.0",
|
"code-point-at": "^1.0.0",
|
||||||
"is-fullwidth-code-point": "1.0.0",
|
"is-fullwidth-code-point": "^1.0.0",
|
||||||
"strip-ansi": "3.0.1"
|
"strip-ansi": "^3.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"string_decoder": {
|
"string_decoder": {
|
||||||
@@ -4139,14 +4125,14 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"safe-buffer": "5.1.1"
|
"safe-buffer": "~5.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"strip-ansi": {
|
"strip-ansi": {
|
||||||
"version": "3.0.1",
|
"version": "3.0.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ansi-regex": "2.1.1"
|
"ansi-regex": "^2.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"strip-json-comments": {
|
"strip-json-comments": {
|
||||||
@@ -4159,13 +4145,13 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"chownr": "1.0.1",
|
"chownr": "^1.0.1",
|
||||||
"fs-minipass": "1.2.5",
|
"fs-minipass": "^1.2.5",
|
||||||
"minipass": "2.2.4",
|
"minipass": "^2.2.4",
|
||||||
"minizlib": "1.1.0",
|
"minizlib": "^1.1.0",
|
||||||
"mkdirp": "0.5.1",
|
"mkdirp": "^0.5.0",
|
||||||
"safe-buffer": "5.1.1",
|
"safe-buffer": "^5.1.1",
|
||||||
"yallist": "3.0.2"
|
"yallist": "^3.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"util-deprecate": {
|
"util-deprecate": {
|
||||||
@@ -4178,7 +4164,7 @@
|
|||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"string-width": "1.0.2"
|
"string-width": "^1.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"wrappy": {
|
"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": {
|
"react-native-safe-area-view": {
|
||||||
"version": "0.8.0",
|
"version": "0.8.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz",
|
||||||
|
|||||||
+2
-1
@@ -22,7 +22,7 @@
|
|||||||
"isobject": "^3.0.1",
|
"isobject": "^3.0.1",
|
||||||
"js-base64": "^2.4.8",
|
"js-base64": "^2.4.8",
|
||||||
"js-joda": "^1.8.2",
|
"js-joda": "^1.8.2",
|
||||||
"moment": "^2.22.1",
|
"moment": "^2.22.2",
|
||||||
"object-path": "^0.11.4",
|
"object-path": "^0.11.4",
|
||||||
"obv": "0.0.1",
|
"obv": "0.0.1",
|
||||||
"react": "16.4.1",
|
"react": "16.4.1",
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
"react-native-document-picker": "^2.1.0",
|
"react-native-document-picker": "^2.1.0",
|
||||||
"react-native-fs": "^2.10.14",
|
"react-native-fs": "^2.10.14",
|
||||||
"react-native-modal-datetime-picker-nevo": "^4.11.0",
|
"react-native-modal-datetime-picker-nevo": "^4.11.0",
|
||||||
|
"react-native-push-notification": "^3.1.1",
|
||||||
"react-native-share": "^1.1.0",
|
"react-native-share": "^1.1.0",
|
||||||
"react-native-simple-radio-button": "^2.7.1",
|
"react-native-simple-radio-button": "^2.7.1",
|
||||||
"react-native-vector-icons": "^5.0.0",
|
"react-native-vector-icons": "^5.0.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user