fix(ui): eliminate button overlapping with overflow menu & clean top bar (v1.1.8)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
This commit is contained in:
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 11
|
||||
versionName = "1.1.7"
|
||||
versionCode = 12
|
||||
versionName = "1.1.8"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -31,7 +31,9 @@ import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.CloudSync
|
||||
import androidx.compose.material.icons.filled.MoreVert
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material.icons.filled.DeleteOutline
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material.icons.filled.PowerOff
|
||||
@@ -119,6 +121,7 @@ fun DevicePage(
|
||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||
var showDeleteConfirm by remember { mutableStateOf(false) }
|
||||
var showEditDialog by remember { mutableStateOf(false) }
|
||||
var showMenu by remember { mutableStateOf(false) }
|
||||
|
||||
if (showEditDialog) {
|
||||
var editName by remember { mutableStateOf(device.name) }
|
||||
@@ -391,10 +394,10 @@ fun DevicePage(
|
||||
)
|
||||
}
|
||||
|
||||
// Compact, non-overlapping button bar
|
||||
// Compact, non-overlapping actions: Single Refresh + Overflow Menu
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
// Refresh button (syncs status & R2 endpoints)
|
||||
IconButton(
|
||||
@@ -428,38 +431,62 @@ fun DevicePage(
|
||||
)
|
||||
}
|
||||
|
||||
// Edit device button
|
||||
IconButton(
|
||||
onClick = { showEditDialog = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Edit,
|
||||
contentDescription = "Edit device",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
}
|
||||
// More Options Overflow (Edit / Delete)
|
||||
Box {
|
||||
IconButton(
|
||||
onClick = { showMenu = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.MoreVert,
|
||||
contentDescription = "Device options",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Delete button
|
||||
IconButton(
|
||||
onClick = { showDeleteConfirm = true },
|
||||
modifier = Modifier
|
||||
.size(34.dp)
|
||||
.clip(RoundedCornerShape(9.dp))
|
||||
.background(RedVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.DeleteOutline,
|
||||
contentDescription = "Remove device",
|
||||
tint = RedVibrant.copy(alpha = 0.8f),
|
||||
modifier = Modifier.size(17.dp)
|
||||
)
|
||||
DropdownMenu(
|
||||
expanded = showMenu,
|
||||
onDismissRequest = { showMenu = false },
|
||||
modifier = Modifier
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
|
||||
) {
|
||||
DropdownMenuItem(
|
||||
text = { Text("Edit Device", color = TextPrimary) },
|
||||
leadingIcon = {
|
||||
Icon(
|
||||
Icons.Default.Edit,
|
||||
contentDescription = null,
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
},
|
||||
onClick = {
|
||||
showMenu = false
|
||||
showEditDialog = true
|
||||
}
|
||||
)
|
||||
DropdownMenuItem(
|
||||
text = { Text("Remove Device", color = RedVibrant) },
|
||||
leadingIcon = {
|
||||
Icon(
|
||||
Icons.Default.DeleteOutline,
|
||||
contentDescription = null,
|
||||
tint = RedVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
},
|
||||
onClick = {
|
||||
showMenu = false
|
||||
showDeleteConfirm = true
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -327,13 +327,6 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
// Spin animation for sync button
|
||||
val rotationAngle by animateFloatAsState(
|
||||
targetValue = if (isSyncing) 360f else 0f,
|
||||
animationSpec = if (isSyncing) tween(900, easing = FastOutSlowInEasing) else tween(0),
|
||||
label = "sync_rotate"
|
||||
)
|
||||
|
||||
Scaffold(
|
||||
modifier = modifier.fillMaxSize(),
|
||||
containerColor = BgBase,
|
||||
@@ -341,52 +334,50 @@ fun MainScreen(
|
||||
TopAppBar(
|
||||
title = {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.padding(start = 2.dp)
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Text(
|
||||
text = "DEVICE TRIGGER",
|
||||
text = "TRIGGER",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
letterSpacing = 1.2.sp,
|
||||
letterSpacing = 1.sp,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
maxLines = 1
|
||||
)
|
||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.background(OnlineBg)
|
||||
.border(1.dp, OnlineBorder, CircleShape)
|
||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||
.padding(horizontal = 5.dp, vertical = 1.dp)
|
||||
) {
|
||||
Text(
|
||||
"$onlineCount on",
|
||||
"$onlineCount",
|
||||
fontSize = 9.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = OnlineText,
|
||||
letterSpacing = 0.5.sp
|
||||
color = OnlineText
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
actions = {
|
||||
// Update Button
|
||||
// Update Button (only when update is ready)
|
||||
if (availableUpdate != null) {
|
||||
IconButton(
|
||||
onClick = { showUpdateDialog = true },
|
||||
modifier = Modifier.size(32.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Box(contentAlignment = Alignment.TopEnd) {
|
||||
Icon(
|
||||
@@ -411,55 +402,39 @@ fun MainScreen(
|
||||
historyLogs = historyRepository.getLogs()
|
||||
showHistoryDialog = true
|
||||
},
|
||||
modifier = Modifier.size(32.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.History,
|
||||
contentDescription = "Trigger History",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(19.dp)
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Settings Button
|
||||
IconButton(
|
||||
onClick = { showSettingsDialog = true },
|
||||
modifier = Modifier.size(32.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Settings,
|
||||
contentDescription = "Settings",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(19.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Unified Refresh / Sync Button
|
||||
IconButton(
|
||||
onClick = { refreshWholePage() },
|
||||
enabled = !isSyncing && !isPullRefreshing,
|
||||
modifier = Modifier.size(32.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Refresh,
|
||||
"Refresh all",
|
||||
tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
|
||||
modifier = Modifier
|
||||
.size(19.dp)
|
||||
.rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f)
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Add Device Button
|
||||
IconButton(
|
||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
||||
modifier = Modifier.size(32.dp)
|
||||
modifier = Modifier.size(30.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Add,
|
||||
"Add Device",
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(20.dp)
|
||||
modifier = Modifier.size(19.dp)
|
||||
)
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user