Fix active scanner mode UI

Semper-Viventem · Jan 22, 2024 · 33e6ca2 · 33e6ca2
1 parent 5e31a9a
commit 33e6ca2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,8 +26,8 @@ android {
 
         // This version code will be applied only for F-Droid builds, for other builds version code will be generated by gradle dynamically
         // For some reason F-Droid requires version code to be hardcoded in the build.gradle file
-        versionCode = 1705859017
-        versionName = "0.22.3-beta"
+        versionCode = 1705859018
+        versionName = "0.22.4-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/f/cking/software/ui/devicelist/DeviceListScreen.kt b/app/src/main/java/f/cking/software/ui/devicelist/DeviceListScreen.kt
@@ -213,8 +213,8 @@ object DeviceListScreen {
     private fun ExpandIcon(viewModel: DeviceListViewModel) {
         val state = viewModel.activeScannerExpandedState
         val icon = when (state) {
-            DeviceListViewModel.ActiveScannerExpandedState.COLLAPSED -> painterResource(id = R.drawable.ic_show_less)
-            DeviceListViewModel.ActiveScannerExpandedState.EXPANDED -> painterResource(id = R.drawable.ic_show_more)
+            DeviceListViewModel.ActiveScannerExpandedState.COLLAPSED -> painterResource(id = R.drawable.ic_show_more)
+            DeviceListViewModel.ActiveScannerExpandedState.EXPANDED -> painterResource(id = R.drawable.ic_show_less)
         }
         IconButton(onClick = { viewModel.activeScannerExpandedState = state.next() }) {
             Icon(

diff --git a/app/src/main/java/f/cking/software/utils/graphic/ComposeFunctions.kt b/app/src/main/java/f/cking/software/utils/graphic/ComposeFunctions.kt
@@ -334,11 +334,7 @@ fun DeviceListItem(
                 )
             }
             Text(
-                text = stringResource(
-                    R.string.lifetime_data,
-                    device.firstDetectionPeriod(LocalContext.current),
-                    device.lastDetectionPeriod(LocalContext.current)
-                ),
+                text = updateStr,
                 fontWeight = FontWeight.Light,
             )
         }