Merge branch 'Chore_Upgrade-for-Android14' into 'main'

Chore upgrade for android14

See merge request bloodyhealth/drip!692

.gitignore

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

README.md

@@ -131,15 +131,19 @@ 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 XCode dependencies by running the following command from the root project directory:
+i. Install yarn dependencies
+
+    yarn install ..
+
+ii. Install XCode dependencies by running the following command from the root project directory:
 
     cd ios && pod install && cd ..
 
-ii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
+iii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
 
     yarn ios
 
-iii. If you are building the app with XCode make sure you are running this as well:
+iiii. If you are building the app with XCode make sure you are running this as well:
 
     yarn start
 

android/app/build.gradle

@@ -1,6 +1,8 @@
 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
@@ -125,6 +127,16 @@ 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
@@ -134,8 +146,8 @@ android {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 33
+        versionCode 39
-        versionName "1.2403.19"
+        versionName "1.2410.29"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
@@ -150,6 +162,10 @@ 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

@@ -49,10 +49,11 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "33.0.2"
     minSdkVersion = 21
-    compileSdkVersion = 33
+    compileSdkVersion = 34
-    targetSdkVersion = 33
+    targetSdkVersion = 34
+    buildToolsVersion = "34.0.0"
+    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/stats/SymptomOccurance.js

@@ -1,89 +0,0 @@
-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,7 +8,6 @@ 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'
@@ -20,8 +19,6 @@ 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' })
 
@@ -86,14 +83,6 @@ const Stats = () => {
             {isStatsVisible && (
               <PeriodDetailsModal onClose={() => setIsStatsVisible(false)} />
             )}
-            <Button isCTA onPress={() => setIsSymptomOccuranceVisible(true)}>
-              {t('showSymptomOccurance')}
-            </Button>
-            {isSymptomOccuranceVisible && (
-              <SymptomOccurance
-                onClose={() => setIsSymptomOccuranceVisible(false)}
-              />
-            )}
             <Footnote>{t('footnote')}</Footnote>
           </>
         )}

db/index.js

@@ -73,9 +73,6 @@ 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,8 +156,7 @@
       "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",

ios/drip/Info.plist

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

lib/notifications.js

@@ -57,6 +57,7 @@ export default function setupNotifications(navigate, setDate) {
         vibrate: false,
         repeatType: 'day',
         channelId: 'drip-channel-id',
+        allowWhileIdle: true,
       })
     }
   }, false)
@@ -100,6 +101,7 @@ function setupPeriodReminder() {
         date: reminderDate.toDate(),
         vibrate: false,
         channelId: 'drip-channel-id',
+        allowWhileIdle: true,
       })
     }
   }

lib/sympto-occurance.js

@@ -1,70 +0,0 @@
-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,
-  }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2403.19",
+  "version": "1.2410.29",
   "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.3",
+    "react-native": "0.68.5",
     "react-native-calendars": "^1.1287.0",
     "react-native-document-picker": "^8.1.1",
     "react-native-fs": "^2.20.0",
@@ -60,7 +60,7 @@
     "react-native-size-matters": "^0.4.0",
     "react-native-vector-icons": "^9.2.0",
     "realm": "^10.16.0",
-    "sympto": "3.0.1"
+    "sympto": "3.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.20.2",

yarn.lock

@@ -6378,7 +6378,7 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-promise@^8.0.3:
+promise@^8.2.0:
   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.17:
+react-native-codegen@^0.0.18:
-  version "0.0.17"
+  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.17.tgz#83fb814d94061cbd46667f510d2ddba35ffb50ac"
+  resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.0.18.tgz#99d6623d65292e8ce3fdb1d133a358caaa2145e7"
-  integrity sha512-7GIEUmAemH9uWwB6iYXNNsPoPgH06pxzGRmdBzK98TgFBdYJZ7CBuZFPMe4jmHQTPOkQazKZ/w5O6/71JBixmw==
+  integrity sha512-XPI9aVsFy3dvgDZvyGWrFnknNiyb22kg5nHgxa0vjWTH9ENLBgVRZt9A64xHZ8BYihH+gl0p/1JNOCIEUzRPBg==
   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.3:
+react-native@0.68.5:
-  version "0.68.3"
+  version "0.68.5"
-  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.3.tgz#07ac7374acde9bc5e80f9e473e03d6b730528f1c"
+  resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.5.tgz#8ba7389e00b757c59b6ea23bf38303d52367d155"
-  integrity sha512-LPgLQ4e96NWCrJPKlXzKfvlg1ddhfUplsEg00/cfBIMFZPJn2inzo9Rym8I/JYjmRORe4GjGY8kOem72hPm0Lw==
+  integrity sha512-t3kiQ/gumFV+0r/NRSIGtYxanjY4da0utFqHgkMcRPJVwXFWC0Fr8YiOeRGYO1dp8EfrSsOjtfWic/inqVYlbQ==
   dependencies:
     "@jest/create-cache-key-function" "^27.0.1"
     "@react-native-community/cli" "^7.0.3"
@@ -6626,9 +6626,9 @@ react-native@0.68.3:
     metro-source-map "0.67.0"
     nullthrows "^1.1.1"
     pretty-format "^26.5.2"
-    promise "^8.0.3"
+    promise "^8.2.0"
     react-devtools-core "^4.23.0"
-    react-native-codegen "^0.0.17"
+    react-native-codegen "^0.0.18"
     react-native-gradle-plugin "^0.0.6"
     react-refresh "^0.4.0"
     react-shallow-renderer "16.14.1"
@@ -7573,10 +7573,10 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-sympto@3.0.1:
+sympto@3.0.2:
-  version "3.0.1"
+  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/sympto/-/sympto-3.0.1.tgz#14a089ee9114f5eb6611c0dd95a1cb6b86701d52"
+  resolved "https://registry.yarnpkg.com/sympto/-/sympto-3.0.2.tgz#8510fe64b2177cd8f9ba3b3af1aaee772dca8a0b"
-  integrity sha512-eskK/6ZUHyQtl/JPPb1ujYU8xCxek5vMFm6hr8kllu/GaYKi2W2wvFzLU2aQAo3RAyEqewhdXz1//DaK2TAneg==
+  integrity sha512-0C1/aXZFXBhA6LHLch+7jhoO4WXchhOskmCMr83CzFMnQ1z3xaS86t7w7hpWha07tK97QpQPmRsr8g74lEb9jQ==
   dependencies:
     assert "^2.0.0"
     js-joda "^1.9.2"