Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1998fffe30 | ||
|
|
82095e614d | ||
|
|
d72abb5f40 | ||
|
|
8ca5bc083a | ||
|
|
a897236b90 | ||
|
|
1ef05a04cb | ||
|
|
5c66f6c4dc | ||
|
|
153bf3598d |
@@ -11,8 +11,8 @@ android {
|
||||
applicationId = "com.expapp.trigger"
|
||||
minSdk = 24
|
||||
targetSdk = 34
|
||||
versionCode = 15
|
||||
versionName = "1.2.1"
|
||||
versionCode = 22
|
||||
versionName = "1.3.3"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:theme="@style/Theme.ExpApp">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
@@ -60,6 +61,15 @@
|
||||
android:name=".update.InstallStatusReceiver"
|
||||
android:exported="false" />
|
||||
|
||||
<!-- Transparent Widget Biometric Auth Activity (Floating Prompt on Launcher) -->
|
||||
<activity
|
||||
android:name=".widget.WidgetAuthActivity"
|
||||
android:exported="false"
|
||||
android:theme="@style/Theme.WidgetAuth"
|
||||
android:excludeFromRecents="true"
|
||||
android:noHistory="true"
|
||||
android:launchMode="singleInstance" />
|
||||
|
||||
<!-- Home Screen Widget -->
|
||||
<receiver
|
||||
android:name=".widget.ServerWidgetProvider"
|
||||
|
||||
@@ -39,6 +39,7 @@ import com.expapp.trigger.ui.theme.DarkBackground
|
||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import com.expapp.trigger.worker.AppUpdateWorker
|
||||
import com.expapp.trigger.worker.NotificationHelper
|
||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||
|
||||
@@ -62,6 +63,7 @@ class MainActivity : FragmentActivity() {
|
||||
NotificationHelper.createNotificationChannel(this)
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
onNotificationPermissionGrantedCallback?.invoke()
|
||||
} else {
|
||||
@@ -91,8 +93,25 @@ class MainActivity : FragmentActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
|
||||
val origHandler = Thread.getDefaultUncaughtExceptionHandler()
|
||||
Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
|
||||
android.util.Log.e("CrashHandler", "Crash on ${thread.name}", throwable)
|
||||
try {
|
||||
getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||
.edit()
|
||||
.putString("last_crash_log", "${throwable.javaClass.simpleName}: ${throwable.message}\n" + throwable.stackTraceToString().take(1500))
|
||||
.commit()
|
||||
} catch (_: Exception) {}
|
||||
origHandler?.uncaughtException(thread, throwable)
|
||||
}
|
||||
|
||||
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||
val lastCrash = settingsPrefs.getString("last_crash_log", null)
|
||||
if (!lastCrash.isNullOrBlank()) {
|
||||
settingsPrefs.edit().remove("last_crash_log").apply()
|
||||
android.util.Log.e("CrashReport", "Recovered from crash: $lastCrash")
|
||||
}
|
||||
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||
if (!hasSeeded) {
|
||||
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||
@@ -106,11 +125,30 @@ 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
|
||||
try {
|
||||
repository.getDevices().forEach { dev ->
|
||||
val sysUrl = dev.syspulseUrl
|
||||
val nodeName = dev.node
|
||||
if (nodeName.equals("debian", ignoreCase = true) && sysUrl.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)
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
// Guard against any startup migration issues
|
||||
}
|
||||
triggerClient = TriggerClient()
|
||||
appSettings = AppSettings(applicationContext)
|
||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||
@@ -127,9 +165,10 @@ class MainActivity : FragmentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize background server monitoring
|
||||
// Initialize background server monitoring & update checks
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
|
||||
// Handle initial launch intent (from NFC or Widget)
|
||||
@@ -195,10 +234,12 @@ class MainActivity : FragmentActivity() {
|
||||
|
||||
override fun onStop() {
|
||||
super.onStop()
|
||||
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled
|
||||
// When leaving the app, trigger an immediate one-time check & ensure workers are scheduled
|
||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||
ServerMonitorWorker.runOnce(this)
|
||||
ServerMonitorWorker.schedule(this)
|
||||
AppUpdateWorker.runOnce(this)
|
||||
AppUpdateWorker.schedule(this)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,6 +308,9 @@ class MainActivity : FragmentActivity() {
|
||||
vibrateFeedback(true)
|
||||
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
|
||||
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
||||
@@ -277,8 +321,13 @@ class MainActivity : FragmentActivity() {
|
||||
) { success, errorMsg ->
|
||||
if (success) {
|
||||
onAuthorized()
|
||||
} else if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
if (errorMsg != null) {
|
||||
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
if (source == "Widget") {
|
||||
finish()
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -7,9 +7,11 @@ data class DeviceConfig(
|
||||
val name: String,
|
||||
val node: String,
|
||||
val secretKey: String,
|
||||
val r2Url: String,
|
||||
val r2Url: String = "",
|
||||
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
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ class AppSettings(private val storage: KeyValueStorage) {
|
||||
|
||||
companion object {
|
||||
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
|
||||
private const val KEY_WIDGET_BIOMETRIC_ENABLED = "key_widget_biometric_enabled"
|
||||
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
|
||||
private const val KEY_LAST_STATUS_PREFIX = "last_status_"
|
||||
private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
|
||||
@@ -24,6 +25,10 @@ class AppSettings(private val storage: KeyValueStorage) {
|
||||
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
|
||||
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
|
||||
|
||||
var isWidgetBiometricEnabled: Boolean
|
||||
get() = storage.getBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, false)
|
||||
set(value) = storage.putBoolean(KEY_WIDGET_BIOMETRIC_ENABLED, value)
|
||||
|
||||
var isBackgroundMonitoringEnabled: Boolean
|
||||
get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true)
|
||||
set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value)
|
||||
|
||||
@@ -4,7 +4,14 @@ import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
import com.google.gson.JsonDeserializationContext
|
||||
import com.google.gson.JsonDeserializer
|
||||
import com.google.gson.JsonElement
|
||||
import com.google.gson.JsonObject
|
||||
import com.google.gson.reflect.TypeToken
|
||||
import java.lang.reflect.Type
|
||||
import java.util.UUID
|
||||
|
||||
interface KeyValueStorage {
|
||||
fun getString(key: String, defaultValue: String?): String?
|
||||
@@ -44,8 +51,35 @@ class SharedPrefsStorage(
|
||||
}
|
||||
}
|
||||
|
||||
private fun JsonObject.getStringSafe(key: String, default: String = ""): String {
|
||||
val elem = get(key) ?: return default
|
||||
if (elem.isJsonNull || !elem.isJsonPrimitive) return default
|
||||
return try { elem.asString ?: default } catch (_: Exception) { default }
|
||||
}
|
||||
|
||||
class DeviceConfigDeserializer : JsonDeserializer<DeviceConfig> {
|
||||
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): DeviceConfig {
|
||||
val obj = if (json.isJsonObject) json.asJsonObject else JsonObject()
|
||||
return DeviceConfig(
|
||||
id = obj.getStringSafe("id").ifBlank { UUID.randomUUID().toString() },
|
||||
name = obj.getStringSafe("name", "Server"),
|
||||
node = obj.getStringSafe("node", "debian"),
|
||||
secretKey = obj.getStringSafe("secretKey"),
|
||||
r2Url = obj.getStringSafe("r2Url"),
|
||||
powerOnUrl = obj.getStringSafe("powerOnUrl"),
|
||||
powerOffUrl = obj.getStringSafe("powerOffUrl"),
|
||||
rebootUrl = obj.getStringSafe("rebootUrl"),
|
||||
statusUrl = obj.getStringSafe("statusUrl"),
|
||||
syspulseUrl = obj.getStringSafe("syspulseUrl"),
|
||||
syspulseSecretKey = obj.getStringSafe("syspulseSecretKey")
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
class DeviceRepository(private val storage: KeyValueStorage) {
|
||||
private val gson = Gson()
|
||||
private val gson: Gson = GsonBuilder()
|
||||
.registerTypeAdapter(DeviceConfig::class.java, DeviceConfigDeserializer())
|
||||
.create()
|
||||
private val storageKey = "saved_devices_json"
|
||||
|
||||
fun getDevices(): List<DeviceConfig> {
|
||||
@@ -80,19 +114,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,346 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import com.expapp.trigger.data.model.CpuMetrics
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
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.ScheduledTasksResponse
|
||||
import com.expapp.trigger.data.model.ServiceOperation
|
||||
import com.expapp.trigger.data.model.SysPulseStatus
|
||||
import com.expapp.trigger.data.model.SysServiceInfo
|
||||
import com.google.gson.Gson
|
||||
import com.google.gson.GsonBuilder
|
||||
import com.google.gson.JsonDeserializationContext
|
||||
import com.google.gson.JsonDeserializer
|
||||
import com.google.gson.JsonElement
|
||||
import com.google.gson.JsonObject
|
||||
import com.google.gson.JsonParser
|
||||
import com.google.gson.reflect.TypeToken
|
||||
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.lang.reflect.Type
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class SysPulseStatusDeserializer : JsonDeserializer<SysPulseStatus> {
|
||||
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): SysPulseStatus {
|
||||
if (!json.isJsonObject) return SysPulseStatus()
|
||||
val obj = json.asJsonObject
|
||||
val cpu = if (obj.has("cpu") && obj.get("cpu").isJsonObject) {
|
||||
context.deserialize<CpuMetrics>(obj.get("cpu"), CpuMetrics::class.java) ?: CpuMetrics()
|
||||
} else CpuMetrics()
|
||||
val ram = if (obj.has("ram") && obj.get("ram").isJsonObject) {
|
||||
context.deserialize<RamMetrics>(obj.get("ram"), RamMetrics::class.java) ?: RamMetrics()
|
||||
} else RamMetrics()
|
||||
val disk = if (obj.has("disk") && obj.get("disk").isJsonArray) {
|
||||
val listType = object : TypeToken<List<DiskMetrics>>() {}.type
|
||||
context.deserialize<List<DiskMetrics>>(obj.get("disk"), listType) ?: emptyList()
|
||||
} else emptyList()
|
||||
val services = if (obj.has("services") && obj.get("services").isJsonArray) {
|
||||
val listType = object : TypeToken<List<SysServiceInfo>>() {}.type
|
||||
context.deserialize<List<SysServiceInfo>>(obj.get("services"), listType) ?: emptyList()
|
||||
} else emptyList()
|
||||
val uptime = if (obj.has("uptime") && !obj.get("uptime").isJsonNull && obj.get("uptime").isJsonPrimitive) {
|
||||
try { obj.get("uptime").asString ?: "" } catch (_: Exception) { "" }
|
||||
} else ""
|
||||
val success = if (obj.has("success") && !obj.get("success").isJsonNull && obj.get("success").isJsonPrimitive) {
|
||||
try { obj.get("success").asBoolean } catch (_: Exception) { true }
|
||||
} else true
|
||||
|
||||
return SysPulseStatus(
|
||||
success = success,
|
||||
uptime = uptime,
|
||||
cpu = cpu,
|
||||
ram = ram,
|
||||
disk = disk,
|
||||
services = services
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
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 = GsonBuilder()
|
||||
.registerTypeAdapter(SysPulseStatus::class.java, SysPulseStatusDeserializer())
|
||||
.create()
|
||||
) {
|
||||
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("/")
|
||||
.removeSuffix("/api/status")
|
||||
.removeSuffix("/api")
|
||||
.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,859 @@
|
||||
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 safePct = if (percentage.isNaN() || percentage.isInfinite()) 0.0 else percentage
|
||||
val clampedPct = safePct.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)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -60,6 +60,8 @@ import com.expapp.trigger.ui.theme.TextSecondary
|
||||
fun SettingsDialog(
|
||||
isBiometricEnabled: Boolean,
|
||||
onBiometricToggled: (Boolean) -> Unit,
|
||||
isWidgetBiometricEnabled: Boolean = false,
|
||||
onWidgetBiometricToggled: (Boolean) -> Unit = {},
|
||||
isBgMonitorEnabled: Boolean,
|
||||
onBgMonitorToggled: (Boolean) -> Unit,
|
||||
isBiometricAvailable: Boolean,
|
||||
@@ -165,6 +167,59 @@ fun SettingsDialog(
|
||||
}
|
||||
}
|
||||
|
||||
// Widget Biometric Setting (Optional)
|
||||
if (isBiometricEnabled && isBiometricAvailable) {
|
||||
Spacer(modifier = Modifier.height(10.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(BgCard)
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||
.padding(14.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Fingerprint,
|
||||
contentDescription = null,
|
||||
tint = if (isWidgetBiometricEnabled) GreenVibrant else TextMuted,
|
||||
modifier = Modifier.size(28.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(12.dp))
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
"Widget Biometric Prompt",
|
||||
color = TextPrimary,
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
if (isWidgetBiometricEnabled)
|
||||
"Fingerprint overlay required before widget actions"
|
||||
else
|
||||
"1-tap instant action from home screen (no prompt)",
|
||||
color = TextMuted,
|
||||
fontSize = 11.sp
|
||||
)
|
||||
}
|
||||
Switch(
|
||||
checked = isWidgetBiometricEnabled,
|
||||
onCheckedChange = { onWidgetBiometricToggled(it) },
|
||||
colors = SwitchDefaults.colors(
|
||||
checkedThumbColor = GreenVibrant,
|
||||
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||
uncheckedThumbColor = TextMuted,
|
||||
uncheckedTrackColor = BgElevated
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(12.dp))
|
||||
|
||||
// Background Monitor Setting Card
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,6 +93,7 @@ import com.expapp.trigger.update.UpdateCheckResult
|
||||
import com.expapp.trigger.update.UpdateManager
|
||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import com.expapp.trigger.worker.AppUpdateWorker
|
||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
@@ -150,6 +151,7 @@ fun MainScreen(
|
||||
var showNfcWriteDialog by remember { mutableStateOf(false) }
|
||||
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
|
||||
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||
var isWidgetBiometricEnabled by remember { mutableStateOf(appSettings.isWidgetBiometricEnabled) }
|
||||
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||
|
||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||
@@ -187,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) {
|
||||
@@ -212,8 +222,14 @@ fun MainScreen(
|
||||
showUpdateDialog = true
|
||||
val newVer = result.info.versionName
|
||||
if (appSettings.lastNotifiedUpdateVersion != newVer) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer)
|
||||
val notified = com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(
|
||||
context = context,
|
||||
newVersion = newVer,
|
||||
releaseTitle = result.info.title
|
||||
)
|
||||
if (notified) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
}
|
||||
}
|
||||
if (isManual) {
|
||||
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||
@@ -511,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 {
|
||||
@@ -563,14 +588,21 @@ fun MainScreen(
|
||||
isBiometricEnabled = enabled
|
||||
appSettings.isBiometricEnabled = enabled
|
||||
},
|
||||
isWidgetBiometricEnabled = isWidgetBiometricEnabled,
|
||||
onWidgetBiometricToggled = { enabled ->
|
||||
isWidgetBiometricEnabled = enabled
|
||||
appSettings.isWidgetBiometricEnabled = enabled
|
||||
},
|
||||
isBgMonitorEnabled = isBgMonitorEnabled,
|
||||
onBgMonitorToggled = { enabled ->
|
||||
isBgMonitorEnabled = enabled
|
||||
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||
if (enabled) {
|
||||
ServerMonitorWorker.schedule(context)
|
||||
AppUpdateWorker.schedule(context)
|
||||
} else {
|
||||
ServerMonitorWorker.cancel(context)
|
||||
AppUpdateWorker.cancel(context)
|
||||
}
|
||||
},
|
||||
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||
|
||||
@@ -50,19 +50,26 @@ class UpdateManager(
|
||||
* Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
|
||||
*/
|
||||
fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
|
||||
// 1. Try Primary: Self-hosted Git server (forge.linuxguy.space)
|
||||
// Query both primary (forge) and fallback (GitHub) and pick the highest available release
|
||||
val primaryResult = queryReleasesSync(primaryReleasesUrl, currentVersionName)
|
||||
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
|
||||
return primaryResult
|
||||
}
|
||||
|
||||
// 2. Fallback: GitHub releases API
|
||||
val fallbackResult = queryReleasesSync(fallbackReleasesUrl, currentVersionName)
|
||||
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
|
||||
return fallbackResult
|
||||
}
|
||||
|
||||
return primaryResult // Return original error if both failed
|
||||
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
|
||||
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
|
||||
|
||||
return when {
|
||||
primaryUpdate != null && fallbackUpdate != null -> {
|
||||
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
|
||||
UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
} else {
|
||||
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
}
|
||||
}
|
||||
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
|
||||
else -> primaryResult
|
||||
}
|
||||
}
|
||||
|
||||
private fun queryReleasesSync(url: String, currentVersionName: String): UpdateCheckResult {
|
||||
@@ -97,19 +104,25 @@ class UpdateManager(
|
||||
currentVersionName: String,
|
||||
callback: (UpdateCheckResult) -> Unit
|
||||
) {
|
||||
// Try Primary first
|
||||
queryReleasesAsync(primaryReleasesUrl, currentVersionName) { primaryResult ->
|
||||
if (primaryResult is UpdateCheckResult.UpdateAvailable || primaryResult is UpdateCheckResult.UpToDate) {
|
||||
runOnMain { callback(primaryResult) }
|
||||
} else {
|
||||
// Primary failed, query GitHub fallback
|
||||
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
|
||||
if (fallbackResult is UpdateCheckResult.UpdateAvailable || fallbackResult is UpdateCheckResult.UpToDate) {
|
||||
runOnMain { callback(fallbackResult) }
|
||||
} else {
|
||||
runOnMain { callback(primaryResult) }
|
||||
queryReleasesAsync(fallbackReleasesUrl, currentVersionName) { fallbackResult ->
|
||||
val primaryUpdate = if (primaryResult is UpdateCheckResult.UpdateAvailable) primaryResult.info else null
|
||||
val fallbackUpdate = if (fallbackResult is UpdateCheckResult.UpdateAvailable) fallbackResult.info else null
|
||||
|
||||
val finalResult = when {
|
||||
primaryUpdate != null && fallbackUpdate != null -> {
|
||||
if (isNewerVersion(primaryUpdate.versionName, fallbackUpdate.versionName)) {
|
||||
UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
} else {
|
||||
UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
}
|
||||
}
|
||||
primaryUpdate != null -> UpdateCheckResult.UpdateAvailable(primaryUpdate)
|
||||
fallbackUpdate != null -> UpdateCheckResult.UpdateAvailable(fallbackUpdate)
|
||||
primaryResult is UpdateCheckResult.UpToDate || fallbackResult is UpdateCheckResult.UpToDate -> UpdateCheckResult.UpToDate
|
||||
else -> if (primaryResult is UpdateCheckResult.Error) primaryResult else fallbackResult
|
||||
}
|
||||
runOnMain { callback(finalResult) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,22 +9,31 @@ import android.content.Intent
|
||||
import android.os.Build
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.os.VibrationEffect
|
||||
import android.os.Vibrator
|
||||
import android.os.VibratorManager
|
||||
import android.widget.RemoteViews
|
||||
import android.widget.Toast
|
||||
import com.expapp.trigger.MainActivity
|
||||
import com.expapp.trigger.R
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.model.TriggerLog
|
||||
import com.expapp.trigger.data.repository.AppSettings
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||
import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
||||
import com.expapp.trigger.network.NodeStatus
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Date
|
||||
import java.util.Locale
|
||||
import java.util.concurrent.Executors
|
||||
|
||||
/**
|
||||
* Self-contained Home Screen Widget for server control and monitoring.
|
||||
* Executes server triggers and status refreshes completely in the background
|
||||
* without opening the main application.
|
||||
*/
|
||||
class ServerWidgetProvider : AppWidgetProvider() {
|
||||
|
||||
companion object {
|
||||
@@ -50,6 +59,31 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
context.sendBroadcast(intent)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateStatus(context: Context, statusText: String, footerText: String? = null) {
|
||||
try {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||
val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||
if (appWidgetIds != null && appWidgetIds.isNotEmpty()) {
|
||||
for (id in appWidgetIds) {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
views.setTextViewText(R.id.widget_status_text, statusText)
|
||||
if (statusText == "SENDING..." || statusText == "CHECKING...") {
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFF59E0B.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
|
||||
}
|
||||
if (footerText != null) {
|
||||
views.setTextViewText(R.id.widget_footer_text, footerText)
|
||||
}
|
||||
appWidgetManager.partiallyUpdateAppWidget(id, views)
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onUpdate(
|
||||
@@ -57,22 +91,36 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
appWidgetManager: AppWidgetManager,
|
||||
appWidgetIds: IntArray
|
||||
) {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val devices = repository.getDevices()
|
||||
try {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val devices = repository.getDevices()
|
||||
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
val device = devices.firstOrNull()
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, null)
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
val device = devices.firstOrNull()
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, null)
|
||||
|
||||
// If device exists, fetch live status asynchronously
|
||||
if (device != null && device.statusUrl.isNotBlank()) {
|
||||
executor.execute {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
mainHandler.post {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
// If device exists, fetch live status asynchronously in background
|
||||
if (device != null && device.statusUrl.isNotBlank()) {
|
||||
executor.execute {
|
||||
try {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
val appSettings = AppSettings(context)
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
mainHandler.post {
|
||||
try {
|
||||
renderWidget(context, appWidgetManager, appWidgetId, device, status)
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,39 +131,66 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
ACTION_TRIGGER -> {
|
||||
val deviceId = intent.getStringExtra(EXTRA_DEVICE_ID) ?: return
|
||||
val actionName = intent.getStringExtra(EXTRA_ACTION) ?: return
|
||||
val action = try { TriggerAction.valueOf(actionName) } catch (e: Exception) { return }
|
||||
val action = try { TriggerAction.valueOf(actionName) } catch (_: Exception) { return }
|
||||
|
||||
val appSettings = AppSettings(context)
|
||||
if (appSettings.isBiometricEnabled) {
|
||||
// Biometric is enabled: open MainActivity with Trigger intent
|
||||
val launchIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
this.action = ACTION_TRIGGER
|
||||
if (appSettings.isWidgetBiometricEnabled && appSettings.isBiometricEnabled) {
|
||||
// Biometric is explicitly required for widget: launch transparent prompt over home screen
|
||||
val launchIntent = Intent(context, WidgetAuthActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION
|
||||
putExtra(EXTRA_DEVICE_ID, deviceId)
|
||||
putExtra(EXTRA_ACTION, actionName)
|
||||
}
|
||||
context.startActivity(launchIntent)
|
||||
} else {
|
||||
// Biometric disabled: execute via guaranteed background worker
|
||||
Toast.makeText(context, "Sending ${action.name} signal...", Toast.LENGTH_SHORT).show()
|
||||
// Frictionless 1-tap trigger directly from home screen without opening the app
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val device = repository.getDevices().find { it.id == deviceId }
|
||||
val deviceName = device?.name ?: "Server"
|
||||
val actionTitle = when (action) {
|
||||
TriggerAction.POWER_ON -> "Power On"
|
||||
TriggerAction.REBOOT -> "Reboot"
|
||||
TriggerAction.POWER_OFF -> "Shutdown"
|
||||
}
|
||||
|
||||
vibrate(context)
|
||||
Toast.makeText(context, "⚡ Sending $actionTitle signal to $deviceName...", Toast.LENGTH_SHORT).show()
|
||||
updateStatus(context, "SENDING...", "⚡ Dispatched $actionTitle • Verifying...")
|
||||
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
|
||||
}
|
||||
}
|
||||
|
||||
ACTION_REFRESH -> {
|
||||
// Immediate visual feedback on home screen
|
||||
updateStatus(context, "CHECKING...", "🔄 Refreshing server status...")
|
||||
Toast.makeText(context, "Checking server status...", Toast.LENGTH_SHORT).show()
|
||||
vibrate(context)
|
||||
|
||||
executor.execute {
|
||||
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||
val device = repository.getDevices().firstOrNull()
|
||||
if (device != null) {
|
||||
val status = TriggerClient().checkStatusSync(device)
|
||||
val appSettings = AppSettings(context)
|
||||
appSettings.setLastStatus(device.id, status.isOnline)
|
||||
|
||||
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
|
||||
val footer = if (status.isOnline) {
|
||||
if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr"
|
||||
else "🟢 Online • Checked $timeStr"
|
||||
} else {
|
||||
"🛑 Server is offline • Checked $timeStr"
|
||||
}
|
||||
|
||||
mainHandler.post {
|
||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||
val ids = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||
for (id in ids) {
|
||||
renderWidget(context, appWidgetManager, id, device, status, "Updated just now")
|
||||
renderWidget(context, appWidgetManager, id, device, status, footer)
|
||||
}
|
||||
Toast.makeText(context, "Widget refreshed", Toast.LENGTH_SHORT).show()
|
||||
val toastMsg = if (status.isOnline) "🟢 ${device.name} is online" else "🛑 ${device.name} is offline"
|
||||
Toast.makeText(context, toastMsg, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,92 +206,111 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
status: NodeStatus?,
|
||||
footerOverride: String? = null
|
||||
) {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
try {
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_server_control)
|
||||
|
||||
if (device == null) {
|
||||
views.setTextViewText(R.id.widget_device_name, "No Device")
|
||||
views.setTextViewText(R.id.widget_node_name, "Configure in app")
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Open app to add server")
|
||||
if (device == null) {
|
||||
views.setTextViewText(R.id.widget_device_name, "No Device")
|
||||
views.setTextViewText(R.id.widget_node_name, "Configure in app")
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
|
||||
views.setTextViewText(R.id.widget_footer_text, "Tap icon to open app & add server")
|
||||
|
||||
val appIntent = Intent(context, MainActivity::class.java)
|
||||
val pendingApp = PendingIntent.getActivity(
|
||||
context, 0, appIntent,
|
||||
// Only icon opens app when no device configured
|
||||
val appIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingApp = PendingIntent.getActivity(
|
||||
context, 0, appIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_app_icon_badge, pendingApp)
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
}
|
||||
|
||||
views.setTextViewText(R.id.widget_device_name, device.name)
|
||||
views.setTextViewText(R.id.widget_node_name, "${device.node} • Server Control")
|
||||
|
||||
// Status chip display
|
||||
val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
|
||||
if (status == null) {
|
||||
views.setTextViewText(R.id.widget_status_text, "CHECKING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF9CA3AF.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_checking)
|
||||
} else if (status.isOnline) {
|
||||
views.setTextViewText(R.id.widget_status_text, "ONLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_online)
|
||||
} else {
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
views.setInt(R.id.widget_status_chip, "setBackgroundResource", R.drawable.widget_chip_offline)
|
||||
}
|
||||
|
||||
// Contextual Footer Text
|
||||
val defaultFooter = when {
|
||||
status == null -> "Checking server status..."
|
||||
status.isOnline -> if (!status.uptime.isNullOrBlank()) "🟢 Up: ${status.uptime} • Checked $timeStr" else "🟢 Online • Checked $timeStr"
|
||||
else -> "🛑 Offline • Tap Refresh to check"
|
||||
}
|
||||
views.setTextViewText(R.id.widget_footer_text, footerOverride ?: defaultFooter)
|
||||
|
||||
// Dedicated Refresh Broadcast Intent
|
||||
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||
action = ACTION_REFRESH
|
||||
}
|
||||
val pendingRefresh = PendingIntent.getBroadcast(
|
||||
context,
|
||||
appWidgetId * 10 + 1,
|
||||
refreshIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingApp)
|
||||
views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
|
||||
|
||||
// Refresh button & Info row triggers Refresh (NOT app launch)
|
||||
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_info, pendingRefresh)
|
||||
views.setOnClickPendingIntent(R.id.widget_footer_text, pendingRefresh)
|
||||
|
||||
// Explicit App Icon Badge Intent (Only this small terminal icon opens MainActivity if desired)
|
||||
val openAppIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingOpenApp = PendingIntent.getActivity(
|
||||
context,
|
||||
appWidgetId * 10,
|
||||
openAppIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_app_icon_badge, pendingOpenApp)
|
||||
|
||||
// Power On click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click (1-tap background action)
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_off,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
|
||||
)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
return
|
||||
} catch (e: Exception) {
|
||||
e.printStackTrace()
|
||||
}
|
||||
|
||||
views.setTextViewText(R.id.widget_device_name, device.name)
|
||||
views.setTextViewText(R.id.widget_node_name, device.node)
|
||||
|
||||
// Status display
|
||||
if (status == null) {
|
||||
views.setTextViewText(R.id.widget_status_text, "SYNCING")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_gray)
|
||||
} else if (status.isOnline) {
|
||||
views.setTextViewText(R.id.widget_status_text, "ONLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFF22C55E.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_green)
|
||||
} else {
|
||||
views.setTextViewText(R.id.widget_status_text, "OFFLINE")
|
||||
views.setTextColor(R.id.widget_status_text, 0xFFEF4444.toInt())
|
||||
views.setImageViewResource(R.id.widget_status_dot, R.drawable.widget_dot_red)
|
||||
}
|
||||
|
||||
views.setTextViewText(
|
||||
R.id.widget_footer_text,
|
||||
footerOverride ?: (if (status?.uptime != null) "Up: ${status.uptime}" else "Tap header to open • Tap button to trigger")
|
||||
)
|
||||
|
||||
// Header click -> Open app
|
||||
val openAppIntent = Intent(context, MainActivity::class.java).apply {
|
||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||
}
|
||||
val pendingOpenApp = PendingIntent.getActivity(
|
||||
context,
|
||||
appWidgetId * 10,
|
||||
openAppIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_header_clickable, pendingOpenApp)
|
||||
|
||||
// Refresh click
|
||||
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||
action = ACTION_REFRESH
|
||||
}
|
||||
val pendingRefresh = PendingIntent.getBroadcast(
|
||||
context,
|
||||
appWidgetId * 10 + 1,
|
||||
refreshIntent,
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
views.setOnClickPendingIntent(R.id.widget_btn_refresh, pendingRefresh)
|
||||
|
||||
// Power On click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_on,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 2, device.id, TriggerAction.POWER_ON)
|
||||
)
|
||||
|
||||
// Reboot click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_reboot,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 3, device.id, TriggerAction.REBOOT)
|
||||
)
|
||||
|
||||
// Power Off click
|
||||
views.setOnClickPendingIntent(
|
||||
R.id.widget_btn_power_off,
|
||||
createTriggerPendingIntent(context, appWidgetId * 10 + 4, device.id, TriggerAction.POWER_OFF)
|
||||
)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
}
|
||||
|
||||
private fun createTriggerPendingIntent(
|
||||
@@ -237,4 +331,19 @@ class ServerWidgetProvider : AppWidgetProvider() {
|
||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||
)
|
||||
}
|
||||
|
||||
private fun vibrate(context: Context) {
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||
val vibratorManager = context.getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as? VibratorManager
|
||||
vibratorManager?.defaultVibrator?.vibrate(
|
||||
VibrationEffect.createOneShot(40, VibrationEffect.DEFAULT_AMPLITUDE)
|
||||
)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
val vibrator = context.getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
|
||||
vibrator?.vibrate(40)
|
||||
}
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
package com.expapp.trigger.widget
|
||||
|
||||
import android.graphics.Color
|
||||
import android.graphics.drawable.ColorDrawable
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.os.VibrationEffect
|
||||
import android.os.Vibrator
|
||||
import android.os.VibratorManager
|
||||
import android.widget.Toast
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.security.BiometricHelper
|
||||
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||
|
||||
/**
|
||||
* Completely translucent activity that prompts for biometric verification directly
|
||||
* on top of the home screen / launcher without ever loading or revealing the main application.
|
||||
* Dismisses instantly and executes the action via guaranteed background worker.
|
||||
*/
|
||||
class WidgetAuthActivity : FragmentActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
// Make window completely transparent & borderless
|
||||
window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
|
||||
window.setDimAmount(0f)
|
||||
|
||||
val deviceId = intent.getStringExtra(ServerWidgetProvider.EXTRA_DEVICE_ID)
|
||||
val actionName = intent.getStringExtra(ServerWidgetProvider.EXTRA_ACTION)
|
||||
|
||||
if (deviceId.isNullOrBlank() || actionName.isNullOrBlank()) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val action = try {
|
||||
TriggerAction.valueOf(actionName)
|
||||
} catch (_: Exception) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val device = repository.getDevices().find { it.id == deviceId }
|
||||
if (device == null) {
|
||||
finishWithoutAnimation()
|
||||
return
|
||||
}
|
||||
|
||||
val actionTitle = when (action) {
|
||||
TriggerAction.POWER_ON -> "Power On"
|
||||
TriggerAction.REBOOT -> "Reboot"
|
||||
TriggerAction.POWER_OFF -> "Shutdown"
|
||||
}
|
||||
|
||||
if (BiometricHelper.isBiometricAvailable(this)) {
|
||||
BiometricHelper.authenticate(
|
||||
this,
|
||||
title = "Confirm $actionTitle",
|
||||
subtitle = "Authenticate to trigger ${device.name}"
|
||||
) { success, errorMsg ->
|
||||
if (success) {
|
||||
vibrateFeedback()
|
||||
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ServerWidgetProvider.updateStatus(
|
||||
applicationContext,
|
||||
"SENDING...",
|
||||
"⚡ Dispatched $actionTitle • Verifying..."
|
||||
)
|
||||
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
|
||||
} else if (errorMsg != null) {
|
||||
Toast.makeText(this, "Trigger cancelled", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
finishWithoutAnimation()
|
||||
}
|
||||
} else {
|
||||
// Biometric hardware unavailable; dispatch directly
|
||||
vibrateFeedback()
|
||||
Toast.makeText(this, "⚡ Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||
ServerWidgetProvider.updateStatus(
|
||||
applicationContext,
|
||||
"SENDING...",
|
||||
"⚡ Dispatched $actionTitle • Verifying..."
|
||||
)
|
||||
ActionTriggerWorker.enqueue(applicationContext, device.id, action, "Widget")
|
||||
finishWithoutAnimation()
|
||||
}
|
||||
}
|
||||
|
||||
private fun finishWithoutAnimation() {
|
||||
finish()
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
|
||||
overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, 0, 0)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
overridePendingTransition(0, 0)
|
||||
}
|
||||
}
|
||||
|
||||
private fun vibrateFeedback() {
|
||||
try {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||
val vibratorManager = getSystemService(VIBRATOR_MANAGER_SERVICE) as? VibratorManager
|
||||
vibratorManager?.defaultVibrator?.vibrate(
|
||||
VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE)
|
||||
)
|
||||
} else {
|
||||
@Suppress("DEPRECATION")
|
||||
val vibrator = getSystemService(VIBRATOR_SERVICE) as? Vibrator
|
||||
vibrator?.vibrate(50)
|
||||
}
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package com.expapp.trigger.worker
|
||||
|
||||
import android.content.Context
|
||||
import androidx.work.Constraints
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
import androidx.work.ExistingWorkPolicy
|
||||
import androidx.work.NetworkType
|
||||
import androidx.work.OneTimeWorkRequestBuilder
|
||||
import androidx.work.PeriodicWorkRequestBuilder
|
||||
import androidx.work.WorkManager
|
||||
import androidx.work.WorkerParameters
|
||||
import com.expapp.trigger.BuildConfig
|
||||
import com.expapp.trigger.data.repository.AppSettings
|
||||
import com.expapp.trigger.update.UpdateCheckResult
|
||||
import com.expapp.trigger.update.UpdateManager
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
/**
|
||||
* Dedicated background worker that checks for new app updates independently of server devices.
|
||||
* Ensures notifications are dispatched even if no servers are configured or if servers are offline.
|
||||
*/
|
||||
class AppUpdateWorker(
|
||||
private val appContext: Context,
|
||||
workerParams: WorkerParameters
|
||||
) : CoroutineWorker(appContext, workerParams) {
|
||||
|
||||
companion object {
|
||||
const val WORK_NAME = "app_update_periodic_check"
|
||||
const val ONE_TIME_WORK_NAME = "app_update_one_time_check"
|
||||
|
||||
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
|
||||
NotificationHelper.createNotificationChannel(context)
|
||||
|
||||
val constraints = Constraints.Builder()
|
||||
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||
.build()
|
||||
|
||||
val workRequest = PeriodicWorkRequestBuilder<AppUpdateWorker>(
|
||||
repeatIntervalMinutes,
|
||||
TimeUnit.MINUTES
|
||||
)
|
||||
.setConstraints(constraints)
|
||||
.build()
|
||||
|
||||
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
|
||||
WORK_NAME,
|
||||
ExistingPeriodicWorkPolicy.UPDATE,
|
||||
workRequest
|
||||
)
|
||||
}
|
||||
|
||||
fun cancel(context: Context) {
|
||||
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
|
||||
}
|
||||
|
||||
fun runOnce(context: Context) {
|
||||
NotificationHelper.createNotificationChannel(context)
|
||||
|
||||
val constraints = Constraints.Builder()
|
||||
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||
.build()
|
||||
|
||||
val oneTimeRequest = OneTimeWorkRequestBuilder<AppUpdateWorker>()
|
||||
.setConstraints(constraints)
|
||||
.build()
|
||||
|
||||
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||
ONE_TIME_WORK_NAME,
|
||||
ExistingWorkPolicy.REPLACE,
|
||||
oneTimeRequest
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun doWork(): Result {
|
||||
val appSettings = AppSettings(appContext)
|
||||
|
||||
try {
|
||||
val updateManager = UpdateManager(appContext)
|
||||
val currentVersion = BuildConfig.VERSION_NAME
|
||||
val result = updateManager.checkForUpdateSync(currentVersion)
|
||||
|
||||
if (result is UpdateCheckResult.UpdateAvailable) {
|
||||
val newVer = result.info.versionName
|
||||
val lastNotified = appSettings.lastNotifiedUpdateVersion
|
||||
|
||||
if (lastNotified != newVer) {
|
||||
val notified = NotificationHelper.sendUpdateAvailableNotification(
|
||||
context = appContext,
|
||||
newVersion = newVer,
|
||||
releaseTitle = result.info.title
|
||||
)
|
||||
if (notified) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
// Ignore failure; will retry next interval
|
||||
}
|
||||
|
||||
return Result.success()
|
||||
}
|
||||
}
|
||||
@@ -85,11 +85,20 @@ object NotificationHelper {
|
||||
}
|
||||
}
|
||||
|
||||
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean {
|
||||
fun sendUpdateAvailableNotification(
|
||||
context: Context,
|
||||
newVersion: String,
|
||||
releaseTitle: String? = null
|
||||
): Boolean {
|
||||
val title = if (!releaseTitle.isNullOrBlank() && releaseTitle != "v$newVersion") {
|
||||
"🚀 Update Available: $releaseTitle"
|
||||
} else {
|
||||
"🚀 Update Available: v$newVersion"
|
||||
}
|
||||
return sendNotification(
|
||||
context = context,
|
||||
id = 8888,
|
||||
title = "🚀 Update Available: v$newVersion",
|
||||
title = title,
|
||||
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
|
||||
isSuccess = true,
|
||||
extraAction = "open_update"
|
||||
|
||||
@@ -142,8 +142,14 @@ class ServerMonitorWorker(
|
||||
val newVer = result.info.versionName
|
||||
val lastNotified = appSettings.lastNotifiedUpdateVersion
|
||||
if (lastNotified != newVer) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
|
||||
val notified = NotificationHelper.sendUpdateAvailableNotification(
|
||||
context = appContext,
|
||||
newVersion = newVer,
|
||||
releaseTitle = result.info.title
|
||||
)
|
||||
if (notified) {
|
||||
appSettings.lastNotifiedUpdateVersion = newVer
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (_: Exception) {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#161619" />
|
||||
<solid android:color="#101013" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#2b2b30" />
|
||||
<corners android:radius="18dp" />
|
||||
android:color="#24242a" />
|
||||
<corners android:radius="20dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2c1e0f" />
|
||||
<solid android:color="#281909" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#f59e0b" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#14291e" />
|
||||
<solid android:color="#0e261a" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#22c55e" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2c1214" />
|
||||
<solid android:color="#2a1013" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:width="1.2dp"
|
||||
android:color="#ef4444" />
|
||||
<corners android:radius="10dp" />
|
||||
<corners android:radius="11dp" />
|
||||
</shape>
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#18181e" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#2c2c36" />
|
||||
<corners android:radius="9dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#1a1a20" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#363640" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#2b1114" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#ef4444" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#122a1c" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#22c55e" />
|
||||
<corners android:radius="12dp" />
|
||||
</shape>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 324 B |
Binary file not shown.
|
After Width: | Height: | Size: 314 B |
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="#18181e" />
|
||||
<stroke
|
||||
android:width="1dp"
|
||||
android:color="#282832" />
|
||||
<corners android:radius="8dp" />
|
||||
</shape>
|
||||
@@ -5,7 +5,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/widget_bg"
|
||||
android:orientation="vertical"
|
||||
android:padding="12dp">
|
||||
android:padding="13dp">
|
||||
|
||||
<!-- Header Row -->
|
||||
<LinearLayout
|
||||
@@ -14,17 +14,27 @@
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@drawable/ic_terminal"
|
||||
android:contentDescription="Server" />
|
||||
<!-- App Launcher Icon Badge (Explicit App Launch only if user taps this badge) -->
|
||||
<FrameLayout
|
||||
android:id="@+id/widget_app_icon_badge"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:background="@drawable/widget_icon_badge">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/widget_ic_terminal"
|
||||
android:contentDescription="Server App" />
|
||||
</FrameLayout>
|
||||
|
||||
<!-- Device & Node Info (Tapping this refreshes status, does NOT open app) -->
|
||||
<LinearLayout
|
||||
android:id="@+id/widget_header_clickable"
|
||||
android:id="@+id/widget_header_info"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="9dp"
|
||||
android:layout_marginEnd="6dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
@@ -47,59 +57,70 @@
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="debian"
|
||||
android:textColor="#71717a"
|
||||
android:textColor="#9ca3af"
|
||||
android:textSize="11sp" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Status Dot + Text -->
|
||||
<!-- Status Chip Badge -->
|
||||
<LinearLayout
|
||||
android:id="@+id/widget_status_chip"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/widget_chip_checking"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingEnd="6dp">
|
||||
android:paddingStart="7dp"
|
||||
android:paddingTop="3dp"
|
||||
android:paddingEnd="7dp"
|
||||
android:paddingBottom="3dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/widget_status_dot"
|
||||
android:layout_width="8dp"
|
||||
android:layout_height="8dp"
|
||||
android:layout_width="6dp"
|
||||
android:layout_height="6dp"
|
||||
android:src="@drawable/widget_dot_gray"
|
||||
android:contentDescription="Status" />
|
||||
android:contentDescription="Status Dot" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/widget_status_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginStart="4dp"
|
||||
android:text="CHECKING"
|
||||
android:textColor="#71717a"
|
||||
android:textSize="11sp"
|
||||
android:textColor="#9ca3af"
|
||||
android:textSize="10sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Refresh Button -->
|
||||
<ImageView
|
||||
<!-- Refresh Button Container (Large 32x32dp touch target) -->
|
||||
<FrameLayout
|
||||
android:id="@+id/widget_btn_refresh"
|
||||
android:layout_width="26dp"
|
||||
android:layout_height="26dp"
|
||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||
android:contentDescription="Refresh"
|
||||
android:padding="3dp"
|
||||
android:src="@drawable/ic_refresh" />
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_marginStart="6dp"
|
||||
android:background="@drawable/widget_btn_refresh_bg">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/widget_ic_refresh"
|
||||
android:contentDescription="Refresh" />
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<!-- Spacer / Divider -->
|
||||
<View
|
||||
<!-- Sleek Horizontal Divider -->
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:background="#27272a" />
|
||||
android:layout_marginTop="9dp"
|
||||
android:layout_marginBottom="9dp"
|
||||
android:background="#222228" />
|
||||
|
||||
<!-- Action Buttons Row -->
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="38dp"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
@@ -107,12 +128,12 @@
|
||||
android:id="@+id/widget_btn_power_on"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_green"
|
||||
android:gravity="center"
|
||||
android:text="POWER ON"
|
||||
android:textColor="#22c55e"
|
||||
android:text="⚡ POWER ON"
|
||||
android:textColor="#4ade80"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
@@ -125,8 +146,8 @@
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_amber"
|
||||
android:gravity="center"
|
||||
android:text="REBOOT"
|
||||
android:textColor="#f59e0b"
|
||||
android:text="🔄 REBOOT"
|
||||
android:textColor="#fbbf24"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
@@ -134,12 +155,12 @@
|
||||
android:id="@+id/widget_btn_power_off"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/widget_btn_red"
|
||||
android:gravity="center"
|
||||
android:text="OFF"
|
||||
android:textColor="#ef4444"
|
||||
android:text="🛑 OFF"
|
||||
android:textColor="#f87171"
|
||||
android:textSize="11sp"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
@@ -149,9 +170,11 @@
|
||||
android:id="@+id/widget_footer_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_marginTop="7dp"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center"
|
||||
android:text="Tap header to open app • Tap action to trigger"
|
||||
android:textColor="#52525b"
|
||||
android:maxLines="1"
|
||||
android:text="Checking server status..."
|
||||
android:textColor="#71717a"
|
||||
android:textSize="10sp" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -3,4 +3,16 @@
|
||||
<item name="android:statusBarColor">#121212</item>
|
||||
<item name="android:navigationBarColor">#121212</item>
|
||||
</style>
|
||||
|
||||
<!-- Translucent invisible theme for widget biometric authentication dialog -->
|
||||
<style name="Theme.WidgetAuth" parent="android:Theme.Material.NoActionBar">
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowIsFloating">false</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:minWidth="250dp"
|
||||
android:minHeight="100dp"
|
||||
android:minWidth="220dp"
|
||||
android:minHeight="90dp"
|
||||
android:targetCellWidth="3"
|
||||
android:targetCellHeight="2"
|
||||
android:minResizeWidth="180dp"
|
||||
android:minResizeHeight="70dp"
|
||||
android:updatePeriodMillis="1800000"
|
||||
android:initialLayout="@layout/widget_server_control"
|
||||
android:resizeMode="horizontal|vertical"
|
||||
|
||||
@@ -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 = """
|
||||
|
||||
@@ -37,6 +37,7 @@ class AppSettingsTest {
|
||||
fun defaultValues_areTrue() {
|
||||
assertTrue(settings.isBiometricEnabled)
|
||||
assertTrue(settings.isBackgroundMonitoringEnabled)
|
||||
assertFalse(settings.isWidgetBiometricEnabled)
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -46,6 +47,9 @@ class AppSettingsTest {
|
||||
|
||||
settings.isBackgroundMonitoringEnabled = false
|
||||
assertFalse(settings.isBackgroundMonitoringEnabled)
|
||||
|
||||
settings.isWidgetBiometricEnabled = true
|
||||
assertTrue(settings.isWidgetBiometricEnabled)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -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
|
||||
@@ -116,4 +120,30 @@ class DeviceRepositoryTest {
|
||||
|
||||
org.junit.Assert.assertFalse(updated)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getDevices_whenOldJsonWithoutSyspulse_doesNotCrash() {
|
||||
val oldJson = """[{"id":"2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6","name":"Server","node":"debian","secretKey":"Carbon@12","r2Url":"https://bucket.linuxguy.space/home-server-app/endpoints.json","powerOnUrl":"https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver","powerOffUrl":"https://cosmos.linuxguy.space/poweroff?node=debian","rebootUrl":"https://cosmos.linuxguy.space/reboot?node=debian","statusUrl":"https://cosmos.linuxguy.space/status?node=debian"}]"""
|
||||
storage.putString("saved_devices_json", oldJson)
|
||||
|
||||
val devices = repository.getDevices()
|
||||
assertEquals(1, devices.size)
|
||||
val dev = devices[0]
|
||||
assertTrue(dev.syspulseUrl.isBlank())
|
||||
assertTrue(dev.syspulseSecretKey.isBlank())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun getDevices_whenJsonContainsExplicitNulls_doesNotCrash() {
|
||||
val jsonWithNulls = """[{"id":"2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6","name":"Server","node":"debian","secretKey":"Carbon@12","r2Url":null,"powerOnUrl":"https://trigger.macrodroid.com","powerOffUrl":"https://cosmos.linuxguy.space","rebootUrl":"https://cosmos.linuxguy.space","statusUrl":null,"syspulseUrl":null,"syspulseSecretKey":null}]"""
|
||||
storage.putString("saved_devices_json", jsonWithNulls)
|
||||
|
||||
val devices = repository.getDevices()
|
||||
assertEquals(1, devices.size)
|
||||
val dev = devices[0]
|
||||
assertEquals("", dev.r2Url)
|
||||
assertEquals("", dev.statusUrl)
|
||||
assertEquals("", dev.syspulseUrl)
|
||||
assertEquals("", dev.syspulseSecretKey)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
import com.expapp.trigger.data.model.SysPulseStatus
|
||||
import com.google.gson.GsonBuilder
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNotNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class SysPulseClientTest {
|
||||
|
||||
@Test
|
||||
fun testDeserializeSysPulseStatus_realPayload() {
|
||||
val json = """{"cpu":{"cores":4,"load":[0.17,1.25,0.88],"pct":5.01},"disk":[{"mount":"/","pct":31.22,"total_gb":115.83,"used_gb":36.16},{"mount":"/mnt/storage","pct":1.95,"total_gb":1862.11,"used_gb":36.27}],"ram":{"pct":40.78,"total_mb":7855,"used_mb":3203},"services":[{"name":"openclaw","unit":"openclaw-gateway.service","active":true,"enabled":true,"state":"running","pid":927},{"name":"forge","unit":"forge.service","active":true,"enabled":true,"state":"exited","pid":1751},{"name":"oort","unit":"oort.service","active":true,"enabled":true,"state":"running","pid":1752},{"name":"minio","unit":"minio.service","active":true,"enabled":true,"state":"running","pid":1711},{"name":"xrdp","unit":"xrdp.service","active":false,"enabled":false,"state":"stopped"},{"name":"xrdp sesman","unit":"xrdp-sesman.service","active":false,"enabled":false,"state":"stopped"},{"name":"docker","unit":"docker.service","active":true,"enabled":true,"state":"running","pid":1020},{"name":"postgres","unit":"[email protected]","active":true,"enabled":true,"state":"running","pid":1883}],"success":true,"uptime":"16m 15s"}"""
|
||||
|
||||
val gson = GsonBuilder()
|
||||
.registerTypeAdapter(SysPulseStatus::class.java, SysPulseStatusDeserializer())
|
||||
.create()
|
||||
|
||||
val status = gson.fromJson(json, SysPulseStatus::class.java)
|
||||
assertNotNull(status)
|
||||
assertEquals("16m 15s", status.uptime)
|
||||
assertEquals(5.01, status.cpu.pct, 0.01)
|
||||
assertEquals(2, status.disk.size)
|
||||
assertEquals(8, status.services.size)
|
||||
val activeCount = status.services.count { it.active }
|
||||
assertEquals(6, activeCount)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testDeserializeSysPulseStatus_emptyOrErrorPayload() {
|
||||
val errorJson = """{"error":"Unauthorized","success":false}"""
|
||||
|
||||
val gson = GsonBuilder()
|
||||
.registerTypeAdapter(SysPulseStatus::class.java, SysPulseStatusDeserializer())
|
||||
.create()
|
||||
|
||||
val status = gson.fromJson(errorJson, SysPulseStatus::class.java)
|
||||
assertNotNull(status)
|
||||
assertEquals("", status.uptime)
|
||||
assertEquals(0.0, status.cpu.pct, 0.01)
|
||||
assertTrue(status.disk.isEmpty())
|
||||
assertTrue(status.services.isEmpty())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user