Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1bcfa21f8 | ||
|
|
d16b87143d | ||
|
|
27b632bcaa | ||
|
|
0bcca1fbf4 | ||
|
|
898b2468c5 | ||
|
|
ff989afcc1 | ||
|
|
79393bf8a6 |
+12
-2
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 3
|
versionCode = 10
|
||||||
versionName = "1.0.3"
|
versionName = "1.1.6"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
@@ -48,6 +48,11 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lint {
|
||||||
|
checkReleaseBuilds = false
|
||||||
|
abortOnError = false
|
||||||
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_17
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
@@ -91,6 +96,11 @@ dependencies {
|
|||||||
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||||
implementation("com.google.code.gson:gson:2.10.1")
|
implementation("com.google.code.gson:gson:2.10.1")
|
||||||
|
|
||||||
|
// Biometrics & Background Work
|
||||||
|
implementation("androidx.fragment:fragment-ktx:1.6.2")
|
||||||
|
implementation("androidx.biometric:biometric:1.1.0")
|
||||||
|
implementation("androidx.work:work-runtime-ktx:2.9.0")
|
||||||
|
|
||||||
// Testing
|
// Testing
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
|
testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
|
||||||
|
|||||||
@@ -4,6 +4,15 @@
|
|||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||||
|
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
|
||||||
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
|
<uses-permission android:name="android.permission.NFC" />
|
||||||
|
<uses-permission android:name="android.permission.VIBRATE" />
|
||||||
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
|
|
||||||
|
<uses-feature
|
||||||
|
android:name="android.hardware.nfc"
|
||||||
|
android:required="false" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@@ -15,11 +24,26 @@
|
|||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
|
android:launchMode="singleTop"
|
||||||
android:theme="@style/Theme.ExpApp">
|
android:theme="@style/Theme.ExpApp">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
|
<!-- Deep link & NFC intent filters -->
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<data android:scheme="expapp" android:host="trigger" />
|
||||||
|
</intent-filter>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.nfc.action.NDEF_DISCOVERED" />
|
||||||
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
|
<data
|
||||||
|
android:scheme="https"
|
||||||
|
android:host="trigger.expapp.com" />
|
||||||
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
<provider
|
<provider
|
||||||
@@ -35,6 +59,21 @@
|
|||||||
<receiver
|
<receiver
|
||||||
android:name=".update.InstallStatusReceiver"
|
android:name=".update.InstallStatusReceiver"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
|
||||||
|
<!-- Home Screen Widget -->
|
||||||
|
<receiver
|
||||||
|
android:name=".widget.ServerWidgetProvider"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||||
|
<action android:name="com.expapp.trigger.widget.ACTION_TRIGGER" />
|
||||||
|
<action android:name="com.expapp.trigger.widget.ACTION_REFRESH" />
|
||||||
|
<action android:name="com.expapp.trigger.widget.ACTION_CYCLE_DEVICE" />
|
||||||
|
</intent-filter>
|
||||||
|
<meta-data
|
||||||
|
android:name="android.appwidget.provider"
|
||||||
|
android:resource="@xml/server_widget_info" />
|
||||||
|
</receiver>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -1,26 +1,139 @@
|
|||||||
package com.expapp.trigger
|
package com.expapp.trigger
|
||||||
|
|
||||||
|
import android.Manifest
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.pm.PackageManager
|
||||||
|
import android.nfc.NfcAdapter
|
||||||
|
import android.nfc.Tag
|
||||||
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.activity.ComponentActivity
|
import android.os.VibrationEffect
|
||||||
|
import android.os.Vibrator
|
||||||
|
import android.os.VibratorManager
|
||||||
|
import android.widget.Toast
|
||||||
import androidx.activity.compose.setContent
|
import androidx.activity.compose.setContent
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.runtime.mutableStateOf
|
||||||
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.fragment.app.FragmentActivity
|
||||||
|
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.DeviceRepository
|
||||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||||
|
import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
import com.expapp.trigger.network.TriggerClient
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.nfc.NfcHelper
|
||||||
|
import com.expapp.trigger.nfc.NfcTriggerPayload
|
||||||
|
import com.expapp.trigger.security.BiometricHelper
|
||||||
import com.expapp.trigger.ui.screens.MainScreen
|
import com.expapp.trigger.ui.screens.MainScreen
|
||||||
import com.expapp.trigger.ui.theme.DarkBackground
|
import com.expapp.trigger.ui.theme.DarkBackground
|
||||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||||
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
|
import com.expapp.trigger.worker.NotificationHelper
|
||||||
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
|
|
||||||
|
class MainActivity : FragmentActivity() {
|
||||||
|
|
||||||
|
private lateinit var repository: DeviceRepository
|
||||||
|
private lateinit var triggerClient: TriggerClient
|
||||||
|
private lateinit var appSettings: AppSettings
|
||||||
|
private lateinit var historyRepository: TriggerHistoryRepository
|
||||||
|
|
||||||
|
private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null)
|
||||||
|
private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null)
|
||||||
|
|
||||||
|
private var isNotificationPermissionGranted by mutableStateOf(false)
|
||||||
|
private var onNotificationPermissionGrantedCallback: (() -> Unit)? = null
|
||||||
|
|
||||||
|
private val notificationPermissionLauncher =
|
||||||
|
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
|
||||||
|
isNotificationPermissionGranted = isGranted || NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
if (isGranted) {
|
||||||
|
NotificationHelper.createNotificationChannel(this)
|
||||||
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
|
ServerMonitorWorker.schedule(this)
|
||||||
|
}
|
||||||
|
onNotificationPermissionGrantedCallback?.invoke()
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "Notification permission is required for alerts", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
onNotificationPermissionGrantedCallback = null
|
||||||
|
}
|
||||||
|
|
||||||
|
fun requestNotificationPermission(onGranted: () -> Unit = {}) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
== PackageManager.PERMISSION_GRANTED
|
||||||
|
) {
|
||||||
|
isNotificationPermissionGranted = true
|
||||||
|
onGranted()
|
||||||
|
} else {
|
||||||
|
onNotificationPermissionGrantedCallback = onGranted
|
||||||
|
notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
onGranted()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
|
|
||||||
val repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||||
val triggerClient = TriggerClient()
|
val settingsPrefs = getSharedPreferences("app_settings_prefs", Context.MODE_PRIVATE)
|
||||||
|
val hasSeeded = settingsPrefs.getBoolean("has_seeded_default_device", false)
|
||||||
|
if (!hasSeeded) {
|
||||||
|
settingsPrefs.edit().putBoolean("has_seeded_default_device", true).apply()
|
||||||
|
if (repository.getDevices().isEmpty()) {
|
||||||
|
val defaultDevice = DeviceConfig(
|
||||||
|
id = "2dc98ae9-9f71-4f29-95a6-a59ac94d7bf6",
|
||||||
|
name = "Server",
|
||||||
|
node = "debian",
|
||||||
|
powerOffUrl = "https://cosmos.linuxguy.space/poweroff?node=debian",
|
||||||
|
powerOnUrl = "https://trigger.macrodroid.com/87f2f62c-09ee-43cb-8796-fd1a6465754b/wakeserver",
|
||||||
|
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"
|
||||||
|
)
|
||||||
|
repository.addDevice(defaultDevice)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
triggerClient = TriggerClient()
|
||||||
|
appSettings = AppSettings(applicationContext)
|
||||||
|
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||||
|
|
||||||
|
NotificationHelper.createNotificationChannel(this)
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
|
||||||
|
// Request notification permission on Android 13+
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
!= PackageManager.PERMISSION_GRANTED
|
||||||
|
) {
|
||||||
|
notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize background server monitoring
|
||||||
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
|
ServerMonitorWorker.schedule(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle initial launch intent (from NFC or Widget)
|
||||||
|
handleIntent(intent)
|
||||||
|
|
||||||
setContent {
|
setContent {
|
||||||
ExpAppTheme {
|
ExpAppTheme {
|
||||||
@@ -30,10 +143,177 @@ class MainActivity : ComponentActivity() {
|
|||||||
) {
|
) {
|
||||||
MainScreen(
|
MainScreen(
|
||||||
repository = repository,
|
repository = repository,
|
||||||
triggerClient = triggerClient
|
triggerClient = triggerClient,
|
||||||
|
appSettings = appSettings,
|
||||||
|
historyRepository = historyRepository,
|
||||||
|
requestBiometricAuth = { title, subtitle, onResult ->
|
||||||
|
BiometricHelper.authenticate(this, title, subtitle) { success, _ ->
|
||||||
|
onResult(success)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||||
|
onRequestNotificationPermission = {
|
||||||
|
requestNotificationPermission()
|
||||||
|
},
|
||||||
|
onSendTestNotification = {
|
||||||
|
val ok = NotificationHelper.sendTestNotification(this)
|
||||||
|
if (ok) {
|
||||||
|
Toast.makeText(this, "Test notification sent!", Toast.LENGTH_SHORT).show()
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "Notification failed to send. Check system permissions.", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
nfcWriteResult = nfcWriteResult,
|
||||||
|
onStartNfcWriting = { payload ->
|
||||||
|
nfcWriteResult = null
|
||||||
|
activeNfcWritePayload = payload
|
||||||
|
},
|
||||||
|
onStopNfcWriting = {
|
||||||
|
activeNfcWritePayload = null
|
||||||
|
nfcWriteResult = null
|
||||||
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
if (NfcHelper.isNfcSupported(this)) {
|
||||||
|
NfcHelper.enableForegroundDispatch(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
super.onPause()
|
||||||
|
if (NfcHelper.isNfcSupported(this)) {
|
||||||
|
NfcHelper.disableForegroundDispatch(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStop() {
|
||||||
|
super.onStop()
|
||||||
|
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled
|
||||||
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
|
ServerMonitorWorker.runOnce(this)
|
||||||
|
ServerMonitorWorker.schedule(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onNewIntent(intent: Intent) {
|
||||||
|
super.onNewIntent(intent)
|
||||||
|
setIntent(intent)
|
||||||
|
handleIntent(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun handleIntent(intent: Intent?) {
|
||||||
|
if (intent == null) return
|
||||||
|
|
||||||
|
// 1. NFC Tag write handling
|
||||||
|
val writePayload = activeNfcWritePayload
|
||||||
|
if (writePayload != null) {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
val tag = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
intent.getParcelableExtra(NfcAdapter.EXTRA_TAG, Tag::class.java)
|
||||||
|
} else {
|
||||||
|
intent.getParcelableExtra(NfcAdapter.EXTRA_TAG)
|
||||||
|
}
|
||||||
|
if (tag != null) {
|
||||||
|
val message = NfcHelper.createNdefMessage(writePayload.nodeOrDeviceId, writePayload.action)
|
||||||
|
val result = NfcHelper.writeTag(tag, message)
|
||||||
|
nfcWriteResult = result
|
||||||
|
vibrateFeedback(result.isSuccess)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. NFC Tag trigger execution
|
||||||
|
val nfcPayload = NfcHelper.parseTriggerPayload(intent)
|
||||||
|
if (nfcPayload != null) {
|
||||||
|
val devices = repository.getDevices()
|
||||||
|
val device = devices.find { it.node.equals(nfcPayload.nodeOrDeviceId, ignoreCase = true) || it.id == nfcPayload.nodeOrDeviceId }
|
||||||
|
if (device != null) {
|
||||||
|
executeExternalTrigger(device, nfcPayload.action, "NFC")
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "NFC Tag: Unknown server (${nfcPayload.nodeOrDeviceId})", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Widget biometric trigger launch
|
||||||
|
if (intent.action == ServerWidgetProvider.ACTION_TRIGGER) {
|
||||||
|
val deviceId = intent.getStringExtra(ServerWidgetProvider.EXTRA_DEVICE_ID)
|
||||||
|
val actionName = intent.getStringExtra(ServerWidgetProvider.EXTRA_ACTION)
|
||||||
|
if (deviceId != null && actionName != null) {
|
||||||
|
val action = try { TriggerAction.valueOf(actionName) } catch (e: Exception) { null }
|
||||||
|
val device = repository.getDevices().find { it.id == deviceId }
|
||||||
|
if (device != null && action != null) {
|
||||||
|
executeExternalTrigger(device, action, "Widget")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun executeExternalTrigger(device: DeviceConfig, action: TriggerAction, source: String) {
|
||||||
|
val actionName = when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power On"
|
||||||
|
TriggerAction.REBOOT -> "Reboot"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown"
|
||||||
|
}
|
||||||
|
|
||||||
|
val onAuthorized = {
|
||||||
|
vibrateFeedback(true)
|
||||||
|
Toast.makeText(this, "Sending $actionName signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
|
ActionTriggerWorker.enqueue(this, device.id, action, source)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(this)) {
|
||||||
|
BiometricHelper.authenticate(
|
||||||
|
this,
|
||||||
|
title = "Confirm $actionName",
|
||||||
|
subtitle = "Authenticate with fingerprint to trigger ${device.name}"
|
||||||
|
) { success, errorMsg ->
|
||||||
|
if (success) {
|
||||||
|
onAuthorized()
|
||||||
|
} else if (errorMsg != null) {
|
||||||
|
Toast.makeText(this, "Authentication cancelled", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
onAuthorized()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun vibrateFeedback(success: Boolean) {
|
||||||
|
try {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
|
||||||
|
val vibratorManager = getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as? VibratorManager
|
||||||
|
val vibrator = vibratorManager?.defaultVibrator
|
||||||
|
vibrator?.vibrate(
|
||||||
|
VibrationEffect.createOneShot(
|
||||||
|
if (success) 80 else 200,
|
||||||
|
VibrationEffect.DEFAULT_AMPLITUDE
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
val vibrator = getSystemService(Context.VIBRATOR_SERVICE) as? Vibrator
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
vibrator?.vibrate(
|
||||||
|
VibrationEffect.createOneShot(
|
||||||
|
if (success) 80 else 200,
|
||||||
|
VibrationEffect.DEFAULT_AMPLITUDE
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
vibrator?.vibrate(if (success) 80 else 200)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
// Ignore if vibration is not supported
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.expapp.trigger.data.model
|
||||||
|
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
import java.util.UUID
|
||||||
|
|
||||||
|
data class TriggerLog(
|
||||||
|
val id: String = UUID.randomUUID().toString(),
|
||||||
|
val timestamp: Long = System.currentTimeMillis(),
|
||||||
|
val deviceId: String,
|
||||||
|
val deviceName: String,
|
||||||
|
val node: String,
|
||||||
|
val action: TriggerAction,
|
||||||
|
val isSuccess: Boolean,
|
||||||
|
val statusCode: Int,
|
||||||
|
val message: String,
|
||||||
|
val source: String = "App" // "App", "Widget", "NFC"
|
||||||
|
)
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.expapp.trigger.data.repository
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
|
||||||
|
class AppSettings(private val storage: KeyValueStorage) {
|
||||||
|
|
||||||
|
constructor(context: Context) : this(SharedPrefsStorage(context, "app_settings_prefs"))
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
|
||||||
|
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
|
||||||
|
private const val KEY_LAST_STATUS_PREFIX = "last_status_"
|
||||||
|
}
|
||||||
|
|
||||||
|
var isBiometricEnabled: Boolean
|
||||||
|
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
|
||||||
|
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
|
||||||
|
|
||||||
|
var isBackgroundMonitoringEnabled: Boolean
|
||||||
|
get() = storage.getBoolean(KEY_BG_MONITOR_ENABLED, true)
|
||||||
|
set(value) = storage.putBoolean(KEY_BG_MONITOR_ENABLED, value)
|
||||||
|
|
||||||
|
fun getLastStatus(deviceId: String): Boolean? {
|
||||||
|
val key = "$KEY_LAST_STATUS_PREFIX$deviceId"
|
||||||
|
return if (storage.contains(key)) storage.getBoolean(key, false) else null
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setLastStatus(deviceId: String, isOnline: Boolean) {
|
||||||
|
val key = "$KEY_LAST_STATUS_PREFIX$deviceId"
|
||||||
|
storage.putBoolean(key, isOnline)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,11 +9,18 @@ import com.google.gson.reflect.TypeToken
|
|||||||
interface KeyValueStorage {
|
interface KeyValueStorage {
|
||||||
fun getString(key: String, defaultValue: String?): String?
|
fun getString(key: String, defaultValue: String?): String?
|
||||||
fun putString(key: String, value: String?)
|
fun putString(key: String, value: String?)
|
||||||
|
fun getBoolean(key: String, defaultValue: Boolean): Boolean = defaultValue
|
||||||
|
fun putBoolean(key: String, value: Boolean) {}
|
||||||
|
fun contains(key: String): Boolean = false
|
||||||
|
fun remove(key: String) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
class SharedPrefsStorage(context: Context) : KeyValueStorage {
|
class SharedPrefsStorage(
|
||||||
|
context: Context,
|
||||||
|
prefsName: String = "device_trigger_prefs"
|
||||||
|
) : KeyValueStorage {
|
||||||
private val prefs: SharedPreferences =
|
private val prefs: SharedPreferences =
|
||||||
context.getSharedPreferences("device_trigger_prefs", Context.MODE_PRIVATE)
|
context.getSharedPreferences(prefsName, Context.MODE_PRIVATE)
|
||||||
|
|
||||||
override fun getString(key: String, defaultValue: String?): String? =
|
override fun getString(key: String, defaultValue: String?): String? =
|
||||||
prefs.getString(key, defaultValue)
|
prefs.getString(key, defaultValue)
|
||||||
@@ -21,6 +28,20 @@ class SharedPrefsStorage(context: Context) : KeyValueStorage {
|
|||||||
override fun putString(key: String, value: String?) {
|
override fun putString(key: String, value: String?) {
|
||||||
prefs.edit().putString(key, value).apply()
|
prefs.edit().putString(key, value).apply()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun getBoolean(key: String, defaultValue: Boolean): Boolean =
|
||||||
|
prefs.getBoolean(key, defaultValue)
|
||||||
|
|
||||||
|
override fun putBoolean(key: String, value: Boolean) {
|
||||||
|
prefs.edit().putBoolean(key, value).apply()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun contains(key: String): Boolean =
|
||||||
|
prefs.contains(key)
|
||||||
|
|
||||||
|
override fun remove(key: String) {
|
||||||
|
prefs.edit().remove(key).apply()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class DeviceRepository(private val storage: KeyValueStorage) {
|
class DeviceRepository(private val storage: KeyValueStorage) {
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package com.expapp.trigger.data.repository
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import com.expapp.trigger.data.model.TriggerLog
|
||||||
|
import com.google.gson.Gson
|
||||||
|
import com.google.gson.reflect.TypeToken
|
||||||
|
|
||||||
|
class TriggerHistoryRepository(private val storage: KeyValueStorage) {
|
||||||
|
|
||||||
|
constructor(context: Context) : this(SharedPrefsStorage(context, "trigger_history_prefs"))
|
||||||
|
|
||||||
|
private val gson = Gson()
|
||||||
|
private val storageKey = "history_logs_json"
|
||||||
|
private val maxLogs = 500
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
fun getLogs(): List<TriggerLog> {
|
||||||
|
val json = storage.getString(storageKey, null) ?: return emptyList()
|
||||||
|
val type = object : TypeToken<List<TriggerLog>>() {}.type
|
||||||
|
return try {
|
||||||
|
val list = gson.fromJson<List<TriggerLog>>(json, type) ?: emptyList()
|
||||||
|
list.sortedByDescending { it.timestamp }
|
||||||
|
} catch (e: Exception) {
|
||||||
|
emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
fun addLog(log: TriggerLog) {
|
||||||
|
val current = getLogs().toMutableList()
|
||||||
|
current.add(0, log)
|
||||||
|
if (current.size > maxLogs) {
|
||||||
|
current.subList(maxLogs, current.size).clear()
|
||||||
|
}
|
||||||
|
saveLogs(current)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
fun clearOlderThan(durationMillis: Long) {
|
||||||
|
val cutoff = System.currentTimeMillis() - durationMillis
|
||||||
|
val filtered = getLogs().filter { it.timestamp >= cutoff }
|
||||||
|
saveLogs(filtered)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Synchronized
|
||||||
|
fun clearAll() {
|
||||||
|
storage.remove(storageKey)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun saveLogs(logs: List<TriggerLog>) {
|
||||||
|
val json = gson.toJson(logs)
|
||||||
|
storage.putString(storageKey, json)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -120,6 +120,28 @@ class TriggerClient(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun sendTriggerSync(device: DeviceConfig, action: TriggerAction): TriggerResponse {
|
||||||
|
return try {
|
||||||
|
val request = buildRequest(device, action)
|
||||||
|
val response = client.newCall(request).execute()
|
||||||
|
response.use {
|
||||||
|
val code = it.code
|
||||||
|
val bodyText = it.body?.string().orEmpty()
|
||||||
|
TriggerResponse(
|
||||||
|
isSuccess = it.isSuccessful,
|
||||||
|
statusCode = code,
|
||||||
|
message = if (bodyText.isNotEmpty()) bodyText else "HTTP $code"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
TriggerResponse(
|
||||||
|
isSuccess = false,
|
||||||
|
statusCode = -1,
|
||||||
|
message = e.localizedMessage ?: "Request failed"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun fetchR2Config(
|
fun fetchR2Config(
|
||||||
url: String,
|
url: String,
|
||||||
callback: (Result<ParsedEndpoints>) -> Unit
|
callback: (Result<ParsedEndpoints>) -> Unit
|
||||||
@@ -156,9 +178,7 @@ class TriggerClient(
|
|||||||
device: DeviceConfig,
|
device: DeviceConfig,
|
||||||
callback: (NodeStatus) -> Unit
|
callback: (NodeStatus) -> Unit
|
||||||
) {
|
) {
|
||||||
// Only use statusUrl from JSON config — no hardcoded fallback
|
|
||||||
val baseStatusUrl = device.statusUrl.trim()
|
val baseStatusUrl = device.statusUrl.trim()
|
||||||
|
|
||||||
if (baseStatusUrl.isBlank()) {
|
if (baseStatusUrl.isBlank()) {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
|
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
|
||||||
@@ -178,69 +198,82 @@ class TriggerClient(
|
|||||||
client.newCall(request).enqueue(object : Callback {
|
client.newCall(request).enqueue(object : Callback {
|
||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
|
callback(NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResponse(call: Call, response: Response) {
|
override fun onResponse(call: Call, response: Response) {
|
||||||
response.use {
|
val nodeStatus = response.use {
|
||||||
val body = it.body?.string().orEmpty().trim()
|
val body = it.body?.string().orEmpty().trim()
|
||||||
if (body.startsWith("{")) {
|
parseNodeStatus(body, it.isSuccessful)
|
||||||
try {
|
|
||||||
val json = com.google.gson.JsonParser.parseString(body).asJsonObject
|
|
||||||
val online = when {
|
|
||||||
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
|
|
||||||
json.get("online").asBoolean
|
|
||||||
json.has("status") && json.get("status").isJsonPrimitive ->
|
|
||||||
json.get("status").asString.equals("online", ignoreCase = true)
|
|
||||||
else -> false
|
|
||||||
}
|
|
||||||
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
|
|
||||||
val uptime = when {
|
|
||||||
json.has("uptime") && !json.get("uptime").isJsonNull -> json.get("uptime").asString
|
|
||||||
json.has("on_since_duration") && !json.get("on_since_duration").isJsonNull -> json.get("on_since_duration").asString
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
val onSinceIst = if (json.has("on_since_ist") && !json.get("on_since_ist").isJsonNull) {
|
|
||||||
json.get("on_since_ist").asString
|
|
||||||
} else null
|
|
||||||
val lastActiveAgo = if (json.has("last_active_ago") && !json.get("last_active_ago").isJsonNull) {
|
|
||||||
json.get("last_active_ago").asString
|
|
||||||
} else null
|
|
||||||
val lastActiveIst = if (json.has("last_active_ist") && !json.get("last_active_ist").isJsonNull) {
|
|
||||||
json.get("last_active_ist").asString
|
|
||||||
} else null
|
|
||||||
|
|
||||||
runOnMain {
|
|
||||||
callback(
|
|
||||||
NodeStatus(
|
|
||||||
isOnline = online,
|
|
||||||
statusText = if (online) "ONLINE" else "OFFLINE",
|
|
||||||
ip = ip,
|
|
||||||
uptime = uptime,
|
|
||||||
onSinceIst = onSinceIst,
|
|
||||||
lastActiveAgo = lastActiveAgo,
|
|
||||||
lastActiveIst = lastActiveIst
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
runOnMain {
|
|
||||||
callback(NodeStatus(isOnline = false, statusText = "ERROR"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (it.isSuccessful) {
|
|
||||||
val isOnline = body.equals("ONLINE", ignoreCase = true)
|
|
||||||
runOnMain {
|
|
||||||
callback(NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE"))
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
runOnMain {
|
|
||||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
runOnMain { callback(nodeStatus) }
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun checkStatusSync(device: DeviceConfig): NodeStatus {
|
||||||
|
val baseStatusUrl = device.statusUrl.trim()
|
||||||
|
if (baseStatusUrl.isBlank()) {
|
||||||
|
return NodeStatus(isOnline = false, statusText = "NO STATUS URL", isReachable = false)
|
||||||
|
}
|
||||||
|
|
||||||
|
return try {
|
||||||
|
val request = Request.Builder().url(baseStatusUrl).get().build()
|
||||||
|
val response = client.newCall(request).execute()
|
||||||
|
response.use {
|
||||||
|
val body = it.body?.string().orEmpty().trim()
|
||||||
|
parseNodeStatus(body, it.isSuccessful)
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
NodeStatus(isOnline = false, statusText = "OFFLINE", isReachable = false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseNodeStatus(body: String, isHttpSuccess: Boolean): NodeStatus {
|
||||||
|
if (body.startsWith("{")) {
|
||||||
|
return try {
|
||||||
|
val json = com.google.gson.JsonParser.parseString(body).asJsonObject
|
||||||
|
val online = when {
|
||||||
|
json.has("online") && json.get("online").isJsonPrimitive && json.get("online").asJsonPrimitive.isBoolean ->
|
||||||
|
json.get("online").asBoolean
|
||||||
|
json.has("status") && json.get("status").isJsonPrimitive ->
|
||||||
|
json.get("status").asString.equals("online", ignoreCase = true)
|
||||||
|
else -> false
|
||||||
|
}
|
||||||
|
val ip = if (json.has("ip") && !json.get("ip").isJsonNull) json.get("ip").asString else null
|
||||||
|
val uptime = when {
|
||||||
|
json.has("uptime") && !json.get("uptime").isJsonNull -> json.get("uptime").asString
|
||||||
|
json.has("on_since_duration") && !json.get("on_since_duration").isJsonNull -> json.get("on_since_duration").asString
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
val onSinceIst = if (json.has("on_since_ist") && !json.get("on_since_ist").isJsonNull) {
|
||||||
|
json.get("on_since_ist").asString
|
||||||
|
} else null
|
||||||
|
val lastActiveAgo = if (json.has("last_active_ago") && !json.get("last_active_ago").isJsonNull) {
|
||||||
|
json.get("last_active_ago").asString
|
||||||
|
} else null
|
||||||
|
val lastActiveIst = if (json.has("last_active_ist") && !json.get("last_active_ist").isJsonNull) {
|
||||||
|
json.get("last_active_ist").asString
|
||||||
|
} else null
|
||||||
|
|
||||||
|
NodeStatus(
|
||||||
|
isOnline = online,
|
||||||
|
statusText = if (online) "ONLINE" else "OFFLINE",
|
||||||
|
ip = ip,
|
||||||
|
uptime = uptime,
|
||||||
|
onSinceIst = onSinceIst,
|
||||||
|
lastActiveAgo = lastActiveAgo,
|
||||||
|
lastActiveIst = lastActiveIst
|
||||||
|
)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
NodeStatus(isOnline = false, statusText = "ERROR")
|
||||||
|
}
|
||||||
|
} else if (isHttpSuccess) {
|
||||||
|
val isOnline = body.equals("ONLINE", ignoreCase = true)
|
||||||
|
return NodeStatus(isOnline = isOnline, statusText = if (isOnline) "ONLINE" else "OFFLINE")
|
||||||
|
} else {
|
||||||
|
return NodeStatus(isOnline = false, statusText = "OFFLINE")
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,6 @@ data class NodeStatus(
|
|||||||
val onSinceIst: String? = null,
|
val onSinceIst: String? = null,
|
||||||
val lastActiveAgo: String? = null,
|
val lastActiveAgo: String? = null,
|
||||||
val lastActiveIst: String? = null,
|
val lastActiveIst: String? = null,
|
||||||
val timestamp: Long = System.currentTimeMillis()
|
val timestamp: Long = System.currentTimeMillis(),
|
||||||
|
val isReachable: Boolean = true
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
package com.expapp.trigger.nfc
|
||||||
|
|
||||||
|
import android.app.Activity
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
|
import android.net.Uri
|
||||||
|
import android.nfc.NdefMessage
|
||||||
|
import android.nfc.NdefRecord
|
||||||
|
import android.nfc.NfcAdapter
|
||||||
|
import android.nfc.Tag
|
||||||
|
import android.nfc.tech.Ndef
|
||||||
|
import android.nfc.tech.NdefFormatable
|
||||||
|
import android.os.Build
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
|
||||||
|
data class NfcTriggerPayload(
|
||||||
|
val nodeOrDeviceId: String,
|
||||||
|
val action: TriggerAction
|
||||||
|
)
|
||||||
|
|
||||||
|
object NfcHelper {
|
||||||
|
|
||||||
|
fun isNfcSupported(context: Context): Boolean {
|
||||||
|
val adapter = NfcAdapter.getDefaultAdapter(context)
|
||||||
|
return adapter != null
|
||||||
|
}
|
||||||
|
|
||||||
|
fun isNfcEnabled(context: Context): Boolean {
|
||||||
|
val adapter = NfcAdapter.getDefaultAdapter(context)
|
||||||
|
return adapter != null && adapter.isEnabled
|
||||||
|
}
|
||||||
|
|
||||||
|
fun enableForegroundDispatch(activity: Activity) {
|
||||||
|
val adapter = NfcAdapter.getDefaultAdapter(activity) ?: return
|
||||||
|
val intent = Intent(activity, activity.javaClass).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
|
||||||
|
val pendingIntent = PendingIntent.getActivity(
|
||||||
|
activity,
|
||||||
|
0,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_MUTABLE else 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
val ndefFilter = IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED).apply {
|
||||||
|
addDataScheme("expapp")
|
||||||
|
}
|
||||||
|
val tagFilter = IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED)
|
||||||
|
|
||||||
|
adapter.enableForegroundDispatch(activity, pendingIntent, arrayOf(ndefFilter, tagFilter), null)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun disableForegroundDispatch(activity: Activity) {
|
||||||
|
val adapter = NfcAdapter.getDefaultAdapter(activity) ?: return
|
||||||
|
adapter.disableForegroundDispatch(activity)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createNdefMessage(nodeOrDeviceId: String, action: TriggerAction): NdefMessage {
|
||||||
|
val uriString = "expapp://trigger?device=$nodeOrDeviceId&action=${action.name.lowercase()}"
|
||||||
|
val uriRecord = NdefRecord.createUri(Uri.parse(uriString))
|
||||||
|
val aarRecord = NdefRecord.createApplicationRecord("com.expapp.trigger")
|
||||||
|
return NdefMessage(arrayOf(uriRecord, aarRecord))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun writeTag(tag: Tag, message: NdefMessage): Result<Unit> {
|
||||||
|
return try {
|
||||||
|
val ndef = Ndef.get(tag)
|
||||||
|
if (ndef != null) {
|
||||||
|
ndef.connect()
|
||||||
|
if (!ndef.isWritable) {
|
||||||
|
ndef.close()
|
||||||
|
return Result.failure(Exception("NFC Tag is read-only"))
|
||||||
|
}
|
||||||
|
if (ndef.maxSize < message.byteArrayLength) {
|
||||||
|
ndef.close()
|
||||||
|
return Result.failure(Exception("Tag capacity too small (${ndef.maxSize} bytes < ${message.byteArrayLength} bytes)"))
|
||||||
|
}
|
||||||
|
ndef.writeNdefMessage(message)
|
||||||
|
ndef.close()
|
||||||
|
Result.success(Unit)
|
||||||
|
} else {
|
||||||
|
val formatable = NdefFormatable.get(tag)
|
||||||
|
if (formatable != null) {
|
||||||
|
formatable.connect()
|
||||||
|
formatable.format(message)
|
||||||
|
formatable.close()
|
||||||
|
Result.success(Unit)
|
||||||
|
} else {
|
||||||
|
Result.failure(Exception("Tag does not support NDEF format"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
Result.failure(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun parseTriggerPayload(intent: Intent): NfcTriggerPayload? {
|
||||||
|
val uri: Uri? = intent.data ?: run {
|
||||||
|
// Check NdefMessage extra
|
||||||
|
val rawMessages = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)
|
||||||
|
if (rawMessages != null && rawMessages.isNotEmpty()) {
|
||||||
|
val ndefMessage = rawMessages[0] as? NdefMessage
|
||||||
|
val record = ndefMessage?.records?.firstOrNull()
|
||||||
|
record?.toUri()
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uri != null && uri.scheme == "expapp" && uri.host == "trigger") {
|
||||||
|
val device = uri.getQueryParameter("device") ?: return null
|
||||||
|
val actionStr = uri.getQueryParameter("action") ?: return null
|
||||||
|
val action = when (actionStr.lowercase()) {
|
||||||
|
"power_on", "on", "poweron" -> TriggerAction.POWER_ON
|
||||||
|
"power_off", "off", "poweroff", "shutdown" -> TriggerAction.POWER_OFF
|
||||||
|
"reboot", "restart" -> TriggerAction.REBOOT
|
||||||
|
else -> null
|
||||||
|
} ?: return null
|
||||||
|
return NfcTriggerPayload(device, action)
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package com.expapp.trigger.security
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.biometric.BiometricManager
|
||||||
|
import androidx.biometric.BiometricPrompt
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.fragment.app.FragmentActivity
|
||||||
|
|
||||||
|
object BiometricHelper {
|
||||||
|
|
||||||
|
fun isBiometricAvailable(context: Context): Boolean {
|
||||||
|
val biometricManager = BiometricManager.from(context)
|
||||||
|
val authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG or
|
||||||
|
BiometricManager.Authenticators.BIOMETRIC_WEAK or
|
||||||
|
BiometricManager.Authenticators.DEVICE_CREDENTIAL
|
||||||
|
return biometricManager.canAuthenticate(authenticators) == BiometricManager.BIOMETRIC_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
fun authenticate(
|
||||||
|
activity: FragmentActivity,
|
||||||
|
title: String,
|
||||||
|
subtitle: String = "Verify your identity to proceed",
|
||||||
|
onResult: (success: Boolean, errorMessage: String?) -> Unit
|
||||||
|
) {
|
||||||
|
val executor = ContextCompat.getMainExecutor(activity)
|
||||||
|
|
||||||
|
val prompt = BiometricPrompt(
|
||||||
|
activity,
|
||||||
|
executor,
|
||||||
|
object : BiometricPrompt.AuthenticationCallback() {
|
||||||
|
override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
|
||||||
|
super.onAuthenticationSucceeded(result)
|
||||||
|
onResult(true, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
|
||||||
|
super.onAuthenticationError(errorCode, errString)
|
||||||
|
// If user clicked cancel or back, return false with message
|
||||||
|
onResult(false, errString.toString())
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onAuthenticationFailed() {
|
||||||
|
super.onAuthenticationFailed()
|
||||||
|
// Intermediate failure (e.g. unrecognised finger), BiometricPrompt handles retry UI
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
val promptInfo = BiometricPrompt.PromptInfo.Builder()
|
||||||
|
.setTitle(title)
|
||||||
|
.setSubtitle(subtitle)
|
||||||
|
.setAllowedAuthenticators(
|
||||||
|
BiometricManager.Authenticators.BIOMETRIC_STRONG or
|
||||||
|
BiometricManager.Authenticators.DEVICE_CREDENTIAL
|
||||||
|
)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
prompt.authenticate(promptInfo)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,510 @@
|
|||||||
|
package com.expapp.trigger.ui.components
|
||||||
|
|
||||||
|
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.PaddingValues
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.layout.fillMaxHeight
|
||||||
|
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.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.LazyRow
|
||||||
|
import androidx.compose.foundation.lazy.items
|
||||||
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.CheckCircle
|
||||||
|
import androidx.compose.material.icons.filled.Close
|
||||||
|
import androidx.compose.material.icons.filled.DeleteSweep
|
||||||
|
import androidx.compose.material.icons.filled.Error
|
||||||
|
import androidx.compose.material.icons.filled.History
|
||||||
|
import androidx.compose.material3.AlertDialog
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.DropdownMenu
|
||||||
|
import androidx.compose.material3.DropdownMenuItem
|
||||||
|
import androidx.compose.material3.FilterChip
|
||||||
|
import androidx.compose.material3.FilterChipDefaults
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
|
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.text.font.FontFamily
|
||||||
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.compose.ui.window.Dialog
|
||||||
|
import androidx.compose.ui.window.DialogProperties
|
||||||
|
import com.expapp.trigger.data.model.TriggerLog
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
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.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.Locale
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun HistoryDialog(
|
||||||
|
logs: List<TriggerLog>,
|
||||||
|
onClearOlderThan: (durationMillis: Long) -> Unit,
|
||||||
|
onClearAll: () -> Unit,
|
||||||
|
onDismiss: () -> Unit
|
||||||
|
) {
|
||||||
|
var filterAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||||
|
var filterSuccessOnly by remember { mutableStateOf<Boolean?>(null) }
|
||||||
|
var showClearMenu by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
|
val filteredLogs = logs.filter { log ->
|
||||||
|
val actionMatches = filterAction == null || log.action == filterAction
|
||||||
|
val successMatches = filterSuccessOnly == null || log.isSuccess == filterSuccessOnly
|
||||||
|
actionMatches && successMatches
|
||||||
|
}
|
||||||
|
|
||||||
|
Dialog(
|
||||||
|
onDismissRequest = onDismiss,
|
||||||
|
properties = DialogProperties(usePlatformDefaultWidth = false)
|
||||||
|
) {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth(0.95f)
|
||||||
|
.fillMaxHeight(0.85f),
|
||||||
|
shape = RoundedCornerShape(24.dp),
|
||||||
|
color = BgSurface,
|
||||||
|
tonalElevation = 6.dp
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier
|
||||||
|
.padding(20.dp)
|
||||||
|
) {
|
||||||
|
// Header Row
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.History,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(24.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
Text(
|
||||||
|
text = "TRIGGER HISTORY",
|
||||||
|
fontSize = 15.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
letterSpacing = 1.2.sp,
|
||||||
|
color = TextPrimary,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
modifier = Modifier.weight(1f)
|
||||||
|
)
|
||||||
|
|
||||||
|
// Clear options menu button
|
||||||
|
Box {
|
||||||
|
IconButton(
|
||||||
|
onClick = { showClearMenu = true },
|
||||||
|
modifier = Modifier.size(36.dp)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.DeleteSweep,
|
||||||
|
contentDescription = "Clear History",
|
||||||
|
tint = TextSecondary
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
DropdownMenu(
|
||||||
|
expanded = showClearMenu,
|
||||||
|
onDismissRequest = { showClearMenu = false },
|
||||||
|
modifier = Modifier.background(BgElevated)
|
||||||
|
) {
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Clear older than 24 hours", color = TextPrimary, fontSize = 13.sp) },
|
||||||
|
onClick = {
|
||||||
|
showClearMenu = false
|
||||||
|
onClearOlderThan(TimeUnit.HOURS.toMillis(24))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Clear older than 7 days", color = TextPrimary, fontSize = 13.sp) },
|
||||||
|
onClick = {
|
||||||
|
showClearMenu = false
|
||||||
|
onClearOlderThan(TimeUnit.DAYS.toMillis(7))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Clear older than 30 days", color = TextPrimary, fontSize = 13.sp) },
|
||||||
|
onClick = {
|
||||||
|
showClearMenu = false
|
||||||
|
onClearOlderThan(TimeUnit.DAYS.toMillis(30))
|
||||||
|
}
|
||||||
|
)
|
||||||
|
DropdownMenuItem(
|
||||||
|
text = { Text("Clear all history", color = RedVibrant, fontWeight = FontWeight.Bold, fontSize = 13.sp) },
|
||||||
|
onClick = {
|
||||||
|
showClearMenu = false
|
||||||
|
onClearAll()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
IconButton(
|
||||||
|
onClick = onDismiss,
|
||||||
|
modifier = Modifier.size(36.dp)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Close,
|
||||||
|
contentDescription = "Close",
|
||||||
|
tint = TextMuted
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|
||||||
|
// Filter chips row
|
||||||
|
LazyRow(
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
item {
|
||||||
|
FilterChip(
|
||||||
|
selected = filterAction == null && filterSuccessOnly == null,
|
||||||
|
onClick = {
|
||||||
|
filterAction = null
|
||||||
|
filterSuccessOnly = null
|
||||||
|
},
|
||||||
|
label = { Text("All (${logs.size})", fontSize = 11.sp) },
|
||||||
|
colors = FilterChipDefaults.filterChipColors(
|
||||||
|
selectedContainerColor = GreenVibrant.copy(alpha = 0.2f),
|
||||||
|
selectedLabelColor = GreenVibrant,
|
||||||
|
containerColor = BgElevated,
|
||||||
|
labelColor = TextSecondary
|
||||||
|
),
|
||||||
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
|
enabled = true,
|
||||||
|
selected = filterAction == null && filterSuccessOnly == null,
|
||||||
|
borderColor = BorderSubtle,
|
||||||
|
selectedBorderColor = GreenVibrant.copy(alpha = 0.4f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
FilterChip(
|
||||||
|
selected = filterAction == TriggerAction.POWER_ON,
|
||||||
|
onClick = {
|
||||||
|
filterAction = if (filterAction == TriggerAction.POWER_ON) null else TriggerAction.POWER_ON
|
||||||
|
},
|
||||||
|
label = { Text("Power On", fontSize = 11.sp) },
|
||||||
|
colors = FilterChipDefaults.filterChipColors(
|
||||||
|
selectedContainerColor = GreenVibrant.copy(alpha = 0.2f),
|
||||||
|
selectedLabelColor = GreenVibrant,
|
||||||
|
containerColor = BgElevated,
|
||||||
|
labelColor = TextSecondary
|
||||||
|
),
|
||||||
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
|
enabled = true,
|
||||||
|
selected = filterAction == TriggerAction.POWER_ON,
|
||||||
|
borderColor = BorderSubtle,
|
||||||
|
selectedBorderColor = GreenVibrant.copy(alpha = 0.4f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
FilterChip(
|
||||||
|
selected = filterAction == TriggerAction.REBOOT,
|
||||||
|
onClick = {
|
||||||
|
filterAction = if (filterAction == TriggerAction.REBOOT) null else TriggerAction.REBOOT
|
||||||
|
},
|
||||||
|
label = { Text("Reboot", fontSize = 11.sp) },
|
||||||
|
colors = FilterChipDefaults.filterChipColors(
|
||||||
|
selectedContainerColor = AmberVibrant.copy(alpha = 0.2f),
|
||||||
|
selectedLabelColor = AmberVibrant,
|
||||||
|
containerColor = BgElevated,
|
||||||
|
labelColor = TextSecondary
|
||||||
|
),
|
||||||
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
|
enabled = true,
|
||||||
|
selected = filterAction == TriggerAction.REBOOT,
|
||||||
|
borderColor = BorderSubtle,
|
||||||
|
selectedBorderColor = AmberVibrant.copy(alpha = 0.4f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
FilterChip(
|
||||||
|
selected = filterAction == TriggerAction.POWER_OFF,
|
||||||
|
onClick = {
|
||||||
|
filterAction = if (filterAction == TriggerAction.POWER_OFF) null else TriggerAction.POWER_OFF
|
||||||
|
},
|
||||||
|
label = { Text("Shutdown", fontSize = 11.sp) },
|
||||||
|
colors = FilterChipDefaults.filterChipColors(
|
||||||
|
selectedContainerColor = RedVibrant.copy(alpha = 0.2f),
|
||||||
|
selectedLabelColor = RedVibrant,
|
||||||
|
containerColor = BgElevated,
|
||||||
|
labelColor = TextSecondary
|
||||||
|
),
|
||||||
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
|
enabled = true,
|
||||||
|
selected = filterAction == TriggerAction.POWER_OFF,
|
||||||
|
borderColor = BorderSubtle,
|
||||||
|
selectedBorderColor = RedVibrant.copy(alpha = 0.4f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
item {
|
||||||
|
FilterChip(
|
||||||
|
selected = filterSuccessOnly == false,
|
||||||
|
onClick = {
|
||||||
|
filterSuccessOnly = if (filterSuccessOnly == false) null else false
|
||||||
|
},
|
||||||
|
label = { Text("Failed Only", fontSize = 11.sp) },
|
||||||
|
colors = FilterChipDefaults.filterChipColors(
|
||||||
|
selectedContainerColor = RedVibrant.copy(alpha = 0.2f),
|
||||||
|
selectedLabelColor = RedVibrant,
|
||||||
|
containerColor = BgElevated,
|
||||||
|
labelColor = TextSecondary
|
||||||
|
),
|
||||||
|
border = FilterChipDefaults.filterChipBorder(
|
||||||
|
enabled = true,
|
||||||
|
selected = filterSuccessOnly == false,
|
||||||
|
borderColor = BorderSubtle,
|
||||||
|
selectedBorderColor = RedVibrant.copy(alpha = 0.4f)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(14.dp))
|
||||||
|
|
||||||
|
// Logs list or empty state
|
||||||
|
if (filteredLogs.isEmpty()) {
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.weight(1f),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.History,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = TextMuted.copy(alpha = 0.4f),
|
||||||
|
modifier = Modifier.size(48.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
Text(
|
||||||
|
"No trigger events recorded",
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 13.sp
|
||||||
|
)
|
||||||
|
if (filterAction != null || filterSuccessOnly != null) {
|
||||||
|
TextButton(
|
||||||
|
onClick = {
|
||||||
|
filterAction = null
|
||||||
|
filterSuccessOnly = null
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
Text("Reset Filters", color = GreenVibrant, fontSize = 12.sp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
LazyColumn(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.weight(1f),
|
||||||
|
verticalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
|
) {
|
||||||
|
items(filteredLogs, key = { it.id }) { log ->
|
||||||
|
HistoryItemCard(log)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun HistoryItemCard(log: TriggerLog) {
|
||||||
|
val actionColor = when (log.action) {
|
||||||
|
TriggerAction.POWER_ON -> GreenVibrant
|
||||||
|
TriggerAction.REBOOT -> AmberVibrant
|
||||||
|
TriggerAction.POWER_OFF -> RedVibrant
|
||||||
|
}
|
||||||
|
|
||||||
|
val actionName = when (log.action) {
|
||||||
|
TriggerAction.POWER_ON -> "POWER ON"
|
||||||
|
TriggerAction.REBOOT -> "REBOOT"
|
||||||
|
TriggerAction.POWER_OFF -> "SHUTDOWN"
|
||||||
|
}
|
||||||
|
|
||||||
|
val formattedTime = remember(log.timestamp) {
|
||||||
|
val sdf = SimpleDateFormat("MMM dd, HH:mm:ss", Locale.getDefault())
|
||||||
|
sdf.format(Date(log.timestamp))
|
||||||
|
}
|
||||||
|
|
||||||
|
val relativeTime = remember(log.timestamp) {
|
||||||
|
val diff = System.currentTimeMillis() - log.timestamp
|
||||||
|
when {
|
||||||
|
diff < 60_000L -> "Just now"
|
||||||
|
diff < 3600_000L -> "${diff / 60_000L}m ago"
|
||||||
|
diff < 86400_000L -> "${diff / 3600_000L}h ago"
|
||||||
|
else -> "${diff / 86400_000L}d ago"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(14.dp))
|
||||||
|
.background(BgCard)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||||
|
.padding(12.dp)
|
||||||
|
) {
|
||||||
|
Column {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
// Action Pill
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.clip(RoundedCornerShape(6.dp))
|
||||||
|
.background(actionColor.copy(alpha = 0.15f))
|
||||||
|
.padding(horizontal = 8.dp, vertical = 3.dp)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
actionName,
|
||||||
|
color = actionColor,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontFamily = FontFamily.Monospace
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.width(8.dp))
|
||||||
|
|
||||||
|
// Source Pill (App / Widget / NFC)
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.clip(RoundedCornerShape(6.dp))
|
||||||
|
.background(BgElevated)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(6.dp))
|
||||||
|
.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
log.source,
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 10.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.weight(1f))
|
||||||
|
|
||||||
|
// Success/Failure Icon + Status Code
|
||||||
|
if (log.isSuccess) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.CheckCircle,
|
||||||
|
contentDescription = "Success",
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(15.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
|
Text(
|
||||||
|
"${log.statusCode}",
|
||||||
|
color = GreenVibrant,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Error,
|
||||||
|
contentDescription = "Failed",
|
||||||
|
tint = RedVibrant,
|
||||||
|
modifier = Modifier.size(15.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(4.dp))
|
||||||
|
Text(
|
||||||
|
if (log.statusCode > 0) "${log.statusCode}" else "ERR",
|
||||||
|
color = RedVibrant,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
|
|
||||||
|
// Device Name + Node
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
horizontalArrangement = Arrangement.SpaceBetween,
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
text = "${log.deviceName} (${log.node})",
|
||||||
|
color = TextPrimary,
|
||||||
|
fontSize = 13.sp,
|
||||||
|
fontWeight = FontWeight.Medium
|
||||||
|
)
|
||||||
|
Text(
|
||||||
|
text = relativeTime,
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 11.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Message / Details
|
||||||
|
if (log.message.isNotBlank()) {
|
||||||
|
Spacer(modifier = Modifier.height(4.dp))
|
||||||
|
Text(
|
||||||
|
text = log.message,
|
||||||
|
color = if (log.isSuccess) TextSecondary else RedVibrant.copy(alpha = 0.8f),
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
maxLines = 2
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exact timestamp
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
text = formattedTime,
|
||||||
|
color = TextMuted.copy(alpha = 0.6f),
|
||||||
|
fontSize = 10.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,312 @@
|
|||||||
|
package com.expapp.trigger.ui.components
|
||||||
|
|
||||||
|
import androidx.compose.animation.core.FastOutSlowInEasing
|
||||||
|
import androidx.compose.animation.core.RepeatMode
|
||||||
|
import androidx.compose.animation.core.animateFloat
|
||||||
|
import androidx.compose.animation.core.infiniteRepeatable
|
||||||
|
import androidx.compose.animation.core.rememberInfiniteTransition
|
||||||
|
import androidx.compose.animation.core.tween
|
||||||
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.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.CheckCircle
|
||||||
|
import androidx.compose.material.icons.filled.Close
|
||||||
|
import androidx.compose.material.icons.filled.Error
|
||||||
|
import androidx.compose.material.icons.filled.Nfc
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TextButton
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.DisposableEffect
|
||||||
|
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.draw.scale
|
||||||
|
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 androidx.compose.ui.window.Dialog
|
||||||
|
import com.expapp.trigger.data.model.DeviceConfig
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
import com.expapp.trigger.nfc.NfcTriggerPayload
|
||||||
|
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||||
|
import com.expapp.trigger.ui.theme.BgElevated
|
||||||
|
import com.expapp.trigger.ui.theme.BgSurface
|
||||||
|
import com.expapp.trigger.ui.theme.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
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun NfcWriteDialog(
|
||||||
|
devices: List<DeviceConfig>,
|
||||||
|
writeResult: Result<Unit>?,
|
||||||
|
onStartWriting: (NfcTriggerPayload) -> Unit,
|
||||||
|
onStopWriting: () -> Unit,
|
||||||
|
onDismiss: () -> Unit
|
||||||
|
) {
|
||||||
|
var selectedDevice by remember { mutableStateOf(devices.firstOrNull()) }
|
||||||
|
var selectedAction by remember { mutableStateOf(TriggerAction.POWER_ON) }
|
||||||
|
var isWaitingForTag by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
|
DisposableEffect(Unit) {
|
||||||
|
onDispose {
|
||||||
|
onStopWriting()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val infiniteTransition = rememberInfiniteTransition(label = "nfc_pulse")
|
||||||
|
val pulseScale by infiniteTransition.animateFloat(
|
||||||
|
initialValue = 1.0f,
|
||||||
|
targetValue = 1.25f,
|
||||||
|
animationSpec = infiniteRepeatable(
|
||||||
|
animation = tween(1000, easing = FastOutSlowInEasing),
|
||||||
|
repeatMode = RepeatMode.Reverse
|
||||||
|
),
|
||||||
|
label = "nfc_pulse_scale"
|
||||||
|
)
|
||||||
|
|
||||||
|
Dialog(onDismissRequest = {
|
||||||
|
onStopWriting()
|
||||||
|
onDismiss()
|
||||||
|
}) {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.fillMaxWidth(0.95f),
|
||||||
|
shape = RoundedCornerShape(24.dp),
|
||||||
|
color = BgSurface,
|
||||||
|
tonalElevation = 6.dp
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(22.dp),
|
||||||
|
horizontalAlignment = Alignment.CenterHorizontally
|
||||||
|
) {
|
||||||
|
// Header
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Nfc,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(24.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
Text(
|
||||||
|
text = "PROGRAM NFC TAG",
|
||||||
|
fontSize = 15.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
letterSpacing = 1.2.sp,
|
||||||
|
color = TextPrimary,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
modifier = Modifier.weight(1f)
|
||||||
|
)
|
||||||
|
IconButton(
|
||||||
|
onClick = {
|
||||||
|
onStopWriting()
|
||||||
|
onDismiss()
|
||||||
|
},
|
||||||
|
modifier = Modifier.size(36.dp)
|
||||||
|
) {
|
||||||
|
Icon(Icons.Default.Close, contentDescription = "Close", tint = TextMuted)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
|
|
||||||
|
if (writeResult != null) {
|
||||||
|
// Result state
|
||||||
|
if (writeResult.isSuccess) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.CheckCircle,
|
||||||
|
contentDescription = "Success",
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(54.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
Text(
|
||||||
|
"NFC Tag Programmed!",
|
||||||
|
color = TextPrimary,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 16.sp
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
|
Text(
|
||||||
|
"Tap this tag on your phone to trigger ${selectedAction.name} on ${selectedDevice?.name}.",
|
||||||
|
color = TextSecondary,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
modifier = Modifier.padding(horizontal = 16.dp)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Error,
|
||||||
|
contentDescription = "Failed",
|
||||||
|
tint = RedVibrant,
|
||||||
|
modifier = Modifier.size(54.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
Text(
|
||||||
|
"Write Failed",
|
||||||
|
color = RedVibrant,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 16.sp
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
|
Text(
|
||||||
|
writeResult.exceptionOrNull()?.message ?: "Could not write to NFC tag.",
|
||||||
|
color = TextSecondary,
|
||||||
|
fontSize = 12.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Spacer(modifier = Modifier.height(20.dp))
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
onStopWriting()
|
||||||
|
onDismiss()
|
||||||
|
},
|
||||||
|
colors = ButtonDefaults.buttonColors(containerColor = GreenVibrant.copy(alpha = 0.2f)),
|
||||||
|
shape = RoundedCornerShape(12.dp)
|
||||||
|
) {
|
||||||
|
Text("Done", color = GreenVibrant, fontWeight = FontWeight.Bold)
|
||||||
|
}
|
||||||
|
} else if (isWaitingForTag) {
|
||||||
|
// Waiting for tag scan animation
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.size(110.dp)
|
||||||
|
.scale(pulseScale)
|
||||||
|
.clip(CircleShape)
|
||||||
|
.background(GreenVibrant.copy(alpha = 0.12f))
|
||||||
|
.border(2.dp, GreenVibrant.copy(alpha = 0.5f), CircleShape),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Nfc,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(50.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(18.dp))
|
||||||
|
Text(
|
||||||
|
"Hold Tag Near Phone",
|
||||||
|
color = TextPrimary,
|
||||||
|
fontSize = 16.sp,
|
||||||
|
fontWeight = FontWeight.Bold
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
|
Text(
|
||||||
|
"Ready to write ${selectedAction.name} for ${selectedDevice?.name ?: ""}.\nHold an NFC tag against the back of your phone.",
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
textAlign = androidx.compose.ui.text.style.TextAlign.Center
|
||||||
|
)
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(20.dp))
|
||||||
|
TextButton(
|
||||||
|
onClick = {
|
||||||
|
isWaitingForTag = false
|
||||||
|
onStopWriting()
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
Text("Cancel", color = TextSecondary)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Selection form
|
||||||
|
Text(
|
||||||
|
"Select Device & Action to program into an NFC tag:",
|
||||||
|
color = TextSecondary,
|
||||||
|
fontSize = 13.sp,
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
)
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(14.dp))
|
||||||
|
|
||||||
|
// Action Selector (3 buttons)
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
|
) {
|
||||||
|
TriggerAction.values().forEach { action ->
|
||||||
|
val isSelected = selectedAction == action
|
||||||
|
val color = when (action) {
|
||||||
|
TriggerAction.POWER_ON -> GreenVibrant
|
||||||
|
TriggerAction.REBOOT -> AmberVibrant
|
||||||
|
TriggerAction.POWER_OFF -> RedVibrant
|
||||||
|
}
|
||||||
|
val label = when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power On"
|
||||||
|
TriggerAction.REBOOT -> "Reboot"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown"
|
||||||
|
}
|
||||||
|
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.weight(1f)
|
||||||
|
.clip(RoundedCornerShape(10.dp))
|
||||||
|
.background(if (isSelected) color.copy(alpha = 0.2f) else BgElevated)
|
||||||
|
.border(
|
||||||
|
1.dp,
|
||||||
|
if (isSelected) color else BorderSubtle,
|
||||||
|
RoundedCornerShape(10.dp)
|
||||||
|
)
|
||||||
|
.clickable { selectedAction = action }
|
||||||
|
.padding(vertical = 10.dp),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
|
) {
|
||||||
|
Text(
|
||||||
|
label,
|
||||||
|
color = if (isSelected) color else TextSecondary,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(20.dp))
|
||||||
|
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
val dev = selectedDevice
|
||||||
|
if (dev != null) {
|
||||||
|
isWaitingForTag = true
|
||||||
|
onStartWriting(NfcTriggerPayload(nodeOrDeviceId = dev.node, action = selectedAction))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
colors = ButtonDefaults.buttonColors(containerColor = GreenVibrant.copy(alpha = 0.2f)),
|
||||||
|
shape = RoundedCornerShape(12.dp)
|
||||||
|
) {
|
||||||
|
Text("Write to Tag", color = GreenVibrant, fontWeight = FontWeight.Bold, fontSize = 14.sp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,354 @@
|
|||||||
|
package com.expapp.trigger.ui.components
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Build
|
||||||
|
import android.provider.Settings
|
||||||
|
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.RoundedCornerShape
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.filled.Close
|
||||||
|
import androidx.compose.material.icons.filled.Fingerprint
|
||||||
|
import androidx.compose.material.icons.filled.Nfc
|
||||||
|
import androidx.compose.material.icons.filled.Notifications
|
||||||
|
import androidx.compose.material.icons.filled.NotificationsActive
|
||||||
|
import androidx.compose.material.icons.filled.Settings
|
||||||
|
import androidx.compose.material.icons.filled.Warning
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
import androidx.compose.material3.IconButton
|
||||||
|
import androidx.compose.material3.Surface
|
||||||
|
import androidx.compose.material3.Switch
|
||||||
|
import androidx.compose.material3.SwitchDefaults
|
||||||
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.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 androidx.compose.ui.window.Dialog
|
||||||
|
import com.expapp.trigger.BuildConfig
|
||||||
|
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.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
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun SettingsDialog(
|
||||||
|
isBiometricEnabled: Boolean,
|
||||||
|
onBiometricToggled: (Boolean) -> Unit,
|
||||||
|
isBgMonitorEnabled: Boolean,
|
||||||
|
onBgMonitorToggled: (Boolean) -> Unit,
|
||||||
|
isBiometricAvailable: Boolean,
|
||||||
|
isNfcAvailable: Boolean,
|
||||||
|
isNotificationPermissionGranted: Boolean,
|
||||||
|
onRequestNotificationPermission: () -> Unit,
|
||||||
|
onSendTestNotification: () -> Unit,
|
||||||
|
onOpenNfcWriter: () -> Unit,
|
||||||
|
onDismiss: () -> Unit
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
|
Dialog(onDismissRequest = onDismiss) {
|
||||||
|
Surface(
|
||||||
|
modifier = Modifier.fillMaxWidth(0.95f),
|
||||||
|
shape = RoundedCornerShape(24.dp),
|
||||||
|
color = BgSurface,
|
||||||
|
tonalElevation = 6.dp
|
||||||
|
) {
|
||||||
|
Column(
|
||||||
|
modifier = Modifier.padding(22.dp)
|
||||||
|
) {
|
||||||
|
// Header
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Settings,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(24.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
Text(
|
||||||
|
text = "SETTINGS",
|
||||||
|
fontSize = 15.sp,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
letterSpacing = 1.2.sp,
|
||||||
|
color = TextPrimary,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
modifier = Modifier.weight(1f)
|
||||||
|
)
|
||||||
|
IconButton(
|
||||||
|
onClick = onDismiss,
|
||||||
|
modifier = Modifier.size(36.dp)
|
||||||
|
) {
|
||||||
|
Icon(Icons.Default.Close, contentDescription = "Close", tint = TextMuted)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(18.dp))
|
||||||
|
|
||||||
|
// Biometric Setting
|
||||||
|
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 (isBiometricEnabled) GreenVibrant else TextMuted,
|
||||||
|
modifier = Modifier.size(28.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
|
Text(
|
||||||
|
"Biometric Security",
|
||||||
|
color = TextPrimary,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
if (isBiometricAvailable) {
|
||||||
|
"Require fingerprint before any power action"
|
||||||
|
} else {
|
||||||
|
"Biometrics not supported or enrolled on this device"
|
||||||
|
},
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 11.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Switch(
|
||||||
|
checked = isBiometricEnabled && isBiometricAvailable,
|
||||||
|
onCheckedChange = { onBiometricToggled(it) },
|
||||||
|
enabled = isBiometricAvailable,
|
||||||
|
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
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(14.dp))
|
||||||
|
.background(BgCard)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||||
|
.padding(14.dp)
|
||||||
|
) {
|
||||||
|
Column {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Notifications,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = if (isBgMonitorEnabled && isNotificationPermissionGranted) GreenVibrant else TextMuted,
|
||||||
|
modifier = Modifier.size(28.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
|
Text(
|
||||||
|
"Server Status Alerts",
|
||||||
|
color = TextPrimary,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
"Alert outside app when servers go offline or online",
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 11.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Switch(
|
||||||
|
checked = isBgMonitorEnabled,
|
||||||
|
onCheckedChange = { enabled ->
|
||||||
|
if (enabled && !isNotificationPermissionGranted) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
}
|
||||||
|
onBgMonitorToggled(enabled)
|
||||||
|
},
|
||||||
|
colors = SwitchDefaults.colors(
|
||||||
|
checkedThumbColor = GreenVibrant,
|
||||||
|
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||||
|
uncheckedThumbColor = TextMuted,
|
||||||
|
uncheckedTrackColor = BgElevated
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Warning banner if notification permission is blocked
|
||||||
|
if (isBgMonitorEnabled && !isNotificationPermissionGranted) {
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(8.dp))
|
||||||
|
.background(AmberVibrant.copy(alpha = 0.12f))
|
||||||
|
.border(1.dp, AmberVibrant.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
|
||||||
|
.clickable {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
} else {
|
||||||
|
val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
|
||||||
|
putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
|
||||||
|
}
|
||||||
|
context.startActivity(intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(8.dp)
|
||||||
|
) {
|
||||||
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Warning,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = AmberVibrant,
|
||||||
|
modifier = Modifier.size(16.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(6.dp))
|
||||||
|
Text(
|
||||||
|
"Notification permission missing. Tap to enable.",
|
||||||
|
color = AmberVibrant,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontWeight = FontWeight.Medium
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send Test Notification button
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
if (!isNotificationPermissionGranted) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
} else {
|
||||||
|
onSendTestNotification()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = if (isNotificationPermissionGranted) GreenVibrant.copy(alpha = 0.15f) else AmberVibrant.copy(alpha = 0.15f)
|
||||||
|
),
|
||||||
|
shape = RoundedCornerShape(8.dp),
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.NotificationsActive,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||||
|
modifier = Modifier.size(16.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(8.dp))
|
||||||
|
Text(
|
||||||
|
text = if (isNotificationPermissionGranted) "Send Test Notification" else "Grant Permission & Test",
|
||||||
|
color = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|
||||||
|
// NFC Programmer Option
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(14.dp))
|
||||||
|
.background(BgCard)
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||||
|
.clickable(enabled = isNfcAvailable) {
|
||||||
|
onDismiss()
|
||||||
|
onOpenNfcWriter()
|
||||||
|
}
|
||||||
|
.padding(14.dp)
|
||||||
|
) {
|
||||||
|
Row(
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
verticalAlignment = Alignment.CenterVertically
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Nfc,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = if (isNfcAvailable) GreenVibrant else TextMuted,
|
||||||
|
modifier = Modifier.size(28.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
|
Column(modifier = Modifier.weight(1f)) {
|
||||||
|
Text(
|
||||||
|
"Program NFC Tag",
|
||||||
|
color = if (isNfcAvailable) TextPrimary else TextMuted,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
if (isNfcAvailable) {
|
||||||
|
"Tap an NFC sticker to send power signals"
|
||||||
|
} else {
|
||||||
|
"NFC is not supported or disabled on this device"
|
||||||
|
},
|
||||||
|
color = TextMuted,
|
||||||
|
fontSize = 11.sp
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Spacer(modifier = Modifier.height(18.dp))
|
||||||
|
|
||||||
|
// App version footer
|
||||||
|
Text(
|
||||||
|
text = "Server Control v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",
|
||||||
|
color = TextMuted.copy(alpha = 0.5f),
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
modifier = Modifier.align(Alignment.CenterHorizontally)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -208,7 +208,7 @@ fun UpdateDialog(
|
|||||||
horizontalArrangement = Arrangement.SpaceBetween
|
horizontalArrangement = Arrangement.SpaceBetween
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Downloading update…",
|
text = if (downloadState.bytesDownloaded == 0L) "Connecting to server…" else "Downloading update…",
|
||||||
fontSize = 12.sp,
|
fontSize = 12.sp,
|
||||||
color = TextSecondary
|
color = TextSecondary
|
||||||
)
|
)
|
||||||
@@ -220,15 +220,26 @@ fun UpdateDialog(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
LinearProgressIndicator(
|
if (downloadState.bytesDownloaded == 0L && downloadState.progressPercent == 0) {
|
||||||
progress = { downloadState.progressPercent / 100f },
|
LinearProgressIndicator(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.height(8.dp)
|
.height(8.dp)
|
||||||
.clip(RoundedCornerShape(4.dp)),
|
.clip(RoundedCornerShape(4.dp)),
|
||||||
color = GreenVibrant,
|
color = GreenVibrant,
|
||||||
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||||
)
|
)
|
||||||
|
} else {
|
||||||
|
LinearProgressIndicator(
|
||||||
|
progress = { (downloadState.progressPercent / 100f).coerceIn(0f, 1f) },
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.height(8.dp)
|
||||||
|
.clip(RoundedCornerShape(4.dp)),
|
||||||
|
color = GreenVibrant,
|
||||||
|
trackColor = GreenVibrant.copy(alpha = 0.15f)
|
||||||
|
)
|
||||||
|
}
|
||||||
if (downloadState.totalBytes > 0) {
|
if (downloadState.totalBytes > 0) {
|
||||||
Spacer(modifier = Modifier.height(6.dp))
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||||
@@ -238,6 +249,14 @@ fun UpdateDialog(
|
|||||||
fontSize = 11.sp,
|
fontSize = 11.sp,
|
||||||
color = TextMuted
|
color = TextMuted
|
||||||
)
|
)
|
||||||
|
} else if (downloadState.bytesDownloaded > 0) {
|
||||||
|
Spacer(modifier = Modifier.height(6.dp))
|
||||||
|
val downloadedMb = String.format("%.1f MB", downloadState.bytesDownloaded / (1024.0 * 1024.0))
|
||||||
|
Text(
|
||||||
|
text = "$downloadedMb downloaded",
|
||||||
|
fontSize = 11.sp,
|
||||||
|
color = TextMuted
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ import androidx.compose.animation.fadeOut
|
|||||||
import androidx.compose.animation.togetherWith
|
import androidx.compose.animation.togetherWith
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -66,6 +68,7 @@ import androidx.compose.ui.text.font.FontFamily
|
|||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||||
import androidx.compose.ui.text.input.VisualTransformation
|
import androidx.compose.ui.text.input.VisualTransformation
|
||||||
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import com.expapp.trigger.data.model.DeviceConfig
|
import com.expapp.trigger.data.model.DeviceConfig
|
||||||
@@ -274,10 +277,12 @@ fun DevicePage(
|
|||||||
)
|
)
|
||||||
|
|
||||||
val isOnline = nodeStatus?.isOnline
|
val isOnline = nodeStatus?.isOnline
|
||||||
|
val scrollState = rememberScrollState()
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
.verticalScroll(scrollState)
|
||||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||||
) {
|
) {
|
||||||
@@ -313,163 +318,153 @@ fun DevicePage(
|
|||||||
Column(
|
Column(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
.padding(horizontal = 20.dp, vertical = 18.dp)
|
.padding(horizontal = 16.dp, vertical = 14.dp)
|
||||||
) {
|
) {
|
||||||
// Title row
|
// Top row: Server Icon + Name / Node (flexible) + Header Actions
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
verticalAlignment = Alignment.CenterVertically
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
|
||||||
) {
|
) {
|
||||||
Row(
|
Box(
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
modifier = Modifier
|
||||||
modifier = Modifier.weight(1f)
|
.size(42.dp)
|
||||||
) {
|
.clip(RoundedCornerShape(12.dp))
|
||||||
Box(
|
.background(
|
||||||
modifier = Modifier
|
Brush.radialGradient(
|
||||||
.size(48.dp)
|
listOf(
|
||||||
.clip(RoundedCornerShape(14.dp))
|
when (isOnline) {
|
||||||
.background(
|
true -> GreenVibrant.copy(alpha = 0.18f)
|
||||||
Brush.radialGradient(
|
false -> RedVibrant.copy(alpha = 0.12f)
|
||||||
listOf(
|
null -> BorderDefault.copy(alpha = 0.1f)
|
||||||
when (isOnline) {
|
},
|
||||||
true -> GreenVibrant.copy(alpha = 0.18f)
|
Color.Transparent
|
||||||
false -> RedVibrant.copy(alpha = 0.12f)
|
|
||||||
null -> BorderDefault.copy(alpha = 0.1f)
|
|
||||||
},
|
|
||||||
Color.Transparent
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.border(
|
|
||||||
1.dp,
|
|
||||||
when (isOnline) {
|
|
||||||
true -> GreenVibrant.copy(alpha = 0.35f)
|
|
||||||
false -> RedVibrant.copy(alpha = 0.25f)
|
|
||||||
null -> BorderSubtle
|
|
||||||
},
|
|
||||||
RoundedCornerShape(14.dp)
|
|
||||||
),
|
|
||||||
contentAlignment = Alignment.Center
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.Terminal,
|
|
||||||
contentDescription = null,
|
|
||||||
tint = when (isOnline) {
|
|
||||||
true -> GreenVibrant
|
|
||||||
false -> RedVibrant.copy(alpha = 0.6f)
|
|
||||||
null -> TextSecondary
|
|
||||||
},
|
|
||||||
modifier = Modifier.size(22.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(14.dp))
|
|
||||||
|
|
||||||
Column {
|
|
||||||
Text(
|
|
||||||
text = device.name,
|
|
||||||
fontSize = 20.sp,
|
|
||||||
fontWeight = FontWeight.Bold,
|
|
||||||
color = TextPrimary,
|
|
||||||
maxLines = 1
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = device.node,
|
|
||||||
fontSize = 11.sp,
|
|
||||||
color = TextMuted,
|
|
||||||
fontFamily = FontFamily.Monospace,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-fetch R2 JSON config button
|
|
||||||
IconButton(
|
|
||||||
onClick = onSyncConfig,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
|
||||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.CloudSync,
|
|
||||||
contentDescription = "Re-fetch R2 JSON",
|
|
||||||
tint = AmberVibrant,
|
|
||||||
modifier = Modifier.size(18.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
|
||||||
|
|
||||||
// Edit device button
|
|
||||||
IconButton(
|
|
||||||
onClick = { showEditDialog = true },
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(BorderSubtle.copy(alpha = 0.3f))
|
|
||||||
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
imageVector = Icons.Default.Edit,
|
|
||||||
contentDescription = "Edit device",
|
|
||||||
tint = TextSecondary,
|
|
||||||
modifier = Modifier.size(18.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
|
||||||
|
|
||||||
// Refresh button (spins while checking)
|
|
||||||
IconButton(
|
|
||||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
|
||||||
modifier = Modifier
|
|
||||||
.size(36.dp)
|
|
||||||
.clip(RoundedCornerShape(10.dp))
|
|
||||||
.background(
|
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
|
||||||
else BorderSubtle.copy(alpha = 0.3f)
|
|
||||||
)
|
)
|
||||||
.border(
|
.border(
|
||||||
1.dp,
|
1.dp,
|
||||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
when (isOnline) {
|
||||||
else BorderSubtle,
|
true -> GreenVibrant.copy(alpha = 0.35f)
|
||||||
RoundedCornerShape(10.dp)
|
false -> RedVibrant.copy(alpha = 0.25f)
|
||||||
)
|
null -> BorderSubtle
|
||||||
|
},
|
||||||
|
RoundedCornerShape(12.dp)
|
||||||
|
),
|
||||||
|
contentAlignment = Alignment.Center
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = Icons.Default.Refresh,
|
imageVector = Icons.Default.Terminal,
|
||||||
contentDescription = "Refresh status",
|
contentDescription = null,
|
||||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
tint = when (isOnline) {
|
||||||
modifier = Modifier
|
true -> GreenVibrant
|
||||||
.size(18.dp)
|
false -> RedVibrant.copy(alpha = 0.6f)
|
||||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
null -> TextSecondary
|
||||||
|
},
|
||||||
|
modifier = Modifier.size(20.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.width(8.dp))
|
Spacer(modifier = Modifier.width(10.dp))
|
||||||
|
|
||||||
// Delete button
|
Column(
|
||||||
IconButton(
|
|
||||||
onClick = { showDeleteConfirm = true },
|
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(36.dp)
|
.weight(1f, fill = true)
|
||||||
.clip(RoundedCornerShape(10.dp))
|
.padding(end = 8.dp)
|
||||||
.background(RedVibrant.copy(alpha = 0.08f))
|
|
||||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
|
|
||||||
) {
|
) {
|
||||||
Icon(
|
Text(
|
||||||
imageVector = Icons.Default.DeleteOutline,
|
text = device.name,
|
||||||
contentDescription = "Remove device",
|
fontSize = 17.sp,
|
||||||
tint = RedVibrant.copy(alpha = 0.7f),
|
fontWeight = FontWeight.Bold,
|
||||||
modifier = Modifier.size(18.dp)
|
color = TextPrimary,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis
|
||||||
)
|
)
|
||||||
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
|
Text(
|
||||||
|
text = device.node,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
color = TextMuted,
|
||||||
|
fontFamily = FontFamily.Monospace,
|
||||||
|
letterSpacing = 0.5.sp,
|
||||||
|
maxLines = 1,
|
||||||
|
overflow = TextOverflow.Ellipsis
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compact, non-overlapping button bar
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||||
|
) {
|
||||||
|
// Refresh button (syncs status & R2 endpoints)
|
||||||
|
IconButton(
|
||||||
|
onClick = {
|
||||||
|
if (!isCheckingStatus) {
|
||||||
|
onRefreshStatus()
|
||||||
|
onSyncConfig()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
modifier = Modifier
|
||||||
|
.size(34.dp)
|
||||||
|
.clip(RoundedCornerShape(9.dp))
|
||||||
|
.background(
|
||||||
|
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.15f)
|
||||||
|
else BorderSubtle.copy(alpha = 0.25f)
|
||||||
|
)
|
||||||
|
.border(
|
||||||
|
1.dp,
|
||||||
|
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.4f)
|
||||||
|
else BorderSubtle,
|
||||||
|
RoundedCornerShape(9.dp)
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.Refresh,
|
||||||
|
contentDescription = "Refresh server",
|
||||||
|
tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
|
||||||
|
modifier = Modifier
|
||||||
|
.size(17.dp)
|
||||||
|
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Edit device button
|
||||||
|
IconButton(
|
||||||
|
onClick = { showEditDialog = true },
|
||||||
|
modifier = Modifier
|
||||||
|
.size(34.dp)
|
||||||
|
.clip(RoundedCornerShape(9.dp))
|
||||||
|
.background(BorderSubtle.copy(alpha = 0.25f))
|
||||||
|
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.Edit,
|
||||||
|
contentDescription = "Edit device",
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(16.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete button
|
||||||
|
IconButton(
|
||||||
|
onClick = { showDeleteConfirm = true },
|
||||||
|
modifier = Modifier
|
||||||
|
.size(34.dp)
|
||||||
|
.clip(RoundedCornerShape(9.dp))
|
||||||
|
.background(RedVibrant.copy(alpha = 0.08f))
|
||||||
|
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.Default.DeleteOutline,
|
||||||
|
contentDescription = "Remove device",
|
||||||
|
tint = RedVibrant.copy(alpha = 0.8f),
|
||||||
|
modifier = Modifier.size(17.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(14.dp))
|
||||||
|
|
||||||
// ── STATUS ROW ────────────────────────────────────────────
|
// ── STATUS ROW ────────────────────────────────────────────
|
||||||
Row(
|
Row(
|
||||||
|
|||||||
@@ -21,18 +21,23 @@ import androidx.compose.foundation.layout.width
|
|||||||
import androidx.compose.foundation.pager.HorizontalPager
|
import androidx.compose.foundation.pager.HorizontalPager
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
import androidx.compose.foundation.pager.rememberPagerState
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.material.ExperimentalMaterialApi
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Add
|
import androidx.compose.material.icons.filled.Add
|
||||||
|
import androidx.compose.material.icons.filled.History
|
||||||
import androidx.compose.material.icons.filled.Refresh
|
import androidx.compose.material.icons.filled.Refresh
|
||||||
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material.icons.filled.SystemUpdate
|
import androidx.compose.material.icons.filled.SystemUpdate
|
||||||
import androidx.compose.material.icons.filled.Terminal
|
import androidx.compose.material.icons.filled.Terminal
|
||||||
import androidx.compose.material3.TopAppBar
|
import androidx.compose.material.pullrefresh.PullRefreshIndicator
|
||||||
|
import androidx.compose.material.pullrefresh.pullRefresh
|
||||||
|
import androidx.compose.material.pullrefresh.rememberPullRefreshState
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TopAppBar
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.DisposableEffect
|
import androidx.compose.runtime.DisposableEffect
|
||||||
@@ -57,10 +62,19 @@ import androidx.lifecycle.Lifecycle
|
|||||||
import androidx.lifecycle.LifecycleEventObserver
|
import androidx.lifecycle.LifecycleEventObserver
|
||||||
import com.expapp.trigger.BuildConfig
|
import com.expapp.trigger.BuildConfig
|
||||||
import com.expapp.trigger.data.model.DeviceConfig
|
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.DeviceRepository
|
||||||
|
import com.expapp.trigger.data.repository.TriggerHistoryRepository
|
||||||
import com.expapp.trigger.network.NodeStatus
|
import com.expapp.trigger.network.NodeStatus
|
||||||
import com.expapp.trigger.network.TriggerAction
|
import com.expapp.trigger.network.TriggerAction
|
||||||
import com.expapp.trigger.network.TriggerClient
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.nfc.NfcHelper
|
||||||
|
import com.expapp.trigger.nfc.NfcTriggerPayload
|
||||||
|
import com.expapp.trigger.security.BiometricHelper
|
||||||
|
import com.expapp.trigger.ui.components.HistoryDialog
|
||||||
|
import com.expapp.trigger.ui.components.NfcWriteDialog
|
||||||
|
import com.expapp.trigger.ui.components.SettingsDialog
|
||||||
import com.expapp.trigger.ui.components.UpdateDialog
|
import com.expapp.trigger.ui.components.UpdateDialog
|
||||||
import com.expapp.trigger.ui.theme.BgBase
|
import com.expapp.trigger.ui.theme.BgBase
|
||||||
import com.expapp.trigger.ui.theme.BgElevated
|
import com.expapp.trigger.ui.theme.BgElevated
|
||||||
@@ -77,15 +91,31 @@ import com.expapp.trigger.update.DownloadState
|
|||||||
import com.expapp.trigger.update.ReleaseInfo
|
import com.expapp.trigger.update.ReleaseInfo
|
||||||
import com.expapp.trigger.update.UpdateCheckResult
|
import com.expapp.trigger.update.UpdateCheckResult
|
||||||
import com.expapp.trigger.update.UpdateManager
|
import com.expapp.trigger.update.UpdateManager
|
||||||
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import com.expapp.trigger.worker.ActionTriggerWorker
|
||||||
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
@OptIn(
|
||||||
|
ExperimentalFoundationApi::class,
|
||||||
|
ExperimentalMaterial3Api::class,
|
||||||
|
ExperimentalMaterialApi::class
|
||||||
|
)
|
||||||
@Composable
|
@Composable
|
||||||
fun MainScreen(
|
fun MainScreen(
|
||||||
repository: DeviceRepository,
|
repository: DeviceRepository,
|
||||||
triggerClient: TriggerClient,
|
triggerClient: TriggerClient,
|
||||||
|
appSettings: AppSettings,
|
||||||
|
historyRepository: TriggerHistoryRepository,
|
||||||
|
requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) },
|
||||||
|
isNotificationPermissionGranted: Boolean = true,
|
||||||
|
onRequestNotificationPermission: () -> Unit = {},
|
||||||
|
onSendTestNotification: () -> Unit = {},
|
||||||
|
nfcWriteResult: Result<Unit>? = null,
|
||||||
|
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
|
||||||
|
onStopNfcWriting: () -> Unit = {},
|
||||||
modifier: Modifier = Modifier
|
modifier: Modifier = Modifier
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
@@ -114,36 +144,20 @@ fun MainScreen(
|
|||||||
var downloadState by remember { mutableStateOf<DownloadState>(DownloadState.Idle) }
|
var downloadState by remember { mutableStateOf<DownloadState>(DownloadState.Idle) }
|
||||||
var isCheckingUpdate by remember { mutableStateOf(false) }
|
var isCheckingUpdate by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
fun checkAppUpdate(showToast: Boolean = false) {
|
// Dialog & Feature states
|
||||||
isCheckingUpdate = true
|
var showHistoryDialog by remember { mutableStateOf(false) }
|
||||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
var showSettingsDialog by remember { mutableStateOf(false) }
|
||||||
isCheckingUpdate = false
|
var showNfcWriteDialog by remember { mutableStateOf(false) }
|
||||||
when (result) {
|
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
|
||||||
is UpdateCheckResult.UpdateAvailable -> {
|
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||||
availableUpdate = result.info
|
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||||
if (showToast || dismissedVersion != result.info.versionName) {
|
|
||||||
showUpdateDialog = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is UpdateCheckResult.UpToDate -> {
|
|
||||||
if (showToast) {
|
|
||||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is UpdateCheckResult.Error -> {
|
|
||||||
if (showToast) {
|
|
||||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||||
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
||||||
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
||||||
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
||||||
var isSyncing by remember { mutableStateOf(false) }
|
var isSyncing by remember { mutableStateOf(false) }
|
||||||
|
var isPullRefreshing by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
||||||
if (showIndicator || nodeStatuses[device.id] == null) {
|
if (showIndicator || nodeStatuses[device.id] == null) {
|
||||||
@@ -152,6 +166,10 @@ fun MainScreen(
|
|||||||
triggerClient.checkStatus(device) { status ->
|
triggerClient.checkStatus(device) { status ->
|
||||||
checkingStatusMap[device.id] = false
|
checkingStatusMap[device.id] = false
|
||||||
nodeStatuses[device.id] = status
|
nodeStatuses[device.id] = status
|
||||||
|
// Only update stored status when server is actually reached
|
||||||
|
if (status.isReachable) {
|
||||||
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -184,6 +202,62 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun checkAppUpdate(isManual: Boolean = false) {
|
||||||
|
isCheckingUpdate = true
|
||||||
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||||
|
isCheckingUpdate = false
|
||||||
|
when (result) {
|
||||||
|
is UpdateCheckResult.UpdateAvailable -> {
|
||||||
|
availableUpdate = result.info
|
||||||
|
showUpdateDialog = true
|
||||||
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is UpdateCheckResult.UpToDate -> {
|
||||||
|
availableUpdate = null
|
||||||
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "Page refreshed • App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is UpdateCheckResult.Error -> {
|
||||||
|
if (isManual) {
|
||||||
|
Toast.makeText(context, "Page refreshed • Update check failed", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pull-to-refresh entire page handler
|
||||||
|
fun refreshWholePage() {
|
||||||
|
isPullRefreshing = true
|
||||||
|
dismissedVersion = null
|
||||||
|
coroutineScope.launch {
|
||||||
|
// 1. Sync R2 endpoints
|
||||||
|
syncEndpoints(showToast = false)
|
||||||
|
|
||||||
|
// 2. Poll status for all configured devices
|
||||||
|
devices.forEach { dev ->
|
||||||
|
refreshStatus(dev, showIndicator = true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Explicitly check for app updates with user feedback
|
||||||
|
checkAppUpdate(isManual = true)
|
||||||
|
|
||||||
|
// 4. Update home screen widgets
|
||||||
|
ServerWidgetProvider.updateAllWidgets(context)
|
||||||
|
|
||||||
|
delay(750)
|
||||||
|
isPullRefreshing = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val pullRefreshState = rememberPullRefreshState(
|
||||||
|
refreshing = isPullRefreshing,
|
||||||
|
onRefresh = { refreshWholePage() }
|
||||||
|
)
|
||||||
|
|
||||||
// Initial R2 sync and update check on launch
|
// Initial R2 sync and update check on launch
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
syncEndpoints(false)
|
syncEndpoints(false)
|
||||||
@@ -203,29 +277,49 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun executeAction(device: DeviceConfig, action: TriggerAction) {
|
fun executeAction(device: DeviceConfig, action: TriggerAction) {
|
||||||
loadingStates[device.id] = true
|
val actionTitle = when (action) {
|
||||||
statusStates.remove(device.id)
|
TriggerAction.POWER_ON -> "Power On"
|
||||||
triggerClient.sendTrigger(device, action) { response ->
|
TriggerAction.REBOOT -> "Reboot"
|
||||||
loadingStates[device.id] = false
|
TriggerAction.POWER_OFF -> "Shutdown"
|
||||||
val msg = if (response.isSuccess) {
|
}
|
||||||
when (action) {
|
|
||||||
TriggerAction.POWER_ON -> "Power on signal sent"
|
val performDispatch = {
|
||||||
TriggerAction.POWER_OFF -> "Shutdown signal sent"
|
loadingStates[device.id] = true
|
||||||
TriggerAction.REBOOT -> "Restart signal sent"
|
statusStates.remove(device.id)
|
||||||
}
|
Toast.makeText(context, "Sending $actionTitle signal to ${device.name}...", Toast.LENGTH_SHORT).show()
|
||||||
} else {
|
|
||||||
val raw = response.message.trim()
|
// Enqueue guaranteed background worker: executes HTTP request, sends notifications, updates widgets & monitors transition
|
||||||
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
|
ActionTriggerWorker.enqueue(context, device.id, action, "App")
|
||||||
"Failed — $clean"
|
|
||||||
}
|
// In foreground, refresh UI smoothly after short intervals if user stays in the app
|
||||||
statusStates[device.id] = msg to response.isSuccess
|
|
||||||
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
|
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
delay(1500); refreshStatus(device, showIndicator = true)
|
delay(2000)
|
||||||
delay(4000); refreshStatus(device)
|
refreshStatus(device, showIndicator = true)
|
||||||
delay(5000); refreshStatus(device)
|
historyLogs = historyRepository.getLogs()
|
||||||
|
loadingStates[device.id] = false
|
||||||
|
delay(3000)
|
||||||
|
refreshStatus(device, showIndicator = false)
|
||||||
|
historyLogs = historyRepository.getLogs()
|
||||||
|
delay(4000)
|
||||||
|
refreshStatus(device, showIndicator = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Biometric Security Gate
|
||||||
|
if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(context)) {
|
||||||
|
requestBiometricAuth(
|
||||||
|
"Confirm $actionTitle",
|
||||||
|
"Authenticate with fingerprint to trigger ${device.name}"
|
||||||
|
) { success ->
|
||||||
|
if (success) {
|
||||||
|
performDispatch()
|
||||||
|
} else {
|
||||||
|
Toast.makeText(context, "Action cancelled", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
performDispatch()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spin animation for sync button
|
// Spin animation for sync button
|
||||||
@@ -251,29 +345,29 @@ fun MainScreen(
|
|||||||
tint = GreenVibrant,
|
tint = GreenVibrant,
|
||||||
modifier = Modifier.size(18.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.width(8.dp))
|
Spacer(modifier = Modifier.width(6.dp))
|
||||||
Text(
|
Text(
|
||||||
text = "DEVICE TRIGGER",
|
text = "DEVICE TRIGGER",
|
||||||
fontSize = 13.sp,
|
fontSize = 12.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
letterSpacing = 1.5.sp,
|
letterSpacing = 1.2.sp,
|
||||||
color = TextPrimary,
|
color = TextPrimary,
|
||||||
fontFamily = FontFamily.Monospace,
|
fontFamily = FontFamily.Monospace,
|
||||||
maxLines = 1
|
maxLines = 1
|
||||||
)
|
)
|
||||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||||
Spacer(modifier = Modifier.width(8.dp))
|
Spacer(modifier = Modifier.width(6.dp))
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.clip(CircleShape)
|
.clip(CircleShape)
|
||||||
.background(OnlineBg)
|
.background(OnlineBg)
|
||||||
.border(1.dp, OnlineBorder, CircleShape)
|
.border(1.dp, OnlineBorder, CircleShape)
|
||||||
.padding(horizontal = 7.dp, vertical = 2.dp)
|
.padding(horizontal = 6.dp, vertical = 2.dp)
|
||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
"$onlineCount online",
|
"$onlineCount on",
|
||||||
fontSize = 10.sp,
|
fontSize = 9.sp,
|
||||||
fontWeight = FontWeight.Bold,
|
fontWeight = FontWeight.Bold,
|
||||||
color = OnlineText,
|
color = OnlineText,
|
||||||
letterSpacing = 0.5.sp
|
letterSpacing = 0.5.sp
|
||||||
@@ -283,44 +377,85 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions = {
|
actions = {
|
||||||
|
// Update Button
|
||||||
if (availableUpdate != null) {
|
if (availableUpdate != null) {
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { showUpdateDialog = true },
|
onClick = { showUpdateDialog = true },
|
||||||
modifier = Modifier.size(40.dp)
|
modifier = Modifier.size(32.dp)
|
||||||
) {
|
) {
|
||||||
Box(contentAlignment = Alignment.TopEnd) {
|
Box(contentAlignment = Alignment.TopEnd) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.SystemUpdate,
|
Icons.Default.SystemUpdate,
|
||||||
contentDescription = "Update available",
|
contentDescription = "Update available",
|
||||||
tint = GreenVibrant,
|
tint = GreenVibrant,
|
||||||
modifier = Modifier.size(20.dp)
|
modifier = Modifier.size(18.dp)
|
||||||
)
|
)
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.size(7.dp)
|
.size(6.dp)
|
||||||
.background(GreenVibrant, CircleShape)
|
.background(GreenVibrant, CircleShape)
|
||||||
.border(1.dp, BgSurface, CircleShape)
|
.border(1.dp, BgSurface, CircleShape)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Trigger History Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { syncEndpoints(true) },
|
onClick = {
|
||||||
enabled = !isSyncing,
|
historyLogs = historyRepository.getLogs()
|
||||||
modifier = Modifier.size(40.dp)
|
showHistoryDialog = true
|
||||||
|
},
|
||||||
|
modifier = Modifier.size(32.dp)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.History,
|
||||||
|
contentDescription = "Trigger History",
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(19.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Settings Button
|
||||||
|
IconButton(
|
||||||
|
onClick = { showSettingsDialog = true },
|
||||||
|
modifier = Modifier.size(32.dp)
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Settings,
|
||||||
|
contentDescription = "Settings",
|
||||||
|
tint = TextSecondary,
|
||||||
|
modifier = Modifier.size(19.dp)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unified Refresh / Sync Button
|
||||||
|
IconButton(
|
||||||
|
onClick = { refreshWholePage() },
|
||||||
|
enabled = !isSyncing && !isPullRefreshing,
|
||||||
|
modifier = Modifier.size(32.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Refresh,
|
Icons.Default.Refresh,
|
||||||
"Sync",
|
"Refresh all",
|
||||||
tint = if (isSyncing) TextMuted else GreenVibrant,
|
tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
|
||||||
modifier = Modifier.rotate(rotationAngle)
|
modifier = Modifier
|
||||||
|
.size(19.dp)
|
||||||
|
.rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add Device Button
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
|
||||||
modifier = Modifier.size(40.dp)
|
modifier = Modifier.size(32.dp)
|
||||||
) {
|
) {
|
||||||
Icon(Icons.Default.Add, "Add Device", tint = GreenVibrant)
|
Icon(
|
||||||
|
Icons.Default.Add,
|
||||||
|
"Add Device",
|
||||||
|
tint = GreenVibrant,
|
||||||
|
modifier = Modifier.size(20.dp)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
colors = TopAppBarDefaults.topAppBarColors(
|
colors = TopAppBarDefaults.topAppBarColors(
|
||||||
@@ -349,90 +484,174 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(horizontal = 3.dp)
|
.padding(horizontal = 4.dp)
|
||||||
.height(6.dp)
|
.size(if (selected) 8.dp else 6.dp)
|
||||||
.width(if (selected) 22.dp else 6.dp)
|
.clip(CircleShape)
|
||||||
.clip(if (selected) RoundedCornerShape(3.dp) else CircleShape)
|
|
||||||
.background(dotColor)
|
.background(dotColor)
|
||||||
|
.clickable {
|
||||||
|
coroutineScope.launch {
|
||||||
|
pagerState.animateScrollToPage(i)
|
||||||
|
}
|
||||||
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
) { padding ->
|
) { innerPadding ->
|
||||||
HorizontalPager(
|
// Pull to refresh container enclosing HorizontalPager
|
||||||
state = pagerState,
|
Box(
|
||||||
modifier = Modifier.fillMaxSize().padding(padding)
|
modifier = Modifier
|
||||||
) { page ->
|
.fillMaxSize()
|
||||||
if (page < devices.size) {
|
.padding(innerPadding)
|
||||||
val dev = devices[page]
|
.pullRefresh(pullRefreshState)
|
||||||
DevicePage(
|
) {
|
||||||
device = dev,
|
HorizontalPager(
|
||||||
isLoading = loadingStates[dev.id] == true,
|
state = pagerState,
|
||||||
nodeStatus = nodeStatuses[dev.id],
|
modifier = Modifier.fillMaxSize()
|
||||||
isCheckingStatus = checkingStatusMap[dev.id] == true,
|
) { page ->
|
||||||
lastStatus = statusStates[dev.id]?.first,
|
if (page < devices.size) {
|
||||||
lastSuccess = statusStates[dev.id]?.second,
|
val dev = devices[page]
|
||||||
onDismissStatus = { statusStates.remove(dev.id) },
|
DevicePage(
|
||||||
onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
|
device = dev,
|
||||||
onTrigger = { action -> executeAction(dev, action) },
|
isLoading = loadingStates[dev.id] == true,
|
||||||
onDelete = { d -> repository.deleteDevice(d.id); devices = repository.getDevices() },
|
nodeStatus = nodeStatuses[dev.id],
|
||||||
onSyncConfig = {
|
isCheckingStatus = checkingStatusMap[dev.id] == true,
|
||||||
triggerClient.fetchR2Config(dev.r2Url) { result ->
|
lastStatus = statusStates[dev.id]?.first,
|
||||||
result.onSuccess { ep ->
|
lastSuccess = statusStates[dev.id]?.second,
|
||||||
val changed = repository.updateEndpoints(dev.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
onDismissStatus = { statusStates.remove(dev.id) },
|
||||||
devices = repository.getDevices()
|
onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
|
||||||
val msg = if (changed) "Endpoints updated from R2" else "Endpoints already up to date"
|
onTrigger = { action -> executeAction(dev, action) },
|
||||||
statusStates[dev.id] = msg to true
|
onDelete = { d ->
|
||||||
refreshStatus(dev, showIndicator = true)
|
repository.deleteDevice(d.id)
|
||||||
}.onFailure { ex ->
|
devices = repository.getDevices()
|
||||||
statusStates[dev.id] = "Failed to fetch R2: ${ex.message}" to false
|
},
|
||||||
|
onSyncConfig = { syncEndpoints(true) },
|
||||||
|
onUpdateDevice = { updated ->
|
||||||
|
repository.updateDevice(updated)
|
||||||
|
devices = repository.getDevices()
|
||||||
|
refreshStatus(updated, showIndicator = true)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
AddDevicePage(
|
||||||
|
triggerClient = triggerClient,
|
||||||
|
onDeviceAdded = { newDev ->
|
||||||
|
repository.addDevice(newDev)
|
||||||
|
devices = repository.getDevices()
|
||||||
|
refreshStatus(newDev, showIndicator = true)
|
||||||
|
coroutineScope.launch {
|
||||||
|
val idx = devices.indexOfFirst { it.id == newDev.id }
|
||||||
|
if (idx >= 0) pagerState.animateScrollToPage(idx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
)
|
||||||
onUpdateDevice = { updated ->
|
}
|
||||||
repository.updateDevice(updated)
|
|
||||||
devices = repository.getDevices()
|
|
||||||
if (updated.r2Url.isNotBlank() && updated.r2Url != dev.r2Url) {
|
|
||||||
triggerClient.fetchR2Config(updated.r2Url) { result ->
|
|
||||||
result.onSuccess { ep ->
|
|
||||||
repository.updateEndpoints(updated.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
|
||||||
devices = repository.getDevices()
|
|
||||||
statusStates[updated.id] = "Device & endpoints updated" to true
|
|
||||||
refreshStatus(updated, showIndicator = true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
statusStates[updated.id] = "Device updated" to true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
AddDevicePage(
|
|
||||||
triggerClient = triggerClient,
|
|
||||||
onDeviceAdded = { newDev ->
|
|
||||||
repository.addDevice(newDev)
|
|
||||||
devices = repository.getDevices()
|
|
||||||
refreshStatus(newDev, showIndicator = true)
|
|
||||||
coroutineScope.launch {
|
|
||||||
val idx = devices.indexOfFirst { it.id == newDev.id }
|
|
||||||
if (idx >= 0) pagerState.animateScrollToPage(idx)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PullRefreshIndicator(
|
||||||
|
refreshing = isPullRefreshing,
|
||||||
|
state = pullRefreshState,
|
||||||
|
modifier = Modifier.align(Alignment.TopCenter),
|
||||||
|
backgroundColor = BgElevated,
|
||||||
|
contentColor = GreenVibrant
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Trigger History Dialog
|
||||||
|
if (showHistoryDialog) {
|
||||||
|
HistoryDialog(
|
||||||
|
logs = historyLogs,
|
||||||
|
onClearOlderThan = { millis ->
|
||||||
|
historyRepository.clearOlderThan(millis)
|
||||||
|
historyLogs = historyRepository.getLogs()
|
||||||
|
},
|
||||||
|
onClearAll = {
|
||||||
|
historyRepository.clearAll()
|
||||||
|
historyLogs = emptyList()
|
||||||
|
},
|
||||||
|
onDismiss = { showHistoryDialog = false }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Settings Dialog
|
||||||
|
if (showSettingsDialog) {
|
||||||
|
SettingsDialog(
|
||||||
|
isBiometricEnabled = isBiometricEnabled,
|
||||||
|
onBiometricToggled = { enabled ->
|
||||||
|
isBiometricEnabled = enabled
|
||||||
|
appSettings.isBiometricEnabled = enabled
|
||||||
|
},
|
||||||
|
isBgMonitorEnabled = isBgMonitorEnabled,
|
||||||
|
onBgMonitorToggled = { enabled ->
|
||||||
|
isBgMonitorEnabled = enabled
|
||||||
|
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||||
|
if (enabled) {
|
||||||
|
ServerMonitorWorker.schedule(context)
|
||||||
|
} else {
|
||||||
|
ServerMonitorWorker.cancel(context)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||||
|
isNfcAvailable = NfcHelper.isNfcSupported(context),
|
||||||
|
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||||
|
onRequestNotificationPermission = onRequestNotificationPermission,
|
||||||
|
onSendTestNotification = onSendTestNotification,
|
||||||
|
onOpenNfcWriter = {
|
||||||
|
showNfcWriteDialog = true
|
||||||
|
},
|
||||||
|
onDismiss = { showSettingsDialog = false }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NFC Write Tag Dialog
|
||||||
|
if (showNfcWriteDialog) {
|
||||||
|
NfcWriteDialog(
|
||||||
|
devices = devices,
|
||||||
|
writeResult = nfcWriteResult,
|
||||||
|
onStartWriting = { payload ->
|
||||||
|
onStartNfcWriting(payload)
|
||||||
|
},
|
||||||
|
onStopWriting = {
|
||||||
|
onStopNfcWriting()
|
||||||
|
},
|
||||||
|
onDismiss = {
|
||||||
|
onStopNfcWriting()
|
||||||
|
showNfcWriteDialog = false
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update Dialog
|
||||||
if (showUpdateDialog && availableUpdate != null) {
|
if (showUpdateDialog && availableUpdate != null) {
|
||||||
UpdateDialog(
|
UpdateDialog(
|
||||||
releaseInfo = availableUpdate!!,
|
releaseInfo = availableUpdate!!,
|
||||||
currentVersion = BuildConfig.VERSION_NAME,
|
currentVersion = BuildConfig.VERSION_NAME,
|
||||||
downloadState = downloadState,
|
downloadState = downloadState,
|
||||||
onDownload = {
|
onDownload = {
|
||||||
downloadState = DownloadState.Downloading(0, 0, availableUpdate!!.sizeBytes)
|
val info = availableUpdate!!
|
||||||
updateManager.downloadApk(availableUpdate!!.downloadUrl) { state ->
|
// If retrying from failure, re-check to get fresh release asset URLs
|
||||||
downloadState = state
|
if (downloadState is DownloadState.Failed) {
|
||||||
|
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||||
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { checkResult ->
|
||||||
|
if (checkResult is UpdateCheckResult.UpdateAvailable) {
|
||||||
|
availableUpdate = checkResult.info
|
||||||
|
val fresh = checkResult.info
|
||||||
|
updateManager.downloadApk(fresh.downloadUrl, fresh.assetApiUrl, fresh.sizeBytes) { state ->
|
||||||
|
downloadState = state
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||||
|
downloadState = state
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
downloadState = DownloadState.Downloading(0, 0, info.sizeBytes)
|
||||||
|
updateManager.downloadApk(info.downloadUrl, info.assetApiUrl, info.sizeBytes) { state ->
|
||||||
|
downloadState = state
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onInstall = { file ->
|
onInstall = { file ->
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ val BgDeep = Color(0xFF060911) // deepest black-navy
|
|||||||
val BgBase = Color(0xFF0C0F1A) // main bg
|
val BgBase = Color(0xFF0C0F1A) // main bg
|
||||||
val BgSurface = Color(0xFF111827) // card surface
|
val BgSurface = Color(0xFF111827) // card surface
|
||||||
val BgElevated = Color(0xFF1A2235) // elevated panels
|
val BgElevated = Color(0xFF1A2235) // elevated panels
|
||||||
|
val BgCard = Color(0xFF161F30) // card background
|
||||||
val BgGlass = Color(0x14FFFFFF) // frosted glass overlay
|
val BgGlass = Color(0x14FFFFFF) // frosted glass overlay
|
||||||
|
|
||||||
// ── Border System ─────────────────────────────────────────────────────────
|
// ── Border System ─────────────────────────────────────────────────────────
|
||||||
|
|||||||
@@ -24,6 +24,9 @@ import java.util.concurrent.TimeUnit
|
|||||||
class UpdateManager(
|
class UpdateManager(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
|
||||||
|
.followRedirects(true)
|
||||||
|
.followSslRedirects(true)
|
||||||
|
.retryOnConnectionFailure(true)
|
||||||
.connectTimeout(30, TimeUnit.SECONDS)
|
.connectTimeout(30, TimeUnit.SECONDS)
|
||||||
.readTimeout(60, TimeUnit.SECONDS)
|
.readTimeout(60, TimeUnit.SECONDS)
|
||||||
.build(),
|
.build(),
|
||||||
@@ -103,6 +106,7 @@ class UpdateManager(
|
|||||||
|
|
||||||
val assets = json.getAsJsonArray("assets")
|
val assets = json.getAsJsonArray("assets")
|
||||||
var apkUrl: String? = null
|
var apkUrl: String? = null
|
||||||
|
var apkApiUrl: String? = null
|
||||||
var apkName = "app-release.apk"
|
var apkName = "app-release.apk"
|
||||||
var apkSize = 0L
|
var apkSize = 0L
|
||||||
|
|
||||||
@@ -112,6 +116,7 @@ class UpdateManager(
|
|||||||
val name = assetObj.get("name")?.asString.orEmpty()
|
val name = assetObj.get("name")?.asString.orEmpty()
|
||||||
if (name.endsWith(".apk", ignoreCase = true)) {
|
if (name.endsWith(".apk", ignoreCase = true)) {
|
||||||
apkUrl = assetObj.get("browser_download_url")?.asString
|
apkUrl = assetObj.get("browser_download_url")?.asString
|
||||||
|
apkApiUrl = assetObj.get("url")?.asString
|
||||||
apkName = name
|
apkName = name
|
||||||
apkSize = assetObj.get("size")?.asLong ?: 0L
|
apkSize = assetObj.get("size")?.asLong ?: 0L
|
||||||
break
|
break
|
||||||
@@ -126,6 +131,7 @@ class UpdateManager(
|
|||||||
title = title,
|
title = title,
|
||||||
changelog = changelog,
|
changelog = changelog,
|
||||||
downloadUrl = apkUrl,
|
downloadUrl = apkUrl,
|
||||||
|
assetApiUrl = apkApiUrl,
|
||||||
apkFileName = apkName,
|
apkFileName = apkName,
|
||||||
sizeBytes = apkSize
|
sizeBytes = apkSize
|
||||||
)
|
)
|
||||||
@@ -162,21 +168,53 @@ class UpdateManager(
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Downloads the APK file to the app's cache directory and streams progress updates.
|
* Downloads the APK file to the app's cache directory and streams progress updates.
|
||||||
|
* If the browser download URL fails or returns 404, automatically attempts fallback to the API asset URL.
|
||||||
*/
|
*/
|
||||||
fun downloadApk(
|
fun downloadApk(
|
||||||
downloadUrl: String,
|
downloadUrl: String,
|
||||||
|
assetApiUrl: String? = null,
|
||||||
|
expectedSizeBytes: Long = 0L,
|
||||||
onProgress: (DownloadState) -> Unit
|
onProgress: (DownloadState) -> Unit
|
||||||
): Call {
|
): Call {
|
||||||
val request = Request.Builder()
|
return startDownloadCall(downloadUrl, assetApiUrl, expectedSizeBytes, isFallback = false, onProgress)
|
||||||
.url(downloadUrl)
|
}
|
||||||
.addHeader("User-Agent", "ServerControlApp")
|
|
||||||
.get()
|
|
||||||
.build()
|
|
||||||
|
|
||||||
|
private fun startDownloadCall(
|
||||||
|
url: String,
|
||||||
|
fallbackUrl: String?,
|
||||||
|
expectedSizeBytes: Long,
|
||||||
|
isFallback: Boolean,
|
||||||
|
onProgress: (DownloadState) -> Unit
|
||||||
|
): Call {
|
||||||
|
// Instantly notify UI that connection/download is initializing so user gets immediate visual feedback
|
||||||
|
runOnMain {
|
||||||
|
onProgress(
|
||||||
|
DownloadState.Downloading(
|
||||||
|
progressPercent = 0,
|
||||||
|
bytesDownloaded = 0L,
|
||||||
|
totalBytes = expectedSizeBytes
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val requestBuilder = Request.Builder()
|
||||||
|
.url(url)
|
||||||
|
.addHeader("User-Agent", "ServerControlApp")
|
||||||
|
.addHeader("Accept-Encoding", "identity") // Disables gzip recompression to stream raw binary immediately with exact Content-Length
|
||||||
|
|
||||||
|
if (isFallback) {
|
||||||
|
requestBuilder.addHeader("Accept", "application/octet-stream")
|
||||||
|
}
|
||||||
|
|
||||||
|
val request = requestBuilder.get().build()
|
||||||
val call = okHttpClient.newCall(request)
|
val call = okHttpClient.newCall(request)
|
||||||
|
|
||||||
call.enqueue(object : Callback {
|
call.enqueue(object : Callback {
|
||||||
override fun onFailure(call: Call, e: IOException) {
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
if (!call.isCanceled()) {
|
if (call.isCanceled()) return
|
||||||
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
|
} else {
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
|
||||||
}
|
}
|
||||||
@@ -184,15 +222,24 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onResponse(call: Call, response: Response) {
|
override fun onResponse(call: Call, response: Response) {
|
||||||
|
if (call.isCanceled()) return
|
||||||
|
|
||||||
if (!response.isSuccessful) {
|
if (!response.isSuccessful) {
|
||||||
runOnMain {
|
response.close()
|
||||||
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
if (!isFallback && !fallbackUrl.isNullOrBlank()) {
|
||||||
|
// Fallback to direct asset API
|
||||||
|
startDownloadCall(fallbackUrl, null, expectedSizeBytes, isFallback = true, onProgress)
|
||||||
|
} else {
|
||||||
|
runOnMain {
|
||||||
|
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val responseBody = response.body
|
val responseBody = response.body
|
||||||
if (responseBody == null) {
|
if (responseBody == null) {
|
||||||
|
response.close()
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(DownloadState.Failed("Response body was empty"))
|
onProgress(DownloadState.Failed("Response body was empty"))
|
||||||
}
|
}
|
||||||
@@ -209,14 +256,16 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
val totalBytes = responseBody.contentLength()
|
val rawLength = responseBody.contentLength()
|
||||||
|
val totalBytes = if (rawLength > 0L) rawLength else expectedSizeBytes
|
||||||
var bytesDownloaded = 0L
|
var bytesDownloaded = 0L
|
||||||
|
|
||||||
responseBody.byteStream().use { input ->
|
responseBody.byteStream().buffered(65536).use { input ->
|
||||||
FileOutputStream(apkFile).use { output ->
|
FileOutputStream(apkFile).buffered(65536).use { output ->
|
||||||
val buffer = ByteArray(8192)
|
val buffer = ByteArray(65536)
|
||||||
var read: Int
|
var read: Int
|
||||||
var lastPercent = -1
|
var lastPercent = -1
|
||||||
|
var lastUpdateTime = 0L
|
||||||
|
|
||||||
while (input.read(buffer).also { read = it } != -1) {
|
while (input.read(buffer).also { read = it } != -1) {
|
||||||
if (call.isCanceled()) return
|
if (call.isCanceled()) return
|
||||||
@@ -224,12 +273,14 @@ class UpdateManager(
|
|||||||
output.write(buffer, 0, read)
|
output.write(buffer, 0, read)
|
||||||
bytesDownloaded += read
|
bytesDownloaded += read
|
||||||
|
|
||||||
val percent = if (totalBytes > 0) {
|
val percent = if (totalBytes > 0L) {
|
||||||
((bytesDownloaded * 100) / totalBytes).toInt()
|
((bytesDownloaded * 100) / totalBytes).toInt().coerceIn(0, 100)
|
||||||
} else 0
|
} else 0
|
||||||
|
|
||||||
if (percent != lastPercent) {
|
val now = System.currentTimeMillis()
|
||||||
|
if (percent != lastPercent || (now - lastUpdateTime >= 100)) {
|
||||||
lastPercent = percent
|
lastPercent = percent
|
||||||
|
lastUpdateTime = now
|
||||||
runOnMain {
|
runOnMain {
|
||||||
onProgress(
|
onProgress(
|
||||||
DownloadState.Downloading(
|
DownloadState.Downloading(
|
||||||
@@ -245,8 +296,14 @@ class UpdateManager(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
runOnMain {
|
if (apkFile.exists() && apkFile.length() > 0) {
|
||||||
onProgress(DownloadState.ReadyToInstall(apkFile))
|
runOnMain {
|
||||||
|
onProgress(DownloadState.ReadyToInstall(apkFile))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
runOnMain {
|
||||||
|
onProgress(DownloadState.Failed("Downloaded file was empty"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
if (!call.isCanceled()) {
|
if (!call.isCanceled()) {
|
||||||
@@ -254,6 +311,8 @@ class UpdateManager(
|
|||||||
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
|
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
response.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -8,8 +8,9 @@ data class ReleaseInfo(
|
|||||||
val title: String,
|
val title: String,
|
||||||
val changelog: String,
|
val changelog: String,
|
||||||
val downloadUrl: String,
|
val downloadUrl: String,
|
||||||
val apkFileName: String,
|
val assetApiUrl: String? = null,
|
||||||
val sizeBytes: Long
|
val apkFileName: String = "app-release.apk",
|
||||||
|
val sizeBytes: Long = 0L
|
||||||
)
|
)
|
||||||
|
|
||||||
sealed class UpdateCheckResult {
|
sealed class UpdateCheckResult {
|
||||||
|
|||||||
@@ -0,0 +1,240 @@
|
|||||||
|
package com.expapp.trigger.widget
|
||||||
|
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.appwidget.AppWidgetManager
|
||||||
|
import android.appwidget.AppWidgetProvider
|
||||||
|
import android.content.ComponentName
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Build
|
||||||
|
import android.os.Handler
|
||||||
|
import android.os.Looper
|
||||||
|
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.util.concurrent.Executors
|
||||||
|
|
||||||
|
class ServerWidgetProvider : AppWidgetProvider() {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val ACTION_TRIGGER = "com.expapp.trigger.widget.ACTION_TRIGGER"
|
||||||
|
const val ACTION_REFRESH = "com.expapp.trigger.widget.ACTION_REFRESH"
|
||||||
|
const val ACTION_CYCLE_DEVICE = "com.expapp.trigger.widget.ACTION_CYCLE_DEVICE"
|
||||||
|
|
||||||
|
const val EXTRA_DEVICE_ID = "extra_device_id"
|
||||||
|
const val EXTRA_ACTION = "extra_action"
|
||||||
|
|
||||||
|
private val executor = Executors.newSingleThreadExecutor()
|
||||||
|
private val mainHandler = Handler(Looper.getMainLooper())
|
||||||
|
|
||||||
|
fun updateAllWidgets(context: Context) {
|
||||||
|
val appWidgetManager = AppWidgetManager.getInstance(context)
|
||||||
|
val thisWidget = ComponentName(context, ServerWidgetProvider::class.java)
|
||||||
|
val appWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
|
||||||
|
if (appWidgetIds != null && appWidgetIds.isNotEmpty()) {
|
||||||
|
val intent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||||
|
action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
|
||||||
|
putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
|
||||||
|
}
|
||||||
|
context.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onUpdate(
|
||||||
|
context: Context,
|
||||||
|
appWidgetManager: AppWidgetManager,
|
||||||
|
appWidgetIds: IntArray
|
||||||
|
) {
|
||||||
|
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||||
|
val devices = repository.getDevices()
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onReceive(context: Context, intent: Intent) {
|
||||||
|
super.onReceive(context, intent)
|
||||||
|
|
||||||
|
when (intent.action) {
|
||||||
|
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 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
|
||||||
|
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()
|
||||||
|
ActionTriggerWorker.enqueue(context, deviceId, action, "Widget")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ACTION_REFRESH -> {
|
||||||
|
executor.execute {
|
||||||
|
val repository = DeviceRepository(SharedPrefsStorage(context))
|
||||||
|
val device = repository.getDevices().firstOrNull()
|
||||||
|
if (device != null) {
|
||||||
|
val status = TriggerClient().checkStatusSync(device)
|
||||||
|
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")
|
||||||
|
}
|
||||||
|
Toast.makeText(context, "Widget refreshed", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun renderWidget(
|
||||||
|
context: Context,
|
||||||
|
appWidgetManager: AppWidgetManager,
|
||||||
|
appWidgetId: Int,
|
||||||
|
device: DeviceConfig?,
|
||||||
|
status: NodeStatus?,
|
||||||
|
footerOverride: String? = null
|
||||||
|
) {
|
||||||
|
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")
|
||||||
|
|
||||||
|
val appIntent = Intent(context, MainActivity::class.java)
|
||||||
|
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)
|
||||||
|
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
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(
|
||||||
|
context: Context,
|
||||||
|
requestCode: Int,
|
||||||
|
deviceId: String,
|
||||||
|
action: TriggerAction
|
||||||
|
): PendingIntent {
|
||||||
|
val intent = Intent(context, ServerWidgetProvider::class.java).apply {
|
||||||
|
this.action = ACTION_TRIGGER
|
||||||
|
putExtra(EXTRA_DEVICE_ID, deviceId)
|
||||||
|
putExtra(EXTRA_ACTION, action.name)
|
||||||
|
}
|
||||||
|
return PendingIntent.getBroadcast(
|
||||||
|
context,
|
||||||
|
requestCode,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
package com.expapp.trigger.worker
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.work.Constraints
|
||||||
|
import androidx.work.CoroutineWorker
|
||||||
|
import androidx.work.Data
|
||||||
|
import androidx.work.ExistingWorkPolicy
|
||||||
|
import androidx.work.NetworkType
|
||||||
|
import androidx.work.OneTimeWorkRequestBuilder
|
||||||
|
import androidx.work.WorkManager
|
||||||
|
import androidx.work.WorkerParameters
|
||||||
|
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.TriggerAction
|
||||||
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
|
||||||
|
class ActionTriggerWorker(
|
||||||
|
private val appContext: Context,
|
||||||
|
workerParams: WorkerParameters
|
||||||
|
) : CoroutineWorker(appContext, workerParams) {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val KEY_DEVICE_ID = "device_id"
|
||||||
|
const val KEY_ACTION = "action"
|
||||||
|
const val KEY_SOURCE = "source"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enqueues guaranteed background execution of a server power action.
|
||||||
|
* Runs even if the user immediately closes the app, locks phone, or clears recents.
|
||||||
|
*/
|
||||||
|
fun enqueue(
|
||||||
|
context: Context,
|
||||||
|
deviceId: String,
|
||||||
|
action: TriggerAction,
|
||||||
|
source: String = "App"
|
||||||
|
) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
|
val inputData = Data.Builder()
|
||||||
|
.putString(KEY_DEVICE_ID, deviceId)
|
||||||
|
.putString(KEY_ACTION, action.name)
|
||||||
|
.putString(KEY_SOURCE, source)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val constraints = Constraints.Builder()
|
||||||
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val workRequest = OneTimeWorkRequestBuilder<ActionTriggerWorker>()
|
||||||
|
.setInputData(inputData)
|
||||||
|
.setConstraints(constraints)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||||
|
"action_trigger_${deviceId}",
|
||||||
|
ExistingWorkPolicy.REPLACE,
|
||||||
|
workRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun doWork(): Result {
|
||||||
|
val deviceId = inputData.getString(KEY_DEVICE_ID) ?: return Result.failure()
|
||||||
|
val actionName = inputData.getString(KEY_ACTION) ?: return Result.failure()
|
||||||
|
val source = inputData.getString(KEY_SOURCE) ?: "App"
|
||||||
|
|
||||||
|
val action = try {
|
||||||
|
TriggerAction.valueOf(actionName)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
return Result.failure()
|
||||||
|
}
|
||||||
|
|
||||||
|
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
||||||
|
val device = repository.getDevices().find { it.id == deviceId } ?: return Result.failure()
|
||||||
|
|
||||||
|
val actionTitle = when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power On"
|
||||||
|
TriggerAction.REBOOT -> "Reboot"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown"
|
||||||
|
}
|
||||||
|
|
||||||
|
val triggerClient = TriggerClient()
|
||||||
|
val historyRepo = TriggerHistoryRepository(appContext)
|
||||||
|
val appSettings = AppSettings(appContext)
|
||||||
|
|
||||||
|
// 1. Execute the HTTP trigger to the server
|
||||||
|
val response = triggerClient.sendTriggerSync(device, action)
|
||||||
|
|
||||||
|
// 2. Post notification immediately confirming the signal was sent (or failed)
|
||||||
|
val signalMsg = if (response.isSuccess) {
|
||||||
|
when (action) {
|
||||||
|
TriggerAction.POWER_ON -> "Power on signal sent successfully to ${device.name}"
|
||||||
|
TriggerAction.POWER_OFF -> "Shutdown signal sent to ${device.name}"
|
||||||
|
TriggerAction.REBOOT -> "Reboot signal sent to ${device.name}"
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val raw = response.message.trim()
|
||||||
|
val clean = if (raw.startsWith("<")) "HTTP ${response.statusCode}" else raw.take(60)
|
||||||
|
"Failed to send $actionTitle: $clean"
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Save to history log
|
||||||
|
historyRepo.addLog(
|
||||||
|
TriggerLog(
|
||||||
|
deviceId = device.id,
|
||||||
|
deviceName = device.name,
|
||||||
|
node = device.node,
|
||||||
|
action = action,
|
||||||
|
isSuccess = response.isSuccess,
|
||||||
|
statusCode = response.statusCode,
|
||||||
|
message = signalMsg,
|
||||||
|
source = source
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
// 4. Update home screen widgets
|
||||||
|
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||||
|
|
||||||
|
// 5. If trigger succeeded and device has a status endpoint, actively poll until state changes!
|
||||||
|
if (response.isSuccess && device.statusUrl.isNotBlank()) {
|
||||||
|
pollForTransition(device, action, triggerClient, appSettings)
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.success()
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun pollForTransition(
|
||||||
|
device: DeviceConfig,
|
||||||
|
action: TriggerAction,
|
||||||
|
triggerClient: TriggerClient,
|
||||||
|
appSettings: AppSettings
|
||||||
|
) {
|
||||||
|
val maxAttempts = 15 // Up to 60 seconds (15 attempts * 4s)
|
||||||
|
var attempts = 0
|
||||||
|
|
||||||
|
// Brief delay for hardware/OS to begin reaction
|
||||||
|
delay(4000L)
|
||||||
|
|
||||||
|
while (attempts < maxAttempts) {
|
||||||
|
attempts++
|
||||||
|
val status = triggerClient.checkStatusSync(device)
|
||||||
|
|
||||||
|
// If phone network is unavailable, do not misinterpret as server going offline
|
||||||
|
if (!status.isReachable) {
|
||||||
|
delay(4000L)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
when (action) {
|
||||||
|
TriggerAction.POWER_ON -> {
|
||||||
|
if (status.isOnline) {
|
||||||
|
appSettings.setLastStatus(device.id, true)
|
||||||
|
NotificationHelper.sendNotification(
|
||||||
|
context = appContext,
|
||||||
|
id = device.id.hashCode(),
|
||||||
|
title = "✅ Server Online: ${device.name}",
|
||||||
|
message = "${device.name} is now online and reachable!",
|
||||||
|
isSuccess = true
|
||||||
|
)
|
||||||
|
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TriggerAction.POWER_OFF -> {
|
||||||
|
if (!status.isOnline) {
|
||||||
|
appSettings.setLastStatus(device.id, false)
|
||||||
|
NotificationHelper.sendNotification(
|
||||||
|
context = appContext,
|
||||||
|
id = device.id.hashCode(),
|
||||||
|
title = "🛑 Server Offline: ${device.name}",
|
||||||
|
message = "${device.name} has shut down and is now offline.",
|
||||||
|
isSuccess = false
|
||||||
|
)
|
||||||
|
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
TriggerAction.REBOOT -> {
|
||||||
|
if (attempts >= 2 && status.isOnline) {
|
||||||
|
appSettings.setLastStatus(device.id, true)
|
||||||
|
NotificationHelper.sendNotification(
|
||||||
|
context = appContext,
|
||||||
|
id = device.id.hashCode(),
|
||||||
|
title = "✅ Reboot Complete: ${device.name}",
|
||||||
|
message = "${device.name} successfully rebooted and is back online!",
|
||||||
|
isSuccess = true
|
||||||
|
)
|
||||||
|
ServerWidgetProvider.updateAllWidgets(appContext)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delay(4000L)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package com.expapp.trigger.worker
|
||||||
|
|
||||||
|
import android.app.Notification
|
||||||
|
import android.app.NotificationChannel
|
||||||
|
import android.app.NotificationManager
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.os.Build
|
||||||
|
import androidx.core.app.NotificationCompat
|
||||||
|
import androidx.core.app.NotificationManagerCompat
|
||||||
|
import com.expapp.trigger.MainActivity
|
||||||
|
import com.expapp.trigger.R
|
||||||
|
|
||||||
|
object NotificationHelper {
|
||||||
|
const val CHANNEL_ID = "server_status_channel"
|
||||||
|
const val CHANNEL_NAME = "Server Status Alerts"
|
||||||
|
|
||||||
|
fun areNotificationsEnabled(context: Context): Boolean {
|
||||||
|
return NotificationManagerCompat.from(context).areNotificationsEnabled()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createNotificationChannel(context: Context) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
val channel = NotificationChannel(
|
||||||
|
CHANNEL_ID,
|
||||||
|
CHANNEL_NAME,
|
||||||
|
NotificationManager.IMPORTANCE_HIGH
|
||||||
|
).apply {
|
||||||
|
description = "Alerts when your servers go offline or come back online"
|
||||||
|
enableVibration(true)
|
||||||
|
vibrationPattern = longArrayOf(0, 300, 200, 300)
|
||||||
|
enableLights(true)
|
||||||
|
lightColor = Color.GREEN
|
||||||
|
lockscreenVisibility = Notification.VISIBILITY_PUBLIC
|
||||||
|
}
|
||||||
|
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||||
|
manager.createNotificationChannel(channel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun sendNotification(
|
||||||
|
context: Context,
|
||||||
|
id: Int,
|
||||||
|
title: String,
|
||||||
|
message: String,
|
||||||
|
isSuccess: Boolean = true
|
||||||
|
): Boolean {
|
||||||
|
createNotificationChannel(context)
|
||||||
|
|
||||||
|
val intent = Intent(context, MainActivity::class.java).apply {
|
||||||
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||||
|
}
|
||||||
|
val pendingIntent = PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
id,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
val accentColor = if (isSuccess) 0xFF22C55E.toInt() else 0xFFFF4757.toInt()
|
||||||
|
|
||||||
|
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||||
|
.setSmallIcon(R.drawable.ic_notification)
|
||||||
|
.setColor(accentColor)
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(message)
|
||||||
|
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
|
||||||
|
.setPriority(NotificationCompat.PRIORITY_MAX)
|
||||||
|
.setDefaults(NotificationCompat.DEFAULT_ALL)
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setContentIntent(pendingIntent)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return try {
|
||||||
|
NotificationManagerCompat.from(context).notify(id, notification)
|
||||||
|
true
|
||||||
|
} catch (e: SecurityException) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun sendTestNotification(context: Context): Boolean {
|
||||||
|
return sendNotification(
|
||||||
|
context = context,
|
||||||
|
id = 9999,
|
||||||
|
title = "🔔 Test Alert: Notifications Working",
|
||||||
|
message = "Server status notifications are properly configured and working on this device!",
|
||||||
|
isSuccess = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
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.data.repository.AppSettings
|
||||||
|
import com.expapp.trigger.data.repository.DeviceRepository
|
||||||
|
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||||
|
import com.expapp.trigger.network.TriggerClient
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
class ServerMonitorWorker(
|
||||||
|
private val appContext: Context,
|
||||||
|
workerParams: WorkerParameters
|
||||||
|
) : CoroutineWorker(appContext, workerParams) {
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val WORK_NAME = "server_status_periodic_monitor"
|
||||||
|
const val ONE_TIME_WORK_NAME = "server_status_one_time_check"
|
||||||
|
|
||||||
|
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
|
val constraints = Constraints.Builder()
|
||||||
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val workRequest = PeriodicWorkRequestBuilder<ServerMonitorWorker>(
|
||||||
|
repeatIntervalMinutes,
|
||||||
|
TimeUnit.MINUTES
|
||||||
|
)
|
||||||
|
.setConstraints(constraints)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
|
||||||
|
WORK_NAME,
|
||||||
|
ExistingPeriodicWorkPolicy.UPDATE,
|
||||||
|
workRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun runOnce(context: Context) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
|
val constraints = Constraints.Builder()
|
||||||
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val oneTimeRequest = OneTimeWorkRequestBuilder<ServerMonitorWorker>()
|
||||||
|
.setConstraints(constraints)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||||
|
ONE_TIME_WORK_NAME,
|
||||||
|
ExistingWorkPolicy.REPLACE,
|
||||||
|
oneTimeRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun cancel(context: Context) {
|
||||||
|
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
|
||||||
|
WorkManager.getInstance(context).cancelUniqueWork(ONE_TIME_WORK_NAME)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createNotificationChannel(context: Context) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun doWork(): Result {
|
||||||
|
val appSettings = AppSettings(appContext)
|
||||||
|
if (!appSettings.isBackgroundMonitoringEnabled) {
|
||||||
|
return Result.success()
|
||||||
|
}
|
||||||
|
|
||||||
|
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
||||||
|
val devices = repository.getDevices()
|
||||||
|
if (devices.isEmpty()) {
|
||||||
|
return Result.success()
|
||||||
|
}
|
||||||
|
|
||||||
|
val triggerClient = TriggerClient()
|
||||||
|
|
||||||
|
for (device in devices) {
|
||||||
|
if (device.statusUrl.isBlank()) continue
|
||||||
|
|
||||||
|
val status = triggerClient.checkStatusSync(device)
|
||||||
|
|
||||||
|
// If the endpoint could not be reached (e.g. phone has no internet / network failure),
|
||||||
|
// do NOT treat this as the server going offline. Maintain the last known state.
|
||||||
|
if (!status.isReachable) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
val previousStatus = appSettings.getLastStatus(device.id)
|
||||||
|
|
||||||
|
// Save new status
|
||||||
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
|
|
||||||
|
// Determine if notification is needed only when server actually transitions
|
||||||
|
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||||
|
NotificationHelper.sendNotification(
|
||||||
|
context = appContext,
|
||||||
|
id = device.id.hashCode(),
|
||||||
|
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
||||||
|
message = if (status.isOnline) {
|
||||||
|
"${device.name} is now online and reachable."
|
||||||
|
} else {
|
||||||
|
"${device.name} has powered off or is offline."
|
||||||
|
},
|
||||||
|
isSuccess = status.isOnline
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Result.success()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<group
|
||||||
|
android:translateX="27.6"
|
||||||
|
android:translateY="27.6"
|
||||||
|
android:scaleX="2.2"
|
||||||
|
android:scaleY="2.2">
|
||||||
|
<path
|
||||||
|
android:fillColor="#22C55E"
|
||||||
|
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<group
|
||||||
|
android:translateX="27.6"
|
||||||
|
android:translateY="27.6"
|
||||||
|
android:scaleX="2.2"
|
||||||
|
android:scaleY="2.2">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FFFFFFFF"
|
||||||
|
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#a1a1aa"
|
||||||
|
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#22c55e"
|
||||||
|
android:pathData="M20,4H4C2.89,4 2,4.9 2,6v12c0,1.1 0.89,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V8h16V18zM6.5,16.5l3.5,-3.5L6.5,9.5L7.91,8.09L12.83,13l-4.92,4.91L6.5,16.5zM12,15h5v2h-5V15z"/>
|
||||||
|
</vector>
|
||||||
@@ -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="#161619" />
|
||||||
|
<stroke
|
||||||
|
android:width="1dp"
|
||||||
|
android:color="#2b2b30" />
|
||||||
|
<corners android:radius="18dp" />
|
||||||
|
</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="#2c1e0f" />
|
||||||
|
<stroke
|
||||||
|
android:width="1dp"
|
||||||
|
android:color="#f59e0b" />
|
||||||
|
<corners android:radius="10dp" />
|
||||||
|
</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="#14291e" />
|
||||||
|
<stroke
|
||||||
|
android:width="1dp"
|
||||||
|
android:color="#22c55e" />
|
||||||
|
<corners android:radius="10dp" />
|
||||||
|
</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="#2c1214" />
|
||||||
|
<stroke
|
||||||
|
android:width="1dp"
|
||||||
|
android:color="#ef4444" />
|
||||||
|
<corners android:radius="10dp" />
|
||||||
|
</shape>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="oval">
|
||||||
|
<solid android:color="#71717a" />
|
||||||
|
<size android:width="8dp" android:height="8dp" />
|
||||||
|
</shape>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="oval">
|
||||||
|
<solid android:color="#22c55e" />
|
||||||
|
<size android:width="8dp" android:height="8dp" />
|
||||||
|
</shape>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="oval">
|
||||||
|
<solid android:color="#ef4444" />
|
||||||
|
<size android:width="8dp" android:height="8dp" />
|
||||||
|
</shape>
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/widget_root"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@drawable/widget_bg"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="12dp">
|
||||||
|
|
||||||
|
<!-- Header Row -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="18dp"
|
||||||
|
android:layout_height="18dp"
|
||||||
|
android:src="@drawable/ic_terminal"
|
||||||
|
android:contentDescription="Server" />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/widget_header_clickable"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:layout_marginEnd="6dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_device_name"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="Server"
|
||||||
|
android:textColor="#ffffff"
|
||||||
|
android:textSize="14sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_node_name"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="1"
|
||||||
|
android:text="debian"
|
||||||
|
android:textColor="#71717a"
|
||||||
|
android:textSize="11sp" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Status Dot + Text -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:gravity="center_vertical"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
android:paddingEnd="6dp">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/widget_status_dot"
|
||||||
|
android:layout_width="8dp"
|
||||||
|
android:layout_height="8dp"
|
||||||
|
android:src="@drawable/widget_dot_gray"
|
||||||
|
android:contentDescription="Status" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_status_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:text="CHECKING"
|
||||||
|
android:textColor="#71717a"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Refresh Button -->
|
||||||
|
<ImageView
|
||||||
|
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" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Spacer / Divider -->
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
android:background="#27272a" />
|
||||||
|
|
||||||
|
<!-- Action Buttons Row -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="38dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_btn_power_on"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginEnd="4dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/widget_btn_green"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="POWER ON"
|
||||||
|
android:textColor="#22c55e"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_btn_reboot"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginStart="2dp"
|
||||||
|
android:layout_marginEnd="2dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/widget_btn_amber"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="REBOOT"
|
||||||
|
android:textColor="#f59e0b"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_btn_power_off"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginStart="4dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:background="@drawable/widget_btn_red"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="OFF"
|
||||||
|
android:textColor="#ef4444"
|
||||||
|
android:textSize="11sp"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Subtitle / Last Update message -->
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/widget_footer_text"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="6dp"
|
||||||
|
android:gravity="center"
|
||||||
|
android:text="Tap header to open app • Tap action to trigger"
|
||||||
|
android:textColor="#52525b"
|
||||||
|
android:textSize="10sp" />
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@color/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<background android:drawable="@color/ic_launcher_background" />
|
||||||
|
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||||
|
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||||
|
</adaptive-icon>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="ic_launcher_background">#0B0F19</color>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<?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:updatePeriodMillis="1800000"
|
||||||
|
android:initialLayout="@layout/widget_server_control"
|
||||||
|
android:resizeMode="horizontal|vertical"
|
||||||
|
android:widgetCategory="home_screen" />
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package com.expapp.trigger.data.repository
|
||||||
|
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertFalse
|
||||||
|
import org.junit.Assert.assertNull
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
|
||||||
|
class AppSettingsTest {
|
||||||
|
|
||||||
|
private class FakeKeyValueStorage : KeyValueStorage {
|
||||||
|
private val data = mutableMapOf<String, String?>()
|
||||||
|
private val boolData = mutableMapOf<String, Boolean>()
|
||||||
|
|
||||||
|
override fun getString(key: String, defaultValue: String?): String? = data[key] ?: defaultValue
|
||||||
|
override fun putString(key: String, value: String?) { data[key] = value }
|
||||||
|
override fun getBoolean(key: String, defaultValue: Boolean): Boolean = boolData[key] ?: defaultValue
|
||||||
|
override fun putBoolean(key: String, value: Boolean) { boolData[key] = value }
|
||||||
|
override fun contains(key: String): Boolean = data.containsKey(key) || boolData.containsKey(key)
|
||||||
|
override fun remove(key: String) {
|
||||||
|
data.remove(key)
|
||||||
|
boolData.remove(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private lateinit var storage: FakeKeyValueStorage
|
||||||
|
private lateinit var settings: AppSettings
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setup() {
|
||||||
|
storage = FakeKeyValueStorage()
|
||||||
|
settings = AppSettings(storage)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun defaultValues_areTrue() {
|
||||||
|
assertTrue(settings.isBiometricEnabled)
|
||||||
|
assertTrue(settings.isBackgroundMonitoringEnabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun toggles_updateCorrectly() {
|
||||||
|
settings.isBiometricEnabled = false
|
||||||
|
assertFalse(settings.isBiometricEnabled)
|
||||||
|
|
||||||
|
settings.isBackgroundMonitoringEnabled = false
|
||||||
|
assertFalse(settings.isBackgroundMonitoringEnabled)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun deviceStatus_tracksTransitions() {
|
||||||
|
assertNull(settings.getLastStatus("dev-1"))
|
||||||
|
|
||||||
|
settings.setLastStatus("dev-1", true)
|
||||||
|
assertEquals(true, settings.getLastStatus("dev-1"))
|
||||||
|
|
||||||
|
settings.setLastStatus("dev-1", false)
|
||||||
|
assertEquals(false, settings.getLastStatus("dev-1"))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
package com.expapp.trigger.data.repository
|
||||||
|
|
||||||
|
import com.expapp.trigger.data.model.TriggerLog
|
||||||
|
import com.expapp.trigger.network.TriggerAction
|
||||||
|
import org.junit.Assert.assertEquals
|
||||||
|
import org.junit.Assert.assertTrue
|
||||||
|
import org.junit.Before
|
||||||
|
import org.junit.Test
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
|
||||||
|
class TriggerHistoryRepositoryTest {
|
||||||
|
|
||||||
|
private class FakeKeyValueStorage : KeyValueStorage {
|
||||||
|
private val data = mutableMapOf<String, String?>()
|
||||||
|
private val boolData = mutableMapOf<String, Boolean>()
|
||||||
|
|
||||||
|
override fun getString(key: String, defaultValue: String?): String? = data[key] ?: defaultValue
|
||||||
|
override fun putString(key: String, value: String?) { data[key] = value }
|
||||||
|
override fun getBoolean(key: String, defaultValue: Boolean): Boolean = boolData[key] ?: defaultValue
|
||||||
|
override fun putBoolean(key: String, value: Boolean) { boolData[key] = value }
|
||||||
|
override fun contains(key: String): Boolean = data.containsKey(key) || boolData.containsKey(key)
|
||||||
|
override fun remove(key: String) {
|
||||||
|
data.remove(key)
|
||||||
|
boolData.remove(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private lateinit var storage: FakeKeyValueStorage
|
||||||
|
private lateinit var repository: TriggerHistoryRepository
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setup() {
|
||||||
|
storage = FakeKeyValueStorage()
|
||||||
|
repository = TriggerHistoryRepository(storage)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun getLogs_whenEmpty_returnsEmptyList() {
|
||||||
|
assertTrue(repository.getLogs().isEmpty())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun addLog_savesAndReturnsSortedByTimestampDescending() {
|
||||||
|
val now = System.currentTimeMillis()
|
||||||
|
val log1 = TriggerLog(
|
||||||
|
timestamp = now - 5000,
|
||||||
|
deviceId = "dev-1",
|
||||||
|
deviceName = "Server",
|
||||||
|
node = "debian",
|
||||||
|
action = TriggerAction.POWER_ON,
|
||||||
|
isSuccess = true,
|
||||||
|
statusCode = 200,
|
||||||
|
message = "Power on ok"
|
||||||
|
)
|
||||||
|
val log2 = TriggerLog(
|
||||||
|
timestamp = now,
|
||||||
|
deviceId = "dev-1",
|
||||||
|
deviceName = "Server",
|
||||||
|
node = "debian",
|
||||||
|
action = TriggerAction.REBOOT,
|
||||||
|
isSuccess = true,
|
||||||
|
statusCode = 200,
|
||||||
|
message = "Reboot ok"
|
||||||
|
)
|
||||||
|
|
||||||
|
repository.addLog(log1)
|
||||||
|
repository.addLog(log2)
|
||||||
|
|
||||||
|
val logs = repository.getLogs()
|
||||||
|
assertEquals(2, logs.size)
|
||||||
|
assertEquals(TriggerAction.REBOOT, logs[0].action)
|
||||||
|
assertEquals(TriggerAction.POWER_ON, logs[1].action)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun clearOlderThan_removesExpiredLogsOnly() {
|
||||||
|
val now = System.currentTimeMillis()
|
||||||
|
val oldLog = TriggerLog(
|
||||||
|
timestamp = now - TimeUnit.HOURS.toMillis(48), // 2 days ago
|
||||||
|
deviceId = "dev-1",
|
||||||
|
deviceName = "Server",
|
||||||
|
node = "debian",
|
||||||
|
action = TriggerAction.POWER_ON,
|
||||||
|
isSuccess = true,
|
||||||
|
statusCode = 200,
|
||||||
|
message = "Old"
|
||||||
|
)
|
||||||
|
val freshLog = TriggerLog(
|
||||||
|
timestamp = now - TimeUnit.HOURS.toMillis(2), // 2 hours ago
|
||||||
|
deviceId = "dev-1",
|
||||||
|
deviceName = "Server",
|
||||||
|
node = "debian",
|
||||||
|
action = TriggerAction.REBOOT,
|
||||||
|
isSuccess = true,
|
||||||
|
statusCode = 200,
|
||||||
|
message = "Fresh"
|
||||||
|
)
|
||||||
|
|
||||||
|
repository.addLog(oldLog)
|
||||||
|
repository.addLog(freshLog)
|
||||||
|
assertEquals(2, repository.getLogs().size)
|
||||||
|
|
||||||
|
// Clear older than 24 hours
|
||||||
|
repository.clearOlderThan(TimeUnit.HOURS.toMillis(24))
|
||||||
|
|
||||||
|
val remaining = repository.getLogs()
|
||||||
|
assertEquals(1, remaining.size)
|
||||||
|
assertEquals("Fresh", remaining[0].message)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun clearAll_clearsEverything() {
|
||||||
|
val log = TriggerLog(
|
||||||
|
deviceId = "dev-1",
|
||||||
|
deviceName = "Server",
|
||||||
|
node = "debian",
|
||||||
|
action = TriggerAction.POWER_ON,
|
||||||
|
isSuccess = true,
|
||||||
|
statusCode = 200,
|
||||||
|
message = "Test"
|
||||||
|
)
|
||||||
|
repository.addLog(log)
|
||||||
|
assertEquals(1, repository.getLogs().size)
|
||||||
|
|
||||||
|
repository.clearAll()
|
||||||
|
assertTrue(repository.getLogs().isEmpty())
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user