calculates cycle days for headaches

.gitignore

@@ -30,7 +30,7 @@ ios/Index/DataStore
 build/
 .idea
 .gradle
-*.properties
+local.properties
 *.iml
 *.hprof
 

README.md

@@ -131,19 +131,15 @@ Minimum system requirements to run iOS app are as follows:
 - MacOS 10.15.7 for Mac users
 - Xcode 13 (command line tools only might be enough)
 
-i. Install yarn dependencies
-
-    yarn install ..
-
-ii. Install XCode dependencies by running the following command from the root project directory:
+i. Install XCode dependencies by running the following command from the root project directory:
 
     cd ios && pod install && cd ..
 
-iii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
+ii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
 
     yarn ios
 
-iiii. If you are building the app with XCode make sure you are running this as well:
+iii. If you are building the app with XCode make sure you are running this as well:
 
     yarn start
 

android/app/build.gradle

@@ -1,8 +1,6 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
-import java.util.Properties
-import java.io.FileInputStream
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -127,16 +125,6 @@ def enableHermes = project.ext.react.get("enableHermes", false);
  */
 def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
 
-// Create a variable called keystorePropertiesFile, and initialize it to your
-// keystore.properties file, in the rootProject folder.
-def keystorePropertiesFile = rootProject.file("keystore.properties")
-
-// Initialize a new Properties() object called keystoreProperties.
-def keystoreProperties = new Properties()
-
-// Load your keystore.properties file into the keystoreProperties object.
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
 android {
     ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
@@ -146,8 +134,8 @@ android {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 38
-        versionName "1.2410.22"
+        versionCode 33
+        versionName "1.2403.19"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
@@ -162,10 +150,6 @@ android {
             keyPassword 'android'
         }
         release {
-            storeFile file('drip-release-key.keystore')
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storePassword keystoreProperties['storePassword']
             if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) {
                 storeFile file(DRIP_RELEASE_STORE_FILE)
                 storePassword DRIP_RELEASE_STORE_PASSWORD

android/build.gradle

@@ -53,7 +53,6 @@ ext {
     minSdkVersion = 21
     compileSdkVersion = 33
     targetSdkVersion = 33
-    soLoaderVersion = "0.10.4+"
 
     if (System.properties['os.arch'] == "aarch64") {
         // For M1 Users we need to use the NDK 24 which added support for aarch64

components/settings/customization/advance-notice-days-slider.js

@@ -1,56 +0,0 @@
-import React from 'react'
-import { View } from 'react-native'
-import PropTypes from 'prop-types'
-import Slider from '@ptomasroos/react-native-multi-slider'
-
-import SliderLabel from './slider-label'
-import { styles } from './slider-styles'
-import {
-  ADVANCE_PERIOD_NOTICE_DAYS_MIN,
-  ADVANCE_PERIOD_NOTICE_DAYS_MAX,
-} from '../../../config'
-
-const AdvanceNoticeDaysSlider = ({
-  disabled,
-  advanceNoticeDays,
-  onAdvanceNoticeDaysChange,
-}) => {
-  const sliderAccentBackground = disabled
-    ? styles.disabledSliderAccentBackground
-    : styles.sliderAccentBackground
-
-  const sliderBackground = disabled
-    ? styles.disabledSliderBackground
-    : styles.sliderBackground
-
-  return (
-    <View style={styles.container}>
-      <Slider
-        customLabel={SliderLabel}
-        enableLabel={true}
-        markerStyle={styles.marker}
-        markerOffsetY={styles.markerOffsetY}
-        max={ADVANCE_PERIOD_NOTICE_DAYS_MAX}
-        min={ADVANCE_PERIOD_NOTICE_DAYS_MIN}
-        onValuesChange={onAdvanceNoticeDaysChange}
-        step={1}
-        showSteps={true}
-        snapped={true}
-        trackStyle={styles.slider}
-        values={[advanceNoticeDays]}
-        enabledOne={!disabled}
-        enabledTwo={false}
-        selectedStyle={sliderAccentBackground}
-        unselectedStyle={sliderBackground}
-      />
-    </View>
-  )
-}
-
-export default AdvanceNoticeDaysSlider
-
-AdvanceNoticeDaysSlider.propTypes = {
-  disabled: PropTypes.bool,
-  advanceNoticeDays: PropTypes.number,
-  onAdvanceNoticeDaysChange: PropTypes.func,
-}

components/settings/customization/slider-styles.js

@@ -1,34 +0,0 @@
-import { StyleSheet } from 'react-native'
-import { Colors, Sizes } from '../../../styles'
-
-export const styles = StyleSheet.create({
-  container: {
-    alignItems: 'center',
-    paddingTop: Sizes.base,
-  },
-  marker: {
-    backgroundColor: Colors.turquoiseDark,
-    borderRadius: 50,
-    elevation: 4,
-    height: Sizes.subtitle,
-    width: Sizes.subtitle,
-  },
-  slider: {
-    borderRadius: 25,
-    height: Sizes.small,
-    paddingTop: Sizes.base,
-  },
-  sliderAccentBackground: {
-    backgroundColor: Colors.turquoiseDark,
-  },
-  disabledSliderAccentBackground: {
-    backgroundColor: Colors.grey,
-  },
-  sliderBackground: {
-    backgroundColor: Colors.turquoise,
-  },
-  disabledSliderBackground: {
-    backgroundColor: Colors.greyLight,
-  },
-  markerOffsetY: Sizes.tiny,
-})

components/settings/customization/temperature-slider.js

@@ -1,12 +1,13 @@
 import React, { useState } from 'react'
-import { View } from 'react-native'
+import { StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'
 import Slider from '@ptomasroos/react-native-multi-slider'
 
-import SliderLabel from './slider-label'
-import { styles } from './slider-styles'
 import alertError from '../common/alert-error'
+import SliderLabel from './slider-label'
+
 import { scaleObservable, saveTempScale } from '../../../local-storage'
+import { Colors, Sizes } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config'
 
@@ -39,7 +40,7 @@ const TemperatureSlider = ({ disabled }) => {
         customLabel={SliderLabel}
         enableLabel={true}
         markerStyle={styles.marker}
-        markerOffsetY={styles.markerOffsetY}
+        markerOffsetY={Sizes.tiny}
         max={TEMP_MAX}
         min={TEMP_MIN}
         onValuesChange={onTemperatureSliderChange}
@@ -60,3 +61,34 @@ export default TemperatureSlider
 TemperatureSlider.propTypes = {
   disabled: PropTypes.bool,
 }
+
+const styles = StyleSheet.create({
+  container: {
+    alignItems: 'center',
+    paddingTop: Sizes.base,
+  },
+  marker: {
+    backgroundColor: Colors.turquoiseDark,
+
+    borderRadius: 50,
+    elevation: 4,
+    height: Sizes.subtitle,
+    width: Sizes.subtitle,
+  },
+  slider: {
+    borderRadius: 25,
+    height: Sizes.small,
+  },
+  sliderAccentBackground: {
+    backgroundColor: Colors.turquoiseDark,
+  },
+  disabledSliderAccentBackground: {
+    backgroundColor: Colors.grey,
+  },
+  sliderBackground: {
+    backgroundColor: Colors.turquoise,
+  },
+  disabledSliderBackground: {
+    backgroundColor: Colors.greyLight,
+  },
+})

components/settings/reminders/period-reminder.js

@@ -1,59 +0,0 @@
-import React, { useState } from 'react'
-import AppSwitch from '../../common/app-switch'
-import AdvanceNoticeDaysSlider from '../customization/advance-notice-days-slider'
-
-import {
-  periodReminderObservable,
-  savePeriodReminder,
-  periodPredictionObservable,
-  saveAdvanceNoticeDays,
-  advanceNoticeDaysObservable,
-} from '../../../local-storage'
-import labels from '../../../i18n/en/settings'
-
-const PeriodReminder = () => {
-  const isPeriodPredictionDisabled = !periodPredictionObservable.value
-
-  const [isPeriodReminderEnabled, setIsPeriodReminderEnabled] = useState(
-    periodReminderObservable.value.enabled
-  )
-
-  const [advanceNoticeDays, setAdvanceNoticeDays] = useState(
-    advanceNoticeDaysObservable.value
-  )
-
-  const periodReminderToggle = (isEnabled) => {
-    setIsPeriodReminderEnabled(isEnabled)
-    savePeriodReminder({ enabled: isEnabled })
-  }
-
-  const handleAdvanceNoticeDaysChange = (days) => {
-    setAdvanceNoticeDays(days)
-    saveAdvanceNoticeDays(days)
-  }
-
-  const reminderText =
-    advanceNoticeDays == 1
-      ? labels.periodReminder.reminderTextSingular
-      : labels.periodReminder.reminderTextPlural(advanceNoticeDays)
-
-  return (
-    <>
-      <AppSwitch
-        onToggle={periodReminderToggle}
-        text={reminderText}
-        value={isPeriodReminderEnabled}
-        disabled={isPeriodPredictionDisabled}
-      />
-      {isPeriodReminderEnabled && (
-        <AdvanceNoticeDaysSlider
-          disabled={isPeriodPredictionDisabled}
-          advanceNoticeDays={parseInt(advanceNoticeDays)}
-          onAdvanceNoticeDaysChange={handleAdvanceNoticeDaysChange}
-        />
-      )}
-    </>
-  )
-}
-
-export default PeriodReminder

components/settings/reminders/reminders.js

@@ -1,11 +1,13 @@
-import React from 'react'
+import React, { useState } from 'react'
 
 import AppPage from '../../common/app-page'
+import AppSwitch from '../../common/app-switch'
 import Segment from '../../common/segment'
 import TemperatureReminder from './temperature-reminder'
-import PeriodReminder from './period-reminder'
 
 import {
+  periodReminderObservable,
+  savePeriodReminder,
   periodPredictionObservable,
   temperatureTrackingCategoryObservable,
 } from '../../../local-storage'
@@ -14,7 +16,17 @@ import labels from '../../../i18n/en/settings'
 import { Alert, Pressable } from 'react-native'
 
 const Reminders = () => {
-  const periodReminderDisabledPrompt = () => {
+  const isPeriodPredictionDisabled = !periodPredictionObservable.value
+
+  const [isPeriodReminderEnabled, setIsPeriodReminderEnabled] = useState(
+    periodReminderObservable.value.enabled
+  )
+  const periodReminderToggle = (isEnabled) => {
+    setIsPeriodReminderEnabled(isEnabled)
+    savePeriodReminder({ enabled: isEnabled })
+  }
+
+  const reminderDisabledPrompt = () => {
     if (!periodPredictionObservable.value) {
       Alert.alert(
         labels.periodReminder.alertNoPeriodReminder.title,
@@ -31,12 +43,16 @@ const Reminders = () => {
       )
     }
   }
-
   return (
     <AppPage>
-      <Pressable onPress={periodReminderDisabledPrompt}>
+      <Pressable onPress={reminderDisabledPrompt}>
         <Segment title={labels.periodReminder.title}>
-          <PeriodReminder />
+          <AppSwitch
+            onToggle={periodReminderToggle}
+            text={labels.periodReminder.reminderText}
+            value={isPeriodReminderEnabled}
+            disabled={isPeriodPredictionDisabled}
+          />
         </Segment>
       </Pressable>
       <Pressable onPress={tempReminderDisabledPrompt}>

components/stats/SymptomOccurance.js

@@ -0,0 +1,89 @@
+import React from 'react'
+import { FlatList, StyleSheet, View } from 'react-native'
+import PropTypes from 'prop-types'
+// import { useTranslation } from 'react-i18next'
+
+import AppModal from '../common/app-modal'
+import AppText from '../common/app-text'
+
+import symOccModule from '../../lib/sympto-occurance'
+import { Spacing, Typography, Colors } from '../../styles'
+
+// const { t } = useTranslation(null, { keyPrefix: 'stats' })
+
+const SymptomOccurance = ({ onClose }) => {
+  const cycleDays = symOccModule().getCycleStartsOfLastYear()
+  if (!cycleDays || cycleDays.length === 0) return false
+  console.log('cycle starts:', cycleDays)
+
+  const headacheDays = symOccModule().getPainDaysOfLastYear()
+  console.log('pain', headacheDays)
+
+  const cycleDaysOfPain = symOccModule().getCycleDayForPainDays(
+    cycleDays,
+    headacheDays
+  )
+  console.log('cycle days of pain', cycleDaysOfPain)
+
+  return (
+    <AppModal onClose={onClose}>
+      <View>
+        <FlatList
+          ListHeaderComponent={FlatListHeader}
+          contentContainerStyle={styles.container}
+        />
+      </View>
+    </AppModal>
+  )
+}
+
+SymptomOccurance.propTypes = {
+  onClose: PropTypes.func,
+}
+
+const FlatListHeader = () => (
+  <View style={styles.row}>
+    <View style={styles.accentCell}>
+      <AppText style={styles.header}>
+        {'When did you experience headaches in the last year?'}
+      </AppText>
+    </View>
+  </View>
+)
+
+const styles = StyleSheet.create({
+  divider: {
+    height: 1,
+    width: '100%',
+    backgroundColor: Colors.grey,
+  },
+  header: {
+    ...Typography.accentOrange,
+    paddingVertical: Spacing.small,
+  },
+  headerDivider: {
+    borderBottomColor: Colors.purple,
+    borderBottomWidth: 2,
+  },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    paddingVertical: Spacing.tiny,
+    backgroundColor: 'white',
+  },
+  cell: {
+    flex: 2,
+    justifyContent: 'center',
+  },
+  accentCell: {
+    flex: 3,
+    justifyContent: 'center',
+  },
+  container: {
+    minHeight: '40%',
+    minWidth: '95%',
+    paddingHorizontal: Spacing.base,
+  },
+})
+
+export default SymptomOccurance

components/stats/index.js

@@ -8,6 +8,7 @@ import Button from '../common/button'
 import Footnote from '../common/Footnote'
 import StatsOverview from './StatsOverview'
 import PeriodDetailsModal from './PeriodDetailsModal'
+import SymptomOccurance from './SymptomOccurance'
 
 import cycleModule from '../../lib/cycle'
 import { getCycleLengthStats as getCycleInfo } from '../../lib/cycle-length'
@@ -19,6 +20,8 @@ const image = require('../../assets/cycle-icon.png')
 
 const Stats = () => {
   const [isStatsVisible, setIsStatsVisible] = useState(false)
+  const [isSymptomOccuranceVisible, setIsSymptomOccuranceVisible] =
+    useState(false)
 
   const { t } = useTranslation(null, { keyPrefix: 'stats' })
 
@@ -83,6 +86,14 @@ const Stats = () => {
             {isStatsVisible && (
               <PeriodDetailsModal onClose={() => setIsStatsVisible(false)} />
             )}
+            <Button isCTA onPress={() => setIsSymptomOccuranceVisible(true)}>
+              {t('showSymptomOccurance')}
+            </Button>
+            {isSymptomOccuranceVisible && (
+              <SymptomOccurance
+                onClose={() => setIsSymptomOccuranceVisible(false)}
+              />
+            )}
             <Footnote>{t('footnote')}</Footnote>
           </>
         )}

config.js

@@ -33,10 +33,6 @@ export const TEMP_MAX = 39
 export const TEMP_MIN = 35
 export const TEMP_SLIDER_STEP = 0.5
 
-export const ADVANCE_PERIOD_NOTICE_DAYS_MIN = 1
-export const ADVANCE_PERIOD_NOTICE_DAYS_MAX = 7
-export const ADVANCE_PERIOD_NOTICE_DAYS_INIT_VALUE = 3
-
 export const HIT_SLOP = {
   top: verticalScale(20),
   bottom: verticalScale(20),

db/index.js

@@ -73,6 +73,9 @@ export function getTemperatureDaysSortedByDate() {
     .filtered('temperature != null')
     .sorted('date', true)
 }
+export function getPainDaysSortedByDate() {
+  return db.objects('CycleDay').filtered('pain != null').sorted('date', true)
+}
 
 export function getCycleDaysSortedByDate() {
   const cycleDays = db.objects('CycleDay').sorted('date', true)

i18n/en.json

@@ -156,7 +156,8 @@
       "cycleLength": "Cycle length",
       "bleedingDays": "Bleeding"
     },
-    "footnote": "Based on the standard deviation of all your tracked periods drip. calculates a range for the starting day of the upcoming 3 periods. The range will be 3 days if your standard deviation is smaller than 1.5 and 5 days if the value is bigger.\n\nThe standard deviation tells you how much the length of your periods vary, 0 means all your periods are exactly the same length and the bigger the value the more the period length varies."
+    "footnote": "Based on the standard deviation of all your tracked periods drip. calculates a range for the starting day of the upcoming 3 periods. The range will be 3 days if your standard deviation is smaller than 1.5 and 5 days if the value is bigger.\n\nThe standard deviation tells you how much the length of your periods vary, 0 means all your periods are exactly the same length and the bigger the value the more the period length varies.",
+    "showSymptomOccurance": "Show details on headaches"
   },
   "plurals": {
     "day": "{{count}} day",

i18n/en/settings.js

@@ -60,12 +60,10 @@ export default {
   },
   periodReminder: {
     title: 'Next period reminder',
-    reminderTextSingular:
-      'Get a notification 1 day before your next period is likely to start.',
-    reminderTextPlural: (days) =>
-      `Get a notification ${days} days before your next period is likely to start.`,
-    notification: (advanceNoticeDays, daysToEndOfPrediction) =>
-      `Your next period is likely to start in ${advanceNoticeDays} to ${daysToEndOfPrediction} days.`,
+    reminderText:
+      'Get a notification 3 days before your next period is likely to start.',
+    notification: (daysToEndOfPrediction) =>
+      `Your next period is likely to start in 3 to ${daysToEndOfPrediction} days.`,
     alertNoPeriodReminder: {
       title: 'Period predictions turned off',
       message:

ios/drip/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2410.22</string>
+	<string>1.2403.19</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

lib/notifications.js

@@ -2,7 +2,6 @@ import { Platform } from 'react-native'
 import {
   tempReminderObservable,
   periodReminderObservable,
-  advanceNoticeDaysObservable,
 } from '../local-storage'
 import * as PN from 'react-native-push-notification'
 import { requestNotifications } from 'react-native-permissions'
@@ -14,19 +13,12 @@ import { getBleedingDaysSortedByDate } from '../db'
 import cycleModule from './cycle'
 import nothingChanged from '../db/db-unchanged'
 
-const DRIP_CHANNEL_ID = 'drip-channel-id'
-const TEMPERATURE_REMINDER_ID = '1'
-const PERIOD_REMINDER_ID = '2'
-const PushNotification = Platform.OS === 'ios' ? PN : PN.default
-
 export default function setupNotifications(navigate, setDate) {
-  // for Android, this method call is necessary
-  if (Platform.OS === 'android') {
-    requestNotifications()
-  }
+  Platform.OS === 'android' ? requestNotifications() : null
+  const PushNotification = Platform.OS === 'ios' ? PN : PN.default
 
   PushNotification.createChannel({
-    channelId: DRIP_CHANNEL_ID, // (required)
+    channelId: 'drip-channel-id', // (required)
     channelName: 'drip reminder', // (required)
     playSound: false, // (optional) default: true
   })
@@ -34,10 +26,7 @@ export default function setupNotifications(navigate, setDate) {
   PushNotification.configure({
     onNotification: (notification) => {
       // https://github.com/zo0r/react-native-push-notification/issues/966#issuecomment-479069106
-      if (
-        notification.data?.id === TEMPERATURE_REMINDER_ID ||
-        notification.id === TEMPERATURE_REMINDER_ID
-      ) {
+      if (notification.data?.id === '1' || notification.id === '1') {
         const todayDate = LocalDate.now().toString()
         setDate(todayDate)
         navigate('TemperatureEditView')
@@ -48,7 +37,7 @@ export default function setupNotifications(navigate, setDate) {
   })
 
   tempReminderObservable((reminder) => {
-    PushNotification.cancelLocalNotification({ id: TEMPERATURE_REMINDER_ID })
+    PushNotification.cancelLocalNotification({ id: '1' })
     if (reminder.enabled) {
       const [hours, minutes] = reminder.time.split(':')
       let target = new Moment()
@@ -61,75 +50,56 @@ export default function setupNotifications(navigate, setDate) {
       }
 
       PushNotification.localNotificationSchedule({
-        id: TEMPERATURE_REMINDER_ID,
-        userInfo: { id: TEMPERATURE_REMINDER_ID },
+        id: '1',
+        userInfo: { id: '1' },
         message: labels.tempReminder.notification,
         date: target.toDate(),
         vibrate: false,
         repeatType: 'day',
-        channelId: DRIP_CHANNEL_ID,
-        allowWhileIdle: true,
+        channelId: 'drip-channel-id',
       })
     }
   }, false)
 
-  periodReminderObservable(() => updatePeriodNotification(), false)
-  advanceNoticeDaysObservable(() => updatePeriodNotification(), false)
+  periodReminderObservable((reminder) => {
+    PushNotification.cancelLocalNotification({ id: '2' })
+    if (reminder.enabled) setupPeriodReminder()
+  }, false)
 
   getBleedingDaysSortedByDate().addListener((_, changes) => {
     // the listener fires on setup, so we check if there were actually any changes
-    if (nothingChanged(changes)) {
-      return
-    }
-
-    updatePeriodNotification()
+    if (nothingChanged(changes)) return
+    PushNotification.cancelLocalNotification({ id: '2' })
+    if (periodReminderObservable.value.enabled) setupPeriodReminder()
   })
 }
 
-const updatePeriodNotification = () => {
-  // Cancel any existing period reminder
-  PushNotification.cancelLocalNotification({ id: PERIOD_REMINDER_ID })
-
-  // Set up a new period reminder if enabled
-  if (periodReminderObservable.value.enabled) {
-    schedulePeriodNotification()
-  }
-}
-
-function schedulePeriodNotification() {
+function setupPeriodReminder() {
+  const PushNotification = Platform.OS === 'ios' ? PN : PN.default
   const bleedingPrediction = cycleModule().getPredictedMenses()
-
   if (bleedingPrediction.length > 0) {
     const predictedBleedingStart = Moment(
       bleedingPrediction[0][0],
       'YYYY-MM-DD'
     )
-
-    const advanceNoticeDays = parseInt(advanceNoticeDaysObservable.value)
-
-    // ${advanceNoticeDays} days before and at 6 am
+    // 3 days before and at 6 am
     const reminderDate = predictedBleedingStart
-      .subtract(advanceNoticeDays, 'days')
+      .subtract(3, 'days')
       .hours(6)
       .minutes(0)
       .seconds(0)
 
     if (reminderDate.isAfter()) {
-      // period is likely to start in advanceNoticeDays to advanceNoticeDays + (length of prediction - 1) days
-      const daysToEndOfPrediction =
-        advanceNoticeDays + bleedingPrediction[0].length - 1
+      // period is likely to start in 3 to 3 + (length of prediction - 1) days
+      const daysToEndOfPrediction = bleedingPrediction[0].length + 2
 
       PushNotification.localNotificationSchedule({
-        id: PERIOD_REMINDER_ID,
-        userInfo: { id: PERIOD_REMINDER_ID },
-        message: labels.periodReminder.notification(
-          advanceNoticeDays,
-          daysToEndOfPrediction
-        ),
+        id: '2',
+        userInfo: { id: '2' },
+        message: labels.periodReminder.notification(daysToEndOfPrediction),
         date: reminderDate.toDate(),
         vibrate: false,
-        channelId: DRIP_CHANNEL_ID,
-        allowWhileIdle: true,
+        channelId: 'drip-channel-id',
       })
     }
   }

lib/sympto-occurance.js

@@ -0,0 +1,70 @@
+import * as joda from '@js-joda/core'
+const LocalDate = joda.LocalDate
+const DAYS = joda.ChronoUnit.DAYS
+
+export default function config(opts) {
+  let cycleStartsSortedByDate
+  let painSortedByDate
+
+  if (!opts) {
+    // we only want to require (and run) the db module
+    // when not running the tests
+    cycleStartsSortedByDate = require('../db').getCycleStartsSortedByDate()
+    painSortedByDate = require('../db').getPainDaysSortedByDate()
+    // maxCycleLength = 45
+  } else {
+    cycleStartsSortedByDate = opts.cycleStartsSortedByDate || []
+    painSortedByDate = opts.painSortedByDate || []
+    // maxCycleLength = opts.maxCycleLength || 99
+  }
+
+  function getCycleStartsOfLastYear() {
+    const today = LocalDate.parse(new Date().toISOString().slice(0, 10))
+    const firstRelevantDay = today.minusYears(1)
+    const relevantCycles = cycleStartsSortedByDate.filter(({ date }) =>
+      LocalDate.parse(date).isAfter(firstRelevantDay)
+    )
+    return relevantCycles.map(({ date }) => date)
+  }
+
+  function getPainDaysOfLastYear() {
+    const today = LocalDate.parse(new Date().toISOString().slice(0, 10))
+    const firstRelevantDay = today.minusYears(1)
+    const relevantPainDays = painSortedByDate.filter(
+      ({ date, pain }) =>
+        LocalDate.parse(date).isAfter(firstRelevantDay) && pain.headache
+    )
+    return relevantPainDays.map(({ date }) => date)
+  }
+
+  function getCycleDayForPainDays(cycleStarts, painDays) {
+    let i = 0
+    const cycleStartsAsc = cycleStarts.sort().reverse()
+    const painDaysAsc = painDays.sort().reverse()
+    const painCycleDays = painDaysAsc.map((pdate) => {
+      if (LocalDate.parse(pdate).isBefore(LocalDate.parse(cycleStartsAsc[i]))) {
+        // increase index i until cycleStart of this painDay is found
+        for (let j = i + 1; j < cycleStartsAsc.length; j++) {
+          i = j
+          if (
+            !LocalDate.parse(cycleStartsAsc[i]).isAfter(LocalDate.parse(pdate))
+          ) {
+            // not(C > P) === C ≤ P
+            break
+          }
+        }
+      }
+      return LocalDate.parse(cycleStartsAsc[i]).until(
+        LocalDate.parse(pdate),
+        DAYS
+      )
+    })
+    return painCycleDays
+  }
+
+  return {
+    getCycleStartsOfLastYear,
+    getPainDaysOfLastYear,
+    getCycleDayForPainDays,
+  }
+}

local-storage.js

@@ -2,8 +2,6 @@ import AsyncStorage from '@react-native-async-storage/async-storage'
 import Observable from 'obv'
 import { TEMP_SCALE_MIN, TEMP_SCALE_MAX, TEMP_SCALE_UNITS } from './config'
 
-import { ADVANCE_PERIOD_NOTICE_DAYS_INIT_VALUE } from './config'
-
 export const scaleObservable = Observable()
 setObvWithInitValue('tempScale', scaleObservable, {
   min: TEMP_SCALE_MIN,
@@ -61,18 +59,6 @@ export async function savePeriodPrediction(bool) {
   }
 }
 
-export const advanceNoticeDaysObservable = Observable()
-setObvWithInitValue(
-  'advanceNoticeDays',
-  advanceNoticeDaysObservable,
-  parseInt(ADVANCE_PERIOD_NOTICE_DAYS_INIT_VALUE)
-)
-
-export async function saveAdvanceNoticeDays(days) {
-  await AsyncStorage.setItem('advanceNoticeDays', JSON.stringify(days))
-  advanceNoticeDaysObservable.set(days)
-}
-
 export const useCervixAsSecondarySymptomObservable = Observable()
 setObvWithInitValue(
   'useCervixAsSecondarySymptom',
@@ -123,7 +109,7 @@ export async function saveTemperatureTrackingCategory(bool) {
   if (!temperatureTrackingCategoryObservable.value) {
     // if temperature tracking is turned off, the temperature reminder gets disabled
     const tempReminderResult = await AsyncStorage.getItem('tempReminder')
-    if (tempReminderResult && JSON.parse(tempReminderResult).enabled) {
+     if (tempReminderResult && JSON.parse(tempReminderResult).enabled) {
       tempReminderObservable.set(false)
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2410.22",
+  "version": "1.2403.19",
   "contributors": [
     "Julia Friesel <julia.friesel@gmail.com>",
     "Marie Kochsiek",
@@ -48,7 +48,7 @@
     "prop-types": "^15.8.1",
     "react": "17.0.2",
     "react-i18next": "^12.0.0",
-    "react-native": "0.68.5",
+    "react-native": "0.68.3",
     "react-native-calendars": "^1.1287.0",
     "react-native-document-picker": "^8.1.1",
     "react-native-fs": "^2.20.0",

yarn.lock

@@ -6378,7 +6378,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-promise@^8.2.0:
+promise@^8.0.3:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
   integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
@@ -6508,10 +6508,10 @@ react-native-calendars@^1.1287.0:
   optionalDependencies:
     moment "^2.29.4"
 
-react-native-codegen@^0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.18.tgz#99d6623d65292e8ce3fdb1d133a358caaa2145e7"
-  integrity sha512-XPI9aVsFy3dvgDZvyGWrFnknNiyb22kg5nHgxa0vjWTH9ENLBgVRZt9A64xHZ8BYihH+gl0p/1JNOCIEUzRPBg==
+react-native-codegen@^0.0.17:
+  version "0.0.17"
+  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.17.tgz#83fb814d94061cbd46667f510d2ddba35ffb50ac"
+  integrity sha512-7GIEUmAemH9uWwB6iYXNNsPoPgH06pxzGRmdBzK98TgFBdYJZ7CBuZFPMe4jmHQTPOkQazKZ/w5O6/71JBixmw==
   dependencies:
     "@babel/parser" "^7.14.0"
     flow-parser "^0.121.0"
@@ -6601,10 +6601,10 @@ react-native-version@^3.1.0:
     resolve-from "^5.0.0"
     semver "^6.0.0"
 
-react-native@0.68.5:
-  version "0.68.5"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.5.tgz#8ba7389e00b757c59b6ea23bf38303d52367d155"
-  integrity sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ==
+react-native@0.68.3:
+  version "0.68.3"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.3.tgz#07ac7374acde9bc5e80f9e473e03d6b730528f1c"
+  integrity sha512-LPgLQ4e96NWCrJPKlXzKfvlg1ddhfUplsEg00/cfBIMFZPJn2inzo9Rym8I/JYjmRORe4GjGY8kOem72hPm0Lw==
   dependencies:
     "@jest/create-cache-key-function" "^27.0.1"
     "@react-native-community/cli" "^7.0.3"
@@ -6626,9 +6626,9 @@ react-native@0.68.5:
     metro-source-map "0.67.0"
     nullthrows "^1.1.1"
     pretty-format "^26.5.2"
-    promise "^8.2.0"
+    promise "^8.0.3"
     react-devtools-core "^4.23.0"
-    react-native-codegen "^0.0.18"
+    react-native-codegen "^0.0.17"
     react-native-gradle-plugin "^0.0.6"
     react-refresh "^0.4.0"
     react-shallow-renderer "16.14.1"