lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/Update-android-1.2310.31-versionNumber21' into 'release'

Browse Source 
Fix: Update android to v1.2310.31 for testing

See merge request bloodyhealth/drip!619
This commit is contained in:
bl00dymarie
2023-11-09 11:10:35 +00:00
parent 573de7545e d81dbac60c
commit 2eca9ba097
12 changed files with 2261 additions and 3090 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build.gradle
+8 -7
View File
@@ -134,10 +134,10 @@ android {
applicationId "com.drip" applicationId "com.drip"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 8 versionCode 21
versionName "1.2102.28" versionName "1.2310.31"
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -198,7 +198,7 @@ android {
// For each separate APK per architecture, set a unique version code as described here: // For each separate APK per architecture, set a unique version code as described here:
// https://developer.android.com/studio/build/configure-apk-splits.html // https://developer.android.com/studio/build/configure-apk-splits.html
// Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc. // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2] def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI) def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride = output.versionCodeOverride =
@@ -211,11 +211,12 @@ android {
dependencies { dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion
implementation 'androidx.appcompat:appcompat:1.0.0' implementation "androidx.appcompat:appcompat:1.0.0"
implementation 'androidx.annotation:annotation:1.1.0' implementation "androidx.annotation:annotation:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.7.1"
implementation "com.facebook.react:react-native:+" // From node_modules implementation "com.facebook.react:react-native:+" // From node_modules
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
exclude group:'com.facebook.fbjni' exclude group:'com.facebook.fbjni'
} }
android/app/src/main/AndroidManifest.xml
+57 -50
View File
@@ -5,74 +5,81 @@
> >
<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" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission tools:node="remove" android:name="android.permission.READ_PHONE_STATE" /> <uses-permission tools:node="remove" android:name="android.permission.READ_PHONE_STATE" />
<uses-permission tools:node="remove" android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission tools:node="remove" android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission tools:node="remove" android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission tools:node="remove" android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<permission <permission
android:name="${applicationId}.permission.C2D_MESSAGE" android:name="${applicationId}.permission.C2D_MESSAGE"
android:protectionLevel="signature" /> 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"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round"
android:allowBackup="false"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask" android:roundIcon="@mipmap/ic_launcher_round"
android:windowSoftInputMode="adjustPan" android:allowBackup="false"
android:screenOrientation="sensorPortrait"> android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" /> <meta-data
<category android:name="android.intent.category.LAUNCHER" /> android:name="com.dieam.reactnativepushnotification.notification_foreground"
</intent-filter> android:value="false" />
</activity> <meta-data
<provider android:name="com.dieam.reactnativepushnotification.notification_color"
android:resource="@color/purple" />
<meta-data
android:name="com.dieam.reactnativepushnotification.default_notification_channel_id"
android:value="..." />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"
android:exported="false"
tools:ignore="MissingClass" />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"
android:exported="false" />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
android:exported="false" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver>
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="sensorPortrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.drip.provider" android:authorities="com.drip.provider"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:exported="false"> android:exported="false" >
<meta-data <meta-data
tools:replace="android:resource" tools:replace="android:resource"
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_foreground"
android:value="false"/>
<!-- 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"/> <!-- or @android:color/{name} to use a standard color -->
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
<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" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
</intent-filter>
</receiver>
<service
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
android:exported="false" >
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>
</application> </application>
</manifest> </manifest>
android/app/src/main/res/values/colors.xml
+1
View File
@@ -14,4 +14,5 @@
<color name="grey">#A5A5A5</color> <color name="grey">#A5A5A5</color>
<color name="orange">#F38337</color> <color name="orange">#F38337</color>
<color name="purple">#3A2671</color> <color name="purple">#3A2671</color>
<color name="turquoiseDark">#69CBC1</color>
</resources> </resources>
android/build.gradle
+8 -11
View File
@@ -5,13 +5,13 @@ buildscript {
google() google()
mavenCentral() mavenCentral()
} }
ext.kotlinVersion = "1.3.10" ext.kotlinVersion = '1.3.40'
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.2.2") classpath('com.android.tools.build:gradle:7.0.3')
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
} }
} }
@@ -46,12 +46,9 @@ allprojects {
} }
ext { ext {
googlePlayServicesVersion = "+" // default: "+" buildToolsVersion = "33.0.2"
firebaseMessagingVersion = "21.1.0" // default: "+" minSdkVersion = 21
compileSdkVersion = 33
buildToolsVersion = "30.0.2" targetSdkVersion = 33
minSdkVersion = 23 ndkVersion = "21.4.7075529"
compileSdkVersion = 30
targetSdkVersion = 30
ndkVersion = "21.4.7075529"
} }
android/gradle/wrapper/gradle-wrapper.properties
Vendored
+3 -2
View File
@@ -1,5 +1,6 @@
#Wed Oct 11 14:45:21 CEST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
components/chart/chart.js
+1 -1
View File
@@ -29,7 +29,7 @@ const getSymptomsFromCycleDays = (cycleDays) =>
SYMPTOMS.filter((symptom) => cycleDays.some((cycleDay) => cycleDay[symptom])) SYMPTOMS.filter((symptom) => cycleDays.some((cycleDay) => cycleDay[symptom]))
const CycleChart = ({ navigate, setDate }) => { const CycleChart = ({ navigate, setDate }) => {
const [shouldShowHint, setShouldShowHint] = useState(true) const [shouldShowHint, setShouldShowHint] = useState(false)
useEffect(() => { useEffect(() => {
let isMounted = true let isMounted = true
i18n/en.json
+9 -9
View File
@@ -9,15 +9,15 @@
}, },
"cycleDay": { "cycleDay": {
"symptomBox": { "symptomBox": {
"bleeding": "Bleeding", "bleeding": "bleeding",
"temperature": "Temperature", "temperature": "temperature",
"mucus": "Cervical Mucus", "mucus": "cervical mucus",
"cervix": "Cervix", "cervix": "cervix",
"note": "Note", "note": "note",
"desire": "Desire", "desire": "desire",
"sex": "Sex", "sex": "sex",
"pain": "Pain", "pain": "pain",
"mood": "Mood" "mood": "mood"
} }
}, },
"labels": { "labels": {
lib/cycle.js
+4 -9
View File
@@ -3,8 +3,6 @@ import { getCycleLengthStats } from './cycle-length'
const LocalDate = joda.LocalDate const LocalDate = joda.LocalDate
const DAYS = joda.ChronoUnit.DAYS const DAYS = joda.ChronoUnit.DAYS
const toJSON = (realmObj) => JSON.parse(JSON.stringify(realmObj))
export default function config(opts) { export default function config(opts) {
let bleedingDaysSortedByDate let bleedingDaysSortedByDate
let cycleStartsSortedByDate let cycleStartsSortedByDate
@@ -16,13 +14,10 @@ export default function config(opts) {
if (!opts) { if (!opts) {
// we only want to require (and run) the db module // we only want to require (and run) the db module
// when not running the tests // when not running the tests
bleedingDaysSortedByDate = toJSON( bleedingDaysSortedByDate = require('../db').getBleedingDaysSortedByDate()
require('../db').getBleedingDaysSortedByDate() cycleStartsSortedByDate = require('../db').getCycleStartsSortedByDate()
) cycleDaysSortedByDate = require('../db').getCycleDaysSortedByDate()
cycleStartsSortedByDate = toJSON(
require('../db').getCycleStartsSortedByDate()
)
cycleDaysSortedByDate = toJSON(require('../db').getCycleDaysSortedByDate())
maxBreakInBleeding = 1 maxBreakInBleeding = 1
maxCycleLength = 99 maxCycleLength = 99
minCyclesForPrediction = 3 minCyclesForPrediction = 3
lib/notifications.js
+21 -7
View File
@@ -1,8 +1,10 @@
import { Platform } from 'react-native'
import { import {
tempReminderObservable, tempReminderObservable,
periodReminderObservable, periodReminderObservable,
} from '../local-storage' } from '../local-storage'
import Notification from 'react-native-push-notification' import * as PN from 'react-native-push-notification'
import { requestNotifications } from 'react-native-permissions'
import Moment from 'moment' import Moment from 'moment'
import { LocalDate } from '@js-joda/core' import { LocalDate } from '@js-joda/core'
@@ -12,7 +14,16 @@ import cycleModule from './cycle'
import nothingChanged from '../db/db-unchanged' import nothingChanged from '../db/db-unchanged'
export default function setupNotifications(navigate, setDate) { export default function setupNotifications(navigate, setDate) {
Notification.configure({ requestNotifications()
const PushNotification = Platform.OS === 'ios' ? PN : PN.default
PushNotification.createChannel({
channelId: 'drip-channel-id', // (required)
channelName: 'drip reminder', // (required)
playSound: false, // (optional) default: true
})
PushNotification.configure({
onNotification: (notification) => { onNotification: (notification) => {
// https://github.com/zo0r/react-native-push-notification/issues/966#issuecomment-479069106 // https://github.com/zo0r/react-native-push-notification/issues/966#issuecomment-479069106
if (notification.data?.id === '1' || notification.id === '1') { if (notification.data?.id === '1' || notification.id === '1') {
@@ -26,7 +37,7 @@ export default function setupNotifications(navigate, setDate) {
}) })
tempReminderObservable((reminder) => { tempReminderObservable((reminder) => {
Notification.cancelLocalNotifications({ id: '1' }) PushNotification.cancelLocalNotification({ id: '1' })
if (reminder.enabled) { if (reminder.enabled) {
const [hours, minutes] = reminder.time.split(':') const [hours, minutes] = reminder.time.split(':')
let target = new Moment() let target = new Moment()
@@ -38,31 +49,33 @@ export default function setupNotifications(navigate, setDate) {
target = target.add(1, 'd') target = target.add(1, 'd')
} }
Notification.localNotificationSchedule({ PushNotification.localNotificationSchedule({
id: '1', id: '1',
userInfo: { id: '1' }, userInfo: { id: '1' },
message: labels.tempReminder.notification, message: labels.tempReminder.notification,
date: target.toDate(), date: target.toDate(),
vibrate: false, vibrate: false,
repeatType: 'day', repeatType: 'day',
channelId: 'drip-channel-id',
}) })
} }
}, false) }, false)
periodReminderObservable((reminder) => { periodReminderObservable((reminder) => {
Notification.cancelLocalNotifications({ id: '2' }) PushNotification.cancelLocalNotification({ id: '2' })
if (reminder.enabled) setupPeriodReminder() if (reminder.enabled) setupPeriodReminder()
}, false) }, false)
getBleedingDaysSortedByDate().addListener((_, changes) => { getBleedingDaysSortedByDate().addListener((_, changes) => {
// the listener fires on setup, so we check if there were actually any changes // the listener fires on setup, so we check if there were actually any changes
if (nothingChanged(changes)) return if (nothingChanged(changes)) return
Notification.cancelLocalNotifications({ id: '2' }) PushNotification.cancelLocalNotification({ id: '2' })
if (periodReminderObservable.value.enabled) setupPeriodReminder() if (periodReminderObservable.value.enabled) setupPeriodReminder()
}) })
} }
function setupPeriodReminder() { function setupPeriodReminder() {
const PushNotification = Platform.OS === 'ios' ? PN : PN.default
const bleedingPrediction = cycleModule().getPredictedMenses() const bleedingPrediction = cycleModule().getPredictedMenses()
if (bleedingPrediction.length > 0) { if (bleedingPrediction.length > 0) {
const predictedBleedingStart = Moment( const predictedBleedingStart = Moment(
@@ -80,12 +93,13 @@ function setupPeriodReminder() {
// period is likely to start in 3 to 3 + (length of prediction - 1) days // period is likely to start in 3 to 3 + (length of prediction - 1) days
const daysToEndOfPrediction = bleedingPrediction[0].length + 2 const daysToEndOfPrediction = bleedingPrediction[0].length + 2
Notification.localNotificationSchedule({ PushNotification.localNotificationSchedule({
id: '2', id: '2',
userInfo: { id: '2' }, userInfo: { id: '2' },
message: labels.periodReminder.notification(daysToEndOfPrediction), message: labels.periodReminder.notification(daysToEndOfPrediction),
date: reminderDate.toDate(), date: reminderDate.toDate(),
vibrate: false, vibrate: false,
channelId: 'drip-channel-id',
}) })
} }
} }
package.json
+5 -5
View File
@@ -1,6 +1,6 @@
{ {
"name": "drip.", "name": "drip.",
"version": "1.2208.11", "version": "1.2310.31",
"contributors": [ "contributors": [
"Julia Friesel <julia.friesel@gmail.com>", "Julia Friesel <julia.friesel@gmail.com>",
"Marie Kochsiek", "Marie Kochsiek",
@@ -34,7 +34,7 @@
"@react-native-async-storage/async-storage": "^1.17.9", "@react-native-async-storage/async-storage": "^1.17.9",
"@react-native-community/art": "^1.2.0", "@react-native-community/art": "^1.2.0",
"@react-native-community/datetimepicker": "^6.3.1", "@react-native-community/datetimepicker": "^6.3.1",
"@react-native-community/push-notification-ios": "^1.8.0", "@react-native-community/push-notification-ios": "^1.11.0",
"csvtojson": "^2.0.8", "csvtojson": "^2.0.8",
"i18next": "^22.0.2", "i18next": "^22.0.2",
"jshashes": "^1.0.8", "jshashes": "^1.0.8",
@@ -49,7 +49,8 @@
"react-native-document-picker": "^8.1.1", "react-native-document-picker": "^8.1.1",
"react-native-fs": "^2.20.0", "react-native-fs": "^2.20.0",
"react-native-modal-datetime-picker": "14.0.0", "react-native-modal-datetime-picker": "14.0.0",
"react-native-push-notification": "3.2.1", "react-native-permissions": "^3.10.0",
"react-native-push-notification": "github:bl00dymarie/react-native-push-notification",
"react-native-share": "^7.9.0", "react-native-share": "^7.9.0",
"react-native-simple-toast": "^1.1.3", "react-native-simple-toast": "^1.1.3",
"react-native-size-matters": "^0.4.0", "react-native-size-matters": "^0.4.0",
@@ -64,13 +65,12 @@
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"@testing-library/jest-native": "^4.0.12", "@testing-library/jest-native": "^4.0.12",
"@testing-library/react-native": "^11.1.0", "@testing-library/react-native": "^11.1.0",
"basic-changelog": "gitlab:bloodyhealth/basic-changelog",
"eslint": "^7.32.0", "eslint": "^7.32.0",
"eslint-plugin-react": "^7.31.10", "eslint-plugin-react": "^7.31.10",
"husky": "^8.0.0", "husky": "^8.0.0",
"jest": "^29.1.2", "jest": "^29.1.2",
"jest-watch-typeahead": "^2.2.0", "jest-watch-typeahead": "^2.2.0",
"jetifier": "^1.6.6", "jetifier": "^2.0.0",
"metro-react-native-babel-preset": "^0.66.2", "metro-react-native-babel-preset": "^0.66.2",
"prettier": "2.4.0", "prettier": "2.4.0",
"pretty-quick": "^3.1.1", "pretty-quick": "^3.1.1",
tools/update-version.js
-6
View File
@@ -50,14 +50,8 @@ module.exports = () => {
} }
const pkgJSON = JSON.parse(fs.readFileSync('./package.json')) const pkgJSON = JSON.parse(fs.readFileSync('./package.json'))
const pkgLockJSON = JSON.parse(fs.readFileSync('./package-lock.json'))
pkgJSON.version = nextVersion pkgJSON.version = nextVersion
pkgLockJSON.version = nextVersion
fs.writeFileSync('./package.json', JSON.stringify(pkgJSON, null, 2)) fs.writeFileSync('./package.json', JSON.stringify(pkgJSON, null, 2))
fs.writeFileSync(
'./package-lock.json',
JSON.stringify(pkgLockJSON, null, 2)
)
await ReactNativeVersion.version( await ReactNativeVersion.version(
{ {
yarn.lock
+2144 -2983
View File
File diff suppressed because it is too large Load Diff