Align with ST BLE Sensor V5.3.2

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

Author: PezzoniL

License.html

@@ -5,7 +5,7 @@ Application ST BLE Sensors
 
 ## Compilation
 
-Code compiled using gradle 9.3.1
+Code compiled using gradle 9.4.1
 
 set on Gradle properties the Github Login name and SSO authentication
 Example:

README.md

@@ -21,20 +21,23 @@ plugins {
     alias(libs.plugins.jaredsburrowsLicense)
 }
 
-apply {
-    from("st_dependencies.gradle")
-}
+apply(from = "st_dependencies.gradle")
 
 android {
     namespace = "com.st.bluems"
+    compileSdk {
+        version = release(stCompileSdk) {
+            minorApiLevel = 1
+        }
+    }
     compileSdk = stCompileSdk
 
     defaultConfig {
         applicationId = "com.st.bluems"
         minSdk = stMinSdk
         targetSdk = stTargetSdk
-        versionCode = 356
-        versionName = "5.3.0"
+        versionCode = 365
+        versionName = "5.3.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
@@ -48,10 +51,6 @@ android {
         )
     }
 
-    hilt {
-        enableAggregatingTask = true
-    }
-
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -75,14 +74,18 @@ android {
         viewBinding = true
     }
 
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
-        arg("room.generateKotlin", "true")
-    }
-
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
+hilt {
+    enableAggregatingTask = true
+}
+
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
+    arg("room.generateKotlin", "true")
+}
+
 licenseReport {
     // Generate reports
     generateCsvReport = false

app/build.gradle.kts

@@ -110,55 +110,6 @@ class MainActivity : AppCompatActivity() {
         val packageName = pInfo.packageName.split('.').last()
 
         val keySearched = "${packageName}_${versionName}"
-        Log.i("Firebase Remote Config", "keySearched : $keySearched")
-
-//        //Singleton
-//        val remoteConfig: FirebaseRemoteConfig = Firebase.remoteConfig
-//        val configSettings = remoteConfigSettings {
-//            minimumFetchIntervalInSeconds = 3600
-//        }
-//        remoteConfig.setConfigSettingsAsync(configSettings)
-//
-//        //Set the Default Values
-//        remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)
-//
-//        //Read the Default Value
-//        var boardCatalogStatus = remoteConfig.getString(keySearched)
-//        Log.d("boardCatalogStatus", "Default number=${boardCatalogStatus}")
-//
-//        remoteConfig.fetchAndActivate()
-//            .addOnCompleteListener(this) { task ->
-//                if (task.isSuccessful) {
-//                    val updated = task.result
-//                    Log.d("boardCatalogStatus", "Config params updated: $updated")
-//                    boardCatalogStatus = remoteConfig.getString(keySearched)
-//                    if (boardCatalogStatus.isNotEmpty()) {
-//                        viewModel.updateBoardCatalogStatus(boardCatalogStatus)
-//                    }
-//                } else {
-//                    Log.d("boardCatalogStatus", "Fetch failed")
-//                }
-//            }
-//
-//        remoteConfig.addOnConfigUpdateListener(object : ConfigUpdateListener {
-//            override fun onUpdate(configUpdate: ConfigUpdate) {
-//                Log.d(boardCatalogStatus, "Updated keys: " + configUpdate.updatedKeys)
-//
-//                if (configUpdate.updatedKeys.contains(keySearched)) {
-//                    remoteConfig.activate().addOnCompleteListener {
-//                        boardCatalogStatus = remoteConfig.getString(keySearched)
-//                        Log.d(boardCatalogStatus, "New number=$boardCatalogStatus")
-//                        if (boardCatalogStatus.isNotEmpty()) {
-//                            viewModel.updateBoardCatalogStatus(boardCatalogStatus)
-//                        }
-//                    }
-//                }
-//            }
-//
-//            override fun onError(error: FirebaseRemoteConfigException) {
-//                Log.w("boardCatalogStatus", "Config update error with code: " + error.code, error)
-//            }
-//        })
 
         //for using NFC deep Link node auto-connect
         val nfcIntent = intent
@@ -232,7 +183,6 @@ class MainActivity : AppCompatActivity() {
                         }
 
                         entry<BlueMSApplicationNavKey> {
-//                            AndroidFragment<HomeFragment>()
                             val homeViewModel: HomeViewModel = hiltViewModel()
                             HomeScreen(homeViewModel = homeViewModel, nfcViewModel = nfcViewModel)
                         }

app/src/main/assets/open_source_licenses.html

@@ -32,9 +32,13 @@ class MainViewModel @Inject constructor(
     val shouldShowProfile = preferences.hasSelectedProfile().not()
     val shouldShowTerms = preferences.hasAcceptedTerms().not()
 
-    fun initApplicationAnalytics(etnaApplication: ApplicationAnalyticsService.ApplicationNameEtna, application: Application, activity: Activity) {
+    fun initApplicationAnalytics(
+        etnaApplication: ApplicationAnalyticsService.ApplicationNameEtna,
+        application: Application,
+        activity: Activity
+    ) {
         appAnalyticsService.forEach {
-            it.createAnalytics(etnaApplication,application,activity)
+            it.createAnalytics(etnaApplication, application, activity)
         }
     }
 
@@ -48,10 +52,6 @@ class MainViewModel @Inject constructor(
         preferences.setTermsFlag(accepted = accepted)
     }
 
-    fun updateBoardCatalogStatus(boardCatalogStatus: String) {
-        preferences.setBoardCatalogStatus(boardCatalogStatus)
-    }
-
     fun welcomeShow() {
         preferences.setWelcomeFlag(completed = true)
     }

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

@@ -26,7 +26,6 @@ import androidx.compose.material.icons.filled.Sync
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -48,16 +47,13 @@ import com.st.ui.theme.Grey6
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
-import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.IntOffset
 import androidx.lifecycle.Lifecycle
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
-import com.st.blue_sdk.board_catalog.models.isDeprecated
-import com.st.blue_sdk.board_catalog.models.isDismissed
 import com.st.ui.composables.BlueMSPullToRefreshBox
 import com.st.ui.composables.ComposableLifecycle
-import com.st.ui.theme.PreviewBlueMSTheme
 import com.st.ui.theme.PrimaryBlue
 import com.st.ui.theme.SecondaryBlue
 import java.text.SimpleDateFormat
@@ -96,20 +92,8 @@ fun DeviceListScreenNavigation(
         mutableStateOf(false)
     }
 
-    var isBoardCatalogDeprecated by remember { mutableStateOf(false) }
-    var isBoardCatalogDismissed by remember { mutableStateOf(false) }
-
-    LaunchedEffect(key1 = Unit) {
-        val boardCatalogStatus = viewModel.boardCatalogStatus
-        if (boardCatalogStatus != null) {
-
-            isBoardCatalogDismissed = boardCatalogStatus.isDismissed()
-
-            if (isBoardCatalogDismissed.not()) {
-                isBoardCatalogDeprecated = boardCatalogStatus.isDeprecated()
-            }
-        }
-    }
+    var isApplicationDeprecated by remember { mutableStateOf(false) }
+    var isApplicationDismissed by remember { mutableStateOf(false) }
 
     ComposableLifecycle { _, event ->
         when (event) {
@@ -194,7 +178,7 @@ fun DeviceListScreenNavigation(
             val enableServer = if (isServerForced) {
                 true
             } else {
-                !( (node.boardType == Boards.Model.SENSOR_TILE_BOX ) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PRO) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PROB) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PROC))
+                !((node.boardType == Boards.Model.SENSOR_TILE_BOX) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PRO) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PROB) || (node.boardType == Boards.Model.SENSOR_TILE_BOX_PROC))
             }
 
             nfcViewModel.setNFCNodeId(null)
@@ -221,22 +205,6 @@ fun DeviceListScreenNavigation(
             }
         }
     )
