Skip to content

Commit 8e59d6a

Browse files
committed
Align with ST BLE Sensor V5.2.8
Signed-off-by: Luca Pezzoni <luca.pezzoni@st.com>
1 parent 8b7ed4f commit 8e59d6a

56 files changed

Lines changed: 3497 additions & 800 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

License.html

Lines changed: 129 additions & 332 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Application ST BLE Sensors
55

66
# Compilation
77

8-
Code compiled using gradle 8.9
8+
Code compiled using gradle 8.12.1
99

1010
set on Gradle properties the Github Login name and SSO authentication
1111
Example:
@@ -16,7 +16,7 @@ GPR_API_KEY=XXXXXXXXXXXXXXXXXXXXXXXX
1616
For using this application is necessary to downlaod the Android BlueST-SDK from:
1717
https://github.com/STMicroelectronics/BlueSTSDK_Android
1818

19-
tag BlueST-SDK_V1.2.8
19+
tag BlueST-SDK_V1.2.9
2020

2121
and follow the instruction for compiling and publish on local maven repository the 2 libraries necessary for this application:
2222
* st-blue-sdk

app/build.gradle.kts

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ plugins {
2222
alias(libs.plugins.jlleitschuhKtlint)
2323
alias(libs.plugins.appswithloveLoco)
2424
alias(libs.plugins.androidxSafeargs)
25+
alias(libs.plugins.jaredsburrowsLicense)
2526
}
2627

