diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 3fb1e366..84235a5a 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..8a6be077 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,16 @@ +# OSX +# +.DS_Store + +# Android/IntelliJ +# +build/ +.idea +.gradle +local.properties +*.iml +*.hprof +.cxx/ + +# Bundle artifacts +*.jsbundle diff --git a/android/app/build.gradle b/android/app/build.gradle new file mode 100644 index 00000000..61d50e79 --- /dev/null +++ b/android/app/build.gradle @@ -0,0 +1,182 @@ +apply plugin: "com.android.application" +apply plugin: "org.jetbrains.kotlin.android" +apply plugin: "com.facebook.react" + +def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath() + +/** + * 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 { + entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", projectRoot, "android", "absolute"].execute(null, rootDir).text.trim()) + reactNativeDir = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() + hermesCommand = new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).getParentFile().getAbsolutePath() + "/sdks/hermesc/%OS-BIN%/hermesc" + codegenDir = new File(["node", "--print", "require.resolve('@react-native/codegen/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim()).getParentFile().getAbsoluteFile() + + enableBundleCompression = (findProperty('android.enableBundleCompression') ?: false).toBoolean() + // Use Expo CLI to bundle the app, this ensures the Metro config + // works correctly with Expo projects. + cliFile = new File(["node", "--print", "require.resolve('@expo/cli', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim()) + bundleCommand = "export:embed" + + /* 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") + + /* 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 = ["liteDebug", "prodDebug"] + + /* Bundling */ + // A list containing the node command and its flags. Default is just 'node'. + // nodeExecutableAndArgs = ["node"] + + // + // 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() +} + +/** + * Set this to true in release builds to optimize the app using [R8](https://developer.android.com/topic/performance/app-optimization/enable-app-optimization). + */ +def enableMinifyInReleaseBuilds = (findProperty('android.enableMinifyInReleaseBuilds') ?: false).toBoolean() + +/** + * 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 = 'io.github.react-native-community:jsc-android:2026004.+' + +android { + ndkVersion rootProject.ext.ndkVersion + + buildToolsVersion rootProject.ext.buildToolsVersion + compileSdk rootProject.ext.compileSdkVersion + + namespace 'org.openforis.arena_mobile' + defaultConfig { + applicationId 'org.openforis.arena_mobile' + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + versionCode 71 + versionName "2.3.7" + + buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\"" + } + signingConfigs { + debug { + storeFile file('debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + buildTypes { + debug { + signingConfig signingConfigs.debug + } + release { + // Caution! In production, you need to generate your own keystore file. + // see https://reactnative.dev/docs/signed-apk-android. + signingConfig signingConfigs.debug + def enableShrinkResources = findProperty('android.enableShrinkResourcesInReleaseBuilds') ?: 'false' + shrinkResources enableShrinkResources.toBoolean() + minifyEnabled enableMinifyInReleaseBuilds + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + def enablePngCrunchInRelease = findProperty('android.enablePngCrunchInReleaseBuilds') ?: 'true' + crunchPngs enablePngCrunchInRelease.toBoolean() + } + } + packagingOptions { + jniLibs { + def enableLegacyPackaging = findProperty('expo.useLegacyPackaging') ?: 'false' + useLegacyPackaging enableLegacyPackaging.toBoolean() + } + } + androidResources { + ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~' + } +} + +// Apply static values from `gradle.properties` to the `android.packagingOptions` +// Accepts values in comma delimited lists, example: +// android.packagingOptions.pickFirsts=/LICENSE,**/picasa.ini +["pickFirsts", "excludes", "merges", "doNotStrip"].each { prop -> + // Split option: 'foo,bar' -> ['foo', 'bar'] + def options = (findProperty("android.packagingOptions.$prop") ?: "").split(","); + // Trim all elements in place. + for (i in 0.. 0) { + println "android.packagingOptions.$prop += $options ($options.length)" + // Ex: android.packagingOptions.pickFirsts += '**/SCCS/**' + options.each { + android.packagingOptions[prop] += it + } + } +} + +dependencies { + // The version of react-native is set by the React Native Gradle Plugin + implementation("com.facebook.react:react-android") + + def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true"; + def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true"; + def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true"; + + if (isGifEnabled) { + // For animated gif support + implementation("com.facebook.fresco:animated-gif:${expoLibs.versions.fresco.get()}") + } + + if (isWebpEnabled) { + // For webp support + implementation("com.facebook.fresco:webpsupport:${expoLibs.versions.fresco.get()}") + if (isWebpAnimatedEnabled) { + // Animated webp support + implementation("com.facebook.fresco:animated-webp:${expoLibs.versions.fresco.get()}") + } + } + + if (hermesEnabled.toBoolean()) { + implementation("com.facebook.react:hermes-android") + } else { + implementation jscFlavor + } +} diff --git a/android/app/debug.keystore b/android/app/debug.keystore new file mode 100644 index 00000000..364e105e Binary files /dev/null and b/android/app/debug.keystore differ diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro new file mode 100644 index 00000000..551eb41d --- /dev/null +++ b/android/app/proguard-rules.pro @@ -0,0 +1,14 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# react-native-reanimated +-keep class com.swmansion.reanimated.** { *; } +-keep class com.facebook.react.turbomodule.** { *; } + +# Add any project specific keep options here: diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000..3ec2507b --- /dev/null +++ b/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/app/src/debugOptimized/AndroidManifest.xml b/android/app/src/debugOptimized/AndroidManifest.xml new file mode 100644 index 00000000..3ec2507b --- /dev/null +++ b/android/app/src/debugOptimized/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..88ba1f16 --- /dev/null +++ b/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/java/org/openforis/arena_mobile/MainActivity.kt b/android/app/src/main/java/org/openforis/arena_mobile/MainActivity.kt new file mode 100644 index 00000000..820ef959 --- /dev/null +++ b/android/app/src/main/java/org/openforis/arena_mobile/MainActivity.kt @@ -0,0 +1,61 @@ +package org.openforis.arena_mobile + +import android.os.Build +import android.os.Bundle + +import com.facebook.react.ReactActivity +import com.facebook.react.ReactActivityDelegate +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled +import com.facebook.react.defaults.DefaultReactActivityDelegate + +import expo.modules.ReactActivityDelegateWrapper + +class MainActivity : ReactActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + // Set the theme to AppTheme BEFORE onCreate to support + // coloring the background, status bar, and navigation bar. + // This is required for expo-splash-screen. + setTheme(R.style.AppTheme); + super.onCreate(null) + } + + /** + * Returns the name of the main component registered from JavaScript. This is used to schedule + * rendering of the component. + */ + override fun getMainComponentName(): String = "main" + + /** + * Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate] + * which allows you to enable New Architecture with a single boolean flags [fabricEnabled] + */ + override fun createReactActivityDelegate(): ReactActivityDelegate { + return ReactActivityDelegateWrapper( + this, + BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, + object : DefaultReactActivityDelegate( + this, + mainComponentName, + fabricEnabled + ){}) + } + + /** + * Align the back button behavior with Android S + * where moving root activities to background instead of finishing activities. + * @see onBackPressed + */ + override fun invokeDefaultOnBackPressed() { + if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) { + if (!moveTaskToBack(false)) { + // For non-root activities, use the default implementation to finish them. + super.invokeDefaultOnBackPressed() + } + return + } + + // Use the default back button implementation on Android S + // because it's doing more than [Activity.moveTaskToBack] in fact. + super.invokeDefaultOnBackPressed() + } +} diff --git a/android/app/src/main/java/org/openforis/arena_mobile/MainApplication.kt b/android/app/src/main/java/org/openforis/arena_mobile/MainApplication.kt new file mode 100644 index 00000000..8037d2f0 --- /dev/null +++ b/android/app/src/main/java/org/openforis/arena_mobile/MainApplication.kt @@ -0,0 +1,56 @@ +package org.openforis.arena_mobile + +import android.app.Application +import android.content.res.Configuration + +import com.facebook.react.PackageList +import com.facebook.react.ReactApplication +import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative +import com.facebook.react.ReactNativeHost +import com.facebook.react.ReactPackage +import com.facebook.react.ReactHost +import com.facebook.react.common.ReleaseLevel +import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint +import com.facebook.react.defaults.DefaultReactNativeHost + +import expo.modules.ApplicationLifecycleDispatcher +import expo.modules.ReactNativeHostWrapper + +class MainApplication : Application(), ReactApplication { + + override val reactNativeHost: ReactNativeHost = ReactNativeHostWrapper( + this, + object : DefaultReactNativeHost(this) { + override fun getPackages(): List = + PackageList(this).packages.apply { + // Packages that cannot be autolinked yet can be added manually here, for example: + // add(MyReactNativePackage()) + } + + override fun getJSMainModuleName(): String = ".expo/.virtual-metro-entry" + + override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG + + override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED + } + ) + + override val reactHost: ReactHost + get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost) + + override fun onCreate() { + super.onCreate() + DefaultNewArchitectureEntryPoint.releaseLevel = try { + ReleaseLevel.valueOf(BuildConfig.REACT_NATIVE_RELEASE_LEVEL.uppercase()) + } catch (e: IllegalArgumentException) { + ReleaseLevel.STABLE + } + loadReactNative(this) + ApplicationLifecycleDispatcher.onApplicationCreate(this) + } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig) + } +} diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png new file mode 100644 index 00000000..78faf02e Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splashscreen_logo.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png new file mode 100644 index 00000000..f1d02553 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splashscreen_logo.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png new file mode 100644 index 00000000..6b8cdefb Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splashscreen_logo.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png new file mode 100644 index 00000000..364226c1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splashscreen_logo.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png new file mode 100644 index 00000000..76c7887b Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_logo.png differ diff --git a/android/app/src/main/res/drawable/arrow_up_green.png b/android/app/src/main/res/drawable/arrow_up_green.png new file mode 100644 index 00000000..94736825 Binary files /dev/null and b/android/app/src/main/res/drawable/arrow_up_green.png differ diff --git a/android/app/src/main/res/drawable/arrow_up_orange.png b/android/app/src/main/res/drawable/arrow_up_orange.png new file mode 100644 index 00000000..dbba607d Binary files /dev/null and b/android/app/src/main/res/drawable/arrow_up_orange.png differ diff --git a/android/app/src/main/res/drawable/arrow_up_red.png b/android/app/src/main/res/drawable/arrow_up_red.png new file mode 100644 index 00000000..c75d5f03 Binary files /dev/null and b/android/app/src/main/res/drawable/arrow_up_red.png differ diff --git a/android/app/src/main/res/drawable/circle_green.png b/android/app/src/main/res/drawable/circle_green.png new file mode 100644 index 00000000..6ac2f35f Binary files /dev/null and b/android/app/src/main/res/drawable/circle_green.png differ diff --git a/android/app/src/main/res/drawable/compass_bg_black.png b/android/app/src/main/res/drawable/compass_bg_black.png new file mode 100644 index 00000000..a8e29bb7 Binary files /dev/null and b/android/app/src/main/res/drawable/compass_bg_black.png differ diff --git a/android/app/src/main/res/drawable/compass_bg_white.png b/android/app/src/main/res/drawable/compass_bg_white.png new file mode 100644 index 00000000..033a5acd Binary files /dev/null and b/android/app/src/main/res/drawable/compass_bg_white.png differ diff --git a/android/app/src/main/res/drawable/compass_pointer.png b/android/app/src/main/res/drawable/compass_pointer.png new file mode 100644 index 00000000..e5aa3ae7 Binary files /dev/null and b/android/app/src/main/res/drawable/compass_pointer.png differ diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..883b2a08 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml new file mode 100644 index 00000000..5c25e728 --- /dev/null +++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/splash.png b/android/app/src/main/res/drawable/splash.png new file mode 100644 index 00000000..eb9f856f Binary files /dev/null and b/android/app/src/main/res/drawable/splash.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..3941bea9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..3941bea9 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 00000000..42afaeca Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..e348c08f Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 00000000..60179b37 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 00000000..92b435a8 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..14129872 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 00000000..644100e4 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 00000000..48242bae Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..3095f789 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..7f3cbf03 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 00000000..1c06a4e9 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..e8654e90 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..94133937 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 00000000..97676cf1 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 00000000..8e9a9f44 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 00000000..fba96630 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 00000000..3c05de5b --- /dev/null +++ b/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..bb2087f7 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + #ffffff + #FFFFFF + #023c69 + #ffffff + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..a41207b8 --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + Arena Mobile + contain + false + \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..cb4ceb71 --- /dev/null +++ b/android/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 00000000..0554dd15 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,24 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath('com.android.tools.build:gradle') + classpath('com.facebook.react:react-native-gradle-plugin') + classpath('org.jetbrains.kotlin:kotlin-gradle-plugin') + } +} + +allprojects { + repositories { + google() + mavenCentral() + maven { url 'https://www.jitpack.io' } + } +} + +apply plugin: "expo-root-project" +apply plugin: "com.facebook.react.rootproject" diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..8e39f82e --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,65 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m +org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +org.gradle.parallel=true + +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true + +# Enable AAPT2 PNG crunching +android.enablePngCrunchInReleaseBuilds=true + +# Use this property to specify which architecture you want to build. +# You can also override it from the CLI using +# ./gradlew -PreactNativeArchitectures=x86_64 +reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64 + +# Use this property to enable support to the new architecture. +# This will allow you to use TurboModules and the Fabric render in +# your application. You should enable this flag either if you want +# to write custom TurboModules/Fabric components OR use libraries that +# are providing them. +newArchEnabled=true + +# Use this property to enable or disable the Hermes JS engine. +# If set to false, you will be using JSC instead. +hermesEnabled=true + +# Use this property to enable edge-to-edge display support. +# This allows your app to draw behind system bars for an immersive UI. +# Note: Only works with ReactActivity and should not be used with custom Activity. +edgeToEdgeEnabled=true + +# Enable GIF support in React Native images (~200 B increase) +expo.gif.enabled=true +# Enable webp support in React Native images (~85 KB increase) +expo.webp.enabled=true +# Enable animated webp support (~3.4 MB increase) +# Disabled by default because iOS doesn't support animated webp +expo.webp.animated=false + +# Enable network inspector +EX_DEV_CLIENT_NETWORK_INSPECTOR=true + +# Use legacy packaging to compress native libraries in the resulting APK. +expo.useLegacyPackaging=false + +# Specifies whether the app is configured to use edge-to-edge via the app config or plugin +# WARNING: This property has been deprecated and will be removed in Expo SDK 55. Use `edgeToEdgeEnabled` or `react.edgeToEdgeEnabled` to determine whether the project is using edge-to-edge. +expo.edgeToEdgeEnabled=true diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..1b33c55b Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..d4081da4 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 00000000..7f94d3d4 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 00000000..5eed7ee8 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 00000000..9b88ee42 --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1,39 @@ +pluginManagement { + def reactNativeGradlePlugin = new File( + providers.exec { + workingDir(rootDir) + commandLine("node", "--print", "require.resolve('@react-native/gradle-plugin/package.json', { paths: [require.resolve('react-native/package.json')] })") + }.standardOutput.asText.get().trim() + ).getParentFile().absolutePath + includeBuild(reactNativeGradlePlugin) + + def expoPluginsPath = new File( + providers.exec { + workingDir(rootDir) + commandLine("node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })") + }.standardOutput.asText.get().trim(), + "../android/expo-gradle-plugin" + ).absolutePath + includeBuild(expoPluginsPath) +} + +plugins { + id("com.facebook.react.settings") + id("expo-autolinking-settings") +} + +extensions.configure(com.facebook.react.ReactSettingsExtension) { ex -> + if (System.getenv('EXPO_USE_COMMUNITY_AUTOLINKING') == '1') { + ex.autolinkLibrariesFromCommand() + } else { + ex.autolinkLibrariesFromCommand(expoAutolinking.rnConfigCommand) + } +} +expoAutolinking.useExpoModules() + +rootProject.name = 'Arena Mobile' + +expoAutolinking.useExpoVersionCatalog() + +include ':app' +includeBuild(expoAutolinking.reactNativeGradlePlugin) diff --git a/app.json b/app.json index fe38dd11..b94b35fe 100644 --- a/app.json +++ b/app.json @@ -21,8 +21,13 @@ "backgroundColor": "#FFFFFF" }, "package": "org.openforis.arena_mobile", - "versionCode": 71, - "permissions": ["android.permission.ACCESS_MEDIA_LOCATION"] + "permissions": [ + "android.permission.ACCESS_MEDIA_LOCATION", + "BLUETOOTH_SCAN", + "BLUETOOTH_CONNECT", + "ACCESS_FINE_LOCATION" + ], + "versionCode": 71 }, "ios": { "buildNumber": "71", @@ -83,7 +88,15 @@ "expo-secure-store", "expo-sqlite", "expo-web-browser", - "@react-native-community/datetimepicker" + "@react-native-community/datetimepicker", + [ + "react-native-ble-plx", + { + "isBackgroundEnabled": true, + "modes": ["peripheral", "central"], + "bluetoothAlwaysPermission": "Allow $(PRODUCT_NAME) to connect to bluetooth devices" + } + ] ] } } diff --git a/package.json b/package.json index 8c2b6f76..f886d037 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,9 @@ "scripts": { "start": "expo start", "start-tunnel": "expo start --tunnel", - "android": "expo start --android", - "ios": "expo start --ios", + "android": "expo run:android", + "run-android-local": "expo run:android --device", + "ios": "expo run:ios", "web": "expo start --web", "lint": "eslint --fix --ext .js,.jsx .", "test": "jest", @@ -57,6 +58,8 @@ "react-dom": "19.1.0", "react-i18next": "^16.5.3", "react-native": "0.81.5", + "react-native-ble-plx": "^3.5.1", + "react-native-bluetooth-classic": "^1.73.0-rc.17", "react-native-check-version": "^1.4.0", "react-native-collapsible": "^1.6.2", "react-native-device-info": "^15.0.1", @@ -95,6 +98,7 @@ "@eslint/compat": "^2.0.1", "@eslint/eslintrc": "^3.3.3", "@eslint/js": "^9.39.2", + "@react-native-community/cli": "^20.1.1", "@react-native/eslint-config": "^0.83.1", "@types/jest": "29.5.14", "@types/react": "~19.1.10", diff --git a/src/hooks/bluetooth/useBLE.ts b/src/hooks/bluetooth/useBLE.ts new file mode 100644 index 00000000..824bcf85 --- /dev/null +++ b/src/hooks/bluetooth/useBLE.ts @@ -0,0 +1,259 @@ +import { useState, useRef, useCallback } from "react"; +import { BleManager, Device, Subscription } from "react-native-ble-plx"; + +import { Buffer } from "buffer"; + +import { Environment, log, Permissions } from "utils"; + +const manager = Environment.isExpoGo ? null : new BleManager(); + +// T is a generic type for the parsed data (e.g., a number, a string, or an object) +type BLEConfig = { + deviceFilter?: (device: Device) => boolean; + onRawData?: (raw: string) => T; +}; + +type BLEHookReturn = { + bleData: T | null; + isBleConnected: boolean; + connectBle: (params: { + deviceId: string; + serviceUUID?: string; + characteristicUUID?: string; + }) => Promise; + disconnectBle: () => Promise; + listBleServicesAndCharacteristics: (params?: { + deviceId?: string; + }) => Promise<{ uuid: string; characteristics: string[] }[]>; + bleError: string | null; +}; + +type ConnectedDeviceInfo = { + device: Device; + services: { + uuid: string; + characteristics: string[]; // Array of characteristic UUIDs + }[]; +}; + +const fetchConnectedDeviceDetails = async (): Promise< + ConnectedDeviceInfo[] +> => { + const connectedDevices = (await manager?.connectedDevices([])) ?? []; + + log.debug( + `BLE - currently connected devices: ${connectedDevices + .map((d) => d.name) + .join(", ")}`, + ); + + const details: ConnectedDeviceInfo[] = await Promise.all( + connectedDevices.map(async (device) => { + // 2. You MUST discover internals before reading them + const discoveredDevice = + await device.discoverAllServicesAndCharacteristics(); + + // 3. Get all services + const services = await discoveredDevice.services(); + + // 4. For each service, get its characteristics + const servicesWithChars = await Promise.all( + services.map(async (service) => { + const characteristics = await service.characteristics(); + return { + uuid: service.uuid, + characteristics: characteristics.map((c) => c.uuid), + }; + }), + ); + + return { + device: discoveredDevice, + services: servicesWithChars, + }; + }), + ); + return details; +}; + +export const useBLE = ({ + onRawData, +}: Omit, "deviceFilter">): BLEHookReturn => { + const [bleData, setBleData] = useState(null); + const [isBleConnected, setIsBleConnected] = useState(false); + const [bleError, setBleError] = useState(null); + + const deviceRef = useRef(null); + const monitoringSubscriptionRef = useRef(null); + + const unsubscribeFromMonitoring = () => { + if (monitoringSubscriptionRef.current) { + monitoringSubscriptionRef.current.remove(); + monitoringSubscriptionRef.current = null; + } + }; + + const startMonitoring = useCallback( + async ({ + device, + serviceUUID, + characteristicUUID, + }: { + device: Device; + serviceUUID: string; + characteristicUUID: string; + }) => { + try { + // You must discover services before monitoring + await device.discoverAllServicesAndCharacteristics(); + + unsubscribeFromMonitoring(); + + monitoringSubscriptionRef.current = + device.monitorCharacteristicForService( + serviceUUID!, + characteristicUUID, + (err, char) => { + if (err) { + setBleError(err.message); + setIsBleConnected(false); + return; + } + if (char?.value) { + const decoded = Buffer.from(char.value, "base64").toString( + "utf-8", + ); + const processedData = onRawData + ? onRawData(decoded) + : (decoded as unknown as T); + setBleData(processedData); + } + }, + ); + } catch (e: any) { + log.error(`BLE monitor error: ${e.message}`); + } + }, + [onRawData], + ); + + const connectBle = useCallback( + async ({ + deviceId, + serviceUUID, + characteristicUUID, + }: { + deviceId: string; + serviceUUID?: string; + characteristicUUID?: string; + }) => { + if (!manager) return; + + const permissionGranted = await Permissions.requestBluetoothPermissions(); + if (!permissionGranted) { + setBleError("Bluetooth permissions not granted"); + return; + } + + setBleError(null); + + try { + unsubscribeFromMonitoring(); + if (deviceRef.current) { + try { + await deviceRef.current.cancelConnection(); + } catch (e: any) { + log.debug( + `BLE - previous connection cleanup warning: ${e?.message ?? String(e)}`, + ); + } finally { + deviceRef.current = null; + setIsBleConnected(false); + setBleData(null); + } + } + + log.debug(`BLE - attempting direct connection to: ${deviceId}`); + + const device = await manager.connectToDevice(deviceId); + + log.debug(`BLE - connected to: ${device.id}`); + + deviceRef.current = device; + setIsBleConnected(true); + + if (serviceUUID && characteristicUUID) { + await startMonitoring({ device, serviceUUID, characteristicUUID }); + } else { + log.debug( + `BLE - connected to ${device.id} without monitor UUIDs; discovery-only mode`, + ); + } + } catch (e: any) { + log.error(`BLE connection error: ${e.message}`); + setBleError(e.message || "Direct connection failed"); + setIsBleConnected(false); + } + }, + [startMonitoring], + ); + + const disconnectBle = useCallback(async () => { + setIsBleConnected(false); + setBleData(null); + + unsubscribeFromMonitoring(); + + if (deviceRef.current) { + await deviceRef.current.cancelConnection(); + deviceRef.current = null; + } + }, []); + + const listBleServicesAndCharacteristics = useCallback( + async ({ deviceId }: { deviceId?: string } = {}) => { + const connectedDevice = deviceRef.current; + + if (!connectedDevice) { + setBleError("No BLE device connected"); + return []; + } + + if (deviceId && connectedDevice.id !== deviceId) { + setBleError("Connected BLE device does not match selected device"); + return []; + } + + try { + const discoveredDevice = + await connectedDevice.discoverAllServicesAndCharacteristics(); + const services = await discoveredDevice.services(); + + return await Promise.all( + services.map(async (service) => { + const characteristics = await service.characteristics(); + return { + uuid: service.uuid, + characteristics: characteristics.map((char) => char.uuid), + }; + }), + ); + } catch (e: any) { + const errorMessage = e?.message ?? String(e); + log.error(`BLE services discovery error: ${errorMessage}`); + setBleError(errorMessage); + return []; + } + }, + [], + ); + + return { + bleData, + isBleConnected, + connectBle, + disconnectBle, + listBleServicesAndCharacteristics, + bleError, + }; +}; diff --git a/src/hooks/bluetooth/useBluetoothDevice.ts b/src/hooks/bluetooth/useBluetoothDevice.ts new file mode 100644 index 00000000..8883338c --- /dev/null +++ b/src/hooks/bluetooth/useBluetoothDevice.ts @@ -0,0 +1,146 @@ +import { useCallback, useEffect, useState } from "react"; +import { useBluetoothDeviceLookup } from "./useBluetoothDeviceLookup"; +import { BluetoothDeviceKind } from "utils/BluetoothScanner"; +import { bluetoothClassicConnector } from "utils/BluetoothClassicConnector"; +import { log } from "utils/Logger"; +import { useBLE } from "./useBLE"; + +export const useBluetoothDevice = ({ + onRawData, +}: { + onRawData: (raw: string) => void; +}) => { + const { + lookupDevice, + isBtScanning, + error: deviceLookupError, + } = useBluetoothDeviceLookup(); + + const { + connectBle, + disconnectBle, + listBleServicesAndCharacteristics, + bleError, + isBleConnected, + } = useBLE({ + onRawData: (raw) => { + onRawData(raw); + }, + }); + + const [connectedClassicDeviceId, setConnectedClassicDeviceId] = useState< + string | null + >(null); + const [error, setError] = useState(null); + + const btScanAndConnect = useCallback(async () => { + const device = await lookupDevice({ + filterFn: (device) => !!device.name && device.name !== device.id, + }); + if (!device) return; + + const { id: deviceId, kind } = device!; + if (kind === BluetoothDeviceKind.ble) { + await bluetoothClassicConnector.disconnect(); + setConnectedClassicDeviceId(null); + await connectBle({ + deviceId, + }); + + const services = await listBleServicesAndCharacteristics({ deviceId }); + if (services.length > 0) { + const servicesSummary = services + .map( + (service) => + `- Service ${service.uuid}: ${service.characteristics.join(", ") || "(no characteristics)"}`, + ) + .join("\n"); + + log.debug( + `BLE device ${deviceId} services/characteristics:\n${servicesSummary}`, + ); + + const monitorDurationMs = 10_000; + + for (const service of services) { + for (const characteristicUUID of service.characteristics) { + try { + log.debug( + `BLE monitoring start - device: ${deviceId}, service: ${service.uuid}, characteristic: ${characteristicUUID}, durationMs: ${monitorDurationMs}`, + ); + + await connectBle({ + deviceId, + serviceUUID: service.uuid, + characteristicUUID, + }); + + await new Promise((resolve) => { + setTimeout(() => resolve(), monitorDurationMs); + }); + + log.debug( + `BLE monitoring end - device: ${deviceId}, service: ${service.uuid}, characteristic: ${characteristicUUID}`, + ); + } catch (error: any) { + log.error( + `BLE monitoring error - device: ${deviceId}, service: ${service.uuid}, characteristic: ${characteristicUUID}, error: ${error?.message ?? String(error)}`, + ); + } finally { + await disconnectBle(); + } + } + } + } + } else { + log.debug(`Connecting to classic BT device ${deviceId}...`); + await disconnectBle(); + const classicDevice = await bluetoothClassicConnector.connect({ + deviceId, + onRawData, + }); + setConnectedClassicDeviceId(classicDevice.id); + } + }, [ + connectBle, + disconnectBle, + listBleServicesAndCharacteristics, + lookupDevice, + onRawData, + ]); + + const btDeviceDisconnect = useCallback(async () => { + if (connectedClassicDeviceId) { + try { + await bluetoothClassicConnector.disconnect(connectedClassicDeviceId); + } catch (error: any) { + const errorMessage = error?.message ?? String(error); + setError(errorMessage); + log.error(`Classic BT disconnect error: ${errorMessage}`); + } finally { + setConnectedClassicDeviceId(null); + } + return; + } + await disconnectBle(); + }, [connectedClassicDeviceId, disconnectBle]); + + useEffect(() => { + return () => { + // Ensure we disconnect BT when the screen unmounts + disconnectBle(); + bluetoothClassicConnector.disconnect().catch((error: unknown) => { + log.error(`Classic BT disconnect error on unmount: ${String(error)}`); + }); + }; + }, [disconnectBle]); + + return { + btScanAndConnect, + btDeviceDisconnect, + isBtConnected: isBleConnected || !!connectedClassicDeviceId, + isBtScanning, + connectedClassicDeviceId, + error: deviceLookupError || bleError || error, + }; +}; diff --git a/src/hooks/bluetooth/useBluetoothDeviceLookup.ts b/src/hooks/bluetooth/useBluetoothDeviceLookup.ts new file mode 100644 index 00000000..5fd2208b --- /dev/null +++ b/src/hooks/bluetooth/useBluetoothDeviceLookup.ts @@ -0,0 +1,69 @@ +import { useCallback, useState } from "react"; +import { + bluetoothScanner, + BluetoothScanOptions, + ScannedBluetoothDevice, +} from "utils/BluetoothScanner"; +import { useToast } from "../useToast"; +import { useConfirm } from "state/confirm"; +import { log } from "utils/Logger"; + +export type UseBluetoothDeviceLookupReturn = { + error: string | null; + isBtScanning: boolean; + lookupDevice: ( + options?: BluetoothScanOptions, + ) => Promise; +}; + +export const useBluetoothDeviceLookup = (): UseBluetoothDeviceLookupReturn => { + const toaster = useToast(); + const confirm = useConfirm(); + const [isBtScanning, setIsBtScanning] = useState(false); + const [error, setError] = useState(null); + + const lookupDevice = async ( + options?: BluetoothScanOptions, + ): Promise => { + setIsBtScanning(true); + setError(null); + + try { + const devices = await bluetoothScanner.scanDevices(options); + + if (devices.length === 0) { + toaster("app:testBluetoothDevices.noDevicesFound"); + return null; + } + + const confirmResult = await confirm({ + titleKey: "app:testBluetoothDevices.scanResults", + singleChoiceOptions: devices.map((d) => ({ + label: d.name ?? d.id, + value: d.id, + })), + }); + + if (!confirmResult) { + return null; + } + const selectedDeviceId = confirmResult.selectedSingleChoiceValue!; + const selectedDevice = devices.find((d) => d.id === selectedDeviceId); + + if (!selectedDevice) { + return null; + } + log.debug( + `Selected Bluetooth device: ${selectedDevice.name} [${selectedDevice.kind}]`, + ); + return selectedDevice; + } catch (err) { + setError(String(err)); + return null; + } finally { + setIsBtScanning(false); + } + }; + + return { error, isBtScanning, lookupDevice }; +}; diff --git a/src/hooks/bluetooth/useVertexLaserGeoDevice.ts b/src/hooks/bluetooth/useVertexLaserGeoDevice.ts new file mode 100644 index 00000000..95703242 --- /dev/null +++ b/src/hooks/bluetooth/useVertexLaserGeoDevice.ts @@ -0,0 +1,48 @@ +import { useBLE } from "./useBLE"; + +const serviceUUID = "9e000000-f685-4ea5-b58a-85287cb04965"; +const characteristicUUID = "9e010000-f685-4ea5-b58a-85287cb04965"; + +type VertexLaserGeoData = { + horizontalDistanceM: number; + horizontalAngleDeg: number; + distanceM: number; + heightM: number; + verticalAngleDeg: number; +}; + +export const useVertexLaserGeoDevice = ({ + onData, +}: { + onData: (data: VertexLaserGeoData) => void; +}) => { + const { connectBle, disconnectBle, bleError, isBleConnected } = useBLE({ + onRawData: (raw) => { + const parts = raw.split("\t"); + const horizontalDistanceM = parseFloat(parts[0]!) / 10; + const distanceM = parseFloat(parts[1]!) / 10; + const heightM = parseFloat(parts[2]!) / 10; + const verticalAngleDeg = parseFloat(parts[3]!) / 10; + const horizontalAngleDeg = parseFloat(parts[4]!) / 10; + + onData({ + horizontalDistanceM, + horizontalAngleDeg, + distanceM, + heightM, + verticalAngleDeg, + }); + }, + }); + + const connect = async ({ deviceId }: { deviceId: string }) => { + await connectBle({ deviceId, serviceUUID, characteristicUUID }); + }; + + return { + connect, + disconnect: disconnectBle, + bleError, + isBleConnected, + }; +}; diff --git a/src/hooks/index.ts b/src/hooks/index.ts index 99484e83..2b0452b3 100644 --- a/src/hooks/index.ts +++ b/src/hooks/index.ts @@ -1,5 +1,6 @@ export { useAppInfo } from "./useAppInfo"; export { useBackHandler } from "./useBackHandler"; +export { useBluetoothDevice } from "./bluetooth/useBluetoothDevice"; export { useEffectiveTheme } from "./useEffectiveTheme"; export { useImageFile } from "./useImageFile"; export { useIsMountedRef } from "./useIsMountedRef"; diff --git a/src/localization/en/app.ts b/src/localization/en/app.ts index 97d9b1a7..be70d944 100644 --- a/src/localization/en/app.ts +++ b/src/localization/en/app.ts @@ -51,4 +51,13 @@ The size will be around {{size}}.`, "Cannot verify application update status: $t(networkNotAvailable)", upToDate: "Application up-to-date", }, + testBluetoothDevices: { + title: "Bluetooth devices", + scanAndConnect: "Scan and connect", + disconnect: "Disconnect", + connected: + "Connected. You can now send test data from your Bluetooth device. Data received from the device will be logged and visible in the app logs.", + noDevicesFound: "No Bluetooth devices found", + scanResults: "Select a device to connect", + }, }; diff --git a/src/screens/SettingsScreen/SettingsScreen.tsx b/src/screens/SettingsScreen/SettingsScreen.tsx index 574029aa..9f8e2bb6 100644 --- a/src/screens/SettingsScreen/SettingsScreen.tsx +++ b/src/screens/SettingsScreen/SettingsScreen.tsx @@ -1,11 +1,12 @@ -import { useCallback, useState } from "react"; +import { useCallback, useEffect, useState } from "react"; import { Objects } from "@openforis/arena-core"; import { ConnectionToRemoteServerButton } from "appComponents/ConnectionToRemoteServerButton"; import { FullBackupButton } from "appComponents/FullBackupButton"; -import { Button, Card, ScreenView, VView } from "components"; +import { Button, Card, ScreenView, Text, VView } from "components"; +import { useBluetoothDevice } from "hooks"; import { SettingsModel, SettingsObject } from "model"; import { AppService } from "service/appService"; import { @@ -26,6 +27,18 @@ export const SettingsScreen = () => { const dispatch = useAppDispatch(); const confirm = useConfirm(); + const onBtRawData = useCallback((raw: string) => { + log.debug(`Received BT data: ${raw}`); + }, []); + + const { + btScanAndConnect, + btDeviceDisconnect, + error: btError, + isBtConnected, + isBtScanning, + } = useBluetoothDevice({ onRawData: onBtRawData }); + const settingsStored = SettingsSelectors.useSettings(); const [state, setState] = useState({ settings: settingsStored }); @@ -39,7 +52,7 @@ export const SettingsScreen = () => { if (value === oldValue) return; dispatch(SettingsActions.updateSetting({ key, value })); setState((statePrev) => - Objects.assocPath({ obj: statePrev, path: ["settings", key], value }) + Objects.assocPath({ obj: statePrev, path: ["settings", key], value }), ); }; @@ -73,6 +86,26 @@ export const SettingsScreen = () => { /> ))} + + {!isBtConnected && !isBtScanning && ( +