feat(dashboard): integrate SysPulse live metrics, multi-disk visualizer, systemd service orchestrator (v1.3.0)
Build & Release Android APK / Build & Publish Release APK (push) Successful in 2m14s
Build & Release Android APK / Build & Publish Release APK (push) Successful in 2m14s
This commit is contained in:
@@ -108,11 +108,24 @@ class MainActivity : FragmentActivity() {
|
||||
r2Url = "https://bucket.linuxguy.space/home-server-app/endpoints.json",
|
||||
rebootUrl = "https://cosmos.linuxguy.space/reboot?node=debian",
|
||||
secretKey = "Carbon@12",
|
||||
statusUrl = "https://cosmos.linuxguy.space/status?node=debian"
|
||||
statusUrl = "https://cosmos.linuxguy.space/status?node=debian",
|
||||
syspulseUrl = "http://100.85.63.44:8088",
|
||||
syspulseSecretKey = "default_pulse_secret_key_change_me"
|
||||
)
|
||||
repository.addDevice(defaultDevice)
|
||||
}
|
||||
}
|
||||
|
||||
// Auto-upgrade existing default device with SysPulse defaults if missing
|
||||
repository.getDevices().forEach { dev ->
|
||||
if (dev.node.equals("debian", ignoreCase = true) && dev.syspulseUrl.isBlank()) {
|
||||
val upgraded = dev.copy(
|
||||
syspulseUrl = "http://100.85.63.44:8088",
|
||||
syspulseSecretKey = if (dev.syspulseSecretKey.isBlank()) "default_pulse_secret_key_change_me" else dev.syspulseSecretKey
|
||||
)
|
||||
repository.updateDevice(upgraded)
|
||||
}
|
||||
}
|
||||
triggerClient = TriggerClient()
|
||||
appSettings = AppSettings(applicationContext)
|
||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||
|
||||
@@ -11,5 +11,7 @@ data class DeviceConfig(
|
||||
val powerOnUrl: String,
|
||||
val powerOffUrl: String,
|
||||
val rebootUrl: String,
|
||||
val statusUrl: String = ""
|
||||
val statusUrl: String = "",
|
||||
val syspulseUrl: String = "",
|
||||
val syspulseSecretKey: String = ""
|
||||
)
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.expapp.trigger.data.model
|
||||
|
||||
import com.google.gson.annotations.SerializedName
|
||||
|
||||
data class SysPulseStatus(
|
||||
val success: Boolean = true,
|
||||
val uptime: String = "",
|
||||
val cpu: CpuMetrics = CpuMetrics(),
|
||||
val ram: RamMetrics = RamMetrics(),
|
||||
val disk: List<DiskMetrics> = emptyList(),
|
||||
val services: List<SysServiceInfo> = emptyList()
|
||||
)
|
||||
|
||||
data class CpuMetrics(
|
||||
val pct: Double = 0.0,
|
||||
val cores: Int = 1,
|
||||
val load: List<Double> = emptyList()
|
||||
)
|
||||
|
||||
data class RamMetrics(
|
||||
@SerializedName("used_mb")
|
||||
val usedMb: Long = 0,
|
||||
@SerializedName("total_mb")
|
||||
val totalMb: Long = 0,
|
||||
val pct: Double = 0.0
|
||||
)
|
||||
|
||||
data class DiskMetrics(
|
||||
val mount: String = "",
|
||||
@SerializedName("used_gb")
|
||||
val usedGb: Double = 0.0,
|
||||
@SerializedName("total_gb")
|
||||
val totalGb: Double = 0.0,
|
||||
val pct: Double = 0.0
|
||||
)
|
||||
|
||||
data class SysServiceInfo(
|
||||
val name: String = "",
|
||||
val unit: String = "",
|
||||
val active: Boolean = false,
|
||||
val enabled: Boolean = false,
|
||||
val state: String = "stopped",
|
||||
val pid: Long? = null
|
||||
)
|
||||
|
||||
data class ScheduledTasksResponse(
|
||||
val success: Boolean = true,
|
||||
val count: Int = 0,
|
||||
val tasks: List<ScheduledTask> = emptyList()
|
||||
)
|
||||
|
||||
data class ScheduledTask(
|
||||
@SerializedName("task_id")
|
||||
val taskId: String = "",
|
||||
@SerializedName("service_name")
|
||||
val serviceName: String = "",
|
||||
val operation: String = "",
|
||||
@SerializedName("delay_seconds")
|
||||
val delaySeconds: Long = 0,
|
||||
@SerializedName("created_at")
|
||||
val createdAt: String = "",
|
||||
@SerializedName("execute_at")
|
||||
val executeAt: String = "",
|
||||
val status: String = "pending"
|
||||
)
|
||||
|
||||
enum class ServiceOperation(val apiName: String, val displayName: String) {
|
||||
START("start", "Start"),
|
||||
STOP("stop", "Stop"),
|
||||
RESTART("restart", "Restart"),
|
||||
ENABLE("enable", "Enable on Boot"),
|
||||
DISABLE("disable", "Disable on Boot")
|
||||
}
|
||||
@@ -6,7 +6,9 @@ data class ParsedEndpoints(
|
||||
val powerOn: String,
|
||||
val powerOff: String,
|
||||
val reboot: String,
|
||||
val status: String = ""
|
||||
val status: String = "",
|
||||
val syspulse: String = "",
|
||||
val syspulseSecret: String = ""
|
||||
)
|
||||
|
||||
object R2ConfigParser {
|
||||
@@ -47,11 +49,25 @@ object R2ConfigParser {
|
||||
?: normalizedMap["health"]
|
||||
?: ""
|
||||
|
||||
val syspulse = normalizedMap["syspulse"]
|
||||
?: normalizedMap["pulse"]
|
||||
?: normalizedMap["metrics"]
|
||||
?: normalizedMap["dashboard"]
|
||||
?: normalizedMap["syspulseurl"]
|
||||
?: ""
|
||||
|
||||
val syspulseSecret = normalizedMap["syspulsesecret"]
|
||||
?: normalizedMap["pulsesecret"]
|
||||
?: normalizedMap["pulsekey"]
|
||||
?: ""
|
||||
|
||||
ParsedEndpoints(
|
||||
powerOn = powerOn,
|
||||
powerOff = powerOff,
|
||||
reboot = reboot,
|
||||
status = status
|
||||
status = status,
|
||||
syspulse = syspulse,
|
||||
syspulseSecret = syspulseSecret
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,19 +80,28 @@ class DeviceRepository(private val storage: KeyValueStorage) {
|
||||
powerOnUrl: String,
|
||||
powerOffUrl: String,
|
||||
rebootUrl: String,
|
||||
statusUrl: String = ""
|
||||
statusUrl: String = "",
|
||||
syspulseUrl: String = "",
|
||||
syspulseSecretKey: String = ""
|
||||
): Boolean {
|
||||
val current = getDevices().toMutableList()
|
||||
val index = current.indexOfFirst { it.id == deviceId }
|
||||
if (index != -1) {
|
||||
val old = current[index]
|
||||
val effectiveStatusUrl = if (statusUrl.isNotBlank()) statusUrl else old.statusUrl
|
||||
if (old.powerOnUrl != powerOnUrl || old.powerOffUrl != powerOffUrl || old.rebootUrl != rebootUrl || old.statusUrl != effectiveStatusUrl) {
|
||||
val effectiveSyspulseUrl = if (syspulseUrl.isNotBlank()) syspulseUrl else old.syspulseUrl
|
||||
val effectiveSyspulseKey = if (syspulseSecretKey.isNotBlank()) syspulseSecretKey else old.syspulseSecretKey
|
||||
if (old.powerOnUrl != powerOnUrl || old.powerOffUrl != powerOffUrl ||
|
||||
old.rebootUrl != rebootUrl || old.statusUrl != effectiveStatusUrl ||
|
||||
old.syspulseUrl != effectiveSyspulseUrl || old.syspulseSecretKey != effectiveSyspulseKey
|
||||
) {
|
||||
current[index] = old.copy(
|
||||
powerOnUrl = powerOnUrl,
|
||||
powerOffUrl = powerOffUrl,
|
||||
rebootUrl = rebootUrl,
|
||||
statusUrl = effectiveStatusUrl
|
||||
statusUrl = effectiveStatusUrl,
|
||||
syspulseUrl = effectiveSyspulseUrl,
|
||||
syspulseSecretKey = effectiveSyspulseKey
|
||||
)
|
||||
saveDevices(current)
|
||||
return true
|
||||
|
||||
@@ -0,0 +1,294 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.model.ScheduledTask
|
||||
import com.expapp.trigger.data.model.ScheduledTasksResponse
|
||||
import com.expapp.trigger.data.model.ServiceOperation
|
||||
import com.expapp.trigger.data.model.SysPulseStatus
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.JsonObject
|
||||
import com.google.gson.JsonParser
|
||||
import okhttp3.Call
|
||||
import okhttp3.Callback
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.Request
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import okhttp3.Response
|
||||
import java.io.IOException
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class SysPulseClient(
|
||||
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
||||
.followRedirects(true)
|
||||
.followSslRedirects(true)
|
||||
.connectTimeout(8, TimeUnit.SECONDS)
|
||||
.readTimeout(12, TimeUnit.SECONDS)
|
||||
.build(),
|
||||
private val gson: Gson = Gson()
|
||||
) {
|
||||
companion object {
|
||||
const val DEFAULT_FALLBACK_SECRET = "default_pulse_secret_key_change_me"
|
||||
const val HEADER_SECRET_KEY = "X-Secret-Key"
|
||||
private val JSON_MEDIA_TYPE = "application/json; charset=utf-8".toMediaType()
|
||||
val shared by lazy { SysPulseClient() }
|
||||
}
|
||||
|
||||
private val mainHandler = try {
|
||||
val looper = Looper.getMainLooper()
|
||||
if (looper != null) Handler(looper) else null
|
||||
} catch (_: Throwable) {
|
||||
null
|
||||
}
|
||||
|
||||
private fun runOnMain(block: () -> Unit) {
|
||||
mainHandler?.post(block) ?: block()
|
||||
}
|
||||
|
||||
fun resolveBaseUrl(device: DeviceConfig, nodeStatus: NodeStatus? = null): String {
|
||||
if (device.syspulseUrl.isNotBlank()) {
|
||||
return device.syspulseUrl.trim().removeSuffix("/")
|
||||
}
|
||||
val ip = nodeStatus?.ip?.trim()
|
||||
if (!ip.isNullOrBlank()) {
|
||||
return "http://$ip:8088"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
fun resolveSecretKey(device: DeviceConfig): String {
|
||||
return when {
|
||||
device.syspulseSecretKey.isNotBlank() -> device.syspulseSecretKey.trim()
|
||||
device.secretKey.isNotBlank() -> device.secretKey.trim()
|
||||
else -> DEFAULT_FALLBACK_SECRET
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Asynchronously fetches concise hardware metrics using device configuration and optional node status.
|
||||
*/
|
||||
fun fetchStatus(
|
||||
device: DeviceConfig,
|
||||
nodeStatus: NodeStatus? = null,
|
||||
onResult: (Result<SysPulseStatus>) -> Unit
|
||||
) {
|
||||
val baseUrl = resolveBaseUrl(device, nodeStatus)
|
||||
if (baseUrl.isBlank()) {
|
||||
runOnMain { onResult(Result.failure(IllegalStateException("No SysPulse URL available"))) }
|
||||
return
|
||||
}
|
||||
val secretKey = resolveSecretKey(device)
|
||||
fetchStatus(baseUrl, secretKey, onResult)
|
||||
}
|
||||
|
||||
/**
|
||||
* Asynchronously fetches concise hardware metrics (CPU, RAM, Disk, Host Uptime) and systemd services.
|
||||
*/
|
||||
fun fetchStatus(
|
||||
baseUrl: String,
|
||||
secretKey: String,
|
||||
onResult: (Result<SysPulseStatus>) -> Unit
|
||||
) {
|
||||
val url = "${baseUrl.removeSuffix("/")}/api/status"
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader(HEADER_SECRET_KEY, secretKey)
|
||||
.get()
|
||||
.build()
|
||||
|
||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use { res ->
|
||||
if (res.code == 401 && secretKey != DEFAULT_FALLBACK_SECRET) {
|
||||
// Secret key failed; retry with default pulse secret key fallback
|
||||
fetchStatus(baseUrl, DEFAULT_FALLBACK_SECRET, onResult)
|
||||
return
|
||||
}
|
||||
|
||||
if (!res.isSuccessful) {
|
||||
runOnMain {
|
||||
onResult(Result.failure(IOException("HTTP ${res.code}: ${res.message}")))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
val body = res.body?.string().orEmpty()
|
||||
try {
|
||||
val status = gson.fromJson(body, SysPulseStatus::class.java)
|
||||
runOnMain { onResult(Result.success(status)) }
|
||||
} catch (e: Exception) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Executes an immediate or scheduled service operation (start, stop, restart, enable, disable).
|
||||
*/
|
||||
fun operateService(
|
||||
baseUrl: String,
|
||||
secretKey: String,
|
||||
serviceName: String,
|
||||
operation: ServiceOperation,
|
||||
delaySeconds: Long? = null,
|
||||
onResult: (Result<String>) -> Unit
|
||||
) {
|
||||
val url = "${baseUrl.removeSuffix("/")}/api/service/operate"
|
||||
val payload = JsonObject().apply {
|
||||
addProperty("servicename", serviceName)
|
||||
addProperty("operation", operation.apiName)
|
||||
if (delaySeconds != null && delaySeconds > 0) {
|
||||
if (operation == ServiceOperation.START) {
|
||||
addProperty("time_to_start_after", delaySeconds)
|
||||
} else if (operation == ServiceOperation.STOP) {
|
||||
addProperty("time_to_stop_after", delaySeconds)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val requestBody = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader(HEADER_SECRET_KEY, secretKey)
|
||||
.post(requestBody)
|
||||
.build()
|
||||
|
||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use { res ->
|
||||
if (res.code == 401 && secretKey != DEFAULT_FALLBACK_SECRET) {
|
||||
operateService(baseUrl, DEFAULT_FALLBACK_SECRET, serviceName, operation, delaySeconds, onResult)
|
||||
return
|
||||
}
|
||||
|
||||
val body = res.body?.string().orEmpty()
|
||||
if (!res.isSuccessful) {
|
||||
val errorMsg = try {
|
||||
val json = JsonParser.parseString(body).asJsonObject
|
||||
json.get("error")?.asString ?: "HTTP ${res.code}: ${res.message}"
|
||||
} catch (_: Exception) {
|
||||
"HTTP ${res.code}: ${res.message}"
|
||||
}
|
||||
runOnMain { onResult(Result.failure(IOException(errorMsg))) }
|
||||
return
|
||||
}
|
||||
|
||||
val message = try {
|
||||
val json = JsonParser.parseString(body).asJsonObject
|
||||
json.get("message")?.asString ?: "Operation '${operation.displayName}' sent successfully"
|
||||
} catch (_: Exception) {
|
||||
"Operation '${operation.displayName}' sent successfully"
|
||||
}
|
||||
|
||||
runOnMain { onResult(Result.success(message)) }
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Lists active and pending scheduled operations.
|
||||
*/
|
||||
fun fetchTasks(
|
||||
baseUrl: String,
|
||||
secretKey: String,
|
||||
onResult: (Result<List<ScheduledTask>>) -> Unit
|
||||
) {
|
||||
val url = "${baseUrl.removeSuffix("/")}/api/service/tasks"
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader(HEADER_SECRET_KEY, secretKey)
|
||||
.get()
|
||||
.build()
|
||||
|
||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use { res ->
|
||||
if (res.code == 401 && secretKey != DEFAULT_FALLBACK_SECRET) {
|
||||
fetchTasks(baseUrl, DEFAULT_FALLBACK_SECRET, onResult)
|
||||
return
|
||||
}
|
||||
|
||||
if (!res.isSuccessful) {
|
||||
runOnMain { onResult(Result.failure(IOException("HTTP ${res.code}"))) }
|
||||
return
|
||||
}
|
||||
|
||||
val body = res.body?.string().orEmpty()
|
||||
try {
|
||||
val resp = gson.fromJson(body, ScheduledTasksResponse::class.java)
|
||||
runOnMain { onResult(Result.success(resp.tasks)) }
|
||||
} catch (e: Exception) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Cancels a pending scheduled service operation.
|
||||
*/
|
||||
fun cancelTask(
|
||||
baseUrl: String,
|
||||
secretKey: String,
|
||||
taskId: String,
|
||||
onResult: (Result<String>) -> Unit
|
||||
) {
|
||||
val url = "${baseUrl.removeSuffix("/")}/api/service/cancel-task"
|
||||
val payload = JsonObject().apply {
|
||||
addProperty("task_id", taskId)
|
||||
}
|
||||
val requestBody = payload.toString().toRequestBody(JSON_MEDIA_TYPE)
|
||||
val request = Request.Builder()
|
||||
.url(url)
|
||||
.addHeader(HEADER_SECRET_KEY, secretKey)
|
||||
.post(requestBody)
|
||||
.build()
|
||||
|
||||
okHttpClient.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain { onResult(Result.failure(e)) }
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use { res ->
|
||||
if (res.code == 401 && secretKey != DEFAULT_FALLBACK_SECRET) {
|
||||
cancelTask(baseUrl, DEFAULT_FALLBACK_SECRET, taskId, onResult)
|
||||
return
|
||||
}
|
||||
|
||||
val body = res.body?.string().orEmpty()
|
||||
if (!res.isSuccessful) {
|
||||
runOnMain { onResult(Result.failure(IOException("HTTP ${res.code}"))) }
|
||||
return
|
||||
}
|
||||
|
||||
val message = try {
|
||||
val json = JsonParser.parseString(body).asJsonObject
|
||||
json.get("message")?.asString ?: "Task cancelled"
|
||||
} catch (_: Exception) {
|
||||
"Task cancelled"
|
||||
}
|
||||
runOnMain { onResult(Result.success(message)) }
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,858 @@
|
||||
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.animateFloatAsState
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
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.Cancel
|
||||
import androidx.compose.material.icons.filled.CheckCircle
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.DeveloperBoard
|
||||
import androidx.compose.material.icons.filled.Memory
|
||||
import androidx.compose.material.icons.filled.MoreTime
|
||||
import androidx.compose.material.icons.filled.Pause
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.RestartAlt
|
||||
import androidx.compose.material.icons.filled.Schedule
|
||||
import androidx.compose.material.icons.filled.Stop
|
||||
import androidx.compose.material.icons.filled.Storage
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.FilterChip
|
||||
import androidx.compose.material3.FilterChipDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LinearProgressIndicator
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.OutlinedTextFieldDefaults
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
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.StrokeCap
|
||||
import androidx.compose.ui.graphics.drawscope.Stroke
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.expapp.trigger.data.model.CpuMetrics
|
||||
import com.expapp.trigger.data.model.DiskMetrics
|
||||
import com.expapp.trigger.data.model.RamMetrics
|
||||
import com.expapp.trigger.data.model.ScheduledTask
|
||||
import com.expapp.trigger.data.model.ServiceOperation
|
||||
import com.expapp.trigger.data.model.SysServiceInfo
|
||||
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||
import com.expapp.trigger.ui.theme.BgCard
|
||||
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.BorderSubtle
|
||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
||||
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
|
||||
import java.util.Locale
|
||||
|
||||
@Composable
|
||||
fun CircularMetricGauge(
|
||||
percentage: Double,
|
||||
label: String,
|
||||
sublabel: String,
|
||||
modifier: Modifier = Modifier,
|
||||
size: Int = 110
|
||||
) {
|
||||
val clampedPct = percentage.coerceIn(0.0, 100.0).toFloat()
|
||||
val animatedSweep by animateFloatAsState(
|
||||
targetValue = clampedPct * 2.6f, // 260 degrees arc
|
||||
animationSpec = tween(700, easing = FastOutSlowInEasing),
|
||||
label = "gauge_sweep"
|
||||
)
|
||||
|
||||
val gaugeColor by animateColorAsState(
|
||||
targetValue = when {
|
||||
clampedPct >= 85f -> RedVibrant
|
||||
clampedPct >= 65f -> AmberVibrant
|
||||
else -> GreenVibrant
|
||||
},
|
||||
animationSpec = tween(500),
|
||||
label = "gauge_color"
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = modifier,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier.size(size.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Canvas(modifier = Modifier.size((size - 10).dp)) {
|
||||
val strokeW = 10.dp.toPx()
|
||||
// Background Track
|
||||
drawArc(
|
||||
color = Color(0xFF26262B),
|
||||
startAngle = 140f,
|
||||
sweepAngle = 260f,
|
||||
useCenter = false,
|
||||
style = Stroke(width = strokeW, cap = StrokeCap.Round)
|
||||
)
|
||||
// Foreground Progress Arc
|
||||
drawArc(
|
||||
color = gaugeColor,
|
||||
startAngle = 140f,
|
||||
sweepAngle = animatedSweep,
|
||||
useCenter = false,
|
||||
style = Stroke(width = strokeW, cap = StrokeCap.Round)
|
||||
)
|
||||
}
|
||||
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(
|
||||
text = String.format(Locale.US, "%.1f%%", clampedPct),
|
||||
fontSize = 17.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
Text(
|
||||
text = label,
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
color = gaugeColor,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
if (sublabel.isNotBlank()) {
|
||||
Spacer(modifier = Modifier.height(4.dp))
|
||||
Text(
|
||||
text = sublabel,
|
||||
fontSize = 11.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun CpuCard(
|
||||
cpu: CpuMetrics,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Box(
|
||||
modifier = modifier
|
||||
.clip(RoundedCornerShape(18.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(18.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Column {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.DeveloperBoard,
|
||||
contentDescription = null,
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = "CPU LOAD",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Text(
|
||||
text = "${cpu.cores} Cores",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(6.dp))
|
||||
.background(BgElevated)
|
||||
.padding(horizontal = 7.dp, vertical = 3.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(12.dp))
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
CircularMetricGauge(
|
||||
percentage = cpu.pct,
|
||||
label = "CPU",
|
||||
sublabel = ""
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.padding(start = 16.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
Text(
|
||||
text = "LOAD AVERAGES",
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextMuted,
|
||||
letterSpacing = 0.8.sp
|
||||
)
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
val loads = cpu.load.ifEmpty { listOf(0.0, 0.0, 0.0) }
|
||||
LoadChip(label = "1m", value = loads.getOrElse(0) { 0.0 })
|
||||
LoadChip(label = "5m", value = loads.getOrElse(1) { 0.0 })
|
||||
LoadChip(label = "15m", value = loads.getOrElse(2) { 0.0 })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun LoadChip(label: String, value: Double) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(8.dp))
|
||||
.padding(horizontal = 7.dp, vertical = 5.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(text = label, fontSize = 9.sp, color = TextMuted)
|
||||
Text(
|
||||
text = String.format(Locale.US, "%.2f", value),
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun RamCard(
|
||||
ram: RamMetrics,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Box(
|
||||
modifier = modifier
|
||||
.clip(RoundedCornerShape(18.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(18.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Column {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Memory,
|
||||
contentDescription = null,
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = "MEMORY (RAM)",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Text(
|
||||
text = String.format(Locale.US, "%.1f%%", ram.pct),
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = if (ram.pct > 80) RedVibrant else AmberVibrant,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
|
||||
val usedGb = ram.usedMb / 1024.0
|
||||
val totalGb = ram.totalMb / 1024.0
|
||||
val freeGb = (ram.totalMb - ram.usedMb).coerceAtLeast(0) / 1024.0
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = String.format(Locale.US, "Used: %.2f GB", usedGb),
|
||||
fontSize = 12.sp,
|
||||
color = TextPrimary,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
Text(
|
||||
text = String.format(Locale.US, "Total: %.2f GB", totalGb),
|
||||
fontSize = 12.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
val progress = (ram.pct / 100.0).coerceIn(0.0, 1.0).toFloat()
|
||||
LinearProgressIndicator(
|
||||
progress = { progress },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(8.dp)
|
||||
.clip(RoundedCornerShape(4.dp)),
|
||||
color = if (progress > 0.85f) RedVibrant else AmberVibrant,
|
||||
trackColor = BgElevated
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
Text(
|
||||
text = String.format(Locale.US, "Free Memory: %.2f GB", freeGb),
|
||||
fontSize = 10.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun DisksCard(
|
||||
disks: List<DiskMetrics>,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Box(
|
||||
modifier = modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(18.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(18.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Storage,
|
||||
contentDescription = null,
|
||||
tint = Color(0xFF38BDF8),
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = "STORAGE & DISK MOUNTS",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Text(
|
||||
text = "${disks.size} Mounts",
|
||||
fontSize = 11.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
disks.forEach { disk ->
|
||||
DiskMountRow(disk = disk)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun DiskMountRow(disk: DiskMetrics) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(12.dp))
|
||||
.background(BgElevated.copy(alpha = 0.6f))
|
||||
.border(1.dp, BorderSubtle.copy(alpha = 0.5f), RoundedCornerShape(12.dp))
|
||||
.padding(10.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = disk.mount,
|
||||
fontSize = 13.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
Text(
|
||||
text = String.format(Locale.US, "%.1f%%", disk.pct),
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = if (disk.pct > 85) RedVibrant else Color(0xFF38BDF8),
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
|
||||
val progress = (disk.pct / 100.0).coerceIn(0.0, 1.0).toFloat()
|
||||
LinearProgressIndicator(
|
||||
progress = { progress },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(6.dp)
|
||||
.clip(RoundedCornerShape(3.dp)),
|
||||
color = if (progress > 0.85f) RedVibrant else Color(0xFF38BDF8),
|
||||
trackColor = BgSurface
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Text(
|
||||
text = String.format(Locale.US, "Used: %.1f GB", disk.usedGb),
|
||||
fontSize = 10.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
Text(
|
||||
text = String.format(Locale.US, "Total: %.1f GB", disk.totalGb),
|
||||
fontSize = 10.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ServiceCard(
|
||||
service: SysServiceInfo,
|
||||
onOperate: (SysServiceInfo, ServiceOperation) -> Unit,
|
||||
onSchedule: (SysServiceInfo) -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val isRunning = service.active && service.state.equals("running", ignoreCase = true)
|
||||
val isExited = service.state.equals("exited", ignoreCase = true)
|
||||
|
||||
val stateBadgeColor = when {
|
||||
isRunning -> GreenVibrant
|
||||
isExited -> AmberVibrant
|
||||
else -> RedVibrant
|
||||
}
|
||||
|
||||
val stateBadgeBg = when {
|
||||
isRunning -> GreenVibrant.copy(alpha = 0.12f)
|
||||
isExited -> AmberVibrant.copy(alpha = 0.12f)
|
||||
else -> RedVibrant.copy(alpha = 0.12f)
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(16.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(16.dp))
|
||||
.padding(13.dp)
|
||||
) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
// Header: Name, PID & State Badge
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
text = service.name.uppercase(),
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
if (service.pid != null && service.pid > 0) {
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
text = "PID ${service.pid}",
|
||||
fontSize = 10.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(4.dp))
|
||||
.background(BgElevated)
|
||||
.padding(horizontal = 5.dp, vertical = 2.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
text = service.unit,
|
||||
fontSize = 11.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis
|
||||
)
|
||||
}
|
||||
|
||||
// State Pill Chip
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(20.dp))
|
||||
.background(stateBadgeBg)
|
||||
.border(1.dp, stateBadgeColor.copy(alpha = 0.5f), RoundedCornerShape(20.dp))
|
||||
.padding(horizontal = 9.dp, vertical = 4.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(6.dp)
|
||||
.background(stateBadgeColor, CircleShape)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(5.dp))
|
||||
Text(
|
||||
text = service.state.uppercase(),
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = stateBadgeColor
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Action Buttons Row
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
if (!isRunning) {
|
||||
// Start Button
|
||||
ServiceActionButton(
|
||||
label = "START",
|
||||
icon = Icons.Default.PlayArrow,
|
||||
color = GreenVibrant,
|
||||
onClick = { onOperate(service, ServiceOperation.START) }
|
||||
)
|
||||
} else {
|
||||
// Stop Button
|
||||
ServiceActionButton(
|
||||
label = "STOP",
|
||||
icon = Icons.Default.Stop,
|
||||
color = RedVibrant,
|
||||
onClick = { onOperate(service, ServiceOperation.STOP) }
|
||||
)
|
||||
}
|
||||
|
||||
// Restart Button
|
||||
ServiceActionButton(
|
||||
label = "RESTART",
|
||||
icon = Icons.Default.RestartAlt,
|
||||
color = AmberVibrant,
|
||||
onClick = { onOperate(service, ServiceOperation.RESTART) }
|
||||
)
|
||||
|
||||
// Schedule Timer Button
|
||||
ServiceActionButton(
|
||||
label = "TIMER",
|
||||
icon = Icons.Default.MoreTime,
|
||||
color = Color(0xFF38BDF8),
|
||||
onClick = { onSchedule(service) }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ServiceActionButton(
|
||||
label: String,
|
||||
icon: androidx.compose.ui.graphics.vector.ImageVector,
|
||||
color: Color,
|
||||
onClick: () -> Unit
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.background(color.copy(alpha = 0.12f))
|
||||
.border(1.dp, color.copy(alpha = 0.35f), RoundedCornerShape(8.dp))
|
||||
.clickable(onClick = onClick)
|
||||
.padding(horizontal = 9.dp, vertical = 6.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
imageVector = icon,
|
||||
contentDescription = label,
|
||||
tint = color,
|
||||
modifier = Modifier.size(13.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Text(
|
||||
text = label,
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = color
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ScheduledTaskCard(
|
||||
task: ScheduledTask,
|
||||
onCancel: (ScheduledTask) -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Box(
|
||||
modifier = modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(BgElevated)
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.4f), RoundedCornerShape(14.dp))
|
||||
.padding(12.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Schedule,
|
||||
contentDescription = null,
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Column {
|
||||
Text(
|
||||
text = "Scheduled ${task.operation.uppercase()}: ${task.serviceName}",
|
||||
fontSize = 13.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary
|
||||
)
|
||||
Text(
|
||||
text = "Fires in ${task.delaySeconds}s • ${task.executeAt}",
|
||||
fontSize = 11.sp,
|
||||
color = TextSecondary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
IconButton(
|
||||
onClick = { onCancel(task) },
|
||||
modifier = Modifier.size(32.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Close,
|
||||
contentDescription = "Cancel Task",
|
||||
tint = RedVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ScheduleServiceDialog(
|
||||
service: SysServiceInfo,
|
||||
onConfirm: (operation: ServiceOperation, delaySeconds: Long) -> Unit,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
var selectedOp by remember {
|
||||
mutableStateOf(if (service.active) ServiceOperation.STOP else ServiceOperation.START)
|
||||
}
|
||||
var selectedMinutes by remember { mutableStateOf(5L) }
|
||||
var customMinutesText by remember { mutableStateOf("") }
|
||||
|
||||
val presetMinutes = listOf(1L, 5L, 15L, 30L, 60L)
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
containerColor = BgSurface,
|
||||
shape = RoundedCornerShape(20.dp),
|
||||
title = {
|
||||
Text(
|
||||
text = "Schedule ${service.name.uppercase()}",
|
||||
color = TextPrimary,
|
||||
fontWeight = FontWeight.Bold,
|
||||
fontSize = 17.sp
|
||||
)
|
||||
},
|
||||
text = {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||
Text(
|
||||
text = "Automatically execute operation after a scheduled delay:",
|
||||
fontSize = 13.sp,
|
||||
color = TextSecondary
|
||||
)
|
||||
|
||||
// Operation Switcher
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
listOf(ServiceOperation.START, ServiceOperation.STOP).forEach { op ->
|
||||
val isSelected = selectedOp == op
|
||||
val opColor = if (op == ServiceOperation.START) GreenVibrant else RedVibrant
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(if (isSelected) opColor.copy(alpha = 0.2f) else BgElevated)
|
||||
.border(1.dp, if (isSelected) opColor else BorderSubtle, RoundedCornerShape(10.dp))
|
||||
.clickable { selectedOp = op }
|
||||
.padding(vertical = 10.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = op.name,
|
||||
fontWeight = FontWeight.Bold,
|
||||
fontSize = 12.sp,
|
||||
color = if (isSelected) opColor else TextSecondary
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text(
|
||||
text = "SELECT DELAY",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextMuted,
|
||||
letterSpacing = 0.8.sp
|
||||
)
|
||||
|
||||
// Presets
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
presetMinutes.forEach { mins ->
|
||||
val isSelected = selectedMinutes == mins && customMinutesText.isBlank()
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.background(if (isSelected) Color(0xFF38BDF8).copy(alpha = 0.2f) else BgElevated)
|
||||
.border(1.dp, if (isSelected) Color(0xFF38BDF8) else BorderSubtle, RoundedCornerShape(8.dp))
|
||||
.clickable {
|
||||
selectedMinutes = mins
|
||||
customMinutesText = ""
|
||||
}
|
||||
.padding(vertical = 8.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = if (mins >= 60) "${mins / 60}h" else "${mins}m",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = if (isSelected) Color(0xFF38BDF8) else TextSecondary
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Custom Minutes Input
|
||||
OutlinedTextField(
|
||||
value = customMinutesText,
|
||||
onValueChange = {
|
||||
customMinutesText = it.filter { char -> char.isDigit() }
|
||||
it.toLongOrNull()?.let { m -> selectedMinutes = m }
|
||||
},
|
||||
label = { Text("Or custom minutes") },
|
||||
singleLine = true,
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = Color(0xFF38BDF8),
|
||||
unfocusedBorderColor = BorderDefault,
|
||||
cursorColor = Color(0xFF38BDF8),
|
||||
focusedLabelColor = Color(0xFF38BDF8),
|
||||
focusedTextColor = TextPrimary,
|
||||
unfocusedTextColor = TextPrimary
|
||||
),
|
||||
shape = RoundedCornerShape(10.dp),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
Button(
|
||||
onClick = {
|
||||
val finalSeconds = selectedMinutes * 60
|
||||
onConfirm(selectedOp, finalSeconds)
|
||||
},
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color(0xFF38BDF8).copy(alpha = 0.25f)),
|
||||
shape = RoundedCornerShape(10.dp)
|
||||
) {
|
||||
Text(
|
||||
text = "Schedule in ${selectedMinutes}m",
|
||||
color = Color(0xFF38BDF8),
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
}
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = onDismiss) {
|
||||
Text("Cancel", color = TextSecondary)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -222,14 +222,16 @@ fun AddDevicePage(
|
||||
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
|
||||
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,
|
||||
syspulseUrl = ep.syspulse,
|
||||
syspulseSecretKey = ep.syspulseSecret
|
||||
)
|
||||
onDeviceAdded(dev)
|
||||
successMsg = "\"${dev.name}\" added successfully"
|
||||
|
||||
@@ -0,0 +1,573 @@
|
||||
package com.expapp.trigger.ui.screens
|
||||
|
||||
import android.widget.Toast
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
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.fillMaxSize
|
||||
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.rememberScrollState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.CheckCircle
|
||||
import androidx.compose.material.icons.filled.CloudOff
|
||||
import androidx.compose.material.icons.filled.FilterList
|
||||
import androidx.compose.material.icons.filled.Pause
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.filled.PowerSettingsNew
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.Schedule
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material.icons.filled.Speed
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.OutlinedTextFieldDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
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.platform.LocalContext
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.model.ScheduledTask
|
||||
import com.expapp.trigger.data.model.ServiceOperation
|
||||
import com.expapp.trigger.data.model.SysPulseStatus
|
||||
import com.expapp.trigger.data.model.SysServiceInfo
|
||||
import com.expapp.trigger.network.NodeStatus
|
||||
import com.expapp.trigger.network.SysPulseClient
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.ui.components.CpuCard
|
||||
import com.expapp.trigger.ui.components.DisksCard
|
||||
import com.expapp.trigger.ui.components.RamCard
|
||||
import com.expapp.trigger.ui.components.ScheduleServiceDialog
|
||||
import com.expapp.trigger.ui.components.ScheduledTaskCard
|
||||
import com.expapp.trigger.ui.components.ServiceCard
|
||||
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||
import com.expapp.trigger.ui.theme.BgCard
|
||||
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.BorderSubtle
|
||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
||||
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
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun DashboardScreen(
|
||||
device: DeviceConfig,
|
||||
nodeStatus: NodeStatus?,
|
||||
onBack: () -> Unit,
|
||||
onTriggerPowerAction: ((TriggerAction) -> Unit)? = null,
|
||||
onRequireBiometric: ((title: String, subtitle: String, onAuthorized: () -> Unit) -> Unit)? = null,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val sysPulseClient = remember { SysPulseClient() }
|
||||
|
||||
val effectiveUrl = remember(device, nodeStatus) {
|
||||
sysPulseClient.resolveBaseUrl(device, nodeStatus)
|
||||
}
|
||||
val effectiveSecret = remember(device) {
|
||||
sysPulseClient.resolveSecretKey(device)
|
||||
}
|
||||
|
||||
var pulseStatus by remember { mutableStateOf<SysPulseStatus?>(null) }
|
||||
var scheduledTasks by remember { mutableStateOf<List<ScheduledTask>>(emptyList()) }
|
||||
var isLoading by remember { mutableStateOf(true) }
|
||||
var isPollingActive by remember { mutableStateOf(true) }
|
||||
var errorMessage by remember { mutableStateOf<String?>(null) }
|
||||
|
||||
var serviceToSchedule by remember { mutableStateOf<SysServiceInfo?>(null) }
|
||||
var searchQuery by remember { mutableStateOf("") }
|
||||
var filterMode by remember { mutableStateOf("ALL") } // ALL, RUNNING, STOPPED
|
||||
|
||||
fun refreshData(showIndicator: Boolean = false) {
|
||||
if (effectiveUrl.isBlank()) {
|
||||
isLoading = false
|
||||
errorMessage = "No SysPulse API endpoint configured or detected for this server."
|
||||
return
|
||||
}
|
||||
if (showIndicator) isLoading = true
|
||||
|
||||
sysPulseClient.fetchStatus(effectiveUrl, effectiveSecret) { result ->
|
||||
isLoading = false
|
||||
result.onSuccess {
|
||||
pulseStatus = it
|
||||
errorMessage = null
|
||||
}.onFailure { err ->
|
||||
if (pulseStatus == null) {
|
||||
errorMessage = err.localizedMessage ?: "Unable to connect to SysPulse at $effectiveUrl"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sysPulseClient.fetchTasks(effectiveUrl, effectiveSecret) { result ->
|
||||
result.onSuccess {
|
||||
scheduledTasks = it
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Active polling loop every 3 seconds while screen is displayed
|
||||
LaunchedEffect(effectiveUrl, effectiveSecret, isPollingActive) {
|
||||
if (effectiveUrl.isBlank()) return@LaunchedEffect
|
||||
while (isActive && isPollingActive) {
|
||||
refreshData(showIndicator = false)
|
||||
delay(3000L)
|
||||
}
|
||||
}
|
||||
|
||||
fun handleServiceOperation(service: SysServiceInfo, op: ServiceOperation, delaySec: Long? = null) {
|
||||
val executeCall = {
|
||||
val delayStr = if (delaySec != null && delaySec > 0) " in ${delaySec / 60}m" else ""
|
||||
Toast.makeText(context, "Executing ${op.displayName} on ${service.name}$delayStr...", Toast.LENGTH_SHORT).show()
|
||||
|
||||
sysPulseClient.operateService(
|
||||
baseUrl = effectiveUrl,
|
||||
secretKey = effectiveSecret,
|
||||
serviceName = service.name,
|
||||
operation = op,
|
||||
delaySeconds = delaySec
|
||||
) { result ->
|
||||
result.onSuccess { msg ->
|
||||
Toast.makeText(context, "✅ $msg", Toast.LENGTH_SHORT).show()
|
||||
refreshData(showIndicator = false)
|
||||
}.onFailure { err ->
|
||||
Toast.makeText(context, "❌ ${err.localizedMessage}", Toast.LENGTH_LONG).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Prompt biometric confirmation for stopping critical production services
|
||||
if (op == ServiceOperation.STOP && onRequireBiometric != null) {
|
||||
onRequireBiometric("Confirm Stop ${service.name.uppercase()}", "Authenticate to stop ${service.unit}") {
|
||||
executeCall()
|
||||
}
|
||||
} else {
|
||||
executeCall()
|
||||
}
|
||||
}
|
||||
|
||||
if (serviceToSchedule != null) {
|
||||
ScheduleServiceDialog(
|
||||
service = serviceToSchedule!!,
|
||||
onConfirm = { op, delaySec ->
|
||||
val s = serviceToSchedule!!
|
||||
serviceToSchedule = null
|
||||
handleServiceOperation(s, op, delaySec)
|
||||
},
|
||||
onDismiss = { serviceToSchedule = null }
|
||||
)
|
||||
}
|
||||
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.background(BgSurface)
|
||||
) {
|
||||
// ── TOP APP BAR ──────────────────────────────────────────────────
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 14.dp, vertical = 10.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
IconButton(
|
||||
onClick = onBack,
|
||||
modifier = Modifier.size(36.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.AutoMirrored.Filled.ArrowBack,
|
||||
contentDescription = "Back",
|
||||
tint = TextPrimary
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
text = "${device.name} • DASHBOARD",
|
||||
fontSize = 15.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
Text(
|
||||
text = if (effectiveUrl.isNotBlank()) effectiveUrl else "SysPulse API Offline",
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
maxLines = 1
|
||||
)
|
||||
}
|
||||
|
||||
// Live Polling Toggle
|
||||
IconButton(
|
||||
onClick = { isPollingActive = !isPollingActive },
|
||||
modifier = Modifier.size(34.dp)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = if (isPollingActive) Icons.Default.Pause else Icons.Default.PlayArrow,
|
||||
contentDescription = if (isPollingActive) "Pause Polling" else "Resume Polling",
|
||||
tint = if (isPollingActive) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
}
|
||||
|
||||
// Manual Refresh Button
|
||||
IconButton(
|
||||
onClick = { refreshData(showIndicator = true) },
|
||||
modifier = Modifier.size(34.dp)
|
||||
) {
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(
|
||||
modifier = Modifier.size(16.dp),
|
||||
strokeWidth = 2.dp,
|
||||
color = GreenVibrant
|
||||
)
|
||||
} else {
|
||||
Icon(
|
||||
Icons.Default.Refresh,
|
||||
contentDescription = "Refresh",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(20.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── DASHBOARD BODY ───────────────────────────────────────────────
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(scrollState)
|
||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(14.dp)
|
||||
) {
|
||||
// ── HOST STATUS BANNER ───────────────────────────────────────
|
||||
val status = pulseStatus
|
||||
if (status != null) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(16.dp))
|
||||
.background(
|
||||
Brush.horizontalGradient(
|
||||
listOf(BgCard, BgElevated)
|
||||
)
|
||||
)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(16.dp))
|
||||
.padding(horizontal = 14.dp, vertical = 10.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(8.dp)
|
||||
.background(GreenVibrant, CircleShape)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = "UPTIME",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextMuted,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
text = status.uptime,
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
color = GreenVibrant,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
text = "POLL",
|
||||
fontSize = 10.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Text(
|
||||
text = if (isPollingActive) "3s" else "PAUSED",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = if (isPollingActive) GreenVibrant else AmberVibrant,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Offline or Connection Failure State
|
||||
if (status == null && !isLoading) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(20.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(20.dp))
|
||||
.padding(24.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Column(
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.CloudOff,
|
||||
contentDescription = null,
|
||||
tint = RedVibrant,
|
||||
modifier = Modifier.size(48.dp)
|
||||
)
|
||||
Text(
|
||||
text = "SysPulse Daemon Unreachable",
|
||||
fontSize = 16.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary
|
||||
)
|
||||
Text(
|
||||
text = errorMessage ?: "The server may be powered off or SysPulse is not running at $effectiveUrl.",
|
||||
fontSize = 12.sp,
|
||||
color = TextSecondary,
|
||||
modifier = Modifier.padding(horizontal = 8.dp)
|
||||
)
|
||||
if (onTriggerPowerAction != null && nodeStatus?.isOnline != true) {
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
Button(
|
||||
onClick = { onTriggerPowerAction(TriggerAction.POWER_ON) },
|
||||
colors = ButtonDefaults.buttonColors(containerColor = GreenVibrant),
|
||||
shape = RoundedCornerShape(12.dp)
|
||||
) {
|
||||
Icon(Icons.Default.PowerSettingsNew, null, modifier = Modifier.size(16.dp))
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text("Wake Server Now", fontWeight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── HARDWARE METRICS GRID ────────────────────────────────────
|
||||
if (status != null) {
|
||||
// CPU Card
|
||||
CpuCard(cpu = status.cpu)
|
||||
|
||||
// RAM Card
|
||||
RamCard(ram = status.ram)
|
||||
|
||||
// Disks Mounts Card
|
||||
if (status.disk.isNotEmpty()) {
|
||||
DisksCard(disks = status.disk)
|
||||
}
|
||||
}
|
||||
|
||||
// ── SCHEDULED TASKS SECTION ──────────────────────────────────
|
||||
if (scheduledTasks.isNotEmpty()) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Schedule,
|
||||
contentDescription = null,
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
text = "ACTIVE SCHEDULED TASKS",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
Text(
|
||||
text = "${scheduledTasks.size} Pending",
|
||||
fontSize = 11.sp,
|
||||
color = AmberVibrant,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
scheduledTasks.forEach { task ->
|
||||
ScheduledTaskCard(
|
||||
task = task,
|
||||
onCancel = { t ->
|
||||
sysPulseClient.cancelTask(effectiveUrl, effectiveSecret, t.taskId) { res ->
|
||||
res.onSuccess { msg ->
|
||||
Toast.makeText(context, "✅ $msg", Toast.LENGTH_SHORT).show()
|
||||
refreshData(false)
|
||||
}.onFailure { err ->
|
||||
Toast.makeText(context, "❌ ${err.localizedMessage}", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── MONITORED SYSTEMD SERVICES SECTION ───────────────────────
|
||||
if (status != null && status.services.isNotEmpty()) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Text(
|
||||
text = "SYSTEMD SERVICES",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 1.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1f))
|
||||
val runningCount = status.services.count { it.active }
|
||||
Text(
|
||||
text = "$runningCount / ${status.services.size} Running",
|
||||
fontSize = 11.sp,
|
||||
color = GreenVibrant,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
}
|
||||
|
||||
// Search & Filter Bar
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
OutlinedTextField(
|
||||
value = searchQuery,
|
||||
onValueChange = { searchQuery = it },
|
||||
placeholder = { Text("Filter services...", fontSize = 12.sp) },
|
||||
singleLine = true,
|
||||
leadingIcon = { Icon(Icons.Default.Search, null, modifier = Modifier.size(16.dp)) },
|
||||
colors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = GreenVibrant,
|
||||
unfocusedBorderColor = BorderSubtle,
|
||||
cursorColor = GreenVibrant,
|
||||
focusedTextColor = TextPrimary,
|
||||
unfocusedTextColor = TextPrimary
|
||||
),
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.height(48.dp)
|
||||
)
|
||||
|
||||
listOf("ALL", "RUNNING", "STOPPED").forEach { mode ->
|
||||
val isSelected = filterMode == mode
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(if (isSelected) GreenVibrant.copy(alpha = 0.2f) else BgElevated)
|
||||
.border(1.dp, if (isSelected) GreenVibrant else BorderSubtle, RoundedCornerShape(10.dp))
|
||||
.clickable { filterMode = mode }
|
||||
.padding(horizontal = 9.dp, vertical = 9.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = mode,
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = if (isSelected) GreenVibrant else TextSecondary
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Filtered Services List
|
||||
val filteredServices = status.services.filter { s ->
|
||||
val matchesSearch = searchQuery.isBlank() ||
|
||||
s.name.contains(searchQuery, ignoreCase = true) ||
|
||||
s.unit.contains(searchQuery, ignoreCase = true)
|
||||
val matchesMode = when (filterMode) {
|
||||
"RUNNING" -> s.active
|
||||
"STOPPED" -> !s.active
|
||||
else -> true
|
||||
}
|
||||
matchesSearch && matchesMode
|
||||
}
|
||||
|
||||
if (filteredServices.isEmpty()) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = 18.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Text(
|
||||
text = "No services matching '$searchQuery'",
|
||||
fontSize = 13.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
} else {
|
||||
filteredServices.forEach { service ->
|
||||
ServiceCard(
|
||||
service = service,
|
||||
onOperate = { s, op -> handleServiceOperation(s, op) },
|
||||
onSchedule = { s -> serviceToSchedule = s }
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.togetherWith
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@@ -40,6 +41,7 @@ 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.Schedule
|
||||
import androidx.compose.material.icons.filled.Speed
|
||||
import androidx.compose.material.icons.filled.Terminal
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
import androidx.compose.material.icons.filled.VisibilityOff
|
||||
@@ -54,6 +56,7 @@ import androidx.compose.material3.OutlinedTextFieldDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
@@ -73,12 +76,15 @@ import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.model.SysPulseStatus
|
||||
import com.expapp.trigger.network.NodeStatus
|
||||
import com.expapp.trigger.network.SysPulseClient
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.ui.components.ActionConfirmDialog
|
||||
import com.expapp.trigger.ui.components.HugeActionButton
|
||||
import com.expapp.trigger.ui.components.StatusBanner
|
||||
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||
import com.expapp.trigger.ui.theme.BgCard
|
||||
import com.expapp.trigger.ui.theme.BgElevated
|
||||
import com.expapp.trigger.ui.theme.BgSurface
|
||||
import com.expapp.trigger.ui.theme.BorderDefault
|
||||
@@ -115,18 +121,35 @@ fun DevicePage(
|
||||
onDelete: (DeviceConfig) -> Unit,
|
||||
onSyncConfig: () -> Unit = {},
|
||||
onUpdateDevice: (DeviceConfig) -> Unit = {},
|
||||
onRequireBiometric: ((title: String, subtitle: String, onAuthorized: () -> Unit) -> Unit)? = null,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
var selectedTab by remember { mutableStateOf("CONTROL") }
|
||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||
var showDeleteConfirm by remember { mutableStateOf(false) }
|
||||
var showEditDialog by remember { mutableStateOf(false) }
|
||||
var showMenu by remember { mutableStateOf(false) }
|
||||
|
||||
// If Dashboard mode is selected, render full-screen interactive dashboard
|
||||
if (selectedTab == "DASHBOARD") {
|
||||
DashboardScreen(
|
||||
device = device,
|
||||
nodeStatus = nodeStatus,
|
||||
onBack = { selectedTab = "CONTROL" },
|
||||
onTriggerPowerAction = onTrigger,
|
||||
onRequireBiometric = onRequireBiometric,
|
||||
modifier = modifier
|
||||
)
|
||||
return
|
||||
}
|
||||
|
||||
if (showEditDialog) {
|
||||
var editName by remember { mutableStateOf(device.name) }
|
||||
var editNode by remember { mutableStateOf(device.node) }
|
||||
var editR2Url by remember { mutableStateOf(device.r2Url) }
|
||||
var editSecretKey by remember { mutableStateOf(device.secretKey) }
|
||||
var editSyspulseUrl by remember { mutableStateOf(device.syspulseUrl) }
|
||||
var editSyspulseSecret by remember { mutableStateOf(device.syspulseSecretKey) }
|
||||
var showKey by remember { mutableStateOf(false) }
|
||||
|
||||
val editFieldColors = OutlinedTextFieldDefaults.colors(
|
||||
@@ -192,6 +215,24 @@ fun DevicePage(
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = editSyspulseUrl,
|
||||
onValueChange = { editSyspulseUrl = it },
|
||||
label = { Text("SysPulse API URL (e.g. http://100.85.63.44:8088)") },
|
||||
singleLine = true,
|
||||
colors = editFieldColors,
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = editSyspulseSecret,
|
||||
onValueChange = { editSyspulseSecret = it },
|
||||
label = { Text("SysPulse Secret Key (optional override)") },
|
||||
singleLine = true,
|
||||
colors = editFieldColors,
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
@@ -202,7 +243,9 @@ fun DevicePage(
|
||||
name = editName.trim().ifBlank { device.name },
|
||||
node = editNode.trim().ifBlank { device.node },
|
||||
r2Url = editR2Url.trim(),
|
||||
secretKey = editSecretKey.trim()
|
||||
secretKey = editSecretKey.trim(),
|
||||
syspulseUrl = editSyspulseUrl.trim(),
|
||||
syspulseSecretKey = editSyspulseSecret.trim()
|
||||
)
|
||||
onUpdateDevice(updated)
|
||||
},
|
||||
@@ -274,6 +317,21 @@ fun DevicePage(
|
||||
val isOnline = nodeStatus?.isOnline
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
var glanceStatus by remember { mutableStateOf<SysPulseStatus?>(null) }
|
||||
var glanceLoading by remember { mutableStateOf(false) }
|
||||
|
||||
LaunchedEffect(device.id, isOnline) {
|
||||
if (isOnline == true) {
|
||||
glanceLoading = true
|
||||
SysPulseClient.shared.fetchStatus(device, nodeStatus) { res ->
|
||||
if (res.isSuccess) {
|
||||
glanceStatus = res.getOrNull()
|
||||
}
|
||||
glanceLoading = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
@@ -580,6 +638,180 @@ fun DevicePage(
|
||||
}
|
||||
}
|
||||
|
||||
// ── MODE SELECTOR (CONTROL vs DASHBOARD) ─────────────────────────
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||
.padding(4.dp),
|
||||
horizontalArrangement = Arrangement.spacedBy(4.dp)
|
||||
) {
|
||||
val isControl = selectedTab == "CONTROL"
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(if (isControl) BgSurface else Color.Transparent)
|
||||
.then(if (isControl) Modifier.border(1.dp, BorderDefault, RoundedCornerShape(10.dp)) else Modifier)
|
||||
.clickable { selectedTab = "CONTROL" }
|
||||
.padding(vertical = 10.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.PowerSettingsNew,
|
||||
contentDescription = null,
|
||||
tint = if (isControl) RedVibrant else TextMuted,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Text(
|
||||
"Power Control",
|
||||
fontSize = 13.sp,
|
||||
fontWeight = if (isControl) FontWeight.Bold else FontWeight.Medium,
|
||||
color = if (isControl) TextPrimary else TextSecondary
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(if (!isControl) BgSurface else Color.Transparent)
|
||||
.then(if (!isControl) Modifier.border(1.dp, BorderDefault, RoundedCornerShape(10.dp)) else Modifier)
|
||||
.clickable { selectedTab = "DASHBOARD" }
|
||||
.padding(vertical = 10.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Speed,
|
||||
contentDescription = null,
|
||||
tint = if (!isControl) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Text(
|
||||
"SysPulse",
|
||||
fontSize = 13.sp,
|
||||
fontWeight = if (!isControl) FontWeight.Bold else FontWeight.Medium,
|
||||
color = if (!isControl) TextPrimary else TextSecondary
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── LIVE TELEMETRY GLANCE CARD ───────────────────────────────────
|
||||
if (isOnline == true) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(16.dp))
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(16.dp))
|
||||
.clickable { selectedTab = "DASHBOARD" }
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(6.dp)
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Speed,
|
||||
contentDescription = null,
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(14.dp)
|
||||
)
|
||||
Text(
|
||||
"Live Telemetry",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
}
|
||||
Text(
|
||||
"Full Dashboard ➔",
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
color = GreenVibrant
|
||||
)
|
||||
}
|
||||
|
||||
if (glanceLoading && glanceStatus == null) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
CircularProgressIndicator(
|
||||
modifier = Modifier.size(12.dp),
|
||||
strokeWidth = 1.5.dp,
|
||||
color = GreenVibrant
|
||||
)
|
||||
Text("Connecting to SysPulse daemon...", fontSize = 12.sp, color = TextMuted)
|
||||
}
|
||||
} else if (glanceStatus != null) {
|
||||
val st = glanceStatus!!
|
||||
val cpuPct = st.cpu.pct
|
||||
val ramPct = st.ram.pct
|
||||
val rootDisk = st.disk.find { it.mount == "/" }
|
||||
val diskPct = rootDisk?.pct ?: 0.0
|
||||
val runningServices = st.services.count { it.active }
|
||||
val totalServices = st.services.size
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
MiniMetricChip(
|
||||
label = "CPU",
|
||||
value = "%.1f%%".format(cpuPct),
|
||||
color = if (cpuPct > 80) RedVibrant else if (cpuPct > 50) AmberVibrant else GreenVibrant,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
MiniMetricChip(
|
||||
label = "RAM",
|
||||
value = "%.0f%%".format(ramPct),
|
||||
color = if (ramPct > 85) RedVibrant else if (ramPct > 65) AmberVibrant else GreenVibrant,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
MiniMetricChip(
|
||||
label = "DISK",
|
||||
value = "%.0f%%".format(diskPct),
|
||||
color = if (diskPct > 90) RedVibrant else AmberVibrant,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
MiniMetricChip(
|
||||
label = "SVCS",
|
||||
value = "$runningServices/$totalServices",
|
||||
color = GreenVibrant,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Text(
|
||||
"Tap to open hardware monitor & service controls",
|
||||
fontSize = 12.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── ACTION RESULT BANNER ─────────────────────────────────────────
|
||||
StatusBanner(
|
||||
status = lastStatus,
|
||||
@@ -593,10 +825,8 @@ fun DevicePage(
|
||||
val isPowerOffEnabled = isOnline != false && !isLoading
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(1f),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp)
|
||||
) {
|
||||
HugeActionButton(
|
||||
text = "Power On",
|
||||
@@ -633,3 +863,26 @@ fun DevicePage(
|
||||
Spacer(modifier = Modifier.height(4.dp))
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun MiniMetricChip(
|
||||
label: String,
|
||||
value: String,
|
||||
color: Color,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Box(
|
||||
modifier = modifier
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(BgSurface)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
|
||||
.padding(vertical = 8.dp, horizontal = 6.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(label, fontSize = 9.sp, fontWeight = FontWeight.Bold, color = TextMuted, letterSpacing = 0.5.sp)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(value, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = color)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -189,7 +189,15 @@ fun MainScreen(
|
||||
triggerClient.fetchR2Config(device.r2Url) { result ->
|
||||
completed++
|
||||
result.onSuccess { ep ->
|
||||
val changed = repository.updateEndpoints(device.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
||||
val changed = repository.updateEndpoints(
|
||||
device.id,
|
||||
ep.powerOn,
|
||||
ep.powerOff,
|
||||
ep.reboot,
|
||||
ep.status,
|
||||
ep.syspulse,
|
||||
ep.syspulseSecret
|
||||
)
|
||||
if (changed) { updated++; devices = repository.getDevices() }
|
||||
}
|
||||
if (completed == total) {
|
||||
@@ -519,6 +527,15 @@ fun MainScreen(
|
||||
repository.updateDevice(updated)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(updated, showIndicator = true)
|
||||
},
|
||||
onRequireBiometric = { title, subtitle, onAuthorized ->
|
||||
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(context)) {
|
||||
requestBiometricAuth(title, subtitle) { success ->
|
||||
if (success) onAuthorized()
|
||||
}
|
||||
} else {
|
||||
onAuthorized()
|
||||
}
|
||||
}
|
||||
)
|
||||
} else {
|
||||
|
||||
@@ -26,6 +26,26 @@ class R2ConfigParserTest {
|
||||
assertEquals("https://cosmos.linuxguy.space/status", endpoints.status)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun parse_withSysPulseEndpoints_returnsSysPulseData() {
|
||||
val json = """
|
||||
{
|
||||
"poweron": "https://cosmos.linuxguy.space/poweron",
|
||||
"poweroff": "https://cosmos.linuxguy.space/poweroff",
|
||||
"reboot": "https://cosmos.linuxguy.space/reboot",
|
||||
"status": "https://cosmos.linuxguy.space/status",
|
||||
"syspulse": "http://100.85.63.44:8088",
|
||||
"syspulse_secret": "my_secret_key"
|
||||
}
|
||||
""".trimIndent()
|
||||
|
||||
val result = R2ConfigParser.parse(json)
|
||||
assertTrue(result.isSuccess)
|
||||
val endpoints = result.getOrThrow()
|
||||
assertEquals("http://100.85.63.44:8088", endpoints.syspulse)
|
||||
assertEquals("my_secret_key", endpoints.syspulseSecret)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun parse_camelCaseAndUnderscoreKeys_returnsEndpoints() {
|
||||
val json = """
|
||||
|
||||
@@ -83,7 +83,9 @@ class DeviceRepositoryTest {
|
||||
deviceId = "dev-1",
|
||||
powerOnUrl = "https://new.url/on",
|
||||
powerOffUrl = "https://new.url/off",
|
||||
rebootUrl = "https://new.url/reboot"
|
||||
rebootUrl = "https://new.url/reboot",
|
||||
syspulseUrl = "http://100.85.63.44:8088",
|
||||
syspulseSecretKey = "secret123"
|
||||
)
|
||||
|
||||
assertTrue(updated)
|
||||
@@ -91,6 +93,8 @@ class DeviceRepositoryTest {
|
||||
assertEquals("https://new.url/on", saved.powerOnUrl)
|
||||
assertEquals("https://new.url/off", saved.powerOffUrl)
|
||||
assertEquals("https://new.url/reboot", saved.rebootUrl)
|
||||
assertEquals("http://100.85.63.44:8088", saved.syspulseUrl)
|
||||
assertEquals("secret123", saved.syspulseSecretKey)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user