diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21fba368d..c3de089ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,105 +1,161 @@
# Changelog
+
All notable changes to this template will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+### Fixed
+
+- We upgraded android SDK version to 33
+
+## [7.0.3] - 2023-08-08
+
+### Fixes
+
+- We fixed distorted splash screen issue for android
+
## [7.0.2] - 2023-08-01
+
### Fixes
+
- We fixed an issue with QR code scanner not working on iOS version of the custom dev app
## [6.2.25] - 2022-08-16
+
### Fixes
+
- Update ndk version to match AppCenter
- Update `react-native-permissions` library
- Removed `mendix.templateVersion` from package.json
## [6.2.24] - 2022-07-26
+
### Fixes
+
- We fixed an issue while uploading an iOS application to App Store
- We fixed crashes on Xiaomi smartphones
- We fixed an issue while building Android apps on AppCenter
## [6.2.23] - 2022-07-16
+
### Fixes
+
- We updated the minimum version of iOS to 14
- We remove QUERY_ALL_PACKAGES permission for Android apps
- We updated the version of react-native-vector-icons to 9.1.0
- We fixed an issue while building iOS apps in AppCenter
## [5.2.13] - 2022-06-15
+
### Fixes
+
- We fixed an issue with the date picker not being visible in dark mode.
## [6.2.22] - 2022-06-02
+
### Fixes
+
- We fixed an iOS build issue (#150964, #150934)
## [6.2.21] - 2022-06-01
+
### Fixes
+
- We fixed an iOS build issue for projects using Crashlytics.
## [6.2.20] - 2022-05-30
+
### Fixes
+
- We fixed an issue with logout action (Ticket #147429)
## [5.0.14] - 2022-05-17
+
### Fixes
+
- We fixed an issue with JCenter on Android and CocoaPods on iOS, which would fail to build (Ticket #148798 #148819 #148830 #148840)
## [5.1.19] - 2022-05-11
+
### Fixes
+
- We fixed an issue with JCenter on Android and CocoaPods on iOS, which would fail to build (Ticket #148798 #148819 #148830 #148840)
## [6.2.19] - 2022-05-11
+
### Fixes
+
- We fixed an issue with CocoaPods on iOS, which would fail to build
## [6.2.18] - 2022-05-11
+
### Fixes
+
- We fixed an issue with JCenter on Android, which would fail to build (Ticket #148798 #148819 #148830 #148840)
## [5.2.12] - 2022-05-11
+
### Fixes
+
- We fixed an issue with CocoaPods on iOS, which would fail to build
## [5.2.11] - 2022-05-10
+
### Fixes
+
- We fixed an issue with JCenter on Android, which would fail to build (Ticket #148798 #148819 #148830 #148840)
## [6.2.16] - 2022-03-29
+
### Fixes
+
- We fixed an issue with App Center CodePush on Android which would fail to install new OTA updates on devices. (Ticket 145335)
## [5.2.9] - 2022-03-29
+
### Improvements
+
- Native Template now supports full-screen Android video. The full-screen icon can be found at the top of the video when the show control's property is set to `true`. When the icon is pressed the video will continue working on an overlay modal. (Ticket 135581)
## [6.2.15] - 2022-03-23
+
### Fixes
+
- We fixed an issue where iOS custom developer apps incurred problems while building.
## [6.2.14] - 2022-03-17
+
### Fixes
+
- We fixed an issue where using react-native-async-storage made the iOS build fail due to duplicated symbols being generated.
- We fixed an issue where compiling an Android app for release would fail when building on a Windows machine.
## [6.2.13] - 2022-03-16 [YANKED]
+
### Fixes
## [6.2.12] - 2022-01-25
+
### Fixes
+
- We identified and fixed an issue that would stop the "Navigate To" action from launching Google Maps on Android OS version 11 and later.
## [5.2.8] - 2022-01-25
+
### Fixes
+
- We identified and fixed an issue that would stop the "Navigate To" action from launching Google Maps on Android OS version 11 and later.
## [6.2.11] - 2022-01-06
+
### Summary
+
- We identified and fixed a bug introduced with Native Template v6.2.9 and Mendix clients built with Mendix Studio Pro 9.8.0 or later and that support the new mobile encryption features. The iOS apps would wrongly clear the keychain values on each restart forcing users of the app to re-authenticate on each app restart.
-*Rebuilding and releasing a new iOS app with this Native Template version will solve the issue.*
+_Rebuilding and releasing a new iOS app with this Native Template version will solve the issue._
+
### Fixes
+
- OS apps should correctly persist the user session after each restart for clients built with Mendix Studio Pro 9.8.0 or later. (Ticket 138881)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 17f128668..be6a6c144 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
+
diff --git a/android/build.gradle b/android/build.gradle
index f31351982..bdbe0fcaf 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,10 +2,10 @@
buildscript {
ext {
- buildToolsVersion = "31.0.0"
+ buildToolsVersion = "33.0.0"
minSdkVersion = 21
- compileSdkVersion = 31
- targetSdkVersion = 31
+ compileSdkVersion = 33
+ targetSdkVersion = 33
kotlin_version = "1.7.21"
excludeAppGlideModule = true
androidx_lifecycle_version = "2.3.1"
diff --git a/package-lock.json b/package-lock.json
index 7d03ce152..aeb6f929a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "native-template",
- "version": "7.0.3",
+ "version": "7.0.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "native-template",
- "version": "7.0.2",
+ "version": "7.0.4",
"hasInstallScript": true,
"dependencies": {
"@mendix/native": "~2.0.1",
diff --git a/package.json b/package.json
index a1c79ec97..94b003f59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "native-template",
- "version": "7.0.3",
+ "version": "7.0.4",
"private": true,
"scripts": {
"postinstall": "node patches/apply-patches.js && jetify",
@@ -8,6 +8,7 @@
},
"dependencies": {
"@mendix/native": "~2.0.1",
+ "@mendix/react-native-sqlite-storage": "5.1.3",
"@react-native-community/async-storage": "1.12.1",
"@react-native-community/cameraroll": "4.0.1",
"@react-native-community/datetimepicker": "3.0.3",
@@ -22,13 +23,12 @@
"react-native-fast-image": "8.3.2",
"react-native-gesture-handler": "1.10.3",
"react-native-image-picker": "5.0.1",
- "react-native-permissions": "3.3.1",
"react-native-localize": "1.4.2",
+ "react-native-permissions": "3.3.1",
"react-native-push-notification": "8.1.1",
"react-native-reanimated": "1.13.1",
"react-native-safe-area-context": "3.1.8",
"react-native-splash-screen": "3.2.0",
- "@mendix/react-native-sqlite-storage": "5.1.3",
"react-native-svg": "12.1.0",
"react-native-vector-icons": "9.2.0",
"react-native-video": "5.2.1"
diff --git a/patches/@react-native-community+cameraroll+4.0.1.patch b/patches/@react-native-community+cameraroll+4.0.1.patch
index cc91ccb6e..5e05f7b78 100644
--- a/patches/@react-native-community+cameraroll+4.0.1.patch
+++ b/patches/@react-native-community+cameraroll+4.0.1.patch
@@ -1,5 +1,15 @@
+diff --git a/node_modules/@react-native-community/cameraroll/android/gradle.properties b/node_modules/@react-native-community/cameraroll/android/gradle.properties
+index 0bec1b5..a3dbe4e 100644
+--- a/node_modules/@react-native-community/cameraroll/android/gradle.properties
++++ b/node_modules/@react-native-community/cameraroll/android/gradle.properties
+@@ -1,4 +1,4 @@
+-ReactNativeCameraRoll_compileSdkVersion=28
++ReactNativeCameraRoll_compileSdkVersion=33
+ ReactNativeCameraRoll_buildToolsVersion=28.0.3
+ ReactNativeCameraRoll_targetSdkVersion=27
+ ReactNativeCameraRoll_minSdkVersion=16
diff --git a/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java b/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
-index b13e570..b681c45 100644
+index b13e570..bfe46b2 100644
--- a/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
+++ b/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/CameraRollModule.java
@@ -9,6 +9,7 @@ package com.reactnativecommunity.cameraroll;
@@ -159,6 +169,32 @@ index b13e570..b681c45 100644
null,
new MediaScannerConnection.OnScanCompletedListener() {
@Override
+@@ -633,7 +666,11 @@ public class CameraRollModule extends ReactContextBaseJavaModule {
+ + photoUri.toString(),
+ e);
+ }
+- retriever.release();
++ try {
++ retriever.release();
++ } catch (IOException e) {
++ // Do nothing. We can't handle this, and this is usually a system problem
++ }
+ }
+
+ if (photoDescriptor != null) {
+@@ -699,7 +736,12 @@ public class CameraRollModule extends ReactContextBaseJavaModule {
+ + photoUri.toString(),
+ e);
+ }
++
++ try {
+ retriever.release();
++ } catch (IOException e) {
++ // Do nothing. We can't handle this, and this is usually a system problem
++ }
+ } else {
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ // Set inJustDecodeBounds to true so we don't actually load the Bitmap, but only get its
diff --git a/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/Utils.java b/node_modules/@react-native-community/cameraroll/android/src/main/java/com/reactnativecommunity/cameraroll/Utils.java
new file mode 100644
index 0000000..880802c