dearsky/LBJ_Console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

feat: enhance MainActivity UI with edge-to-edge support and improved TopAppBar layout in HistoryScreen

Browse Source
This commit is contained in:
Nedifinita
2025-07-19 19:09:19 +08:00
parent 9389ef6e6a
commit a1a9a479f9
3 changed files with 84 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -12,8 +12,8 @@ android {
applicationId = "org.noxylva.lbjconsole"
minSdk = 29
targetSdk = 35
versionCode = 3
versionName = "0.0.3"
versionCode = 4
versionName = "0.0.4"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

108
app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt
View File

@@ -18,6 +18,8 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.ui.graphics.toArgb
import androidx.core.view.WindowCompat
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
@@ -27,6 +29,7 @@ import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.filled.LocationOn
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
@@ -219,6 +222,10 @@ class MainActivity : ComponentActivity() {
saveSettings()
enableEdgeToEdge()
WindowCompat.getInsetsController(window, window.decorView).apply {
isAppearanceLightStatusBars = false
}
setContent {
LBJReceiverTheme {
val scope = rememberCoroutineScope()
@@ -707,37 +714,83 @@ fun MainContent(
Scaffold(
topBar = {
TopAppBar(
title = { Text("LBJ Console") },
actions = {
timeSinceLastUpdate.value?.let { time ->
Text(
text = time,
modifier = Modifier.padding(end = 8.dp),
style = MaterialTheme.typography.bodySmall
)
}
Box(
modifier = Modifier
.size(10.dp)
.background(
color = statusColor,
shape = CircleShape
Box {
TopAppBar(
title = { Text("LBJ Console") },
actions = {
timeSinceLastUpdate.value?.let { time ->
Text(
text = time,
modifier = Modifier.padding(end = 8.dp),
style = MaterialTheme.typography.bodySmall
)
)
Spacer(modifier = Modifier.width(8.dp))
IconButton(onClick = onConnectClick) {
Icon(
imageVector = Icons.Default.Bluetooth,
contentDescription = "连接蓝牙设备"
}
Box(
modifier = Modifier
.size(10.dp)
.background(
color = statusColor,
shape = CircleShape
)
)
Spacer(modifier = Modifier.width(8.dp))
IconButton(onClick = onConnectClick) {
Icon(
imageVector = Icons.Default.Bluetooth,
contentDescription = "连接蓝牙设备"
)
}
}
)
if (historyEditMode && currentTab == 0) {
TopAppBar(
title = {
Text(
"已选择 ${historySelectedRecords.size} 条记录",
color = MaterialTheme.colorScheme.onPrimary
)
},
navigationIcon = {
IconButton(onClick = {
onHistoryStateChange(false, emptySet(), historyExpandedStates, historyScrollPosition, historyScrollOffset)
}) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = "取消",
tint = MaterialTheme.colorScheme.onPrimary
)
}
},
actions = {
IconButton(
onClick = {
if (historySelectedRecords.isNotEmpty()) {
val recordsToDelete = allRecords.filter {
historySelectedRecords.contains(it.timestamp.time.toString())
}
onDeleteRecords(recordsToDelete)
onHistoryStateChange(false, emptySet(), historyExpandedStates, historyScrollPosition, historyScrollOffset)
}
}
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = "删除所选记录",
tint = MaterialTheme.colorScheme.onPrimary
)
}
},
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.primary
)
)
}
)
}
},
bottomBar = {
NavigationBar {
@@ -777,7 +830,6 @@ fun MainContent(
temporaryStatusMessage = temporaryStatusMessage,
locoInfoUtil = locoInfoUtil,
onClearRecords = onClearRecords,
onRecordClick = onRecordClick,
onClearLog = onClearMonitorLog,
onDeleteRecords = onDeleteRecords,

61
app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt
View File

@@ -95,11 +95,6 @@ fun HistoryScreen(
records
}
fun exitEditMode() {
isInEditMode = false
selectedRecordsList.clear()
onStateChange(false, emptySet(), expandedStatesMap.toMap(), listState.firstVisibleItemIndex, listState.firstVisibleItemScrollOffset)
}
LaunchedEffect(isInEditMode, selectedRecordsList.size) {
val selectedIds = selectedRecordsList.map { it.timestamp.time.toString() }.toSet()
@@ -122,7 +117,8 @@ fun HistoryScreen(
LaunchedEffect(selectedRecordsList.size) {
if (selectedRecordsList.isEmpty() && isInEditMode) {
exitEditMode()
isInEditMode = false
onStateChange(false, emptySet(), expandedStatesMap.toMap(), listState.firstVisibleItemIndex, listState.firstVisibleItemScrollOffset)
}
}
@@ -545,57 +541,4 @@ fun HistoryScreen(
}
}
if (isInEditMode) {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.TopCenter
) {
Box(
modifier = Modifier
.fillMaxWidth()
.height(56.dp)
.background(MaterialTheme.colorScheme.primary)
) {
Row(
modifier = Modifier
.fillMaxSize()
.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
IconButton(onClick = { exitEditMode() }) {
Icon(
imageVector = Icons.Default.Close,
contentDescription = "取消",
tint = MaterialTheme.colorScheme.onPrimary
)
}
Text(
"已选择 ${selectedRecordsList.size} 条记录",
color = MaterialTheme.colorScheme.onPrimary
)
}
IconButton(
onClick = {
if (selectedRecordsList.isNotEmpty()) {
onDeleteRecords(selectedRecordsList.toList())
exitEditMode()
}
}
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = "删除所选记录",
tint = MaterialTheme.colorScheme.onPrimary
)
}
}
}
}
}
}