Compare commits

...

11 Commits

Author SHA1 Message Date
bl00dymarie 8b101ec952 Release: 1.2410.29 2024-10-29 19:29:18 +01:00
bl00dymarie 5bb6bc05e7 Update Sdk to comply with Android14 2024-10-29 19:21:55 +01:00
bl00dymarie 805587302b Merge branch '730-bug-bad-version-of-the-soloader-sdk' into 'main'
Resolve "Bug: Bad version of the SoLoader SDK"

Closes #730

See merge request bloodyhealth/drip!689
2024-10-24 12:25:51 +00:00
bl00dymarie e3f44d7654 Release: 1.2410.22 2024-10-24 14:19:05 +02:00
bl00dymarie 590acd0bcb Fix: Bad version of the SoLoader SDK 2024-10-24 14:19:05 +02:00
bl00dymarie 7710e9c9bd Merge branch '728-reminders-appear-only-after-opening-the-app-on-some-phone-models' into 'main'
Fix: Allow push notification in idle state for Android

Closes #728

See merge request bloodyhealth/drip!687
2024-10-22 12:06:27 +00:00
Lynn a434242640 Added step "yarn install" to iOS set-up 2024-10-18 18:59:47 +00:00
bl00dymarie 05f28b072a Fix: Allow push notification in idle state for Android 2024-10-15 13:38:42 +02:00
bl00dymarie 223ac148bd Merge branch 'Chore/Fix-android-build' into 'main'
Chore/fix android build

See merge request bloodyhealth/drip!686
2024-10-15 11:36:01 +00:00
bl00dymarie e82dcb6cc1 Chore: Store android keystore properties in separate file 2024-10-07 18:02:05 +02:00
bl00dymarie bd9c586edb Chore: Upgrade react-native to 0.68.5 2024-10-07 18:01:56 +02:00
8 changed files with 46 additions and 23 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ ios/Index/DataStore
build/
.idea
.gradle
local.properties
*.properties
*.iml
*.hprof
+7 -3
View File
@@ -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
+18 -2
View File
@@ -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
versionName "1.2403.19"
versionCode 39
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
+4 -3
View File
@@ -49,10 +49,11 @@ allprojects {
}
ext {
buildToolsVersion = "33.0.2"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
compileSdkVersion = 34
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
+1 -1
View File
@@ -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>
+2
View File
@@ -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,
})
}
}
+2 -2
View File
@@ -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",
+11 -11
View File
@@ -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:
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==
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==
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:
version "0.68.3"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.68.3.tgz#07ac7374acde9bc5e80f9e473e03d6b730528f1c"
integrity sha512-LPgLQ4e96NWCrJPKlXzKfvlg1ddhfUplsEg00/cfBIMFZPJn2inzo9Rym8I/JYjmRORe4GjGY8kOem72hPm0Lw==
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==
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"