perf(alarm): conditionnal rendering and style

- add boolean to activate the alarm - add width to alarm border
MyWatcher · Apr 1, 2024 · d3e7df6 · d3e7df6
1 parent de91933
commit d3e7df6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app/src/main/java/com/eipsaferoad/owl/MainActivity.kt b/app/src/main/java/com/eipsaferoad/owl/MainActivity.kt
@@ -61,6 +61,7 @@ class MainActivity : ComponentActivity(),
     CapabilityClient.OnCapabilityChangedListener {
 
     private var bpm: MutableState<String> = mutableStateOf("0")
+    private var isAlarmActivated: MutableState<Boolean> = mutableStateOf(true)
     private var accessToken: MutableState<String?> = mutableStateOf(null)
     private var url: MutableState<String> = mutableStateOf("")
     private var activityContext: Context? = null
@@ -88,7 +89,7 @@ class MainActivity : ComponentActivity(),
         setTheme(android.R.style.Theme_DeviceDefault)
         url.value = ReadEnvVar.readEnvVar(this, ReadEnvVar.EnvVar.API_URL)
         setContent {
-            WearApp(this, bpm, url.value) { token -> accessToken.value = token }
+            WearApp(this, bpm, isAlarmActivated, url.value) { token -> accessToken.value = token }
         }
     }
 
@@ -203,7 +204,7 @@ fun login(apiUrl: String, email: String, password: String, navController: NavHos
 }
 
 @Composable
-fun WearApp(context: Context, currentHeartRate: MutableState<String>, apiUrl: String, setAccessToken: (token: String) -> Unit) {
+fun WearApp(context: Context, currentHeartRate: MutableState<String>, isAlarmActivated: MutableState<Boolean>, apiUrl: String, setAccessToken: (token: String) -> Unit) {
     val navController = rememberSwipeDismissableNavController()
     val email = LocalStorage.getData(context, "email");
     val password = LocalStorage.getData(context, "password");
@@ -224,7 +225,7 @@ fun WearApp(context: Context, currentHeartRate: MutableState<String>, apiUrl: St
                     contentAlignment = Alignment.Center
                 ) {
                     TimeText()
-                    Home(currentHeartRate, context, navController)
+                    Home(currentHeartRate, context, navController, isAlarmActivated.value)
                 }
             }
             composable(PagesEnum.LOGIN.value) {
@@ -267,5 +268,7 @@ fun WearApp(context: Context, currentHeartRate: MutableState<String>, apiUrl: St
 @Preview(device = Devices.WEAR_OS_SMALL_ROUND, showSystemUi = true)
 @Composable
 fun DefaultPreview() {
-    /*WearApp(LocalContext.current , "42", "", {})*/
+    var bpm: MutableState<String> = mutableStateOf("0")
+    var isAlarmActivated: MutableState<Boolean> = mutableStateOf(true)
+    WearApp(LocalContext.current , bpm, isAlarmActivated, "", {})
 }
diff --git a/app/src/main/java/com/eipsaferoad/owl/presentation/home/Home.kt b/app/src/main/java/com/eipsaferoad/owl/presentation/home/Home.kt
@@ -53,11 +53,10 @@ import com.eipsaferoad.owl.presentation.theme.OwlTheme
 import com.eipsaferoad.owl.utils.LocalStorage
 
 @Composable
-fun Home(currentHeartRate: MutableState<String>, context: Context, navController: NavHostController) {
-    if (currentHeartRate.value.toInt() < 50 && currentHeartRate.value.toInt() != 0) {
+fun Home(currentHeartRate: MutableState<String>, context: Context, navController: NavHostController, isAlarmActivated: Boolean) {
+    if (isAlarmActivated && currentHeartRate.value.toInt() < 50 && currentHeartRate.value.toInt() != 0) {
         Alarm(currentHeartRate)
     } else {
-        /*Alarm(currentHeartRate)*/
         NoAlarm(currentHeartRate.value, context, navController)
     }
 }
@@ -173,7 +172,7 @@ fun MultiColorBorderCircularColumn(
             modifier = Modifier
                 .fillMaxSize()
                 .border(
-                    width = 5.dp,
+                    width = 7.dp,
                     brush = borderBrushMultiColor(borderColors),
                     shape = CircleShape
                 )
@@ -272,7 +271,7 @@ fun PreviewHome() {
     val bpm: MutableState<String> = mutableStateOf("0")
     val navController = rememberSwipeDismissableNavController()
     OwlTheme {
-            Home(bpm, LocalContext.current,  navController)
+            Home(bpm, LocalContext.current,  navController, true)
     }
 }