Fix issue with refreshing mib catalog element name and display descri…

…ption - if available
emschu · Dec 27, 2023 · 8fb2c4c · 8fb2c4c
1 parent 02cdfeb
commit 8fb2c4c
Showing 1 changed file with 43 additions and 8 deletions.
diff --git a/app/src/main/java/org/emschu/snmp/cockpit/ui/components/BottomSheet.kt b/app/src/main/java/org/emschu/snmp/cockpit/ui/components/BottomSheet.kt
@@ -22,14 +22,37 @@ import android.content.Context
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.*
-import androidx.compose.runtime.*
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Card
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ModalBottomSheetState
+import androidx.compose.material.ModalBottomSheetValue
+import androidx.compose.material.Text
+import androidx.compose.material.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -108,7 +131,7 @@ fun BottomSheetContent(
                             modifier = Modifier.padding(4.dp),
                         )
                     }
-                    val name: String = remember {
+                    val name: String = remember(oidQuery.value) {
                         OIDCatalog.getAsnByOid(oidQuery.value) ?: oidQuery.value
                     }
                     Row {
@@ -118,6 +141,18 @@ fun BottomSheetContent(
                         )
                         Text(name)
                     }
+                    val description: String = remember(oidQuery.value) {
+                        OIDCatalog.getSysDescrByOid(oidQuery.value) ?: oidQuery.value
+                    }
+                    if (description != oidQuery.value) {
+                        Row {
+                            Text(
+                                "Description:", fontWeight = FontWeight.Bold,
+                                modifier = Modifier.padding(end = 2.dp)
+                            )
+                            Text(description)
+                        }
+                    }
                     val deviceList = SnmpCockpitApp.deviceManager.deviceConnectionList
                     Row(modifier = Modifier.padding(vertical = 4.dp)) {
                         if (deviceList.isEmpty()) {
@@ -240,13 +275,13 @@ private fun BottomSheetViewPreviewLight() {
 private fun ConnectionSelectorLight() {
     val deviceConnectionLists = listOf(
         DeviceConnection(DeviceConfiguration(DeviceConfiguration.SNMP_VERSION.v1),
-                         remember { mutableStateOf(SystemQuery()) }),
+            remember { mutableStateOf(SystemQuery()) }),
         DeviceConnection(DeviceConfiguration(DeviceConfiguration.SNMP_VERSION.v1),
-                         remember { mutableStateOf(SystemQuery()) }),
+            remember { mutableStateOf(SystemQuery()) }),
         DeviceConnection(DeviceConfiguration(DeviceConfiguration.SNMP_VERSION.v1),
-                         remember { mutableStateOf(SystemQuery()) }),
+            remember { mutableStateOf(SystemQuery()) }),
         DeviceConnection(DeviceConfiguration(DeviceConfiguration.SNMP_VERSION.v1),
-                         remember { mutableStateOf(SystemQuery()) }),
+            remember { mutableStateOf(SystemQuery()) }),
     )
 
     CockpitTheme(darkTheme = false) {