Updating code to ST BLE Sensor V5.2.0

Signed-off-by: Luca Pezzoni <luca.pezzoni@st.com>

Author: PezzoniL

README.md

@@ -16,7 +16,7 @@ GPR_API_KEY=XXXXXXXXXXXXXXXXXXXXXXXX
 For using this application is necessary to downlaod the Android BlueST-SDK from:
 https://github.com/STMicroelectronics/BlueSTSDK_Android
 
-tag BlueST-SDK_V1.0.10
+tag BlueST-SDK_V1.1.0
 
 and follow the instruction for compiling and publish on local maven repository the 2 libraries necessary for this application:
 * st-blue-sdk

app/build.gradle

@@ -25,8 +25,8 @@ android {
         applicationId "com.st.bluems"
         minSdk rootProject.minSdk
         targetSdk rootProject.targetSdk
-        versionCode 168
-        versionName "5.1.0"
+        versionCode 180
+        versionName "5.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

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

@@ -16,6 +16,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.findNavController
 import androidx.navigation.navOptions
 import com.st.bluems.ui.home.HomeFragmentDirections
+import com.st.core.GlobalConfig
 import com.st.core.api.ApplicationAnalyticsService.ApplicationNameEtna
 import com.st.demo_showcase.DemoShowCaseConfig
 import com.st.terms.StTermsConfig
@@ -74,6 +75,11 @@ class MainActivity : AppCompatActivity() {
 
         navController = findNavController(R.id.nav_host_fragment_content_main)
 
+        GlobalConfig.navigateBack = { nodeId ->
+            navController.navigate(HomeFragmentDirections.actionToHomeFragment())
+            viewModel.disconnect(nodeId = nodeId)
+        }
+
         setUpDemoShowCase()
         setUpTerms()
         setUpWelcome()

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

@@ -11,6 +11,7 @@ import android.app.Activity
 import android.app.Application
 import android.content.Context
 import androidx.lifecycle.ViewModel
+import com.st.blue_sdk.BlueManager
 import com.st.core.api.ApplicationAnalyticsService
 import com.st.preferences.StPreferences
 import com.st.user_profiling.model.LevelProficiency
@@ -21,6 +22,7 @@ import javax.inject.Inject
 @HiltViewModel
 class MainViewModel @Inject constructor(
     private val preferences: StPreferences,
+    private val blueManager: BlueManager,
     private val appAnalyticsService: Set<@JvmSuppressWildcards ApplicationAnalyticsService>
 ) : ViewModel() {
 
@@ -55,4 +57,8 @@ class MainViewModel @Inject constructor(
         preferences.setLevelProficiency(level = level.name)
         preferences.setProfileType(profile = type.name)
     }
+
+    fun disconnect(nodeId: String) {
+        blueManager.disconnect(nodeId = nodeId)
+    }
 }

app/src/main/java/com/st/bluems/ui/composable/DeviceListFilterDialog.kt

@@ -32,6 +32,7 @@ import com.st.bluems.R
 import com.st.ui.composables.BlueMsButton
 import com.st.ui.theme.LocalDimensions
 import com.st.ui.theme.PreviewBlueMSTheme
+import com.st.ui.theme.Shapes
 import kotlin.math.roundToInt
 
 @Composable
@@ -42,7 +43,8 @@ fun DeviceListFilterDialog(
 ) {
     var internalFilters by remember(key1 = filters) { mutableStateOf(value = filters) }
     Surface(
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier.fillMaxWidth(),
+        shape = Shapes.medium
     ) {
         Column(
             modifier = Modifier

app/src/main/java/com/st/bluems/ui/composable/DeviceListItem.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.PushPin
 import androidx.compose.material.icons.filled.SignalCellular4Bar
@@ -27,6 +26,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.st.blue_sdk.board_catalog.models.BoardFirmware
+import com.st.blue_sdk.board_catalog.models.FirmwareMaturity
 import com.st.blue_sdk.models.Node
 import com.st.ui.theme.*
 import com.st.ui.utils.getBlueStBoardImages
@@ -99,7 +99,7 @@ fun DeviceListItem(
                     }
                 }
             ),
-        shape = RoundedCornerShape(size = LocalDimensions.current.cornerNormal),
+        shape = Shapes.small,
         shadowElevation = LocalDimensions.current.elevationNormal
     ) {
         Column(
@@ -150,12 +150,23 @@ fun DeviceListItem(
             Column(
                 modifier = Modifier.fillMaxWidth()
             ) {
+
                 if (isCustomFw) {
                     Text(
                         modifier = Modifier.padding(all = LocalDimensions.current.paddingNormal),
                         color = ErrorText,
                         text = stringResource(id = com.st.bluems.R.string.st_home_deviceListItem_fwCustomLabel)
                     )
+                } else {
+                    catalogInfo?.maturity?.let { maturity ->
+                        if(maturity!=FirmwareMaturity.RELEASE) {
+                            Text(
+                                modifier = Modifier.padding(all = LocalDimensions.current.paddingNormal),
+                                color = ErrorText,
+                                text = "$maturity FW"
+                            )
+                        }
+                    }
                 }
 
                 displayMessages.forEach { msg ->

app/src/main/java/com/st/bluems/ui/composable/MainBottomBar.kt

@@ -9,7 +9,6 @@ package com.st.bluems.ui.composable
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.FilterList
@@ -24,6 +23,7 @@ import com.st.bluems.R
 import com.st.ui.theme.Grey0
 import com.st.ui.theme.LocalDimensions
 import com.st.ui.theme.PreviewBlueMSTheme
+import com.st.ui.theme.Shapes
 import androidx.compose.material.BottomAppBar as Material2BottomAppBar
 
 @Composable
@@ -66,7 +66,7 @@ fun BottomAppBarItem(
 ) {
     Surface(
         modifier = modifier,
-        shape = RoundedCornerShape(size = LocalDimensions.current.cornerNormal),
+        shape = Shapes.small,
         color = MaterialTheme.colorScheme.primary,
         contentColor = Grey0,
         onClick = onClick

app/src/main/java/com/st/bluems/ui/home/HomeViewModel.kt

@@ -158,7 +158,6 @@ class HomeViewModel @Inject constructor(
 //
 //        }
         //checkBoardsCatalogPresence()
-        readReleaseCatalog()
     }
 
     fun readReleaseCatalog() {

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

@@ -81,6 +81,12 @@
         android:name="com.st.catalog.CatalogFragment"
         android:label="Catalog" />
 
+    <action
+        android:id="@+id/action_to_home_fragment"
+        app:destination="@id/homeFragment"
+        app:popUpTo="@id/homeFragment"
+        app:popUpToInclusive="true" />
+
     <action
         android:id="@+id/action_user_profiling_nav_graph_to_home_fragment"
         app:destination="@id/homeFragment"

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

@@ -14,7 +14,7 @@
  Exported by: st localise
  Exported at: Fri, 27 May 2022 07:38:17 +0200
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="st_home_deviceList_screenTitle">Available Boards</string>
     <string name="st_home_deviceList_discoverBtn">Discover our products</string>
     <string name="st_home_deviceList_emptyTitle">Don’t have an ST Board?</string>
@@ -44,8 +44,8 @@
     <string name="st_home_menuActions_login">Login</string>
     <string name="st_home_menuActions_logout">Logout</string>
 
-    <string name="st_home_menuAction_force_server">Force Audio Server</string>
-    <string name="st_home_menuAction_no_force_server">No Force Audio Server</string>
+    <string name="st_home_menuAction_force_server" tools:ignore="ExtraTranslation">Force Audio Server</string>
+    <string name="st_home_menuAction_no_force_server" tools:ignore="ExtraTranslation">No Force Audio Server</string>
 
     <string name="st_home_missingPermission_goToSettingsBtn">Open Settings</string>
 
@@ -63,6 +63,6 @@
     <string name="profile_restricted_dialog_body_text">Change the Profile selection in order to be able to enable the explore the boards catalog for finding the best STMicroelectronics board that fits your necessities</string>
     <string name="missing_ble_dialog_title">Bluetooth required</string>
     <string name="missing_ble_dialog_body_text">It\'s necessary to enable the Bluetooth for connecting one STMicroelectronics board</string>
-    <string name="missing_location_dialog_title">Location required</string>
-    <string name="missing_location_dialog_body_text">It\'s necessary to enable the Location for searching the boards</string>
+    <string name="missing_location_dialog_title" tools:ignore="ExtraTranslation">Location required</string>
+    <string name="missing_location_dialog_body_text" tools:ignore="ExtraTranslation">It\'s necessary to enable the Location for searching the boards</string>
 </resources>