Compare commits

...
6 Commits
Author SHA1 Message Date
Vaishno Singh 79393bf8a6 feat: release v1.1.0 with Widgets, Background Monitor, Biometrics, History & NFC
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 00:28:17 +05:30
Vaishno Singh 808a402d26 feat: release v1.0.3 with multi-release semantic version resolution
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 00:00:22 +05:30
Vaishno Singh 9d87ceeb0b fix(ui): use TopAppBar with icon badge for updates to prevent online count shift 2026-11-18 23:57:24 +05:30
Vaishno Singh 4371f0403f fix: dismiss update dialog after install and prevent duplicate checks 2026-11-18 23:55:50 +05:30
Vaishno Singh 0ee9addc68 feat: implement PackageInstaller session API for streamlined in-app updates and bump to v1.0.2 2026-11-18 23:49:22 +05:30
Vaishno Singh 57b96a21f2 feat: in-app self-updating via GitHub Releases, CI/CD pipeline, and R2 config re-fetching
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-18 23:42:22 +05:30
41 changed files with 4022 additions and 115 deletions
+109
View File
@@ -0,0 +1,109 @@
name: Build & Release Android APK
on:
push:
branches:
- main
tags:
- 'v*'
workflow_dispatch:
inputs:
release_tag:
description: 'Custom release tag (e.g. v1.0.1)'
required: false
type: string
permissions:
contents: write
jobs:
build-and-release:
name: Build & Publish Release APK
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
- name: Make Gradlew Executable
run: chmod +x ./gradlew
- name: Determine Version Tag
id: versioning
run: |
if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ -n "${{ inputs.release_tag }}" ]; then
TAG="${{ inputs.release_tag }}"
elif [[ "${{ github.ref }}" == refs/tags/v* ]]; then
TAG="${GITHUB_REF#refs/tags/}"
else
# Extract versionName from app/build.gradle.kts
APP_VERSION=$(grep 'versionName = ' app/build.gradle.kts | head -n 1 | cut -d '"' -f 2)
if [ -n "$APP_VERSION" ]; then
TAG="v$APP_VERSION"
else
TAG="v1.0.${{ github.run_number }}"
fi
fi
echo "TAG=$TAG" >> $GITHUB_OUTPUT
echo "Release tag will be $TAG"
- name: Build Release APK
env:
KEYSTORE_PASSWORD: servercontrol123
KEY_ALIAS: servercontrol
KEY_PASSWORD: servercontrol123
run: |
./gradlew assembleRelease
- name: Find and Verify APK
id: apk
run: |
APK_PATH=$(find app/build/outputs/apk/release -name "*.apk" | head -n 1)
if [ -z "$APK_PATH" ]; then
echo "ERROR: Release APK not found!"
exit 1
fi
echo "Found APK at: $APK_PATH"
echo "APK_PATH=$APK_PATH" >> $GITHUB_OUTPUT
- name: Generate Changelog
id: changelog
run: |
PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
if [ -n "$PREV_TAG" ]; then
CHANGES=$(git log ${PREV_TAG}..HEAD --oneline --no-merges)
else
CHANGES=$(git log -n 10 --oneline --no-merges)
fi
echo "CHANGELOG<<EOF" >> $GITHUB_OUTPUT
echo "$CHANGES" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Create GitHub Release & Upload APK
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ steps.versioning.outputs.TAG }}
name: Device Trigger ${{ steps.versioning.outputs.TAG }}
body: |
## 🚀 What's New in ${{ steps.versioning.outputs.TAG }}
${{ steps.changelog.outputs.CHANGELOG }}
---
*This release was built and signed automatically via GitHub Actions.*
files: ${{ steps.apk.outputs.APK_PATH }}
draft: false
prerelease: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+6 -3
View File
@@ -31,10 +31,13 @@ adb install -r app/build/outputs/apk/debug/app-debug.apk
- **Massive Tactile Buttons**: High-contrast, large touch targets designed to prevent accidental mis-taps while remaining effortless to press. - **Massive Tactile Buttons**: High-contrast, large touch targets designed to prevent accidental mis-taps while remaining effortless to press.
- **Horizontal Swipe Navigation**: Seamlessly swipe left and right between configured machines with an animated bottom page indicator. - **Horizontal Swipe Navigation**: Seamlessly swipe left and right between configured machines with an animated bottom page indicator.
- **Dynamic Cloudflare R2 Configuration**: Simply supply your Cloudflare R2 JSON URL when adding a device; the app fetches and validates endpoint URLs automatically. - **Dynamic Cloudflare R2 Configuration**: Simply supply your Cloudflare R2 JSON URL when adding a device; the app fetches and validates endpoint URLs automatically.
- **One-Tap R2 Config Re-fetch**: If you modify endpoint URLs in your Cloudflare R2 JSON, simply tap the **Re-fetch R2 JSON** button (or top-bar Sync) to update all URLs instantly without losing your device secretKey or configuration.
- **Device Configuration Editor**: Easily edit device names, node identifiers, secret keys, or R2 URLs anytime via the built-in edit dialog.
- **In-App Self-Updating (OTA)**: Automatically checks GitHub Releases on launch. When a newer version is pushed to GitHub, an in-app dialog displays the changelog with a one-tap "Update Now" installer that updates the APK in-place without wiping any saved data or credentials.
- **Multi-Device Support**: Manage any number of remote machines. The last swipe tab is always an **"+ Add Device"** configuration screen. - **Multi-Device Support**: Manage any number of remote machines. The last swipe tab is always an **"+ Add Device"** configuration screen.
- **Persistent Local Storage**: Configured machines are safely saved to Android persistent storage (`SharedPreferences`) so they remain available whenever the app is reopened. - **Persistent Local Storage**: Configured machines are safely saved to Android persistent storage (`SharedPreferences`) so they remain available whenever the app is reopened and preserved across app updates.
- **Mistake-Proof Safety Prompts**: Reboot and Power Off actions trigger a quick confirmation dialog before sending the request. - **Mistake-Proof Safety Prompts**: Reboot, Power Off, and Power On actions trigger a quick confirmation dialog before sending the request.
- **Instant Visual Feedback**: On-screen status banners, in-button loading indicators, and Android Toast notifications display HTTP status codes (e.g., `200 OK`) and server responses. - **Instant Visual Feedback**: On-screen status banners, in-button loading indicators, live uptime/last-seen telemetry, and Android Toast notifications display HTTP status codes (e.g., `200 OK`) and server responses.
--- ---
+32 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger" applicationId = "com.expapp.trigger"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 4
versionName = "1.0" versionName = "1.1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -20,14 +20,38 @@ android {
} }
} }
signingConfigs {
create("release") {
val keystoreFile = file("release.keystore")
if (keystoreFile.exists()) {
storeFile = keystoreFile
storePassword = System.getenv("KEYSTORE_PASSWORD") ?: "servercontrol123"
keyAlias = System.getenv("KEY_ALIAS") ?: "servercontrol"
keyPassword = System.getenv("KEY_PASSWORD") ?: "servercontrol123"
}
}
}
buildTypes { buildTypes {
release { release {
isMinifyEnabled = false isMinifyEnabled = false
signingConfig = signingConfigs.getByName("release")
proguardFiles( proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"), getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro" "proguard-rules.pro"
) )
} }
debug {
val relConfig = signingConfigs.findByName("release")
if (relConfig?.storeFile?.exists() == true) {
signingConfig = relConfig
}
}
}
lint {
checkReleaseBuilds = false
abortOnError = false
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_17
@@ -38,6 +62,7 @@ android {
} }
buildFeatures { buildFeatures {
compose = true compose = true
buildConfig = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.5.8" kotlinCompilerExtensionVersion = "1.5.8"
@@ -71,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")
Binary file not shown.
+54
View File
@@ -3,6 +3,16 @@
<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.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"
@@ -14,12 +24,56 @@
<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
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
<receiver
android:name=".update.InstallStatusReceiver"
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,88 @@
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.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 val notificationPermissionLauncher =
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
if (isGranted && appSettings.isBackgroundMonitoringEnabled) {
ServerMonitorWorker.schedule(this)
}
}
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() triggerClient = TriggerClient()
appSettings = AppSettings(applicationContext)
historyRepository = TriggerHistoryRepository(applicationContext)
// 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.createNotificationChannel(this)
ServerMonitorWorker.schedule(this)
}
// Handle initial launch intent (from NFC or Widget)
handleIntent(intent)
setContent { setContent {
ExpAppTheme { ExpAppTheme {
@@ -30,10 +92,175 @@ 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)
}
},
nfcWriteResult = nfcWriteResult,
onStartNfcWriting = { payload ->
nfcWriteResult = null
activeNfcWritePayload = payload
},
onStopNfcWriting = {
activeNfcWritePayload = null
nfcWriteResult = null
}
) )
} }
} }
} }
} }
override fun onResume() {
super.onResume()
if (NfcHelper.isNfcSupported(this)) {
NfcHelper.enableForegroundDispatch(this)
}
}
override fun onPause() {
super.onPause()
if (NfcHelper.isNfcSupported(this)) {
NfcHelper.disableForegroundDispatch(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()
triggerClient.sendTrigger(device, action) { response ->
val msg = if (response.isSuccess) {
"$actionName signal sent successfully"
} else {
"Failed: ${response.message.take(50)}"
}
Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
historyRepository.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = response.message,
source = source
)
)
ServerWidgetProvider.updateAllWidgets(this)
}
}
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"))
@@ -183,64 +203,77 @@ class TriggerClient(
} }
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")
}
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")
}
}
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")
}
}
} }
@@ -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,261 @@
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.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.Settings
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.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.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.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,
onOpenNfcWriter: () -> Unit,
onDismiss: () -> Unit
) {
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
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.Notifications,
contentDescription = null,
tint = if (isBgMonitorEnabled) 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(
"Notify outside app if servers go offline or online",
color = TextMuted,
fontSize = 11.sp
)
}
Switch(
checked = isBgMonitorEnabled,
onCheckedChange = { onBgMonitorToggled(it) },
colors = SwitchDefaults.colors(
checkedThumbColor = GreenVibrant,
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
uncheckedThumbColor = TextMuted,
uncheckedTrackColor = BgElevated
)
)
}
}
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)
)
}
}
}
}
@@ -0,0 +1,320 @@
package com.expapp.trigger.ui.components
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudDownload
import androidx.compose.material.icons.filled.Download
import androidx.compose.material.icons.filled.SystemUpdate
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.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.update.DownloadState
import com.expapp.trigger.update.ReleaseInfo
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.io.File
@Composable
fun UpdateDialog(
releaseInfo: ReleaseInfo,
currentVersion: String,
downloadState: DownloadState,
onDownload: () -> Unit,
onInstall: (File) -> Unit,
onDismiss: () -> Unit
) {
Dialog(onDismissRequest = {
if (downloadState !is DownloadState.Downloading) {
onDismiss()
}
}) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(24.dp))
.background(
brush = Brush.verticalGradient(
listOf(Color(0xFF0C1420), Color(0xFF070B12))
)
)
.border(1.dp, GreenVibrant.copy(alpha = 0.35f), RoundedCornerShape(24.dp))
.padding(24.dp)
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxWidth()
) {
// Header Icon
Box(
modifier = Modifier
.size(60.dp)
.background(
brush = Brush.radialGradient(
listOf(GreenVibrant.copy(alpha = 0.22f), Color.Transparent)
),
shape = CircleShape
)
.border(1.dp, GreenVibrant.copy(alpha = 0.45f), CircleShape),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.SystemUpdate,
contentDescription = "Update",
tint = GreenVibrant,
modifier = Modifier.size(28.dp)
)
}
Spacer(modifier = Modifier.height(16.dp))
Text(
text = "Update Available",
fontSize = 20.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary
)
Spacer(modifier = Modifier.height(6.dp))
// Version Badge row: v1.0 -> v1.1
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Text(
text = "v$currentVersion",
fontSize = 12.sp,
color = TextMuted,
fontFamily = FontFamily.Monospace,
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.background(BgElevated)
.border(1.dp, BorderSubtle, RoundedCornerShape(8.dp))
.padding(horizontal = 8.dp, vertical = 3.dp)
)
Text("→", fontSize = 14.sp, color = GreenVibrant, fontWeight = FontWeight.Bold)
Text(
text = releaseInfo.tagName,
fontSize = 12.sp,
color = GreenVibrant,
fontWeight = FontWeight.Bold,
fontFamily = FontFamily.Monospace,
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.background(GreenVibrant.copy(alpha = 0.12f))
.border(1.dp, GreenVibrant.copy(alpha = 0.4f), RoundedCornerShape(8.dp))
.padding(horizontal = 8.dp, vertical = 3.dp)
)
if (releaseInfo.sizeBytes > 0) {
val mb = String.format("%.1f MB", releaseInfo.sizeBytes / (1024.0 * 1024.0))
Text(
text = mb,
fontSize = 11.sp,
color = TextSecondary,
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.background(BgElevated)
.border(1.dp, BorderSubtle, RoundedCornerShape(8.dp))
.padding(horizontal = 6.dp, vertical = 3.dp)
)
}
}
Spacer(modifier = Modifier.height(16.dp))
// Changelog Card
Text(
text = "WHAT'S NEW",
fontSize = 11.sp,
fontWeight = FontWeight.SemiBold,
color = TextMuted,
letterSpacing = 1.sp,
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(6.dp))
Box(
modifier = Modifier
.fillMaxWidth()
.heightIn(max = 140.dp)
.clip(RoundedCornerShape(14.dp))
.background(BgElevated)
.border(1.dp, BorderDefault, RoundedCornerShape(14.dp))
.padding(14.dp)
.verticalScroll(rememberScrollState())
) {
val changelogText = if (releaseInfo.changelog.isNotBlank()) {
releaseInfo.changelog.trim()
} else {
"• Performance improvements & new features."
}
Text(
text = changelogText,
fontSize = 13.sp,
color = TextSecondary,
lineHeight = 18.sp
)
}
Spacer(modifier = Modifier.height(16.dp))
// Download Progress / States
when (downloadState) {
is DownloadState.Downloading -> {
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
text = "Downloading update…",
fontSize = 12.sp,
color = TextSecondary
)
Text(
text = "${downloadState.progressPercent}%",
fontSize = 12.sp,
fontWeight = FontWeight.Bold,
color = GreenVibrant
)
}
Spacer(modifier = Modifier.height(8.dp))
LinearProgressIndicator(
progress = { downloadState.progressPercent / 100f },
modifier = Modifier
.fillMaxWidth()
.height(8.dp)
.clip(RoundedCornerShape(4.dp)),
color = GreenVibrant,
trackColor = GreenVibrant.copy(alpha = 0.15f)
)
if (downloadState.totalBytes > 0) {
Spacer(modifier = Modifier.height(6.dp))
val downloadedMb = String.format("%.1f", downloadState.bytesDownloaded / (1024.0 * 1024.0))
val totalMb = String.format("%.1f MB", downloadState.totalBytes / (1024.0 * 1024.0))
Text(
text = "$downloadedMb / $totalMb",
fontSize = 11.sp,
color = TextMuted
)
}
}
}
is DownloadState.Failed -> {
Text(
text = downloadState.error,
fontSize = 12.sp,
color = RedVibrant,
modifier = Modifier.padding(vertical = 4.dp)
)
}
else -> {}
}
Spacer(modifier = Modifier.height(20.dp))
// Actions row
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(10.dp)
) {
TextButton(
onClick = onDismiss,
enabled = downloadState !is DownloadState.Downloading,
modifier = Modifier
.weight(1f)
.clip(RoundedCornerShape(14.dp))
.background(BgElevated)
.border(1.dp, BorderDefault, RoundedCornerShape(14.dp))
) {
Text(
"Later",
color = TextSecondary,
fontWeight = FontWeight.Medium
)
}
Button(
onClick = {
when (downloadState) {
is DownloadState.ReadyToInstall -> onInstall(downloadState.apkFile)
is DownloadState.Downloading -> {}
else -> onDownload()
}
},
enabled = downloadState !is DownloadState.Downloading,
shape = RoundedCornerShape(14.dp),
colors = ButtonDefaults.buttonColors(
containerColor = GreenVibrant.copy(alpha = 0.2f),
contentColor = GreenVibrant
),
modifier = Modifier.weight(1.3f)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
val icon = when (downloadState) {
is DownloadState.ReadyToInstall -> Icons.Default.SystemUpdate
else -> Icons.Default.Download
}
val text = when (downloadState) {
is DownloadState.ReadyToInstall -> "Install Now"
is DownloadState.Failed -> "Retry"
is DownloadState.Downloading -> "Downloading…"
else -> "Update Now"
}
Icon(icon, contentDescription = null, modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(6.dp))
Text(
text = text,
fontWeight = FontWeight.Bold,
fontSize = 14.sp
)
}
}
}
}
}
}
}
@@ -29,19 +29,25 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudSync
import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.PowerOff import androidx.compose.material.icons.filled.PowerOff
import androidx.compose.material.icons.filled.PowerSettingsNew import androidx.compose.material.icons.filled.PowerSettingsNew
import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.RestartAlt import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.filled.Schedule import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Terminal import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material.icons.filled.Visibility
import androidx.compose.material.icons.filled.VisibilityOff
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@@ -58,6 +64,8 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.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.VisualTransformation
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
@@ -66,6 +74,7 @@ import com.expapp.trigger.network.TriggerAction
import com.expapp.trigger.ui.components.ActionConfirmDialog import com.expapp.trigger.ui.components.ActionConfirmDialog
import com.expapp.trigger.ui.components.HugeActionButton import com.expapp.trigger.ui.components.HugeActionButton
import com.expapp.trigger.ui.components.StatusBanner import com.expapp.trigger.ui.components.StatusBanner
import com.expapp.trigger.ui.theme.AmberVibrant
import com.expapp.trigger.ui.theme.BgElevated import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.BgSurface import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.BorderDefault import com.expapp.trigger.ui.theme.BorderDefault
@@ -100,10 +109,111 @@ fun DevicePage(
onRefreshStatus: () -> Unit, onRefreshStatus: () -> Unit,
onTrigger: (TriggerAction) -> Unit, onTrigger: (TriggerAction) -> Unit,
onDelete: (DeviceConfig) -> Unit, onDelete: (DeviceConfig) -> Unit,
onSyncConfig: () -> Unit = {},
onUpdateDevice: (DeviceConfig) -> Unit = {},
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) } var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
var showDeleteConfirm by remember { mutableStateOf(false) } var showDeleteConfirm by remember { mutableStateOf(false) }
var showEditDialog by remember { mutableStateOf(false) }
if (showEditDialog) {
var editName by remember { mutableStateOf(device.name) }
var editNode by remember { mutableStateOf(device.node) }
var editR2Url by remember { mutableStateOf(device.r2Url) }
var editSecretKey by remember { mutableStateOf(device.secretKey) }
var showKey by remember { mutableStateOf(false) }
val editFieldColors = OutlinedTextFieldDefaults.colors(
focusedBorderColor = GreenVibrant,
unfocusedBorderColor = BorderDefault,
focusedLabelColor = GreenVibrant,
unfocusedLabelColor = TextSecondary,
cursorColor = GreenVibrant,
focusedTextColor = TextPrimary,
unfocusedTextColor = TextPrimary
)
AlertDialog(
onDismissRequest = { showEditDialog = false },
containerColor = BgSurface,
shape = RoundedCornerShape(20.dp),
title = { Text("Edit Device", color = TextPrimary, fontWeight = FontWeight.Bold) },
text = {
Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {
OutlinedTextField(
value = editName,
onValueChange = { editName = it },
label = { Text("Device Name") },
singleLine = true,
colors = editFieldColors,
shape = RoundedCornerShape(12.dp),
modifier = Modifier.fillMaxWidth()
)
OutlinedTextField(
value = editNode,
onValueChange = { editNode = it },
label = { Text("Node Identifier") },
singleLine = true,
colors = editFieldColors,
shape = RoundedCornerShape(12.dp),
modifier = Modifier.fillMaxWidth()
)
OutlinedTextField(
value = editR2Url,
onValueChange = { editR2Url = it },
label = { Text("Cloudflare R2 JSON URL") },
singleLine = true,
colors = editFieldColors,
shape = RoundedCornerShape(12.dp),
modifier = Modifier.fillMaxWidth()
)
OutlinedTextField(
value = editSecretKey,
onValueChange = { editSecretKey = it },
label = { Text("Secret Key") },
trailingIcon = {
IconButton(onClick = { showKey = !showKey }) {
Icon(
if (showKey) Icons.Default.VisibilityOff else Icons.Default.Visibility,
null,
tint = TextSecondary
)
}
},
visualTransformation = if (showKey) VisualTransformation.None else PasswordVisualTransformation(),
singleLine = true,
colors = editFieldColors,
shape = RoundedCornerShape(12.dp),
modifier = Modifier.fillMaxWidth()
)
}
},
confirmButton = {
Button(
onClick = {
showEditDialog = false
val updated = device.copy(
name = editName.trim().ifBlank { device.name },
node = editNode.trim().ifBlank { device.node },
r2Url = editR2Url.trim(),
secretKey = editSecretKey.trim()
)
onUpdateDevice(updated)
},
colors = ButtonDefaults.buttonColors(containerColor = GreenVibrant.copy(alpha = 0.2f)),
shape = RoundedCornerShape(12.dp)
) {
Text("Save", color = GreenVibrant, fontWeight = FontWeight.Bold)
}
},
dismissButton = {
TextButton(onClick = { showEditDialog = false }) {
Text("Cancel", color = TextSecondary)
}
}
)
}
if (pendingAction != null) { if (pendingAction != null) {
ActionConfirmDialog( ActionConfirmDialog(
@@ -274,6 +384,44 @@ fun DevicePage(
} }
} }
// 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) // Refresh button (spins while checking)
IconButton( IconButton(
onClick = { if (!isCheckingStatus) onRefreshStatus() }, onClick = { if (!isCheckingStatus) onRefreshStatus() },
@@ -7,6 +7,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
@@ -23,9 +24,12 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.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.Terminal import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.TopAppBar
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
@@ -53,12 +57,24 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleEventObserver
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.theme.BgBase import com.expapp.trigger.ui.theme.BgBase
import com.expapp.trigger.ui.theme.BgElevated
import com.expapp.trigger.ui.theme.BgSurface import com.expapp.trigger.ui.theme.BgSurface
import com.expapp.trigger.ui.theme.BorderSubtle import com.expapp.trigger.ui.theme.BorderSubtle
import com.expapp.trigger.ui.theme.GreenVibrant import com.expapp.trigger.ui.theme.GreenVibrant
@@ -68,6 +84,12 @@ import com.expapp.trigger.ui.theme.OnlineText
import com.expapp.trigger.ui.theme.TextMuted import com.expapp.trigger.ui.theme.TextMuted
import com.expapp.trigger.ui.theme.TextPrimary import com.expapp.trigger.ui.theme.TextPrimary
import com.expapp.trigger.ui.theme.TextSecondary import com.expapp.trigger.ui.theme.TextSecondary
import com.expapp.trigger.update.DownloadState
import com.expapp.trigger.update.ReleaseInfo
import com.expapp.trigger.update.UpdateCheckResult
import com.expapp.trigger.update.UpdateManager
import com.expapp.trigger.widget.ServerWidgetProvider
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
@@ -77,6 +99,12 @@ import kotlinx.coroutines.launch
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) },
nfcWriteResult: Result<Unit>? = null,
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
onStopNfcWriting: () -> Unit = {},
modifier: Modifier = Modifier modifier: Modifier = Modifier
) { ) {
val context = LocalContext.current val context = LocalContext.current
@@ -98,6 +126,46 @@ fun MainScreen(
onDispose { lifecycleOwner.lifecycle.removeObserver(obs) } onDispose { lifecycleOwner.lifecycle.removeObserver(obs) }
} }
val updateManager = remember { UpdateManager(context) }
var availableUpdate by remember { mutableStateOf<ReleaseInfo?>(null) }
var showUpdateDialog by remember { mutableStateOf(false) }
var dismissedVersion by remember { mutableStateOf<String?>(null) }
var downloadState by remember { mutableStateOf<DownloadState>(DownloadState.Idle) }
var isCheckingUpdate by remember { mutableStateOf(false) }
// Dialog & Feature states
var showHistoryDialog by remember { mutableStateOf(false) }
var showSettingsDialog by remember { mutableStateOf(false) }
var showNfcWriteDialog by remember { mutableStateOf(false) }
var historyLogs by remember { mutableStateOf(historyRepository.getLogs()) }
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
fun checkAppUpdate(showToast: Boolean = false) {
isCheckingUpdate = true
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
isCheckingUpdate = false
when (result) {
is UpdateCheckResult.UpdateAvailable -> {
availableUpdate = result.info
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>() }
@@ -120,7 +188,10 @@ fun MainScreen(
isSyncing = true isSyncing = true
var updated = 0; var completed = 0 var updated = 0; var completed = 0
val total = current.count { it.r2Url.isNotBlank() } val total = current.count { it.r2Url.isNotBlank() }
if (total == 0) { isSyncing = false; return } if (total == 0) {
isSyncing = false
return
}
current.filter { it.r2Url.isNotBlank() }.forEach { device -> current.filter { it.r2Url.isNotBlank() }.forEach { device ->
triggerClient.fetchR2Config(device.r2Url) { result -> triggerClient.fetchR2Config(device.r2Url) { result ->
completed++ completed++
@@ -140,8 +211,11 @@ fun MainScreen(
} }
} }
// Initial R2 sync on launch // Initial R2 sync and update check on launch
LaunchedEffect(Unit) { syncEndpoints(false) } LaunchedEffect(Unit) {
syncEndpoints(false)
checkAppUpdate(false)
}
// Active 5-second polling — only while in foreground on a device page // Active 5-second polling — only while in foreground on a device page
LaunchedEffect(pagerState.currentPage, isAppInForeground, devices.size) { LaunchedEffect(pagerState.currentPage, isAppInForeground, devices.size) {
@@ -156,28 +230,71 @@ 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)
triggerClient.sendTrigger(device, action) { response ->
loadingStates[device.id] = false
val msg = if (response.isSuccess) {
when (action) {
TriggerAction.POWER_ON -> "Power on signal sent"
TriggerAction.POWER_OFF -> "Shutdown signal sent"
TriggerAction.REBOOT -> "Restart signal sent"
}
} else {
val raw = response.message.trim()
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
"Failed — $clean"
}
statusStates[device.id] = msg to response.isSuccess
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
// Save to history log
historyRepository.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = msg,
source = "App"
)
)
historyLogs = historyRepository.getLogs()
// Update home screen widgets
ServerWidgetProvider.updateAllWidgets(context)
coroutineScope.launch {
delay(1500); refreshStatus(device, showIndicator = true)
delay(4000); refreshStatus(device)
delay(5000); refreshStatus(device)
} }
} else {
val raw = response.message.trim()
val clean = if (raw.startsWith("<")) "Request failed (HTTP ${response.statusCode})" else raw.take(60)
"Failed — $clean"
} }
statusStates[device.id] = msg to response.isSuccess }
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
coroutineScope.launch { // Biometric Security Gate
delay(1500); refreshStatus(device, showIndicator = true) if (appSettings.isBiometricEnabled && BiometricHelper.isBiometricAvailable(context)) {
delay(4000); refreshStatus(device) requestBiometricAuth(
delay(5000); refreshStatus(device) "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()
} }
} }
@@ -192,37 +309,41 @@ fun MainScreen(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
containerColor = BgBase, containerColor = BgBase,
topBar = { topBar = {
CenterAlignedTopAppBar( TopAppBar(
title = { title = {
Row(verticalAlignment = Alignment.CenterVertically) { Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 2.dp)
) {
Icon( Icon(
Icons.Default.Terminal, Icons.Default.Terminal,
contentDescription = null, contentDescription = null,
tint = GreenVibrant, tint = GreenVibrant,
modifier = Modifier.size(18.dp) modifier = Modifier.size(18.dp)
) )
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(6.dp))
Text( Text(
text = "DEVICE TRIGGER", text = "DEVICE TRIGGER",
fontSize = 14.sp, fontSize = 12.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
letterSpacing = 2.sp, letterSpacing = 1.2.sp,
color = TextPrimary, color = TextPrimary,
fontFamily = FontFamily.Monospace fontFamily = FontFamily.Monospace,
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(10.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 = 8.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
@@ -232,21 +353,88 @@ fun MainScreen(
} }
}, },
actions = { actions = {
IconButton(onClick = { syncEndpoints(true) }, enabled = !isSyncing) { // Update Button
if (availableUpdate != null) {
IconButton(
onClick = { showUpdateDialog = true },
modifier = Modifier.size(36.dp)
) {
Box(contentAlignment = Alignment.TopEnd) {
Icon(
Icons.Default.SystemUpdate,
contentDescription = "Update available",
tint = GreenVibrant,
modifier = Modifier.size(18.dp)
)
Box(
modifier = Modifier
.size(6.dp)
.background(GreenVibrant, CircleShape)
.border(1.dp, BgSurface, CircleShape)
)
}
}
}
// Trigger History Button
IconButton(
onClick = {
historyLogs = historyRepository.getLogs()
showHistoryDialog = true
},
modifier = Modifier.size(36.dp)
) {
Icon(
Icons.Default.History,
contentDescription = "Trigger History",
tint = TextSecondary,
modifier = Modifier.size(20.dp)
)
}
// Settings Button
IconButton(
onClick = { showSettingsDialog = true },
modifier = Modifier.size(36.dp)
) {
Icon(
Icons.Default.Settings,
contentDescription = "Settings",
tint = TextSecondary,
modifier = Modifier.size(20.dp)
)
}
// R2 Sync Button
IconButton(
onClick = { syncEndpoints(true) },
enabled = !isSyncing,
modifier = Modifier.size(36.dp)
) {
Icon( Icon(
Icons.Default.Refresh, Icons.Default.Refresh,
"Sync", "Sync",
tint = if (isSyncing) TextMuted else GreenVibrant, tint = if (isSyncing) TextMuted else GreenVibrant,
modifier = Modifier.rotate(rotationAngle) modifier = Modifier
.size(20.dp)
.rotate(rotationAngle)
) )
} }
// Add Device Button
IconButton( IconButton(
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } } onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
modifier = Modifier.size(36.dp)
) { ) {
Icon(Icons.Default.Add, "Add Device", tint = GreenVibrant) Icon(
Icons.Default.Add,
"Add Device",
tint = GreenVibrant,
modifier = Modifier.size(22.dp)
)
} }
}, },
colors = TopAppBarDefaults.centerAlignedTopAppBarColors( colors = TopAppBarDefaults.topAppBarColors(
containerColor = BgSurface containerColor = BgSurface
) )
) )
@@ -272,20 +460,26 @@ 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( HorizontalPager(
state = pagerState, state = pagerState,
modifier = Modifier.fillMaxSize().padding(padding) modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
) { page -> ) { page ->
if (page < devices.size) { if (page < devices.size) {
val dev = devices[page] val dev = devices[page]
@@ -299,7 +493,16 @@ fun MainScreen(
onDismissStatus = { statusStates.remove(dev.id) }, onDismissStatus = { statusStates.remove(dev.id) },
onRefreshStatus = { refreshStatus(dev, showIndicator = true) }, onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
onTrigger = { action -> executeAction(dev, action) }, onTrigger = { action -> executeAction(dev, action) },
onDelete = { d -> repository.deleteDevice(d.id); devices = repository.getDevices() } onDelete = { d ->
repository.deleteDevice(d.id)
devices = repository.getDevices()
},
onSyncConfig = { syncEndpoints(true) },
onUpdateDevice = { updated ->
repository.updateDevice(updated)
devices = repository.getDevices()
refreshStatus(updated, showIndicator = true)
}
) )
} else { } else {
AddDevicePage( AddDevicePage(
@@ -317,4 +520,89 @@ fun MainScreen(
} }
} }
} }
// 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.createNotificationChannel(context)
ServerMonitorWorker.schedule(context)
} else {
ServerMonitorWorker.cancel(context)
}
},
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
isNfcAvailable = NfcHelper.isNfcSupported(context),
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) {
UpdateDialog(
releaseInfo = availableUpdate!!,
currentVersion = BuildConfig.VERSION_NAME,
downloadState = downloadState,
onDownload = {
downloadState = DownloadState.Downloading(0, 0, availableUpdate!!.sizeBytes)
updateManager.downloadApk(availableUpdate!!.downloadUrl) { state ->
downloadState = state
}
},
onInstall = { file ->
showUpdateDialog = false
updateManager.installApk(file)
},
onDismiss = {
dismissedVersion = availableUpdate?.versionName
showUpdateDialog = false
}
)
}
} }
@@ -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 ─────────────────────────────────────────────────────────
@@ -0,0 +1,37 @@
package com.expapp.trigger.update
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.content.pm.PackageInstaller
import android.os.Build
import android.widget.Toast
class InstallStatusReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)
when (status) {
PackageInstaller.STATUS_PENDING_USER_ACTION -> {
val confirmationIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
} else {
@Suppress("DEPRECATION")
intent.getParcelableExtra(Intent.EXTRA_INTENT)
}
if (confirmationIntent != null) {
confirmationIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(confirmationIntent)
}
}
PackageInstaller.STATUS_SUCCESS -> {
Toast.makeText(context, "Update installed successfully!", Toast.LENGTH_SHORT).show()
}
else -> {
val message = intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
if (!message.isNullOrBlank()) {
Toast.makeText(context, "Update: $message", Toast.LENGTH_SHORT).show()
}
}
}
}
}
@@ -0,0 +1,355 @@
package com.expapp.trigger.update
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.content.pm.PackageInstaller
import android.net.Uri
import android.os.Build
import android.os.Handler
import android.os.Looper
import android.provider.Settings
import androidx.core.content.FileProvider
import com.google.gson.JsonParser
import okhttp3.Call
import okhttp3.Callback
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import java.io.File
import java.io.FileOutputStream
import java.io.IOException
import java.util.concurrent.TimeUnit
class UpdateManager(
private val context: Context,
private val okHttpClient: OkHttpClient = OkHttpClient.Builder()
.connectTimeout(30, TimeUnit.SECONDS)
.readTimeout(60, TimeUnit.SECONDS)
.build(),
val githubRepo: String = "vaishnosingh/server-control-app"
) {
private val mainHandler = try {
val looper = Looper.getMainLooper()
if (looper != null) Handler(looper) else null
} catch (e: Throwable) {
null
}
private fun runOnMain(block: () -> Unit) {
mainHandler?.post(block) ?: block()
}
/**
* Checks GitHub Releases API for the latest published release.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Query releases list so we always inspect the highest semantic version
val url = "https://api.github.com/repos/$githubRepo/releases"
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
runOnMain {
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
}
override fun onResponse(call: Call, response: Response) {
response.use { res ->
if (res.code == 404) {
runOnMain { callback(UpdateCheckResult.UpToDate) }
return
}
if (!res.isSuccessful) {
runOnMain {
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates"))
}
return
}
val body = res.body?.string().orEmpty()
try {
val jsonElement = JsonParser.parseString(body)
val releasesArray = if (jsonElement.isJsonArray) {
jsonElement.asJsonArray
} else {
// In case a single release object was returned
val arr = com.google.gson.JsonArray()
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
arr
}
var highestRelease: ReleaseInfo? = null
for (item in releasesArray) {
if (!item.isJsonObject) continue
val json = item.asJsonObject
if (json.has("draft") && json.get("draft").asBoolean) continue
val tagName = json.get("tag_name")?.asString.orEmpty()
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
val changelog = json.get("body")?.asString.orEmpty()
val assets = json.getAsJsonArray("assets")
var apkUrl: String? = null
var apkName = "app-release.apk"
var apkSize = 0L
if (assets != null) {
for (element in assets) {
val assetObj = element.asJsonObject
val name = assetObj.get("name")?.asString.orEmpty()
if (name.endsWith(".apk", ignoreCase = true)) {
apkUrl = assetObj.get("browser_download_url")?.asString
apkName = name
apkSize = assetObj.get("size")?.asLong ?: 0L
break
}
}
}
if (!apkUrl.isNullOrBlank()) {
val releaseInfo = ReleaseInfo(
tagName = tagName,
versionName = cleanVer,
title = title,
changelog = changelog,
downloadUrl = apkUrl,
apkFileName = apkName,
sizeBytes = apkSize
)
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
highestRelease = releaseInfo
}
}
}
if (highestRelease == null) {
runOnMain { callback(UpdateCheckResult.UpToDate) }
return
}
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
runOnMain {
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
}
} else {
runOnMain { callback(UpdateCheckResult.UpToDate) }
}
} catch (e: Exception) {
runOnMain {
callback(UpdateCheckResult.Error("Failed to parse update info: ${e.message}"))
}
}
}
}
})
}
/**
* Downloads the APK file to the app's cache directory and streams progress updates.
*/
fun downloadApk(
downloadUrl: String,
onProgress: (DownloadState) -> Unit
): Call {
val request = Request.Builder()
.url(downloadUrl)
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
val call = okHttpClient.newCall(request)
call.enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
if (!call.isCanceled()) {
runOnMain {
onProgress(DownloadState.Failed("Download failed: ${e.localizedMessage}"))
}
}
}
override fun onResponse(call: Call, response: Response) {
if (!response.isSuccessful) {
runOnMain {
onProgress(DownloadState.Failed("Server returned HTTP ${response.code}"))
}
return
}
val responseBody = response.body
if (responseBody == null) {
runOnMain {
onProgress(DownloadState.Failed("Response body was empty"))
}
return
}
val updateDir = File(context.cacheDir, "updates")
if (!updateDir.exists()) {
updateDir.mkdirs()
}
val apkFile = File(updateDir, "update.apk")
if (apkFile.exists()) {
apkFile.delete()
}
try {
val totalBytes = responseBody.contentLength()
var bytesDownloaded = 0L
responseBody.byteStream().use { input ->
FileOutputStream(apkFile).use { output ->
val buffer = ByteArray(8192)
var read: Int
var lastPercent = -1
while (input.read(buffer).also { read = it } != -1) {
if (call.isCanceled()) return
output.write(buffer, 0, read)
bytesDownloaded += read
val percent = if (totalBytes > 0) {
((bytesDownloaded * 100) / totalBytes).toInt()
} else 0
if (percent != lastPercent) {
lastPercent = percent
runOnMain {
onProgress(
DownloadState.Downloading(
progressPercent = percent,
bytesDownloaded = bytesDownloaded,
totalBytes = totalBytes
)
)
}
}
}
output.flush()
}
}
runOnMain {
onProgress(DownloadState.ReadyToInstall(apkFile))
}
} catch (e: Exception) {
if (!call.isCanceled()) {
runOnMain {
onProgress(DownloadState.Failed("File write failed: ${e.localizedMessage}"))
}
}
}
}
})
return call
}
/**
* Prompts Android package installer to install the downloaded APK.
*/
fun installApk(apkFile: File) {
if (!apkFile.exists()) return
// On Android 8.0+, check if installing from unknown sources is permitted
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (!context.packageManager.canRequestPackageInstalls()) {
val settingsIntent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES).apply {
data = Uri.parse("package:${context.packageName}")
flags = Intent.FLAG_ACTIVITY_NEW_TASK
}
context.startActivity(settingsIntent)
return
}
}
try {
val packageInstaller = context.packageManager.packageInstaller
val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply {
setAppPackageName(context.packageName)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
}
}
val sessionId = packageInstaller.createSession(params)
val session = packageInstaller.openSession(sessionId)
apkFile.inputStream().use { input ->
session.openWrite("package", 0, apkFile.length()).use { output ->
input.copyTo(output)
session.fsync(output)
}
}
val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
} else {
PendingIntent.FLAG_UPDATE_CURRENT
}
val receiverIntent = Intent(context, InstallStatusReceiver::class.java)
val pendingIntent = PendingIntent.getBroadcast(
context,
sessionId,
receiverIntent,
flags
)
session.commit(pendingIntent.intentSender)
session.close()
} catch (e: Exception) {
// Fallback to FileProvider VIEW intent if session API is unsupported by vendor ROM
fallbackInstall(apkFile)
}
}
private fun fallbackInstall(apkFile: File) {
try {
val apkUri = FileProvider.getUriForFile(
context,
"${context.packageName}.fileprovider",
apkFile
)
val installIntent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(apkUri, "application/vnd.android.package-archive")
flags = Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK
}
context.startActivity(installIntent)
} catch (_: Exception) {}
}
companion object {
/**
* Semantic version comparator. Returns true if remote is strictly greater than local.
*/
fun isNewerVersion(remote: String, local: String): Boolean {
val remoteParts = remote.split("-")[0].split(".").mapNotNull { it.toIntOrNull() }
val localParts = local.split("-")[0].split(".").mapNotNull { it.toIntOrNull() }
val maxLen = maxOf(remoteParts.size, localParts.size)
for (i in 0 until maxLen) {
val r = remoteParts.getOrElse(i) { 0 }
val l = localParts.getOrElse(i) { 0 }
if (r > l) return true
if (r < l) return false
}
return false
}
}
}
@@ -0,0 +1,30 @@
package com.expapp.trigger.update
import java.io.File
data class ReleaseInfo(
val tagName: String,
val versionName: String,
val title: String,
val changelog: String,
val downloadUrl: String,
val apkFileName: String,
val sizeBytes: Long
)
sealed class UpdateCheckResult {
data class UpdateAvailable(val info: ReleaseInfo) : UpdateCheckResult()
object UpToDate : UpdateCheckResult()
data class Error(val message: String) : UpdateCheckResult()
}
sealed class DownloadState {
object Idle : DownloadState()
data class Downloading(
val progressPercent: Int,
val bytesDownloaded: Long,
val totalBytes: Long
) : DownloadState()
data class ReadyToInstall(val apkFile: File) : DownloadState()
data class Failed(val error: String) : DownloadState()
}
@@ -0,0 +1,271 @@
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 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 directly in background
executor.execute {
val repository = DeviceRepository(SharedPrefsStorage(context))
val device = repository.getDevices().find { it.id == deviceId } ?: return@execute
val client = TriggerClient()
val response = client.sendTriggerSync(device, action)
val historyRepo = TriggerHistoryRepository(context)
historyRepo.addLog(
TriggerLog(
deviceId = device.id,
deviceName = device.name,
node = device.node,
action = action,
isSuccess = response.isSuccess,
statusCode = response.statusCode,
message = response.message,
source = "Widget"
)
)
mainHandler.post {
val msg = if (response.isSuccess) {
when (action) {
TriggerAction.POWER_ON -> "Power on sent to ${device.name}"
TriggerAction.REBOOT -> "Restart sent to ${device.name}"
TriggerAction.POWER_OFF -> "Shutdown sent to ${device.name}"
}
} else {
"Failed: ${response.message.take(40)}"
}
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
updateAllWidgets(context)
}
}
}
}
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,143 @@
package com.expapp.trigger.worker
import android.app.NotificationChannel
import android.app.NotificationManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.os.Build
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
import androidx.work.Constraints
import androidx.work.CoroutineWorker
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.NetworkType
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import androidx.work.WorkerParameters
import com.expapp.trigger.MainActivity
import com.expapp.trigger.R
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 CHANNEL_ID = "server_status_channel"
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
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.KEEP,
workRequest
)
}
fun cancel(context: Context) {
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
}
fun createNotificationChannel(context: Context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel(
CHANNEL_ID,
"Server Status Alerts",
NotificationManager.IMPORTANCE_HIGH
).apply {
description = "Alerts when your servers go offline or come back online"
enableVibration(true)
}
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
manager.createNotificationChannel(channel)
}
}
}
override suspend fun doWork(): Result {
val appSettings = AppSettings(appContext)
if (!appSettings.isBackgroundMonitoringEnabled) {
return Result.success()
}
createNotificationChannel(appContext)
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)
val previousStatus = appSettings.getLastStatus(device.id)
// Save new status
appSettings.setLastStatus(device.id, status.isOnline)
// If we have a prior status recorded and it flipped, notify
if (previousStatus != null && previousStatus != status.isOnline) {
sendNotification(
device.id.hashCode(),
if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
if (status.isOnline) {
"${device.name} is now online and reachable."
} else {
"${device.name} is unreachable or offline."
}
)
}
}
return Result.success()
}
private fun sendNotification(id: Int, title: String, message: String) {
val intent = Intent(appContext, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
}
val pendingIntent = PendingIntent.getActivity(
appContext,
id,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
)
val notification = NotificationCompat.Builder(appContext, CHANNEL_ID)
.setSmallIcon(R.mipmap.ic_launcher)
.setContentTitle(title)
.setContentText(message)
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
.setPriority(NotificationCompat.PRIORITY_HIGH)
.setAutoCancel(true)
.setContentIntent(pendingIntent)
.build()
try {
NotificationManagerCompat.from(appContext).notify(id, notification)
} catch (e: SecurityException) {
// Android 13+ permission might not be granted yet
}
}
}
+9
View File
@@ -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>
+9
View File
@@ -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,156 @@
<?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_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/widget_device_name"
android:layout_width="wrap_content"
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="wrap_content"
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>
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<cache-path name="apk_cache" path="updates/" />
<external-cache-path name="apk_external_cache" path="updates/" />
</paths>
@@ -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())
}
}
@@ -0,0 +1,41 @@
package com.expapp.trigger.update
import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer
import org.junit.After
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
class UpdateManagerTest {
private lateinit var server: MockWebServer
@Before
fun setup() {
server = MockWebServer()
server.start()
}
@After
fun tearDown() {
server.shutdown()
}
@Test
fun isNewerVersion_correctlyComparesVersions() {
assertTrue(UpdateManager.isNewerVersion("1.1", "1.0"))
assertTrue(UpdateManager.isNewerVersion("1.0.1", "1.0.0"))
assertTrue(UpdateManager.isNewerVersion("2.0.0", "1.9.9"))
assertTrue(UpdateManager.isNewerVersion("1.2.0", "1.1"))
assertFalse(UpdateManager.isNewerVersion("1.0", "1.0"))
assertFalse(UpdateManager.isNewerVersion("1.0.0", "1.0"))
assertFalse(UpdateManager.isNewerVersion("1.0", "1.1"))
assertFalse(UpdateManager.isNewerVersion("0.9", "1.0"))
}
}
-1
View File
@@ -1 +0,0 @@
sdk.dir=/home/creserver/Android/Sdk