feat: glassmorphism UI redesign, refresh button, button dimming, uptime/last-seen bar, clean error messages

This commit is contained in:
Vaishno Singh
2026-11-18 17:43:40 +05:30
parent efa200c5fe
commit 583f421d7f
12 changed files with 1147 additions and 687 deletions
+1
View File
@@ -64,6 +64,7 @@ dependencies {
implementation("androidx.compose.ui:ui-tooling-preview") implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3") implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material:material-icons-extended") implementation("androidx.compose.material:material-icons-extended")
implementation("androidx.compose.material:material")
implementation("androidx.compose.foundation:foundation") implementation("androidx.compose.foundation:foundation")
// Networking & Serialization // Networking & Serialization
@@ -22,6 +22,22 @@ class TriggerClient(
) { ) {
private val jsonMediaType = "application/json; charset=utf-8".toMediaType() private val jsonMediaType = "application/json; charset=utf-8".toMediaType()
private val mainHandler = try {
val looper = android.os.Looper.getMainLooper()
if (looper != null) android.os.Handler(looper) else null
} catch (e: Throwable) {
null
}
private fun runOnMain(block: () -> Unit) {
val handler = mainHandler
if (handler != null) {
handler.post(block)
} else {
block()
}
}
fun buildRequest(device: DeviceConfig, action: TriggerAction): Request { fun buildRequest(device: DeviceConfig, action: TriggerAction): Request {
return when (action) { return when (action) {
TriggerAction.POWER_ON -> { TriggerAction.POWER_ON -> {
@@ -61,38 +77,44 @@ class TriggerClient(
val request = try { val request = try {
buildRequest(device, action) buildRequest(device, action)
} catch (e: Exception) { } catch (e: Exception) {
callback( runOnMain {
TriggerResponse( callback(
isSuccess = false, TriggerResponse(
statusCode = -1, isSuccess = false,
message = "Invalid URL or configuration: ${e.message}" statusCode = -1,
message = "Invalid URL or configuration: ${e.message}"
)
) )
) }
return return
} }
client.newCall(request).enqueue(object : Callback { client.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
callback( runOnMain {
TriggerResponse( callback(
isSuccess = false, TriggerResponse(
statusCode = -1, isSuccess = false,
message = e.localizedMessage ?: "Network connection failed" statusCode = -1,
message = e.localizedMessage ?: "Network connection failed"
)
) )
) }
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
response.use { response.use {
val code = it.code val code = it.code
val bodyText = it.body?.string().orEmpty() val bodyText = it.body?.string().orEmpty()
callback( runOnMain {
TriggerResponse( callback(
isSuccess = it.isSuccessful, TriggerResponse(
statusCode = code, isSuccess = it.isSuccessful,
message = if (bodyText.isNotEmpty()) bodyText else "HTTP $code" statusCode = code,
message = if (bodyText.isNotEmpty()) bodyText else "HTTP $code"
)
) )
) }
} }
} }
}) })
@@ -105,24 +127,26 @@ class TriggerClient(
val request = try { val request = try {
Request.Builder().url(url).get().build() Request.Builder().url(url).get().build()
} catch (e: Exception) { } catch (e: Exception) {
callback(Result.failure(e)) runOnMain { callback(Result.failure(e)) }
return return
} }
client.newCall(request).enqueue(object : Callback { client.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
callback(Result.failure(e)) runOnMain { callback(Result.failure(e)) }
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
response.use { response.use {
if (!it.isSuccessful) { if (!it.isSuccessful) {
callback(Result.failure(IOException("Failed to fetch R2 JSON: HTTP ${it.code}"))) runOnMain {
callback(Result.failure(IOException("Failed to fetch R2 JSON: HTTP ${it.code}")))
}
return return
} }
val jsonString = it.body?.string().orEmpty() val jsonString = it.body?.string().orEmpty()
val parseResult = R2ConfigParser.parse(jsonString) val parseResult = R2ConfigParser.parse(jsonString)
callback(parseResult) runOnMain { callback(parseResult) }
} }
} }
}) })
@@ -132,40 +156,34 @@ class TriggerClient(
device: DeviceConfig, device: DeviceConfig,
callback: (NodeStatus) -> Unit callback: (NodeStatus) -> Unit
) { ) {
val baseStatusUrl = if (device.statusUrl.isNotBlank()) { // Only use statusUrl from JSON config — no hardcoded fallback
device.statusUrl val baseStatusUrl = device.statusUrl.trim()
} else {
"https://cosmos.linuxguy.space/status?node=${device.node}"
}
val targetUrl = if (!baseStatusUrl.contains("node=") && device.node.isNotBlank()) { if (baseStatusUrl.isBlank()) {
if (baseStatusUrl.contains("?")) { runOnMain {
"$baseStatusUrl&node=${device.node}" callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
} else {
"$baseStatusUrl?node=${device.node}"
} }
} else { return
baseStatusUrl
} }
val request = try { val request = try {
Request.Builder().url(targetUrl).get().build() Request.Builder().url(baseStatusUrl).get().build()
} catch (e: Exception) { } catch (e: Exception) {
callback(NodeStatus(isOnline = false, statusText = "INVALID URL")) runOnMain {
callback(NodeStatus(isOnline = false, statusText = "INVALID URL"))
}
return return
} }
client.newCall(request).enqueue(object : Callback { client.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
callback(NodeStatus(isOnline = false, statusText = "OFFLINE")) runOnMain {
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
}
} }
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
response.use { response.use {
if (!it.isSuccessful) {
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
return
}
val body = it.body?.string().orEmpty().trim() val body = it.body?.string().orEmpty().trim()
if (body.startsWith("{")) { if (body.startsWith("{")) {
try { try {
@@ -177,14 +195,49 @@ class TriggerClient(
json.get("status").asString.equals("online", ignoreCase = true) json.get("status").asString.equals("online", ignoreCase = true)
else -> false else -> false
} }
val ip = if (json.has("ip") && json.get("ip").isJsonPrimitive) json.get("ip").asString else null val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
callback(NodeStatus(isOnline = online, statusText = if (online) "ONLINE" else "OFFLINE", ip = ip)) val uptime = when {
json.has("uptime") && !json.get("uptime").isJsonNull -> json.get("uptime").asString
json.has("on_since_duration") && !json.get("on_since_duration").isJsonNull -> json.get("on_since_duration").asString
else -> null
}
val onSinceIst = if (json.has("on_since_ist") && !json.get("on_since_ist").isJsonNull) {
json.get("on_since_ist").asString
} else null
val lastActiveAgo = if (json.has("last_active_ago") && !json.get("last_active_ago").isJsonNull) {
json.get("last_active_ago").asString
} else null
val lastActiveIst = if (json.has("last_active_ist") && !json.get("last_active_ist").isJsonNull) {
json.get("last_active_ist").asString
} else null
runOnMain {
callback(
NodeStatus(
isOnline = online,
statusText = if (online) "ONLINE" else "OFFLINE",
ip = ip,
uptime = uptime,
onSinceIst = onSinceIst,
lastActiveAgo = lastActiveAgo,
lastActiveIst = lastActiveIst
)
)
}
} catch (e: Exception) { } catch (e: Exception) {
callback(NodeStatus(isOnline = false, statusText = "ERROR")) runOnMain {
callback(NodeStatus(isOnline = false, statusText = "ERROR"))
}
}
} else if (it.isSuccessful) {
val isOnline = body.equals("ONLINE", ignoreCase = true)
runOnMain {
callback(NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE"))
} }
} else { } else {
val isOnline = body.equals("ONLINE", ignoreCase = true) runOnMain {
callback(NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE")) callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
}
} }
} }
} }
@@ -16,5 +16,9 @@ data class NodeStatus(
val isOnline: Boolean, val isOnline: Boolean,
val statusText: String, val statusText: String,
val ip: String? = null, val ip: String? = null,
val uptime: String? = null,
val onSinceIst: String? = null,
val lastActiveAgo: String? = null,
val lastActiveIst: String? = null,
val timestamp: Long = System.currentTimeMillis() val timestamp: Long = System.currentTimeMillis()
) )
@@ -1,15 +1,51 @@
package com.expapp.trigger.ui.components package com.expapp.trigger.ui.components
import androidx.compose.material3.AlertDialog import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
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.size
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.PowerOff
import androidx.compose.material.icons.filled.PowerSettingsNew
import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog
import com.expapp.trigger.network.TriggerAction import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.ui.theme.PowerOffRed import com.expapp.trigger.ui.theme.AmberBorder
import com.expapp.trigger.ui.theme.RebootAmber import com.expapp.trigger.ui.theme.AmberVibrant
import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.BorderDefault
import com.expapp.trigger.ui.theme.GreenVibrant
import com.expapp.trigger.ui.theme.RedBorder
import com.expapp.trigger.ui.theme.RedVibrant
import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary
@Composable @Composable
fun ActionConfirmDialog( fun ActionConfirmDialog(
@@ -18,36 +54,127 @@ fun ActionConfirmDialog(
onConfirm: () -> Unit, onConfirm: () -> Unit,
onDismiss: () -> Unit onDismiss: () -> Unit
) { ) {
val actionName = when (action) { val (actionName, actionIcon, accentColor, bgGradient, description) = when (action) {
TriggerAction.POWER_ON -> "Power On" TriggerAction.POWER_ON -> Quintuple(
TriggerAction.POWER_OFF -> "Power Off" "Power On", Icons.Default.PowerSettingsNew, GreenVibrant,
TriggerAction.REBOOT -> "Reboot" listOf(Color(0xFF071A0F), Color(0xFF0C1118)),
"This will send a wake signal to boot the remote machine."
)
TriggerAction.POWER_OFF -> Quintuple(
"Power Off", Icons.Default.PowerOff, RedVibrant,
listOf(Color(0xFF1A0007), Color(0xFF0C1118)),
"This will shut down the remote machine. All running processes will stop."
)
TriggerAction.REBOOT -> Quintuple(
"Reboot", Icons.Default.RestartAlt, AmberVibrant,
listOf(Color(0xFF191000), Color(0xFF0C1118)),
"This will gracefully restart the remote machine."
)
} }
val confirmButtonColor = when (action) { Dialog(onDismissRequest = onDismiss) {
TriggerAction.POWER_OFF -> PowerOffRed Box(
TriggerAction.REBOOT -> RebootAmber modifier = Modifier
TriggerAction.POWER_ON -> Color(0xFF2E7D32) .clip(RoundedCornerShape(24.dp))
} .background(
brush = Brush.verticalGradient(bgGradient)
)
.border(1.dp, accentColor.copy(alpha = 0.25f), RoundedCornerShape(24.dp))
.padding(28.dp)
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
// Icon circle
Box(
modifier = Modifier
.size(64.dp)
.background(
brush = Brush.radialGradient(
listOf(accentColor.copy(alpha = 0.2f), Color.Transparent)
),
shape = CircleShape
)
.border(1.dp, accentColor.copy(alpha = 0.4f), CircleShape),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = actionIcon,
contentDescription = actionName,
tint = accentColor,
modifier = Modifier.size(30.dp)
)
}
AlertDialog( Spacer(modifier = Modifier.height(20.dp))
onDismissRequest = onDismiss,
title = { Text(text = "Confirm $actionName") }, Text(
text = { text = "Confirm $actionName",
Text(text = "Are you sure you want to send $actionName to \"$deviceName\"?") fontSize = 20.sp,
}, fontWeight = FontWeight.Bold,
confirmButton = { color = TextPrimary
Button( )
onClick = onConfirm,
colors = ButtonDefaults.buttonColors(containerColor = confirmButtonColor) Spacer(modifier = Modifier.height(8.dp))
) {
Text(text = actionName, color = Color.White) Text(
} text = deviceName,
}, fontSize = 13.sp,
dismissButton = { color = accentColor,
TextButton(onClick = onDismiss) { fontWeight = FontWeight.SemiBold
Text(text = "Cancel") )
Spacer(modifier = Modifier.height(14.dp))
Text(
text = description,
fontSize = 13.sp,
color = TextSecondary,
lineHeight = 20.sp
)
Spacer(modifier = Modifier.height(28.dp))
// Buttons row
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
TextButton(
onClick = onDismiss,
modifier = Modifier
.weight(1f)
.clip(RoundedCornerShape(14.dp))
.background(BgElevated)
.border(1.dp, BorderDefault, RoundedCornerShape(14.dp))
) {
Text("Cancel", color = TextSecondary, fontWeight = FontWeight.Medium)
}
Button(
onClick = onConfirm,
modifier = Modifier.weight(1f),
shape = RoundedCornerShape(14.dp),
colors = ButtonDefaults.buttonColors(
containerColor = accentColor.copy(alpha = 0.15f),
contentColor = accentColor
)
) {
Text(
actionName,
fontWeight = FontWeight.Bold,
fontSize = 14.sp
)
}
}
} }
} }
) }
} }
// Helper data class
private data class Quintuple<A, B, C, D, E>(val a: A, val b: B, val c: C, val d: D, val e: E)
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component1() = a
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component2() = b
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component3() = c
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component4() = d
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component5() = e
@@ -1,10 +1,18 @@
package com.expapp.trigger.ui.components package com.expapp.trigger.ui.components
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.RepeatMode
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -22,10 +30,12 @@ import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.scale
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@@ -45,35 +55,73 @@ fun HugeActionButton(
enabled: Boolean = true, enabled: Boolean = true,
onClick: () -> Unit onClick: () -> Unit
) { ) {
val shape = RoundedCornerShape(24.dp)
val interactionSource = remember { MutableInteractionSource() } val interactionSource = remember { MutableInteractionSource() }
val isPressed by interactionSource.collectIsPressedAsState()
val scale by animateFloatAsState(
targetValue = if (isPressed && enabled) 0.97f else 1f,
animationSpec = tween(100, easing = FastOutSlowInEasing),
label = "button_scale"
)
val borderAlpha by animateFloatAsState(
targetValue = if (enabled) 1f else 0.25f,
animationSpec = tween(300),
label = "border_alpha"
)
val contentAlpha = if (enabled) 1f else 0.35f
val shape = RoundedCornerShape(20.dp)
// Pulsing glow when enabled
val infiniteTransition = rememberInfiniteTransition(label = "glow")
val glowAlpha by infiniteTransition.animateFloat(
initialValue = 0.3f,
targetValue = 0.65f,
animationSpec = infiniteRepeatable(
animation = tween(2000, easing = FastOutSlowInEasing),
repeatMode = RepeatMode.Reverse
),
label = "glow_alpha"
)
val shadowColor = borderColor.copy(alpha = if (enabled && !isLoading) glowAlpha * 0.5f else 0f)
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(115.dp) .scale(scale)
.shadow(if (enabled) 8.dp else 0.dp, shape = shape, spotColor = borderColor.copy(alpha = 0.5f)) .shadow(
elevation = if (enabled) 16.dp else 0.dp,
shape = shape,
spotColor = shadowColor,
ambientColor = shadowColor
)
.clip(shape) .clip(shape)
.background( .background(
brush = Brush.horizontalGradient( brush = Brush.linearGradient(
if (enabled) gradientColors else gradientColors.map { it.copy(alpha = 0.35f) } if (enabled) gradientColors
else gradientColors.map { it.copy(alpha = 0.2f) }
) )
) )
.border( .border(
width = 1.5.dp, width = 1.dp,
brush = Brush.horizontalGradient( brush = Brush.linearGradient(
if (enabled) listOf(borderColor.copy(alpha = 0.8f), borderColor.copy(alpha = 0.3f)) listOf(
else listOf(Color.Transparent, Color.Transparent) borderColor.copy(alpha = borderAlpha * 0.8f),
borderColor.copy(alpha = borderAlpha * 0.2f),
borderColor.copy(alpha = borderAlpha * 0.5f),
)
), ),
shape = shape shape = shape
) )
.clickable( .clickable(
interactionSource = interactionSource, interactionSource = interactionSource,
indication = rememberRipple(color = Color.White.copy(alpha = 0.3f)), indication = rememberRipple(color = borderColor.copy(alpha = 0.4f)),
enabled = enabled && !isLoading, enabled = enabled && !isLoading,
onClick = onClick onClick = onClick
) )
.padding(horizontal = 22.dp, vertical = 18.dp) .padding(horizontal = 24.dp, vertical = 20.dp)
) { ) {
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -84,18 +132,31 @@ fun HugeActionButton(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.weight(1f) modifier = Modifier.weight(1f)
) { ) {
// Icon circle with glow
Box( Box(
modifier = Modifier modifier = Modifier
.size(54.dp) .size(52.dp)
.clip(CircleShape) .background(
.background(Color.White.copy(alpha = if (enabled) 0.15f else 0.07f)), brush = Brush.radialGradient(
listOf(
borderColor.copy(alpha = if (enabled) 0.25f else 0.08f),
Color.Transparent
)
),
shape = CircleShape
)
.border(
1.dp,
borderColor.copy(alpha = if (enabled) 0.4f else 0.1f),
CircleShape
),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Icon( Icon(
imageVector = icon, imageVector = icon,
contentDescription = text, contentDescription = text,
tint = if (enabled) Color.White else Color.White.copy(alpha = 0.5f), tint = borderColor.copy(alpha = contentAlpha),
modifier = Modifier.size(32.dp) modifier = Modifier.size(26.dp)
) )
} }
@@ -104,26 +165,35 @@ fun HugeActionButton(
Column { Column {
Text( Text(
text = text, text = text,
fontSize = 22.sp, fontSize = 18.sp,
fontWeight = FontWeight.ExtraBold, fontWeight = FontWeight.Bold,
color = if (enabled) Color.White else Color.White.copy(alpha = 0.5f), color = Color.White.copy(alpha = contentAlpha),
letterSpacing = 1.sp letterSpacing = 0.5.sp
) )
Spacer(modifier = Modifier.height(3.dp)) Spacer(modifier = Modifier.height(3.dp))
Text( Text(
text = subtext, text = subtext,
fontSize = 13.sp, fontSize = 12.sp,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Normal,
color = if (enabled) Color.White.copy(alpha = 0.85f) else Color.White.copy(alpha = 0.4f) color = Color.White.copy(alpha = contentAlpha * 0.6f)
) )
} }
} }
AnimatedVisibility(visible = isLoading) { if (isLoading) {
CircularProgressIndicator( CircularProgressIndicator(
modifier = Modifier.size(28.dp), modifier = Modifier.size(24.dp),
color = Color.White, color = borderColor,
strokeWidth = 3.dp strokeWidth = 2.5.dp,
trackColor = borderColor.copy(alpha = 0.2f)
)
} else if (enabled) {
// Chevron
Text(
text = "›",
fontSize = 28.sp,
color = borderColor.copy(alpha = 0.5f),
fontWeight = FontWeight.Light
) )
} }
} }
@@ -1,25 +1,30 @@
package com.expapp.trigger.ui.components package com.expapp.trigger.ui.components
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
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.CheckCircle import androidx.compose.material.icons.filled.CheckCircle
import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Error import androidx.compose.material.icons.filled.ErrorOutline
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@@ -32,43 +37,46 @@ fun StatusBanner(
onDismiss: () -> Unit, onDismiss: () -> Unit,
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
AnimatedVisibility(visible = !status.isNullOrBlank()) { AnimatedVisibility(
visible = !status.isNullOrBlank(),
enter = slideInVertically(initialOffsetY = { -it }) + fadeIn(),
exit = slideOutVertically(targetOffsetY = { -it }) + fadeOut()
) {
val success = isSuccess == true val success = isSuccess == true
val bgColor = if (success) Color(0xFF1B3B22) else Color(0xFF3E1A1A) val bgColor = if (success) Color(0xFF071A0F) else Color(0xFF190004)
val borderColor = if (success) Color(0xFF4CAF50) else Color(0xFFE53935) val border = if (success) Color(0xFF0E3B1E) else Color(0xFF3D0010)
val iconColor = if (success) Color(0xFF81C784) else Color(0xFFE57373) val iconColor = if (success) Color(0xFF22D47E) else Color(0xFFFF4757)
val textColor = if (success) Color(0xFF34EE91) else Color(0xFFFF6B78)
Row( Row(
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.background(bgColor, RoundedCornerShape(12.dp)) .clip(RoundedCornerShape(14.dp))
.border(1.dp, borderColor, RoundedCornerShape(12.dp)) .background(bgColor)
.padding(horizontal = 14.dp, vertical = 10.dp), .border(1.dp, border, RoundedCornerShape(14.dp))
verticalAlignment = Alignment.CenterVertically, .padding(start = 16.dp, end = 4.dp, top = 10.dp, bottom = 10.dp),
horizontalArrangement = Arrangement.SpaceBetween verticalAlignment = Alignment.CenterVertically
) { ) {
Row( Icon(
modifier = Modifier.weight(1f), imageVector = if (success) Icons.Default.CheckCircle else Icons.Default.ErrorOutline,
verticalAlignment = Alignment.CenterVertically contentDescription = null,
) { tint = iconColor,
Icon( modifier = Modifier.size(18.dp)
imageVector = if (success) Icons.Default.CheckCircle else Icons.Default.Error, )
contentDescription = null, Spacer(modifier = Modifier.width(10.dp))
tint = iconColor Text(
) text = status.orEmpty(),
Spacer(modifier = Modifier.width(10.dp)) color = textColor,
Text( fontSize = 13.sp,
text = status.orEmpty(), fontWeight = FontWeight.Medium,
color = Color.White, modifier = Modifier.weight(1f)
fontSize = 13.sp, )
fontWeight = FontWeight.Medium IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
)
}
IconButton(onClick = onDismiss) {
Icon( Icon(
imageVector = Icons.Default.Close, imageVector = Icons.Default.Close,
contentDescription = "Dismiss", contentDescription = "Dismiss",
tint = Color.White.copy(alpha = 0.7f) tint = textColor.copy(alpha = 0.5f),
modifier = Modifier.size(16.dp)
) )
} }
} }
@@ -1,12 +1,16 @@
package com.expapp.trigger.ui.screens package com.expapp.trigger.ui.screens
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.width
@@ -24,8 +28,6 @@ import androidx.compose.material.icons.filled.Visibility
import androidx.compose.material.icons.filled.VisibilityOff import androidx.compose.material.icons.filled.VisibilityOff
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@@ -39,6 +41,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
@@ -49,9 +53,12 @@ import androidx.compose.ui.unit.sp
import com.expapp.trigger.data.model.DeviceConfig import com.expapp.trigger.data.model.DeviceConfig
import com.expapp.trigger.network.TriggerClient import com.expapp.trigger.network.TriggerClient
import com.expapp.trigger.ui.components.StatusBanner import com.expapp.trigger.ui.components.StatusBanner
import com.expapp.trigger.ui.theme.DarkCardBorder import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.DarkSurface import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.PowerOnGreen import com.expapp.trigger.ui.theme.BorderDefault
import com.expapp.trigger.ui.theme.BorderSubtle
import com.expapp.trigger.ui.theme.GreenVibrant
import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.TextPrimary import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary import com.expapp.trigger.ui.theme.TextSecondary
@@ -62,227 +69,211 @@ fun AddDevicePage(
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
var deviceName by remember { mutableStateOf("") } var deviceName by remember { mutableStateOf("") }
var nodeName by remember { mutableStateOf("debian") } var nodeName by remember { mutableStateOf("debian") }
var r2Url by remember { mutableStateOf("") } var r2Url by remember { mutableStateOf("") }
var secretKey by remember { mutableStateOf("") } var secretKey by remember { mutableStateOf("") }
var passwordVisible by remember { mutableStateOf(false) } var showKey by remember { mutableStateOf(false) }
var isFetching by remember { mutableStateOf(false) } var isFetching by remember { mutableStateOf(false) }
var errorMessage by remember { mutableStateOf<String?>(null) } var errorMsg by remember { mutableStateOf<String?>(null) }
var successMessage by remember { mutableStateOf<String?>(null) } var successMsg by remember { mutableStateOf<String?>(null) }
Column( Column(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.padding(horizontal = 20.dp, vertical = 12.dp), .imePadding()
horizontalAlignment = Alignment.CenterHorizontally .padding(horizontal = 16.dp, vertical = 16.dp)
) { ) {
Card( // Header
modifier = Modifier.fillMaxWidth(), Row(verticalAlignment = Alignment.CenterVertically) {
shape = RoundedCornerShape(20.dp), Box(
colors = CardDefaults.cardColors(containerColor = DarkSurface),
border = CardDefaults.outlinedCardBorder().copy(brush = androidx.compose.ui.graphics.SolidColor(DarkCardBorder))
) {
Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .size(44.dp)
.padding(20.dp) .clip(RoundedCornerShape(13.dp))
.background(GreenVibrant.copy(alpha = 0.12f))
.border(1.dp, GreenVibrant.copy(alpha = 0.3f), RoundedCornerShape(13.dp)),
contentAlignment = Alignment.Center
) { ) {
Row(verticalAlignment = Alignment.CenterVertically) { Icon(
Icon( Icons.Default.Add,
imageVector = Icons.Default.Add, null,
contentDescription = null, tint = GreenVibrant,
tint = PowerOnGreen, modifier = Modifier.size(22.dp)
modifier = Modifier.size(28.dp) )
) }
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(14.dp))
Text( Column {
text = "Add Remote Device",
fontSize = 22.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary
)
}
Spacer(modifier = Modifier.height(6.dp))
Text( Text(
text = "Provide your Cloudflare R2 JSON endpoint URL and authentication key to register a new remote trigger.", "Add Device",
fontSize = 13.sp, fontSize = 20.sp,
color = TextSecondary, fontWeight = FontWeight.Bold,
lineHeight = 18.sp color = TextPrimary
) )
Text(
Spacer(modifier = Modifier.height(18.dp)) "Configure via Cloudflare R2 JSON",
fontSize = 12.sp,
StatusBanner( color = TextMuted
status = errorMessage ?: successMessage,
isSuccess = errorMessage == null,
onDismiss = {
errorMessage = null
successMessage = null
}
) )
}
}
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(20.dp))
// Device Name Field StatusBanner(
status = errorMsg ?: successMsg,
isSuccess = errorMsg == null,
onDismiss = { errorMsg = null; successMsg = null }
)
Spacer(modifier = Modifier.height(16.dp))
// Form card
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(20.dp))
.background(Brush.verticalGradient(listOf(BgElevated, BgSurface)))
.border(1.dp, BorderSubtle, RoundedCornerShape(20.dp))
.padding(20.dp)
) {
val fieldColors = OutlinedTextFieldDefaults.colors(
focusedBorderColor = GreenVibrant,
unfocusedBorderColor = BorderDefault,
focusedLabelColor = GreenVibrant,
unfocusedLabelColor = TextSecondary,
cursorColor = GreenVibrant,
focusedTextColor = TextPrimary,
unfocusedTextColor = TextPrimary,
focusedPlaceholderColor = TextMuted,
unfocusedPlaceholderColor= TextMuted
)
Column(verticalArrangement = Arrangement.spacedBy(14.dp)) {
OutlinedTextField( OutlinedTextField(
value = deviceName, value = deviceName, onValueChange = { deviceName = it },
onValueChange = { deviceName = it }, label = { Text("Device Name") },
label = { Text("Device Friendly Name") }, placeholder = { Text("e.g. Home Server") },
placeholder = { Text("e.g. Living Room Server") }, leadingIcon = { Icon(Icons.Default.Storage, null, tint = TextSecondary) },
leadingIcon = {
Icon(Icons.Default.Storage, contentDescription = null, tint = TextSecondary)
},
singleLine = true, singleLine = true,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
colors = OutlinedTextFieldDefaults.colors( colors = fieldColors,
focusedBorderColor = PowerOnGreen, shape = RoundedCornerShape(14.dp)
unfocusedBorderColor = DarkCardBorder
)
) )
Spacer(modifier = Modifier.height(14.dp))
// Node Identifier Field
OutlinedTextField( OutlinedTextField(
value = nodeName, value = nodeName, onValueChange = { nodeName = it },
onValueChange = { nodeName = it },
label = { Text("Node Identifier") }, label = { Text("Node Identifier") },
placeholder = { Text("e.g. debian or pop-os") }, placeholder = { Text("e.g. debian") },
leadingIcon = { leadingIcon = { Icon(Icons.Default.Memory, null, tint = TextSecondary) },
Icon(Icons.Default.Memory, contentDescription = null, tint = TextSecondary)
},
singleLine = true, singleLine = true,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
colors = OutlinedTextFieldDefaults.colors( colors = fieldColors,
focusedBorderColor = PowerOnGreen, shape = RoundedCornerShape(14.dp)
unfocusedBorderColor = DarkCardBorder
)
) )
Spacer(modifier = Modifier.height(14.dp))
// Cloudflare R2 JSON URL Field
OutlinedTextField( OutlinedTextField(
value = r2Url, value = r2Url, onValueChange = { r2Url = it },
onValueChange = { r2Url = it },
label = { Text("Cloudflare R2 JSON URL") }, label = { Text("Cloudflare R2 JSON URL") },
placeholder = { Text("https://.../endpoints.json") }, placeholder = { Text("https://pub-xxx.r2.dev/config.json") },
leadingIcon = { leadingIcon = { Icon(Icons.Default.Link, null, tint = TextSecondary) },
Icon(Icons.Default.Link, contentDescription = null, tint = TextSecondary)
},
singleLine = true, singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
colors = OutlinedTextFieldDefaults.colors( colors = fieldColors,
focusedBorderColor = PowerOnGreen, shape = RoundedCornerShape(14.dp)
unfocusedBorderColor = DarkCardBorder
)
) )
Spacer(modifier = Modifier.height(14.dp))
// Secret Key Field
OutlinedTextField( OutlinedTextField(
value = secretKey, value = secretKey, onValueChange = { secretKey = it },
onValueChange = { secretKey = it },
label = { Text("Secret Key") }, label = { Text("Secret Key") },
placeholder = { Text("Carbon@12") }, placeholder = { Text("Your API secret") },
leadingIcon = { leadingIcon = { Icon(Icons.Default.Key, null, tint = TextSecondary) },
Icon(Icons.Default.Key, contentDescription = null, tint = TextSecondary)
},
trailingIcon = { trailingIcon = {
IconButton(onClick = { passwordVisible = !passwordVisible }) { IconButton(onClick = { showKey = !showKey }) {
Icon( Icon(
imageVector = if (passwordVisible) Icons.Default.Visibility else Icons.Default.VisibilityOff, if (showKey) Icons.Default.VisibilityOff else Icons.Default.Visibility,
contentDescription = if (passwordVisible) "Hide password" else "Show password", null,
tint = TextSecondary tint = TextSecondary
) )
} }
}, },
visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(), visualTransformation = if (showKey) VisualTransformation.None else PasswordVisualTransformation(),
singleLine = true, singleLine = true,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password), keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
colors = OutlinedTextFieldDefaults.colors( colors = fieldColors,
focusedBorderColor = PowerOnGreen, shape = RoundedCornerShape(14.dp)
unfocusedBorderColor = DarkCardBorder
)
) )
Spacer(modifier = Modifier.height(24.dp))
// Fetch & Add Button
Button(
onClick = {
errorMessage = null
successMessage = null
if (deviceName.isBlank()) {
errorMessage = "Please enter a device name"
return@Button
}
if (r2Url.isBlank()) {
errorMessage = "Please provide the Cloudflare R2 JSON URL"
return@Button
}
if (secretKey.isBlank()) {
errorMessage = "Please enter the secret key for this device"
return@Button
}
isFetching = true
triggerClient.fetchR2Config(r2Url.trim()) { result ->
isFetching = false
result.onSuccess { endpoints ->
val newDevice = DeviceConfig(
name = deviceName.trim(),
node = if (nodeName.isBlank()) "debian" else nodeName.trim(),
secretKey = secretKey.trim(),
r2Url = r2Url.trim(),
powerOnUrl = endpoints.powerOn,
powerOffUrl = endpoints.powerOff,
rebootUrl = endpoints.reboot,
statusUrl = endpoints.status
)
onDeviceAdded(newDevice)
successMessage = "Device \"${newDevice.name}\" added successfully!"
deviceName = ""
r2Url = ""
secretKey = ""
}.onFailure { ex ->
errorMessage = "Failed to fetch endpoints: ${ex.message}"
}
}
},
enabled = !isFetching,
modifier = Modifier
.fillMaxWidth()
.height(56.dp),
shape = RoundedCornerShape(14.dp),
colors = ButtonDefaults.buttonColors(containerColor = PowerOnGreen)
) {
if (isFetching) {
CircularProgressIndicator(
color = Color.White,
modifier = Modifier.size(24.dp),
strokeWidth = 2.dp
)
Spacer(modifier = Modifier.width(10.dp))
Text("Fetching Endpoints...", color = Color.White)
} else {
Text(
text = "Fetch & Add Device",
fontSize = 17.sp,
fontWeight = FontWeight.Bold,
color = Color.White
)
}
}
} }
} }
Spacer(modifier = Modifier.height(20.dp))
Button(
onClick = {
errorMsg = null; successMsg = null
when {
deviceName.isBlank() -> { errorMsg = "Enter a device name"; return@Button }
r2Url.isBlank() -> { errorMsg = "Enter the Cloudflare R2 URL"; return@Button }
secretKey.isBlank() -> { errorMsg = "Enter the secret key"; return@Button }
}
isFetching = true
triggerClient.fetchR2Config(r2Url.trim()) { result ->
isFetching = false
result.onSuccess { ep ->
val dev = DeviceConfig(
name = deviceName.trim(),
node = nodeName.trim().ifBlank { "debian" },
secretKey = secretKey.trim(),
r2Url = r2Url.trim(),
powerOnUrl = ep.powerOn,
powerOffUrl= ep.powerOff,
rebootUrl = ep.reboot,
statusUrl = ep.status
)
onDeviceAdded(dev)
successMsg = "\"${dev.name}\" added successfully"
deviceName = ""; r2Url = ""; secretKey = ""
}.onFailure { ex ->
errorMsg = "Failed: ${ex.message}"
}
}
},
enabled = !isFetching,
modifier = Modifier
.fillMaxWidth()
.height(54.dp),
shape = RoundedCornerShape(16.dp),
colors = ButtonDefaults.buttonColors(
containerColor = GreenVibrant.copy(alpha = 0.15f),
contentColor = GreenVibrant,
disabledContainerColor= GreenVibrant.copy(alpha = 0.05f),
disabledContentColor = GreenVibrant.copy(alpha = 0.4f)
)
) {
if (isFetching) {
CircularProgressIndicator(
color = GreenVibrant,
modifier = Modifier.size(20.dp),
strokeWidth = 2.dp,
trackColor = GreenVibrant.copy(alpha = 0.2f)
)
Spacer(modifier = Modifier.width(10.dp))
Text("Fetching config…", fontWeight = FontWeight.SemiBold)
} else {
Icon(Icons.Default.Add, null, modifier = Modifier.size(18.dp))
Spacer(modifier = Modifier.width(8.dp))
Text("Add Device", fontSize = 16.sp, fontWeight = FontWeight.Bold)
}
}
Spacer(modifier = Modifier.height(20.dp))
Text(
text = "The JSON config must include: poweron, poweroff, reboot, and status URL keys.",
fontSize = 11.sp,
color = TextMuted,
lineHeight = 16.sp
)
} }
} }
@@ -1,9 +1,20 @@
package com.expapp.trigger.ui.screens package com.expapp.trigger.ui.screens
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.RepeatMode
import androidx.compose.animation.core.animateFloat
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.rememberInfiniteTransition
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -19,16 +30,15 @@ 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.DeleteOutline import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Dns
import androidx.compose.material.icons.filled.PowerOff import androidx.compose.material.icons.filled.PowerOff
import androidx.compose.material.icons.filled.PowerSettingsNew import androidx.compose.material.icons.filled.PowerSettingsNew
import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.RestartAlt import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
@@ -42,7 +52,11 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@@ -52,22 +66,25 @@ import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.ui.components.ActionConfirmDialog import com.expapp.trigger.ui.components.ActionConfirmDialog
import com.expapp.trigger.ui.components.HugeActionButton import com.expapp.trigger.ui.components.HugeActionButton
import com.expapp.trigger.ui.components.StatusBanner import com.expapp.trigger.ui.components.StatusBanner
import com.expapp.trigger.ui.theme.DarkCardBorder import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.DarkSurface import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.DarkSurfaceVariant import com.expapp.trigger.ui.theme.BorderDefault
import com.expapp.trigger.ui.theme.BorderSubtle
import com.expapp.trigger.ui.theme.GreenVibrant
import com.expapp.trigger.ui.theme.OfflineBg
import com.expapp.trigger.ui.theme.OfflineBorder
import com.expapp.trigger.ui.theme.OfflineText
import com.expapp.trigger.ui.theme.OnlineBg
import com.expapp.trigger.ui.theme.OnlineBorder
import com.expapp.trigger.ui.theme.OnlineText
import com.expapp.trigger.ui.theme.PowerOffBorder import com.expapp.trigger.ui.theme.PowerOffBorder
import com.expapp.trigger.ui.theme.PowerOffGradient import com.expapp.trigger.ui.theme.PowerOffGradient
import com.expapp.trigger.ui.theme.PowerOffRed
import com.expapp.trigger.ui.theme.PowerOnBorder import com.expapp.trigger.ui.theme.PowerOnBorder
import com.expapp.trigger.ui.theme.PowerOnGradient import com.expapp.trigger.ui.theme.PowerOnGradient
import com.expapp.trigger.ui.theme.RebootBorder import com.expapp.trigger.ui.theme.RebootBorder
import com.expapp.trigger.ui.theme.RebootGradient import com.expapp.trigger.ui.theme.RebootGradient
import com.expapp.trigger.ui.theme.StatusOfflineBg import com.expapp.trigger.ui.theme.RedVibrant
import com.expapp.trigger.ui.theme.StatusOfflineBorder import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.StatusOfflineText
import com.expapp.trigger.ui.theme.StatusOnlineBg
import com.expapp.trigger.ui.theme.StatusOnlineBorder
import com.expapp.trigger.ui.theme.StatusOnlineText
import com.expapp.trigger.ui.theme.TextPrimary import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary import com.expapp.trigger.ui.theme.TextSecondary
@@ -93,9 +110,9 @@ fun DevicePage(
action = pendingAction!!, action = pendingAction!!,
deviceName = device.name, deviceName = device.name,
onConfirm = { onConfirm = {
val actionToExecute = pendingAction!! val a = pendingAction!!
pendingAction = null pendingAction = null
onTrigger(actionToExecute) onTrigger(a)
}, },
onDismiss = { pendingAction = null } onDismiss = { pendingAction = null }
) )
@@ -104,45 +121,91 @@ fun DevicePage(
if (showDeleteConfirm) { if (showDeleteConfirm) {
AlertDialog( AlertDialog(
onDismissRequest = { showDeleteConfirm = false }, onDismissRequest = { showDeleteConfirm = false },
title = { Text("Delete Device") }, containerColor = BgSurface,
text = { Text("Are you sure you want to remove \"${device.name}\" from your trigger list?") }, shape = RoundedCornerShape(20.dp),
title = { Text("Remove Device", color = TextPrimary, fontWeight = FontWeight.Bold) },
text = {
Text(
"Remove \"${device.name}\" from your devices?",
color = TextSecondary,
fontSize = 14.sp
)
},
confirmButton = { confirmButton = {
Button( Button(
onClick = { onClick = { showDeleteConfirm = false; onDelete(device) },
showDeleteConfirm = false colors = ButtonDefaults.buttonColors(containerColor = RedVibrant.copy(alpha = 0.15f)),
onDelete(device) shape = RoundedCornerShape(12.dp)
}, ) { Text("Remove", color = RedVibrant, fontWeight = FontWeight.Bold) }
colors = ButtonDefaults.buttonColors(containerColor = PowerOffRed)
) {
Text("Delete", color = Color.White)
}
}, },
dismissButton = { dismissButton = {
TextButton(onClick = { showDeleteConfirm = false }) { TextButton(onClick = { showDeleteConfirm = false }) {
Text("Cancel") Text("Cancel", color = TextSecondary)
} }
} }
) )
} }
// Spin animation for refresh icon
val infiniteTransition = rememberInfiniteTransition(label = "refresh_spin")
val spinAngle by infiniteTransition.animateFloat(
initialValue = 0f, targetValue = 360f,
animationSpec = infiniteRepeatable(tween(900, easing = LinearEasing)),
label = "spin"
)
// Pulse for online dot
val pulseScale by infiniteTransition.animateFloat(
initialValue = 0.8f, targetValue = 1.5f,
animationSpec = infiniteRepeatable(
tween(1400, easing = FastOutSlowInEasing), RepeatMode.Reverse
),
label = "pulse_scale"
)
val isOnline = nodeStatus?.isOnline
Column( Column(
modifier = modifier modifier = modifier
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 20.dp, vertical = 10.dp), .padding(horizontal = 16.dp, vertical = 8.dp),
verticalArrangement = Arrangement.SpaceBetween verticalArrangement = Arrangement.spacedBy(12.dp)
) { ) {
// Professional Server Info Header Card
Card( // ── HEADER CARD ──────────────────────────────────────────────────
modifier = Modifier.fillMaxWidth(), Box(
shape = RoundedCornerShape(22.dp), modifier = Modifier
colors = CardDefaults.cardColors(containerColor = DarkSurface), .fillMaxWidth()
border = CardDefaults.outlinedCardBorder().copy(brush = androidx.compose.ui.graphics.SolidColor(DarkCardBorder)) .clip(RoundedCornerShape(24.dp))
.background(Brush.verticalGradient(listOf(BgElevated, BgSurface)))
.border(1.dp, BorderSubtle, RoundedCornerShape(24.dp))
) { ) {
// Top accent line that changes color with server state
Box(
modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.background(
Brush.horizontalGradient(
listOf(
Color.Transparent,
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.7f)
false -> RedVibrant.copy(alpha = 0.5f)
null -> BorderDefault.copy(alpha = 0.4f)
},
Color.Transparent
)
)
)
)
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 18.dp, vertical = 16.dp) .padding(horizontal = 20.dp, vertical = 18.dp)
) { ) {
// Title row
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
@@ -154,17 +217,40 @@ fun DevicePage(
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.size(44.dp) .size(48.dp)
.clip(RoundedCornerShape(12.dp)) .clip(RoundedCornerShape(14.dp))
.background(DarkSurfaceVariant) .background(
.border(1.dp, DarkCardBorder, RoundedCornerShape(12.dp)), Brush.radialGradient(
listOf(
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.18f)
false -> RedVibrant.copy(alpha = 0.12f)
null -> BorderDefault.copy(alpha = 0.1f)
},
Color.Transparent
)
)
)
.border(
1.dp,
when (isOnline) {
true -> GreenVibrant.copy(alpha = 0.35f)
false -> RedVibrant.copy(alpha = 0.25f)
null -> BorderSubtle
},
RoundedCornerShape(14.dp)
),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
) { ) {
Icon( Icon(
imageVector = Icons.Default.Dns, imageVector = Icons.Default.Terminal,
contentDescription = null, contentDescription = null,
tint = if (nodeStatus?.isOnline == true) StatusOnlineText else TextSecondary, tint = when (isOnline) {
modifier = Modifier.size(24.dp) true -> GreenVibrant
false -> RedVibrant.copy(alpha = 0.6f)
null -> TextSecondary
},
modifier = Modifier.size(22.dp)
) )
} }
@@ -173,187 +259,253 @@ fun DevicePage(
Column { Column {
Text( Text(
text = device.name, text = device.name,
fontSize = 22.sp, fontSize = 20.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = TextPrimary, color = TextPrimary,
maxLines = 1 maxLines = 1
) )
Spacer(modifier = Modifier.height(2.dp))
Text( Text(
text = "node: ${device.node}", text = device.node,
fontSize = 12.sp, fontSize = 11.sp,
color = TextSecondary, color = TextMuted,
fontWeight = FontWeight.Medium fontFamily = FontFamily.Monospace,
letterSpacing = 0.5.sp
) )
} }
} }
// Refresh button (spins while checking)
IconButton(
onClick = { if (!isCheckingStatus) onRefreshStatus() },
modifier = Modifier
.size(36.dp)
.clip(RoundedCornerShape(10.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
else BorderSubtle.copy(alpha = 0.3f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
else BorderSubtle,
RoundedCornerShape(10.dp)
)
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh status",
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
modifier = Modifier
.size(18.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
)
}
Spacer(modifier = Modifier.width(8.dp))
// Delete button
IconButton( IconButton(
onClick = { showDeleteConfirm = true }, onClick = { showDeleteConfirm = true },
modifier = Modifier modifier = Modifier
.size(36.dp) .size(36.dp)
.clip(CircleShape) .clip(RoundedCornerShape(10.dp))
.background(Color.White.copy(alpha = 0.05f)) .background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.DeleteOutline, imageVector = Icons.Default.DeleteOutline,
contentDescription = "Delete device", contentDescription = "Remove device",
tint = Color(0xFFE57373), tint = RedVibrant.copy(alpha = 0.7f),
modifier = Modifier.size(20.dp) modifier = Modifier.size(18.dp)
) )
} }
} }
Spacer(modifier = Modifier.height(14.dp)) Spacer(modifier = Modifier.height(16.dp))
// Live Server Status Badge & IP Address // ── STATUS ROW ────────────────────────────────────────────
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Row(verticalAlignment = Alignment.CenterVertically) { Row(
// Live Status Pill verticalAlignment = Alignment.CenterVertically,
val isOnline = nodeStatus?.isOnline == true horizontalArrangement = Arrangement.spacedBy(8.dp)
val badgeBg = if (isCheckingStatus) DarkSurfaceVariant else if (isOnline) StatusOnlineBg else StatusOfflineBg ) {
val badgeBorder = if (isCheckingStatus) DarkCardBorder else if (isOnline) StatusOnlineBorder else StatusOfflineBorder AnimatedContent(
val badgeText = if (isCheckingStatus) TextSecondary else if (isOnline) StatusOnlineText else StatusOfflineText targetState = Triple(isOnline, isCheckingStatus, nodeStatus?.statusText),
transitionSpec = { fadeIn(tween(300)) togetherWith fadeOut(tween(200)) },
label = "status_badge"
) { (online, checking, statusTxt) ->
val badgeBg = if (checking) BgElevated else if (online == true) OnlineBg else OfflineBg
val badgeBorder = if (checking) BorderDefault else if (online == true) OnlineBorder else OfflineBorder
val dotColor = if (online == true) GreenVibrant else RedVibrant
val labelColor = if (checking) TextSecondary else if (online == true) OnlineText else OfflineText
Row( Row(
modifier = Modifier modifier = Modifier
.clip(RoundedCornerShape(8.dp)) .clip(RoundedCornerShape(10.dp))
.background(badgeBg) .background(badgeBg)
.border(1.dp, badgeBorder, RoundedCornerShape(8.dp)) .border(1.dp, badgeBorder, RoundedCornerShape(10.dp))
.clickable { onRefreshStatus() } .padding(horizontal = 12.dp, vertical = 7.dp),
.padding(horizontal = 10.dp, vertical = 5.dp), verticalAlignment = Alignment.CenterVertically
verticalAlignment = Alignment.CenterVertically ) {
) { if (checking) {
if (isCheckingStatus) { CircularProgressIndicator(
CircularProgressIndicator( modifier = Modifier.size(9.dp),
modifier = Modifier.size(10.dp), strokeWidth = 1.5.dp,
strokeWidth = 1.5.dp, color = TextSecondary,
color = TextSecondary trackColor = Color.Transparent
) )
Spacer(modifier = Modifier.width(6.dp)) } else {
Box(
modifier = Modifier.size(16.dp),
contentAlignment = Alignment.Center
) {
if (online == true) {
Box(
modifier = Modifier
.size(14.dp)
.scale(pulseScale)
.background(dotColor.copy(alpha = 0.25f), CircleShape)
)
}
Box(
modifier = Modifier
.size(8.dp)
.background(dotColor, CircleShape)
)
}
}
Spacer(modifier = Modifier.width(7.dp))
Text( Text(
text = "PINGING...", text = if (checking) "CHECKING" else (statusTxt ?: "UNKNOWN"),
fontSize = 11.sp, fontSize = 11.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = TextSecondary, color = labelColor,
letterSpacing = 0.5.sp letterSpacing = 0.8.sp
)
} else {
Box(
modifier = Modifier
.size(8.dp)
.clip(CircleShape)
.background(badgeText)
)
Spacer(modifier = Modifier.width(6.dp))
Text(
text = nodeStatus?.statusText ?: "OFFLINE",
fontSize = 11.sp,
fontWeight = FontWeight.ExtraBold,
color = badgeText,
letterSpacing = 0.5.sp
) )
} }
} }
// IP Address chip if returned // IP chip
if (!nodeStatus?.ip.isNullOrBlank()) { if (!nodeStatus?.ip.isNullOrBlank()) {
Spacer(modifier = Modifier.width(8.dp)) Text(
Box( text = nodeStatus!!.ip!!,
fontSize = 11.sp,
color = TextMuted,
fontFamily = FontFamily.Monospace,
modifier = Modifier modifier = Modifier
.clip(RoundedCornerShape(8.dp)) .clip(RoundedCornerShape(8.dp))
.background(DarkSurfaceVariant) .background(BgElevated)
.border(1.dp, DarkCardBorder, RoundedCornerShape(8.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(8.dp))
.padding(horizontal = 8.dp, vertical = 5.dp) .padding(horizontal = 8.dp, vertical = 5.dp)
) { )
Text(
text = nodeStatus!!.ip!!,
fontSize = 11.sp,
fontWeight = FontWeight.SemiBold,
color = TextSecondary
)
}
} }
} }
}
// Tap to re-check indicator // ── UPTIME / LAST SEEN BAR ─────────────────────────────────
val showUptime = nodeStatus != null && !isCheckingStatus &&
isOnline == true && !nodeStatus.uptime.isNullOrBlank()
val showOffline = nodeStatus != null && !isCheckingStatus &&
isOnline == false && !nodeStatus.lastActiveAgo.isNullOrBlank()
AnimatedVisibility(visible = showUptime || showOffline) {
val barOnline = isOnline == true
val barBg = if (barOnline) OnlineBg.copy(alpha = 0.6f) else OfflineBg.copy(alpha = 0.6f)
val barBorder = if (barOnline) OnlineBorder.copy(alpha = 0.5f) else OfflineBorder.copy(alpha = 0.5f)
val barColor = if (barOnline) OnlineText else OfflineText
val barLabel = if (barOnline) "Uptime ${nodeStatus?.uptime}" else "Last seen ${nodeStatus?.lastActiveAgo}"
val barDetail = if (barOnline) nodeStatus?.onSinceIst else nodeStatus?.lastActiveIst
Spacer(modifier = Modifier.height(12.dp))
Row( Row(
modifier = Modifier modifier = Modifier
.clip(RoundedCornerShape(8.dp)) .fillMaxWidth()
.clickable { onRefreshStatus() } .clip(RoundedCornerShape(12.dp))
.padding(4.dp), .background(barBg)
.border(1.dp, barBorder, RoundedCornerShape(12.dp))
.padding(horizontal = 14.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon( Icon(
imageVector = Icons.Default.Refresh, Icons.Default.Schedule,
contentDescription = "Check Status", null,
tint = TextSecondary, tint = barColor,
modifier = Modifier.size(14.dp) modifier = Modifier.size(13.dp)
) )
Spacer(modifier = Modifier.width(4.dp)) Spacer(modifier = Modifier.width(8.dp))
Text( Text(
text = "check", text = barLabel,
fontSize = 11.sp, fontSize = 12.sp,
color = TextSecondary fontWeight = FontWeight.SemiBold,
color = barColor
) )
if (!barDetail.isNullOrBlank()) {
Text(
text = " · $barDetail",
fontSize = 11.sp,
color = TextSecondary,
maxLines = 1
)
}
} }
} }
} }
} }
Spacer(modifier = Modifier.height(10.dp)) // ── ACTION RESULT BANNER ─────────────────────────────────────────
// Status Banner for Action Result
StatusBanner( StatusBanner(
status = lastStatus, status = lastStatus,
isSuccess = lastSuccess, isSuccess = lastSuccess,
onDismiss = onDismissStatus onDismiss = onDismissStatus
) )
Spacer(modifier = Modifier.height(12.dp)) // ── ACTION BUTTONS ───────────────────────────────────────────────
val isPowerOnEnabled = isOnline != true && !isLoading
val isRebootEnabled = isOnline != false && !isLoading
val isPowerOffEnabled = isOnline != false && !isLoading
// 3 Massive Tactile Action Buttons
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.weight(1f), .weight(1f),
verticalArrangement = Arrangement.SpaceEvenly verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)
) { ) {
HugeActionButton( HugeActionButton(
text = "POWER ON", text = "Power On",
subtext = "Wake / Start Remote Machine", subtext = if (isOnline == true) "Already online — unavailable" else "Send wake signal to boot",
gradientColors = PowerOnGradient, gradientColors = PowerOnGradient,
borderColor = PowerOnBorder, borderColor = PowerOnBorder,
icon = Icons.Default.PowerSettingsNew, icon = Icons.Default.PowerSettingsNew,
isLoading = isLoading && pendingAction == null, isLoading = isLoading,
onClick = { onTrigger(TriggerAction.POWER_ON) } enabled = isPowerOnEnabled,
onClick = { pendingAction = TriggerAction.POWER_ON }
) )
HugeActionButton( HugeActionButton(
text = "REBOOT", text = "Reboot",
subtext = "Graceful Restart (Auth Required)", subtext = if (isOnline == false) "Offline — unavailable" else "Gracefully restart server",
gradientColors = RebootGradient, gradientColors = RebootGradient,
borderColor = RebootBorder, borderColor = RebootBorder,
icon = Icons.Default.RestartAlt, icon = Icons.Default.RestartAlt,
isLoading = isLoading && pendingAction == null, isLoading = isLoading,
enabled = isRebootEnabled,
onClick = { pendingAction = TriggerAction.REBOOT } onClick = { pendingAction = TriggerAction.REBOOT }
) )
HugeActionButton( HugeActionButton(
text = "POWER OFF", text = "Power Off",
subtext = "Remote Shutdown (Auth Required)", subtext = if (isOnline == false) "Offline — unavailable" else "Shut down remote machine",
gradientColors = PowerOffGradient, gradientColors = PowerOffGradient,
borderColor = PowerOffBorder, borderColor = PowerOffBorder,
icon = Icons.Default.PowerOff, icon = Icons.Default.PowerOff,
isLoading = isLoading && pendingAction == null, isLoading = isLoading,
enabled = isPowerOffEnabled,
onClick = { pendingAction = TriggerAction.POWER_OFF } onClick = { pendingAction = TriggerAction.POWER_OFF }
) )
} }
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(4.dp))
} }
} }
@@ -1,12 +1,14 @@
package com.expapp.trigger.ui.screens package com.expapp.trigger.ui.screens
import android.widget.Toast import android.widget.Toast
import androidx.compose.animation.core.FastOutSlowInEasing
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
@@ -21,8 +23,8 @@ 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.Add import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Dns
import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
@@ -31,6 +33,7 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateMapOf
@@ -41,28 +44,32 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.draw.rotate
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import com.expapp.trigger.data.model.DeviceConfig import com.expapp.trigger.data.model.DeviceConfig
import com.expapp.trigger.data.repository.DeviceRepository import com.expapp.trigger.data.repository.DeviceRepository
import com.expapp.trigger.network.NodeStatus import com.expapp.trigger.network.NodeStatus
import com.expapp.trigger.network.TriggerAction import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.network.TriggerClient import com.expapp.trigger.network.TriggerClient
import com.expapp.trigger.ui.theme.DarkBackground import com.expapp.trigger.ui.theme.BgBase
import com.expapp.trigger.ui.theme.DarkCardBorder import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.DarkSurface import com.expapp.trigger.ui.theme.BorderSubtle
import com.expapp.trigger.ui.theme.DarkSurfaceVariant import com.expapp.trigger.ui.theme.GreenVibrant
import com.expapp.trigger.ui.theme.PowerOnBorder import com.expapp.trigger.ui.theme.OnlineBg
import com.expapp.trigger.ui.theme.PowerOnGreen import com.expapp.trigger.ui.theme.OnlineBorder
import com.expapp.trigger.ui.theme.StatusOnlineBg import com.expapp.trigger.ui.theme.OnlineText
import com.expapp.trigger.ui.theme.StatusOnlineBorder import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.StatusOnlineText
import com.expapp.trigger.ui.theme.TextPrimary import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary import com.expapp.trigger.ui.theme.TextSecondary
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
@@ -74,23 +81,33 @@ fun MainScreen(
) { ) {
val context = LocalContext.current val context = LocalContext.current
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
val lifecycleOwner = LocalLifecycleOwner.current
var devices by remember { mutableStateOf(repository.getDevices()) } var devices by remember { mutableStateOf(repository.getDevices()) }
val pagerState = rememberPagerState(pageCount = { devices.size + 1 }) val pagerState = rememberPagerState(pageCount = { devices.size + 1 })
// Device ID -> In-Flight Loading State var isAppInForeground by remember { mutableStateOf(true) }
val loadingStates = remember { mutableStateMapOf<String, Boolean>() } DisposableEffect(lifecycleOwner) {
// Device ID -> Pair(StatusMessage, IsSuccess) val obs = LifecycleEventObserver { _, event ->
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() } isAppInForeground = when (event) {
// Device ID -> Live NodeStatus (online / offline / ip) Lifecycle.Event.ON_RESUME -> true
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() } else -> false
// Device ID -> Is Checking Status }
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() } }
lifecycleOwner.lifecycle.addObserver(obs)
onDispose { lifecycleOwner.lifecycle.removeObserver(obs) }
}
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
var isSyncing by remember { mutableStateOf(false) } var isSyncing by remember { mutableStateOf(false) }
fun refreshDeviceStatus(device: DeviceConfig) { fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
checkingStatusMap[device.id] = true if (showIndicator || nodeStatuses[device.id] == null) {
checkingStatusMap[device.id] = true
}
triggerClient.checkStatus(device) { status -> triggerClient.checkStatus(device) { status ->
checkingStatusMap[device.id] = false checkingStatusMap[device.id] = false
nodeStatuses[device.id] = status nodeStatuses[device.id] = status
@@ -98,262 +115,202 @@ fun MainScreen(
} }
fun syncEndpoints(showToast: Boolean = false) { fun syncEndpoints(showToast: Boolean = false) {
val currentDevices = repository.getDevices() val current = repository.getDevices()
if (currentDevices.isEmpty()) return if (current.isEmpty()) return
isSyncing = true isSyncing = true
var updatedCount = 0 var updated = 0; var completed = 0
var completedCount = 0 val total = current.count { it.r2Url.isNotBlank() }
val totalToSync = currentDevices.count { it.r2Url.isNotBlank() } if (total == 0) { isSyncing = false; return }
current.filter { it.r2Url.isNotBlank() }.forEach { device ->
if (totalToSync == 0) { triggerClient.fetchR2Config(device.r2Url) { result ->
isSyncing = false completed++
// Still check ping/status for all devices result.onSuccess { ep ->
currentDevices.forEach { refreshDeviceStatus(it) } val changed = repository.updateEndpoints(device.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
return if (changed) { updated++; devices = repository.getDevices() }
} }
if (completed == total) {
currentDevices.forEach { device -> isSyncing = false
// Trigger status check simultaneously if (showToast) Toast.makeText(
refreshDeviceStatus(device) context,
if (updated > 0) "Endpoints updated" else "Already up to date",
if (device.r2Url.isNotBlank()) { Toast.LENGTH_SHORT
triggerClient.fetchR2Config(device.r2Url) { result -> ).show()
completedCount++
result.onSuccess { endpoints ->
val changed = repository.updateEndpoints(
deviceId = device.id,
powerOnUrl = endpoints.powerOn,
powerOffUrl = endpoints.powerOff,
rebootUrl = endpoints.reboot,
statusUrl = endpoints.status
)
if (changed) {
updatedCount++
devices = repository.getDevices()
}
}
if (completedCount == totalToSync) {
isSyncing = false
if (showToast) {
if (updatedCount > 0) {
Toast.makeText(context, "Updated endpoints for $updatedCount device(s)", Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(context, "All device endpoints are up to date", Toast.LENGTH_SHORT).show()
}
} else if (updatedCount > 0) {
Toast.makeText(context, "Synced: Updated endpoints from Cloudflare R2", Toast.LENGTH_SHORT).show()
}
}
} }
} }
} }
} }
// Automatically check Cloudflare R2 and device status on every app launch // Initial R2 sync on launch
LaunchedEffect(Unit) { LaunchedEffect(Unit) { syncEndpoints(false) }
syncEndpoints(showToast = false)
devices.forEach { refreshDeviceStatus(it) }
}
// Auto-refresh status when swiping to a device // Active 5-second polling — only while in foreground on a device page
LaunchedEffect(pagerState.currentPage) { LaunchedEffect(pagerState.currentPage, isAppInForeground, devices.size) {
if (!isAppInForeground) return@LaunchedEffect
val page = pagerState.currentPage val page = pagerState.currentPage
if (page < devices.size) { if (page >= devices.size) return@LaunchedEffect
refreshDeviceStatus(devices[page]) val dev = devices[page]
while (isActive && isAppInForeground) {
refreshStatus(dev, showIndicator = false)
delay(5000L)
} }
} }
fun executeAction(device: DeviceConfig, action: TriggerAction) { fun executeAction(device: DeviceConfig, action: TriggerAction) {
val actionLabel = when (action) {
TriggerAction.POWER_ON -> "Power On"
TriggerAction.POWER_OFF -> "Power Off"
TriggerAction.REBOOT -> "Reboot"
}
loadingStates[device.id] = true loadingStates[device.id] = true
statusStates.remove(device.id) statusStates.remove(device.id)
triggerClient.sendTrigger(device, action) { response -> triggerClient.sendTrigger(device, action) { response ->
loadingStates[device.id] = false loadingStates[device.id] = false
val statusText = if (response.isSuccess) { val msg = if (response.isSuccess) {
"$actionLabel sent: HTTP ${response.statusCode} - ${response.message.take(60)}" when (action) {
TriggerAction.POWER_ON -> "Power on signal sent"
TriggerAction.POWER_OFF -> "Shutdown signal sent"
TriggerAction.REBOOT -> "Restart signal sent"
}
} else { } else {
"Failed: ${response.message.take(60)}" val raw = response.message.trim()
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
"Failed — $clean"
} }
statusStates[device.id] = Pair(statusText, response.isSuccess) statusStates[device.id] = msg to response.isSuccess
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
Toast.makeText(
context,
if (response.isSuccess) "$actionLabel successful (${response.statusCode})" else "Failed: ${response.message}",
Toast.LENGTH_SHORT
).show()
// Re-check live status after action
coroutineScope.launch { coroutineScope.launch {
delay(2000) delay(1500); refreshStatus(device, showIndicator = true)
refreshDeviceStatus(device) delay(4000); refreshStatus(device)
delay(5000); refreshStatus(device)
} }
} }
} }
// 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 = DarkBackground, containerColor = BgBase,
topBar = { topBar = {
CenterAlignedTopAppBar( CenterAlignedTopAppBar(
title = { title = {
Row(verticalAlignment = Alignment.CenterVertically) { Row(verticalAlignment = Alignment.CenterVertically) {
Box( Icon(
modifier = Modifier Icons.Default.Terminal,
.size(34.dp) contentDescription = null,
.clip(RoundedCornerShape(10.dp)) tint = GreenVibrant,
.background(DarkSurfaceVariant) modifier = Modifier.size(18.dp)
.border(1.dp, DarkCardBorder, RoundedCornerShape(10.dp)), )
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Dns,
contentDescription = null,
tint = PowerOnBorder,
modifier = Modifier.size(20.dp)
)
}
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
Text( Text(
text = "DEVICE TRIGGER", text = "DEVICE TRIGGER",
fontSize = 17.sp, fontSize = 14.sp,
fontWeight = FontWeight.ExtraBold, fontWeight = FontWeight.Bold,
letterSpacing = 1.sp, letterSpacing = 2.sp,
color = TextPrimary color = TextPrimary,
fontFamily = FontFamily.Monospace
) )
// Online counter badge if devices exist
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true } val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
if (devices.isNotEmpty()) { if (devices.isNotEmpty() && onlineCount > 0) {
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
Box( Box(
modifier = Modifier modifier = Modifier
.clip(RoundedCornerShape(12.dp)) .clip(CircleShape)
.background(if (onlineCount > 0) StatusOnlineBg else DarkSurfaceVariant) .background(OnlineBg)
.border(1.dp, if (onlineCount > 0) StatusOnlineBorder else DarkCardBorder, RoundedCornerShape(12.dp)) .border(1.dp, OnlineBorder, CircleShape)
.padding(horizontal = 7.dp, vertical = 2.dp) .padding(horizontal = 8.dp, vertical = 2.dp)
) { ) {
Text( Text(
text = "$onlineCount online", "$onlineCount online",
fontSize = 11.sp, fontSize = 10.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = if (onlineCount > 0) StatusOnlineText else TextSecondary color = OnlineText,
letterSpacing = 0.5.sp
) )
} }
} }
} }
}, },
actions = { actions = {
// Manual sync check IconButton(onClick = { syncEndpoints(true) }, enabled = !isSyncing) {
IconButton(
onClick = { syncEndpoints(showToast = true) },
enabled = !isSyncing
) {
Icon( Icon(
imageVector = Icons.Default.Refresh, Icons.Default.Refresh,
contentDescription = "Sync Endpoints", "Sync",
tint = if (isSyncing) TextSecondary.copy(alpha = 0.5f) else PowerOnBorder tint = if (isSyncing) TextMuted else GreenVibrant,
modifier = Modifier.rotate(rotationAngle)
) )
} }
// Quick jump to Add Device tab
IconButton( IconButton(
onClick = { onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } }
coroutineScope.launch {
pagerState.animateScrollToPage(devices.size)
}
}
) { ) {
Icon( Icon(Icons.Default.Add, "Add Device", tint = GreenVibrant)
imageVector = Icons.Default.Add,
contentDescription = "Add Device",
tint = PowerOnBorder
)
} }
}, },
colors = TopAppBarDefaults.centerAlignedTopAppBarColors( colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
containerColor = DarkSurface containerColor = BgSurface
) )
) )
}, },
bottomBar = { bottomBar = {
// Horizontal Pager Dots Indicator val total = devices.size + 1
val totalPages = devices.size + 1 if (total > 1) {
if (totalPages > 1) {
Row( Row(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(vertical = 16.dp), .padding(vertical = 14.dp),
horizontalArrangement = Arrangement.Center, horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
repeat(totalPages) { pageIndex -> repeat(total) { i ->
val isSelected = pagerState.currentPage == pageIndex val selected = pagerState.currentPage == i
val isAddPage = pageIndex == devices.size val isAdd = i == devices.size
val dotColor = when {
selected && !isAdd -> GreenVibrant
selected -> TextSecondary
isAdd -> TextMuted.copy(alpha = 0.4f)
else -> TextMuted.copy(alpha = 0.3f)
}
Box( Box(
modifier = Modifier modifier = Modifier
.padding(horizontal = 4.dp) .padding(horizontal = 3.dp)
.height(8.dp) .height(6.dp)
.width(if (isSelected) 24.dp else 8.dp) .width(if (selected) 22.dp else 6.dp)
.clip(if (isSelected) RoundedCornerShape(4.dp) else CircleShape) .clip(if (selected) RoundedCornerShape(3.dp) else CircleShape)
.background( .background(dotColor)
when {
isSelected -> PowerOnBorder
isAddPage -> TextSecondary.copy(alpha = 0.5f)
else -> TextSecondary.copy(alpha = 0.25f)
}
)
) )
} }
} }
} }
} }
) { paddingValues -> ) { padding ->
HorizontalPager( HorizontalPager(
state = pagerState, state = pagerState,
modifier = Modifier modifier = Modifier.fillMaxSize().padding(padding)
.fillMaxSize()
.padding(paddingValues)
) { page -> ) { page ->
if (page < devices.size) { if (page < devices.size) {
val currentDevice = devices[page] val dev = devices[page]
val isLoading = loadingStates[currentDevice.id] == true
val statusInfo = statusStates[currentDevice.id]
DevicePage( DevicePage(
device = currentDevice, device = dev,
isLoading = isLoading, isLoading = loadingStates[dev.id] == true,
nodeStatus = nodeStatuses[currentDevice.id], nodeStatus = nodeStatuses[dev.id],
isCheckingStatus = checkingStatusMap[currentDevice.id] == true, isCheckingStatus = checkingStatusMap[dev.id] == true,
lastStatus = statusInfo?.first, lastStatus = statusStates[dev.id]?.first,
lastSuccess = statusInfo?.second, lastSuccess = statusStates[dev.id]?.second,
onDismissStatus = { statusStates.remove(currentDevice.id) }, onDismissStatus = { statusStates.remove(dev.id) },
onRefreshStatus = { refreshDeviceStatus(currentDevice) }, onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
onTrigger = { action -> executeAction(currentDevice, action) }, onTrigger = { action -> executeAction(dev, action) },
onDelete = { dev -> onDelete = { d -> repository.deleteDevice(d.id); devices = repository.getDevices() }
repository.deleteDevice(dev.id)
devices = repository.getDevices()
}
) )
} else { } else {
AddDevicePage( AddDevicePage(
triggerClient = triggerClient, triggerClient = triggerClient,
onDeviceAdded = { newDevice -> onDeviceAdded = { newDev ->
repository.addDevice(newDevice) repository.addDevice(newDev)
devices = repository.getDevices() devices = repository.getDevices()
refreshDeviceStatus(newDevice) refreshStatus(newDev, showIndicator = true)
coroutineScope.launch { coroutineScope.launch {
val newPageIndex = devices.indexOfFirst { it.id == newDevice.id } val idx = devices.indexOfFirst { it.id == newDev.id }
if (newPageIndex >= 0) { if (idx >= 0) pagerState.animateScrollToPage(idx)
pagerState.animateScrollToPage(newPageIndex)
}
} }
} }
) )
@@ -2,33 +2,75 @@ package com.expapp.trigger.ui.theme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
val PowerOnGradient = listOf(Color(0xFF1B6A32), Color(0xFF0E431E)) // ── Background System ─────────────────────────────────────────────────────
val PowerOnBorder = Color(0xFF38A169) val BgDeep = Color(0xFF060911) // deepest black-navy
val BgBase = Color(0xFF0C0F1A) // main bg
val BgSurface = Color(0xFF111827) // card surface
val BgElevated = Color(0xFF1A2235) // elevated panels
val BgGlass = Color(0x14FFFFFF) // frosted glass overlay
val RebootGradient = listOf(Color(0xFFC05621), Color(0xFF7B341E)) // ── Border System ─────────────────────────────────────────────────────────
val RebootBorder = Color(0xFFDD6B20) val BorderSubtle = Color(0xFF1E2D47) // very subtle border
val BorderDefault = Color(0xFF253450) // standard border
val BorderStrong = Color(0xFF334D73) // stronger border on hover/focus
val PowerOffGradient = listOf(Color(0xFFC53030), Color(0xFF742A2A)) // ── Text ──────────────────────────────────────────────────────────────────
val PowerOffBorder = Color(0xFFE53E3E) val TextPrimary = Color(0xFFF1F5F9) // near-white
val TextSecondary = Color(0xFF8899B4) // muted blue-grey
val TextMuted = Color(0xFF4A5F7A) // very muted
val PowerOnGreen = Color(0xFF2E7D32) // ── Power On / Green ──────────────────────────────────────────────────────
val PowerOnGreenLight = Color(0xFF4CAF50) val GreenVibrant = Color(0xFF22D47E) // primary green
val RebootAmber = Color(0xFFEF6C00) val GreenDim = Color(0xFF16A361) // darker green
val RebootAmberLight = Color(0xFFFF9800) val GreenGlow = Color(0x4022D47E) // transparent glow
val PowerOffRed = Color(0xFFC62828) val GreenBg = Color(0xFF071A11) // dark green tinted bg
val PowerOffRedLight = Color(0xFFE53935) val GreenBorder = Color(0xFF0D3D22) // green border
val DarkBackground = Color(0xFF0D0F14) // ── Reboot / Amber ────────────────────────────────────────────────────────
val DarkSurface = Color(0xFF161A22) val AmberVibrant = Color(0xFFFFB627) // primary amber
val DarkSurfaceVariant = Color(0xFF1F2430) val AmberDim = Color(0xFFC47E00) // darker amber
val DarkCardBorder = Color(0xFF2B3242) val AmberGlow = Color(0x40FFB627) // transparent glow
val TextPrimary = Color(0xFFF7FAFC) val AmberBg = Color(0xFF191000) // dark amber tinted bg
val TextSecondary = Color(0xFFA0AEC0) val AmberBorder = Color(0xFF3D2C00) // amber border
val StatusOnlineBg = Color(0xFF0B2618) // ── Power Off / Red ───────────────────────────────────────────────────────
val StatusOnlineBorder = Color(0xFF1C4532) val RedVibrant = Color(0xFFFF4757) // primary red
val StatusOnlineText = Color(0xFF48BB78) val RedDim = Color(0xFFCC2233) // darker red
val RedGlow = Color(0x40FF4757) // transparent glow
val RedBg = Color(0xFF190004) // dark red tinted bg
val RedBorder = Color(0xFF3D0010) // red border
val StatusOfflineBg = Color(0xFF2D1214) // ── Status Colors ─────────────────────────────────────────────────────────
val StatusOfflineBorder = Color(0xFF63171B) val OnlineDot = Color(0xFF22D47E)
val StatusOfflineText = Color(0xFFF56565) val OnlineBg = Color(0xFF071A11)
val OnlineBorder = Color(0xFF0E3B1E)
val OnlineText = Color(0xFF34EE91)
val OfflineDot = Color(0xFFFF4757)
val OfflineBg = Color(0xFF190004)
val OfflineBorder = Color(0xFF3D0010)
val OfflineText = Color(0xFFFF6B78)
// ── Backwards-compat aliases (keep these so other files compile) ──────────
val DarkBackground = BgBase
val DarkSurface = BgSurface
val DarkSurfaceVariant = BgElevated
val DarkCardBorder = BorderDefault
val PowerOnGreen = GreenVibrant
val PowerOnGreenLight = GreenVibrant
val PowerOnBorder = GreenVibrant
val PowerOnGradient = listOf(Color(0xFF0E3D22), Color(0xFF061610))
val RebootAmber = AmberVibrant
val RebootAmberLight = AmberVibrant
val RebootBorder = AmberVibrant
val RebootGradient = listOf(Color(0xFF3D2800), Color(0xFF1A1000))
val PowerOffRed = RedVibrant
val PowerOffRedLight = RedVibrant
val PowerOffBorder = RedVibrant
val PowerOffGradient = listOf(Color(0xFF3D0010), Color(0xFF190004))
val StatusOnlineBg = OnlineBg
val StatusOnlineBorder = OnlineBorder
val StatusOnlineText = OnlineText
val StatusOfflineBg = OfflineBg
val StatusOfflineBorder = OfflineBorder
val StatusOfflineText = OfflineText
@@ -1,29 +1,27 @@
package com.expapp.trigger.ui.theme package com.expapp.trigger.ui.theme
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
private val DarkColorScheme = darkColorScheme( private val DarkColorScheme = darkColorScheme(
primary = PowerOnGreenLight, primary = GreenVibrant,
secondary = RebootAmberLight, secondary = AmberVibrant,
tertiary = PowerOffRedLight, tertiary = RedVibrant,
background = DarkBackground, background = BgBase,
surface = DarkSurface, surface = BgSurface,
onPrimary = Color.White, onPrimary = Color.White,
onSecondary = Color.White, onSecondary = Color.White,
onTertiary = Color.White, onTertiary = Color.White,
onBackground = TextPrimary, onBackground = TextPrimary,
onSurface = TextPrimary onSurface = TextPrimary,
surfaceVariant = BgElevated,
outline = BorderDefault
) )
@Composable @Composable
fun ExpAppTheme( fun ExpAppTheme(content: @Composable () -> Unit) {
darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit
) {
MaterialTheme( MaterialTheme(
colorScheme = DarkColorScheme, colorScheme = DarkColorScheme,
content = content content = content
@@ -139,7 +139,20 @@ class TriggerClientTest {
server.enqueue( server.enqueue(
MockResponse() MockResponse()
.setResponseCode(200) .setResponseCode(200)
.setBody("""{"node":"debian","online":true,"status":"online","ip":"100.85.63.44"}""") .setBody(
"""
{
"node": "debian",
"online": true,
"status": "online",
"ip": "100.85.63.44",
"on_since_duration": "57m 14s",
"on_since_ist": "2026-11-18 02:42:33 PM IST",
"uptime": "57m 14s",
"uptime_seconds": 3434
}
""".trimIndent()
)
) )
val localDevice = sampleDevice.copy( val localDevice = sampleDevice.copy(
@@ -159,6 +172,50 @@ class TriggerClientTest {
assertTrue(status.isOnline) assertTrue(status.isOnline)
assertEquals("ONLINE", status.statusText) assertEquals("ONLINE", status.statusText)
assertEquals("100.85.63.44", status.ip) assertEquals("100.85.63.44", status.ip)
assertEquals("57m 14s", status.uptime)
assertEquals("2026-11-18 02:42:33 PM IST", status.onSinceIst)
}
@Test
fun checkStatus_withOfflineHttp503Json_parsesOfflineAndLastActive() {
server.enqueue(
MockResponse()
.setResponseCode(503)
.setBody(
"""
{
"node": "debian",
"online": false,
"status": "offline",
"ip": "100.85.63.44",
"last_active_ist": "2026-11-18 03:36:58 PM IST",
"last_active_time": "2026-11-18 15:36:58 IST",
"last_active_ago": "4m 12s ago",
"last_active_timestamp": 1794996418
}
""".trimIndent()
)
)
val localDevice = sampleDevice.copy(
statusUrl = server.url("/status").toString()
)
val latch = CountDownLatch(1)
var statusResult: NodeStatus? = null
client.checkStatus(localDevice) { status ->
statusResult = status
latch.countDown()
}
assertTrue(latch.await(3, TimeUnit.SECONDS))
val status = statusResult!!
assertEquals(false, status.isOnline)
assertEquals("OFFLINE", status.statusText)
assertEquals("100.85.63.44", status.ip)
assertEquals("4m 12s ago", status.lastActiveAgo)
assertEquals("2026-11-18 03:36:58 PM IST", status.lastActiveIst)
} }
@Test @Test