diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ba61454..86bb72b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger"
minSdk = 24
targetSdk = 34
- versionCode = 17
- versionName = "1.2.3"
+ versionCode = 18
+ versionName = "1.2.4"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0ae1a68..5d1fca7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,6 +60,15 @@
android:name=".update.InstallStatusReceiver"
android:exported="false" />
+
+
+
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 {
diff --git a/app/src/main/java/com/expapp/trigger/data/repository/AppSettings.kt b/app/src/main/java/com/expapp/trigger/data/repository/AppSettings.kt
index dde5018..b912c14 100644
--- a/app/src/main/java/com/expapp/trigger/data/repository/AppSettings.kt
+++ b/app/src/main/java/com/expapp/trigger/data/repository/AppSettings.kt
@@ -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)
diff --git a/app/src/main/java/com/expapp/trigger/ui/components/SettingsDialog.kt b/app/src/main/java/com/expapp/trigger/ui/components/SettingsDialog.kt
index 0764142..9707b5d 100644
--- a/app/src/main/java/com/expapp/trigger/ui/components/SettingsDialog.kt
+++ b/app/src/main/java/com/expapp/trigger/ui/components/SettingsDialog.kt
@@ -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
diff --git a/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt b/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt
index dc3a56e..b31dd07 100644
--- a/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt
+++ b/app/src/main/java/com/expapp/trigger/ui/screens/MainScreen.kt
@@ -151,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() }
@@ -570,6 +571,11 @@ fun MainScreen(
isBiometricEnabled = enabled
appSettings.isBiometricEnabled = enabled
},
+ isWidgetBiometricEnabled = isWidgetBiometricEnabled,
+ onWidgetBiometricToggled = { enabled ->
+ isWidgetBiometricEnabled = enabled
+ appSettings.isWidgetBiometricEnabled = enabled
+ },
isBgMonitorEnabled = isBgMonitorEnabled,
onBgMonitorToggled = { enabled ->
isBgMonitorEnabled = enabled
diff --git a/app/src/main/java/com/expapp/trigger/widget/ServerWidgetProvider.kt b/app/src/main/java/com/expapp/trigger/widget/ServerWidgetProvider.kt
index 9709874..87e334a 100644
--- a/app/src/main/java/com/expapp/trigger/widget/ServerWidgetProvider.kt
+++ b/app/src/main/java/com/expapp/trigger/widget/ServerWidgetProvider.kt
@@ -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(
@@ -65,11 +99,13 @@ class ServerWidgetProvider : AppWidgetProvider() {
val device = devices.firstOrNull()
renderWidget(context, appWidgetManager, appWidgetId, device, null)
- // If device exists, fetch live status asynchronously
+ // 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)
@@ -95,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()
}
}
}
@@ -150,56 +213,55 @@ class ServerWidgetProvider : AppWidgetProvider() {
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")
+ 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)
+ // 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_header_clickable, pendingApp)
- views.setOnClickPendingIntent(R.id.widget_root, pendingApp)
+ 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)
+ views.setTextViewText(R.id.widget_node_name, "${device.node} • Server Control")
- // Status display
+ // Status chip display
+ val timeStr = SimpleDateFormat("HH:mm", Locale.getDefault()).format(Date())
if (status == null) {
- views.setTextViewText(R.id.widget_status_text, "SYNCING")
- views.setTextColor(R.id.widget_status_text, 0xFF71717A.toInt())
+ 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)
}
- 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
+ // 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"
}
- 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)
+ views.setTextViewText(R.id.widget_footer_text, footerOverride ?: defaultFooter)
- // Refresh click
+ // Dedicated Refresh Broadcast Intent
val refreshIntent = Intent(context, ServerWidgetProvider::class.java).apply {
action = ACTION_REFRESH
}
@@ -209,21 +271,37 @@ class ServerWidgetProvider : AppWidgetProvider() {
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
+ // 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
+ // 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
+ // 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)
@@ -253,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) {}
+ }
}
diff --git a/app/src/main/java/com/expapp/trigger/widget/WidgetAuthActivity.kt b/app/src/main/java/com/expapp/trigger/widget/WidgetAuthActivity.kt
new file mode 100644
index 0000000..488c4a8
--- /dev/null
+++ b/app/src/main/java/com/expapp/trigger/widget/WidgetAuthActivity.kt
@@ -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) {}
+ }
+}
diff --git a/app/src/main/res/drawable/widget_bg.xml b/app/src/main/res/drawable/widget_bg.xml
index c8a3871..b49093f 100644
--- a/app/src/main/res/drawable/widget_bg.xml
+++ b/app/src/main/res/drawable/widget_bg.xml
@@ -1,9 +1,9 @@
-
+
-
+ android:color="#24242a" />
+
diff --git a/app/src/main/res/drawable/widget_btn_amber.xml b/app/src/main/res/drawable/widget_btn_amber.xml
index 4399188..80eab2e 100644
--- a/app/src/main/res/drawable/widget_btn_amber.xml
+++ b/app/src/main/res/drawable/widget_btn_amber.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/app/src/main/res/drawable/widget_btn_green.xml b/app/src/main/res/drawable/widget_btn_green.xml
index 017c4c3..0ee573f 100644
--- a/app/src/main/res/drawable/widget_btn_green.xml
+++ b/app/src/main/res/drawable/widget_btn_green.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/app/src/main/res/drawable/widget_btn_red.xml b/app/src/main/res/drawable/widget_btn_red.xml
index 1607461..6227873 100644
--- a/app/src/main/res/drawable/widget_btn_red.xml
+++ b/app/src/main/res/drawable/widget_btn_red.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/app/src/main/res/drawable/widget_btn_refresh_bg.xml b/app/src/main/res/drawable/widget_btn_refresh_bg.xml
new file mode 100644
index 0000000..843dd8d
--- /dev/null
+++ b/app/src/main/res/drawable/widget_btn_refresh_bg.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/widget_chip_checking.xml b/app/src/main/res/drawable/widget_chip_checking.xml
new file mode 100644
index 0000000..08dffa7
--- /dev/null
+++ b/app/src/main/res/drawable/widget_chip_checking.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/widget_chip_offline.xml b/app/src/main/res/drawable/widget_chip_offline.xml
new file mode 100644
index 0000000..3019476
--- /dev/null
+++ b/app/src/main/res/drawable/widget_chip_offline.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/widget_chip_online.xml b/app/src/main/res/drawable/widget_chip_online.xml
new file mode 100644
index 0000000..610d3a7
--- /dev/null
+++ b/app/src/main/res/drawable/widget_chip_online.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/widget_icon_badge.xml b/app/src/main/res/drawable/widget_icon_badge.xml
new file mode 100644
index 0000000..a4c3326
--- /dev/null
+++ b/app/src/main/res/drawable/widget_icon_badge.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/widget_server_control.xml b/app/src/main/res/layout/widget_server_control.xml
index 12ccac7..0b2bcbc 100644
--- a/app/src/main/res/layout/widget_server_control.xml
+++ b/app/src/main/res/layout/widget_server_control.xml
@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:background="@drawable/widget_bg"
android:orientation="vertical"
- android:padding="12dp">
+ android:padding="13dp">
-
+
+
+
+
+
+
@@ -47,58 +57,70 @@
android:ellipsize="end"
android:maxLines="1"
android:text="debian"
- android:textColor="#71717a"
+ android:textColor="#9ca3af"
android:textSize="11sp" />
-
+
+ android:paddingStart="7dp"
+ android:paddingTop="3dp"
+ android:paddingEnd="7dp"
+ android:paddingBottom="3dp">
+ android:contentDescription="Status Dot" />
-
-
+
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:layout_marginStart="6dp"
+ android:background="@drawable/widget_btn_refresh_bg">
+
+
+
-
+
+ android:layout_marginTop="9dp"
+ android:layout_marginBottom="9dp"
+ android:background="#222228" />
@@ -106,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" />
@@ -124,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" />
@@ -133,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" />
@@ -148,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" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 02ac49e..9ac9488 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,4 +3,16 @@
- #121212
- #121212
+
+
+
diff --git a/app/src/test/java/com/expapp/trigger/data/repository/AppSettingsTest.kt b/app/src/test/java/com/expapp/trigger/data/repository/AppSettingsTest.kt
index 862e302..36cd8c0 100644
--- a/app/src/test/java/com/expapp/trigger/data/repository/AppSettingsTest.kt
+++ b/app/src/test/java/com/expapp/trigger/data/repository/AppSettingsTest.kt
@@ -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