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"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 11
|
versionCode = 12
|
||||||
versionName = "1.1.7"
|
versionName = "1.1.8"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -31,7 +31,9 @@ import androidx.compose.foundation.layout.width
|
|||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
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.DeleteOutline
|
||||||
import androidx.compose.material.icons.filled.Edit
|
import androidx.compose.material.icons.filled.Edit
|
||||||
import androidx.compose.material.icons.filled.PowerOff
|
import androidx.compose.material.icons.filled.PowerOff
|
||||||
@@ -119,6 +121,7 @@ fun DevicePage(
|
|||||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||||
var showDeleteConfirm by remember { mutableStateOf(false) }
|
var showDeleteConfirm by remember { mutableStateOf(false) }
|
||||||
var showEditDialog by remember { mutableStateOf(false) }
|
var showEditDialog by remember { mutableStateOf(false) }
|
||||||
|
var showMenu by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
if (showEditDialog) {
|
if (showEditDialog) {
|
||||||
var editName by remember { mutableStateOf(device.name) }
|
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(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||||
) {
|
) {
|
||||||
// Refresh button (syncs status & R2 endpoints)
|
// Refresh button (syncs status & R2 endpoints)
|
||||||
IconButton(
|
IconButton(
|
||||||
@@ -428,38 +431,62 @@ fun DevicePage(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Edit device button
|
// More Options Overflow (Edit / Delete)
|
||||||
IconButton(
|
Box {
|
||||||
onClick = { showEditDialog = true },
|
IconButton(
|
||||||
modifier = Modifier
|
onClick = { showMenu = true },
|
||||||
.size(34.dp)
|
modifier = Modifier
|
||||||
.clip(RoundedCornerShape(9.dp))
|
.size(34.dp)
|
||||||
.background(BorderSubtle.copy(alpha = 0.25f))
|
.clip(RoundedCornerShape(9.dp))
|
||||||
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||||
) {
|
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||||
Icon(
|
) {
|
||||||
imageVector = Icons.Default.Edit,
|
Icon(
|
||||||
contentDescription = "Edit device",
|
imageVector = Icons.Default.MoreVert,
|
||||||
tint = TextSecondary,
|
contentDescription = "Device options",
|
||||||
modifier = Modifier.size(16.dp)
|
tint = TextSecondary,
|
||||||
)
|
modifier = Modifier.size(18.dp)
|
||||||
}
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// Delete button
|
DropdownMenu(
|
||||||
IconButton(
|
expanded = showMenu,
|
||||||
onClick = { showDeleteConfirm = true },
|
onDismissRequest = { showMenu = false },
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(34.dp)
|
.background(BgElevated)
|
||||||
.clip(RoundedCornerShape(9.dp))
|
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
|
||||||
.background(RedVibrant.copy(alpha = 0.08f))
|
) {
|
||||||
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
|
DropdownMenuItem(
|
||||||
) {
|
text = { Text("Edit Device", color = TextPrimary) },
|
||||||
Icon(
|
leadingIcon = {
|
||||||
imageVector = Icons.Default.DeleteOutline,
|
Icon(
|
||||||
contentDescription = "Remove device",
|
Icons.Default.Edit,
|
||||||
tint = RedVibrant.copy(alpha = 0.8f),
|
contentDescription = null,
|
||||||
modifier = Modifier.size(17.dp)
|
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(
|
Scaffold(
|
||||||
modifier = modifier.fillMaxSize(),
|
modifier = modifier.fillMaxSize(),
|
||||||
containerColor = BgBase,
|
containerColor = BgBase,
|
||||||
@@ -341,52 +334,50 @@ fun MainScreen(
|
|||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = {
|
title = {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically
|
||||||
modifier = Modifier.padding(start = 2.dp)
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Terminal,
|
Icons.Default.Terminal,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
tint = GreenVibrant,
|
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(
|
||||||
text = "DEVICE TRIGGER",
|
text = "TRIGGER",
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
letterSpacing = 1.2.sp,
|
letterSpacing = 1.sp,
|
||||||
color = TextPrimary,
|
color = TextPrimary,
|
||||||
fontFamily = FontFamily.Monospace,
|
fontFamily = FontFamily.Monospace,
|
||||||
maxLines = 1
|
maxLines = 1
|
||||||
)
|
)
|
||||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(OnlineBg)
|
.background(OnlineBg)
|
||||||
.border(1.dp, OnlineBorder, CircleShape)
|
.border(1.dp, OnlineBorder, CircleShape)
|
||||||
.padding(horizontal = 6.dp, vertical = 2.dp)
|
.padding(horizontal = 5.dp, vertical = 1.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
"$onlineCount on",
|
"$onlineCount",
|
||||||
fontSize = 9.sp,
|
fontSize = 9.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
color = OnlineText,
|
color = OnlineText
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
// Update Button
|
// Update Button (only when update is ready)
|
||||||
if (availableUpdate != null) {
|
if (availableUpdate != null) {
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { showUpdateDialog = true },
|
onClick = { showUpdateDialog = true },
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Box(contentAlignment = Alignment.TopEnd) {
|
Box(contentAlignment = Alignment.TopEnd) {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -411,55 +402,39 @@ fun MainScreen(
|
|||||||
historyLogs = historyRepository.getLogs()
|
historyLogs = historyRepository.getLogs()
|
||||||
showHistoryDialog = true
|
showHistoryDialog = true
|
||||||
},
|
},
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.History,
|
Icons.Default.History,
|
||||||
contentDescription = "Trigger History",
|
contentDescription = "Trigger History",
|
||||||
tint = TextSecondary,
|
tint = TextSecondary,
|
||||||
modifier = Modifier.size(19.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings Button
|
// Settings Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { showSettingsDialog = true },
|
onClick = { showSettingsDialog = true },
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Settings,
|
Icons.Default.Settings,
|
||||||
contentDescription = "Settings",
|
contentDescription = "Settings",
|
||||||
tint = TextSecondary,
|
tint = TextSecondary,
|
||||||
modifier = Modifier.size(19.dp)
|
modifier = Modifier.size(18.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)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add Device Button
|
// Add Device Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(30.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Add,
|
Icons.Default.Add,
|
||||||
"Add Device",
|
"Add Device",
|
||||||
tint = GreenVibrant,
|
tint = GreenVibrant,
|
||||||
modifier = Modifier.size(20.dp)
|
modifier = Modifier.size(19.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user