2728
apply {
@@ -36,8 +37,8 @@ android {
3637
applicationId = "com.st.bluems"
3738
minSdk = stMinSdk
3839
targetSdk = stTargetSdk
39-
versionCode = 303
40-
versionName = "5.2.6"
40+
versionCode = 313
41+
versionName = "5.2.8"
4142

4243
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4344
vectorDrawables { useSupportLibrary = true }
@@ -90,6 +91,27 @@ android {
9091
packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
9192
}
9293

94+
licenseReport {
95+
// Generate reports
96+
generateCsvReport = false
97+
generateHtmlReport = true
98+
generateJsonReport = false
99+
generateTextReport = false
100+
101+
// Copy reports - These options are ignored for Java projects
102+
copyCsvReportToAssets = false
103+
copyHtmlReportToAssets = true
104+
copyJsonReportToAssets = false
105+
copyTextReportToAssets = false
106+
useVariantSpecificAssetDirs = false
107+
108+
// Ignore licenses for certain artifact patterns
109+
//ignoredPatterns = []
110+
111+
// Show versions in the report - default is false
112+
showVersions = true
113+
}
114+
93115
detekt {
94116
config.setFrom("../detekt-config-compose.yml")
95117
}
@@ -124,6 +146,8 @@ dependencies {
124146
implementation(project(":st_user_profiling"))
125147
// - Welcome
126148
implementation(project(":st_welcome"))
149+
// - Licenses
150+
implementation(project(":st_licenses"))
127151
// - Terms
128152
implementation(project(":st_terms"))
129153
// - Demos

app/src/main/assets/open_source_licenses.html

Lines changed: 2189 additions & 0 deletions
Large diffs are not rendered by default.

app/src/main/java/com/st/bluems/MainActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
*/
88
package com.st.bluems
99

10+
import android.content.pm.PackageManager
1011
import android.graphics.Color
1112
import android.os.Build
1213
import android.os.Bundle
14+
import android.util.Log
1315
import androidx.activity.SystemBarStyle
1416
import androidx.activity.enableEdgeToEdge
1517
import androidx.activity.viewModels

app/src/main/java/com/st/bluems/MainViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ class MainViewModel @Inject constructor(
4848
preferences.setTermsFlag(accepted = accepted)
4949
}
5050

51+
fun updateBoardCatalogStatus(boardCatalogStatus: String) {
52+
preferences.setBoardCatalogStatus(boardCatalogStatus)
53+
}
54+
5155
fun welcomeShow() {
5256
preferences.setWelcomeFlag(completed = true)
5357
}

app/src/main/res/navigation/nav_graph.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
android:id="@+id/homeFragment"
2020
android:name="com.st.bluems.ui.home.HomeFragment"
2121
android:label="Home">
22+
<action
23+
android:id="@+id/action_homeFragment_to_licensesFragment"
24+
app:destination="@id/licenseFragment" />
2225
<action
2326
android:id="@+id/action_homeFragment_to_profileNavGraph"
2427
app:destination="@id/user_profiling_nav_graph" />
@@ -51,6 +54,12 @@
5154
app:popUpToInclusive="true" />
5255
</fragment>
5356

57+
<fragment
58+
android:id="@+id/licenseFragment"
59+
android:name="com.st.licenses.LicensesFragment"
60+
android:label="Licenses">
61+
</fragment>
62+
5463
<fragment
5564
android:id="@+id/termsFragment"
5665
android:name="com.st.terms.TermsFragment"
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<defaults>
33
<entry>
4-
<key>D183G</key>
5-
<value>1111</value>
6-
</entry>
7-
<entry>
8-
<key>LastCatalogVersion</key>
9-
<value>{ "checksum": "5599e0f8a8f5a7ade763a023baa8d2d1", "date": "2024-01-09T09:00:07.495702S", "version": "0.5.13" }</value>
4+
<key>bluems_5_2_8</key>
5+
<value>{"deprecationDate": "2028-12-31","dismissionDate":"2029-12-31"}</value>
106
</entry>
117
</defaults>

gradle/libs.versions.toml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
[versions]
99
# @pin https://github.com/google/accompanist#compose-versions
1010
accompanist = "0.36.0"
11-
androidGradlePlugin = "8.7.3"
12-
androidxActivity = "1.9.3"
11+
accompanistPermission = "0.37.0"
12+
androidGradlePlugin = "8.8.0"
13+
androidxActivity = "1.10.0"
1314
androidxCompat = "1.7.0"
1415
# @pin https://developer.android.com/jetpack/androidx/releases/compose#versions
15-
androidxComposeBom = "2024.11.00"
16+
androidxComposeBom = "2025.01.00"
1617
androidxConstraintlayout = "2.2.0"
1718
androidxCore = "1.15.0"
18-
androidxDatastore = "1.1.1"
19+
androidxDatastore = "1.1.2"
1920
androidxEspresso = "3.6.1"
2021
androidxFragment = "1.8.5"
2122
androidxGridLayout = "1.0.0"
@@ -26,26 +27,27 @@ androidxLegacy = "1.0.0"
2627
androidxLifecycle = "2.8.7"
2728
androidxLifecycleViewmodel = "2.8.7"
2829
androidxMaterial = "1.12.0"
29-
androidxSafeargs = "2.8.4"
30+
androidxSafeargs = "2.8.5"
3031
androidxPreference = "1.2.1"
3132
androidxRoom = "2.6.1"
3233
androidxSplash = "1.1.0-rc01"
3334
androidxTestCore = "1.6.1"
3435
androidxTestExt = "1.2.1"
3536
androidxTestRules = "1.6.1"
3637
apacheCommons = "3.11.1"
37-
appCenterSdkVersion = "5.0.5"
38+
appCenterSdkVersion = "5.0.6"
3839
appauth = "0.11.1"
3940
benManes = "0.51.0"
40-
androidxCamera = "1.4.0"
41+
androidxCamera = "1.4.1"
4142
coil = "2.7.0"
42-
desugar_jdk_libs_nio = "2.1.3"
43+
desugar_jdk_libs_nio = "2.1.4"
44+
firebaseCrashlytics = "3.0.2"
4345
glide = "5.0.0-rc01"
4446
googleCodeScanner = "16.1.0"
45-
googleFirebaseBom = "33.6.0"
47+
googleFirebaseBom = "33.7.0"
4648
arturboschDetekt = "1.23.6"
4749
googleGms = "4.4.2"
48-
googleHilt = "2.53"
50+
googleHilt = "2.55"
4951
hiltNavigationFragment = "1.2.0"
5052
iotDeviceClient = "2.5.0"
5153
jacksonAnnotations = "2.18.2"
@@ -54,14 +56,14 @@ junit4 = "4.13.2"
5456
jwt = "2.0.2"
5557
# @pin https://developer.android.com/jetpack/androidx/releases/compose-kotlin
5658
kotlin = "2.0.20"
57-
kotlinxCoroutines = "1.9.0"
58-
kotlinxSerializationJson = "1.7.3"
59+
kotlinxCoroutines = "1.10.1"
60+
kotlinxSerializationJson = "1.8.0"
5961
# @pin
6062
devtoolsKsp = "2.0.20-1.0.25"
6163
jlleitschuhKtlint = "12.1.1"
6264
littlerobotsVersionCatalogUpdate = "0.8.4"
6365
appswithloveLoco = "0.3.1"
64-
media3Version = "1.5.0"
66+
media3Version = "1.5.1"
6567
mlkitBarcode = "17.3.0"
6668
mpChart = "3.1.0"
6769
okhttp = "4.12.0"
@@ -70,14 +72,17 @@ provisioningDeviceClient = "2.1.3"
7072
reorderable = "0.9.6"
7173
retrofit = "2.11.0"
7274
retrofitKotlinxSerializationJson = "1.0.0"
73-
stSdk = "1.2.8"
75+
stSdk = "1.2.9"
7476
stOpus= "1.0.0"
7577
ytPlayer = "12.1.1"
76-
runtimeLivedata = "1.7.5"
78+
runtimeLivedata = "1.7.6"
79+
jaredsburrowsLicense = "0.9.8"
80+
firebaseConfigKtx = "22.0.1"
81+
dynatrace = "8.305.1.1005"
7782

7883
[libraries]
7984
accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
80-
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
85+
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermission" }
8186
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
8287
androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidxActivity" }
8388
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxCompat" }
@@ -267,3 +272,4 @@ jlleitschuhKtlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "jllei
267272
littlerobotsVersionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "littlerobotsVersionCatalogUpdate" }
268273
appswithloveLoco = { id = "com.appswithlove.loco", version.ref = "appswithloveLoco" }
269274
androidxSafeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidxSafeargs" }
275+
jaredsburrowsLicense = { id = "com.jaredsburrows.license", version.ref = "jaredsburrowsLicense" }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Aug 03 15:07:43 CEST 2023
1+
#Thu Jan 30 11:35:17 CET 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)