Production Release v10.24

android/app/build.gradle

@@ -1,56 +1,19 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
-apply plugin: "kotlin-android"
 apply plugin: "com.google.gms.google-services"
 apply plugin: "com.google.firebase.crashlytics"
+apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
-/**
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
- */
 react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
-    // root = file("../../")
-    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
-    // reactNativeDir = file("../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
-    // codegenDir = file("../../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
-    // cliFile = file("../../node_modules/react-native/cli.js")
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
      debuggableVariants = ["productionDebug", "productionRelease"]
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-    //
+
     /* Autolinking */
     autolinkLibrariesWithApp()
 }
@@ -60,27 +23,6 @@ react {
  */
 def enableProguardInReleaseBuilds = false
 
-/**
- * The preferred build flavor of JavaScriptCore (JSC)
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
- * this variant is about 6MiB larger per architecture than default.
- */
-def jscFlavor = "org.webkit:android-jsc:+"
-
-/**
- * Whether to load react from source or use the prepacked package
- *
- * Keep false for faster compilation and avoid the need for an NDK to be installed.
- * Use true if you want to debug and modify RN source, say for patching.
- */
-def reactNativeFromSource = BUILD_RN_FROM_SOURCE.toBoolean()
-
 android {
     ndkVersion rootProject.ndkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -91,14 +33,15 @@ android {
         applicationId "com.mendix.developerapp.mx10"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 301
-        versionName "3.0.1"
+        versionCode 514
+        versionName "10.24.0"
         missingDimensionStrategy "react-native-camera", "general"
         testBuildType System.getProperty("testBuildType", "debug")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "boolean", "DETOX", "false"
         buildConfigField "String", "RUNTIME_URL", '""'
         buildConfigField "boolean", "OTA", "false"
+        manifestPlaceholders["cookieEncryption"] = project.hasProperty("mendixnative.cookieEncryption") ? project.property("mendixnative.cookieEncryption") : "false"
     }
     signingConfigs {
         debug {
@@ -117,7 +60,7 @@ android {
         }
         release {
            Properties releaseProps = new Properties()
-           def propFile = new File('./local.properties')
+           def propFile = new File('./keystores/debug.keystore.properties')
            if (propFile.canRead()) {
                releaseProps.load(new FileInputStream(propFile))
 
@@ -169,13 +112,7 @@ android {
 
 dependencies {
     // React Native Core
-    if (reactNativeFromSource) {
-        implementation project(":ReactAndroid")
-    } else {
-        implementation "com.facebook.react:react-android"
-    }
-
-    // Javascript engine
+    implementation "com.facebook.react:react-android:0.77.3"
     implementation("com.facebook.react:hermes-android")
 
     // Mendix dependencies

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.mendix.developerapp">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:node="remove"
                      tools:ignore="QueryAllPackagesPermission"/>
@@ -74,7 +73,7 @@
             android:supportsRtl="true">
         <activity
                 android:name=".MainActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode|fontScale"
                 android:launchMode="singleTask"
                 android:screenOrientation="user"
                 android:windowSoftInputMode="stateHidden"
@@ -119,6 +118,8 @@
         </service>
         <meta-data android:name="com.google.android.geo.API_KEY"
                    android:value="{{GEO_API_KEY}}"/>
+        <meta-data android:name="mendixnative.CookieEncryption"
+                   android:value="${cookieEncryption}"/>
         <meta-data
                 android:name="com.google.ar.core"
                 android:value="optional"/>

android/app/src/main/assets/sample_apps.json

@@ -26,7 +26,7 @@
       "id": "lato_bikes_app",
       "name": "Lato Bikes",
       "description": "Control your Lato Bike via your device",
-      "runtimeUrl": "https://lato-bicycles.mendixcloud.com",
+      "runtimeUrl": "https://customer.lato-bicycles.com",
       "backgroundImageName": "lato_bikes_app"
     },
     {
@@ -42,13 +42,6 @@
       "description": "Showcases Atlas 3",
       "runtimeUrl": "https://atlasdesignsystem.mendixcloud.com",
       "backgroundImageName": "atlas_ref_app"
-    },
-    {
-      "id": "mendix_ar",
-      "name": "Mendix AR",
-      "description": "Showcases possible Mendix AR applications",
-      "runtimeUrl": "https://ar-examples-2.mendixcloud.com",
-      "backgroundImageName": "ar_app"
     }
   ]
-}
+}

android/app/src/main/java/com/mendix/developerapp/firebase/FirebaseMessagingService.kt

@@ -66,7 +66,7 @@ class FirebaseMessagingService: com.google.firebase.messaging.FirebaseMessagingS
         val intent = Intent(Intent.ACTION_VIEW).apply {
             this.data = uri
         }
-        return PendingIntent.getActivity(context, MENDIX_AD_NOTIFICATION_ID, intent, PendingIntent.FLAG_ONE_SHOT)
+        return PendingIntent.getActivity(context, MENDIX_AD_NOTIFICATION_ID, intent, PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE)
     }
 
     private fun safeParseStringToUri(url: String?): Uri? {

android/app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Make It Native 10</string>
+    <string name="app_name">Make It Native</string>
 </resources>

android/app/src/production/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <application android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode|fontScale"
             android:launchMode="singleTask"
             android:screenOrientation="user"
             android:windowSoftInputMode="stateHidden"

android/app/src/production/java/com/mendix/developerapp/MainActivity.kt

@@ -262,7 +262,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS
     }
 
     override fun requestPermissions(
-        permissions: Array<out String>,
+        permissions: Array<String>,
         requestCode: Int,
         listener: PermissionListener?
     ) {

android/app/src/production/java/com/mendix/developerapp/loading/MendixProjectLoaderScreen.kt

@@ -45,7 +45,7 @@ fun MendixProjectLoaderScreen(viewModel: ProjectLoaderViewModel) {
             errorMessageTitle = stringResource(R.string.error_version_title)
             primaryButtonText = stringResource(R.string.button_min_versions_guide)
             secondaryButtonText = stringResource(R.string.button_custom_developer_app_guide)
-            primaryButtonOnPress = { viewModel.openInBrowser.invoke("https://docs.mendix.com/refguide/mobile/distributing-mobile-apps/building-native-apps/how-to-min-versions/") }
+            primaryButtonOnPress = { viewModel.openInBrowser.invoke("https://docs.mendix.com/refguide/mobile/getting-started-with-mobile/prerequisites/#get-min-app") }
             secondaryButtonOnPress = { viewModel.openInBrowser.invoke("https://docs.mendix.com/howto8/mobile/how-to-devapps/") }
         }
 

android/app/src/production/java/com/mendix/developerapp/mendixapp/MendixProjectFragment.kt

@@ -2,9 +2,8 @@ package com.mendix.developerapp.mendixapp
 
 import android.os.Bundle
 import androidx.navigation.fragment.findNavController
-import com.facebook.react.devsupport.overrideDevLoadingViewController
+import com.facebook.react.devsupport.DefaultDevLoadingViewImplementation
 import com.facebook.react.devsupport.setBundleDownloadListener
-import com.mendix.developerapp.utilities.EmptyDevLoadingViewController
 import com.mendix.mendixnative.react.MxConfiguration
 
 class MendixProjectFragment : MendixProjectFragmentBase() {
@@ -23,8 +22,10 @@ class MendixProjectFragment : MendixProjectFragmentBase() {
         // Setting up our download listener
         reactNativeHost.reactInstanceManager.devSupportManager.apply {
             setBundleDownloadListener(this, viewModel.devServerCallback)
-            overrideDevLoadingViewController(this, EmptyDevLoadingViewController())
         }
+
+        // This now uses built-in RN mechanism to show bundling progress.
+        DefaultDevLoadingViewImplementation.setDevLoadingEnabled(true);
     }
 
     override fun onCloseProjectSelected() {

android/app/src/production/res/values/styles.xml

@@ -5,7 +5,7 @@
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/blue1</item>
         <item name="colorPrimaryVariant">@color/blue2</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/black</item>
         <item name="colorPrimaryDark">@color/blue1</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/blue2</item>

android/build.gradle

@@ -2,16 +2,14 @@
 buildscript {
     ext {
         buildToolsVersion = "35.0.0"
-        minSdkVersion = 23
+        minSdkVersion = 24
         compileSdkVersion = 35
         targetSdkVersion = 35
         // needed by camera module
         googlePlayServicesVersion = "17+"
-//        supportLibVersion = "28.0.0"
         androidXAnnotation = "1.2.0"
         androidXBrowser = "1.3.0"
         lifecycleVersion = "2.0.0"
-        kotlin_version = "1.9.24"
         kotlinVersion = "1.9.24"
         nav_version = "2.8.3"
         androidx_core_version = "1.6.0"
@@ -25,19 +23,20 @@ buildscript {
         compose_ui_version = '1.7.4'
         camerax_version = "1.3.4"
 
-        ndkVersion = "26.1.10909125"
+        ndkVersion = "27.3.13750724"
     }
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.2"
+        classpath "com.android.tools.build:gradle:8.8.2"
         classpath "com.facebook.react:react-native-gradle-plugin"
         classpath "com.google.gms:google-services:4.4.2"
         classpath "de.undercouch:gradle-download-task:4.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21'
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.1"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3"
 
@@ -68,6 +67,31 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
     }
+
+    // Build all modules with Android 16KB pages enabled
+    plugins.withId('com.android.application') {
+        android {
+            defaultConfig {
+                externalNativeBuild {
+                    cmake {
+                        arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                    }
+                }
+            }
+        }
+    }
+
+    plugins.withId('com.android.library') {
+        android {
+            defaultConfig {
+                externalNativeBuild {
+                    cmake {
+                        arguments "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+                    }
+                }
+            }
+        }
+    }
 }
 
 apply plugin: "com.facebook.react.rootproject"

android/gradle.properties

@@ -16,11 +16,14 @@ android.useAndroidX=true
 android.enableJetifier=true
 # android.enableJetifier=true
 org.gradle.configureondemand=true
-BUILD_RN_FROM_SOURCE=false
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
 reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 android.suppressUnsupportedCompileSdk=33
 android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+# enabled by default in RN 0.76 so we need to disable it explicitly
+newArchEnabled=false
+hermesEnabled=true
+mendixnative.cookieEncryption=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 validateDistributionUrl=true
 networkTimeout=10000