-
-    if (isBoardCatalogDeprecated) {
-        CatalogStatusDeprecatedDismissedDialog(
-            title = "Deprecated Application Version",
-            body = "Please update your application.\nThis application version will be dismissed on ",
-            date = viewModel.boardCatalogStatus?.dismissionDate ?: Date(),
-            onDismissRequest = { isBoardCatalogDeprecated = false })
-    }
-
-    if (isBoardCatalogDismissed) {
-        CatalogStatusDeprecatedDismissedDialog(title = "Dismissed Application Version",
-            body = "Please update your application!.\n" +
-                    "This application version is dismissed from ",
-            date = viewModel.boardCatalogStatus?.dismissionDate ?: Date(),
-            onDismissRequest = { isBoardCatalogDismissed = false })
-    }
 }
 
 @OptIn(
@@ -698,58 +666,9 @@ fun DeviceList(
     }
 }
 
-@Composable
-fun CatalogStatusDeprecatedDismissedDialog(
-    modifier: Modifier = Modifier,
-    title: String,
-    body: String,
-    date: Date,
-    onDismissRequest: () -> Unit = { /** NOOP **/ }
-) {
-    AlertDialog(
-        modifier = modifier,
-        onDismissRequest = onDismissRequest,
-        title = {
-            Text(text = title)
-        },
-        text = {
-            val string = body + SimpleDateFormat("dd/MM/yyyy", Locale.getDefault()).format(date)
-            Text(
-                text = string
-            )
-        },
-        confirmButton = {
-            BlueMsButton(
-                text = stringResource(id = android.R.string.ok),
-                onClick = onDismissRequest
-            )
-        }
-    )
-}
-
-@Preview
-@Composable
-private fun CatalogStatusDeprecatedDismissedDialogDeprecatedPreview() {
-    PreviewBlueMSTheme {
-        CatalogStatusDeprecatedDismissedDialog(
-            title = "Deprecated Application Version",
-            body = "Please update your application.\nThis application version will be dismissed on ",
-            date = Date(),
-            onDismissRequest = { })
-    }
-}
 
-@Preview
-@Composable
-private fun CatalogStatusDeprecatedDismissedDialogDismissedPreview() {
-    PreviewBlueMSTheme {
-        CatalogStatusDeprecatedDismissedDialog(
-            title = "Dismissed Application Version",
-            body = "Please update your application!.\n" +
-                    "This application version is dismissed from ",
-            date = Date(),
-            onDismissRequest = { })
-    }
+fun Date.toDayMonthYearString(): String {
+    return SimpleDateFormat("dd/MM/yyyy", Locale.getDefault()).format(this)
 }
 
 private const val DEGREES = 360f

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

@@ -40,7 +40,9 @@ fun HomeScreenNavigation(
         rememberNavBackStack(HomeScreenNavKey)
 
     GlobalConfig.removeBackState = {
-        backState.removeLastOrNull()
+        if(backState.size>1) {
+            backState.removeLastOrNull()
+        }
     }
 
     BlueMSTheme {
@@ -51,7 +53,9 @@ fun HomeScreenNavigation(
                 ),
             backStack = backState,
             onBack = {
-                backState.removeLastOrNull()
+                if (backState.size > 1) {
+                    backState.removeLastOrNull()
+                }
             },
             entryDecorators = listOf(
                 rememberSaveableStateHolderNavEntryDecorator(),