Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57b96a21f2 | ||
|
|
583f421d7f | ||
|
|
efa200c5fe | ||
|
|
f31f049877 | ||
|
|
48dabc50a8 | ||
|
|
378bf291f2 | ||
|
|
2f7e6c5816 | ||
|
|
8f621bf88b | ||
|
|
5c58f1195d | ||
|
|
7f2e48f5d5 | ||
|
|
7769a49454 |
@@ -0,0 +1,104 @@
|
||||
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
|
||||
# On pushes to main, generate a version based on run number
|
||||
TAG="v1.0.${{ github.run_number }}"
|
||||
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 }}
|
||||
@@ -0,0 +1,11 @@
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/
|
||||
.DS_Store
|
||||
build/
|
||||
app/build/
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
@@ -0,0 +1,145 @@
|
||||
# Device Trigger — Android Remote Device Control App
|
||||
|
||||
A clean, native Android mobile application designed to remotely control the power states of multiple machines (e.g. servers, Debian/Pop!_OS nodes, lab rigs).
|
||||
|
||||
The app features a **horizontal swipe interface** where each device is represented by a dedicated screen with **three massive, high-contrast, tactile buttons**:
|
||||
1. 🟢 **POWER ON** — Sends remote power on / wake trigger
|
||||
2. 🟠 **REBOOT** — Gracefully restarts the remote machine (confirmation protected)
|
||||
3. 🔴 **POWER OFF** — Shuts down the machine (confirmation protected)
|
||||
|
||||
Endpoints for each machine are loaded dynamically by fetching a lightweight JSON configuration hosted in a **Cloudflare R2** bucket. Critical actions (`poweroff` and `reboot`) authenticate using a device-specific `secretKey`.
|
||||
|
||||
---
|
||||
|
||||
## 📱 Pre-built Ready-to-Install APK
|
||||
|
||||
The application has been compiled into a ready-to-install debug APK:
|
||||
```
|
||||
app/build/outputs/apk/debug/app-debug.apk
|
||||
```
|
||||
|
||||
### Installing on your Android phone via ADB:
|
||||
```bash
|
||||
adb install -r app/build/outputs/apk/debug/app-debug.apk
|
||||
```
|
||||
*Or transfer `app-debug.apk` directly to your phone and tap to install.*
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Key Features
|
||||
|
||||
- **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.
|
||||
- **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.
|
||||
- **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, 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, live uptime/last-seen telemetry, and Android Toast notifications display HTTP status codes (e.g., `200 OK`) and server responses.
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Cloudflare R2 JSON Specification
|
||||
|
||||
When adding a device, the application downloads and parses a JSON file hosted in your Cloudflare R2 bucket.
|
||||
|
||||
### Example JSON file:
|
||||
```json
|
||||
{
|
||||
"poweron": "https://cosmos.linuxguy.space/poweron",
|
||||
"poweroff": "https://cosmos.linuxguy.space/poweroff",
|
||||
"reboot": "https://cosmos.linuxguy.space/reboot"
|
||||
}
|
||||
```
|
||||
|
||||
*Note: The built-in parser is resilient and automatically accepts key variants such as `power_on`, `powerOn`, `power_off`, `powerOff`, `restart`, and `shutdown`.*
|
||||
|
||||
---
|
||||
|
||||
## 📡 API Request Specification
|
||||
|
||||
When an action is triggered, the app dispatches an asynchronous HTTP `POST` request using `OkHttp`:
|
||||
|
||||
| Field | Value / Description |
|
||||
|---|---|
|
||||
| **HTTP Method** | `POST` |
|
||||
| **Header 1** | `Content-Type: application/json` |
|
||||
| **Header 2** | `X-Secret-Key: <your_secretKey>` (e.g., `Carbon@12`) |
|
||||
| **JSON Body** | `{"node": "<node_identifier>"}` (e.g., `{"node": "debian"}`) |
|
||||
| **Timeout** | 15 seconds connect / read / write |
|
||||
|
||||
---
|
||||
|
||||
## 🛠️ Project Structure
|
||||
|
||||
```
|
||||
exp-app/
|
||||
├── app/
|
||||
│ ├── src/
|
||||
│ │ ├── main/
|
||||
│ │ │ ├── AndroidManifest.xml
|
||||
│ │ │ ├── java/com/expapp/trigger/
|
||||
│ │ │ │ ├── MainActivity.kt
|
||||
│ │ │ │ ├── data/
|
||||
│ │ │ │ │ ├── model/DeviceConfig.kt
|
||||
│ │ │ │ │ ├── parser/R2ConfigParser.kt
|
||||
│ │ │ │ │ └── repository/DeviceRepository.kt
|
||||
│ │ │ │ ├── network/
|
||||
│ │ │ │ │ ├── TriggerClient.kt
|
||||
│ │ │ │ │ └── TriggerResult.kt
|
||||
│ │ │ │ └── ui/
|
||||
│ │ │ │ ├── components/
|
||||
│ │ │ │ │ ├── ActionConfirmDialog.kt
|
||||
│ │ │ │ │ ├── HugeActionButton.kt
|
||||
│ │ │ │ │ └── StatusBanner.kt
|
||||
│ │ │ │ ├── screens/
|
||||
│ │ │ │ │ ├── AddDevicePage.kt
|
||||
│ │ │ │ │ ├── DevicePage.kt
|
||||
│ │ │ │ │ └── MainScreen.kt
|
||||
│ │ │ │ └── theme/
|
||||
│ │ │ │ ├── Color.kt
|
||||
│ │ │ │ └── Theme.kt
|
||||
│ │ │ └── res/
|
||||
│ │ │ └── values/
|
||||
│ │ │ ├── strings.xml
|
||||
│ │ │ └── themes.xml
|
||||
│ │ └── test/java/com/expapp/trigger/
|
||||
│ │ ├── data/parser/R2ConfigParserTest.kt
|
||||
│ │ ├── data/repository/DeviceRepositoryTest.kt
|
||||
│ │ └── network/TriggerClientTest.kt
|
||||
│ └── build.gradle.kts
|
||||
├── docs/superpowers/
|
||||
│ ├── specs/2026-11-18-remote-device-trigger-app-design.md
|
||||
│ └── plans/2026-11-18-remote-device-trigger-app.md
|
||||
├── build.gradle.kts
|
||||
├── settings.gradle.kts
|
||||
├── gradle.properties
|
||||
├── gradlew
|
||||
└── gradlew.bat
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 💻 Building from Source
|
||||
|
||||
### Prerequisites:
|
||||
- Java JDK 17 or 21
|
||||
- Android SDK (API 34)
|
||||
|
||||
### Run Unit Tests:
|
||||
```bash
|
||||
./gradlew testDebugUnitTest
|
||||
```
|
||||
|
||||
### Build Debug APK:
|
||||
```bash
|
||||
./gradlew assembleDebug
|
||||
```
|
||||
The generated APK will be at `app/build/outputs/apk/debug/app-debug.apk`.
|
||||
|
||||
### Open in Android Studio:
|
||||
1. Open Android Studio.
|
||||
2. Select **File -> Open...** and navigate to `/home/creserver/Desktop/Vaishno_workspace/experiments/exp-app`.
|
||||
3. Allow Gradle sync to complete and click **Run** (Shift+F10) on a connected device or emulator.
|
||||
@@ -20,14 +20,33 @@ 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 {
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
proguardFiles(
|
||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
}
|
||||
debug {
|
||||
val relConfig = signingConfigs.findByName("release")
|
||||
if (relConfig?.storeFile?.exists() == true) {
|
||||
signingConfig = relConfig
|
||||
}
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
@@ -38,6 +57,7 @@ android {
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
buildConfig = true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion = "1.5.8"
|
||||
@@ -64,6 +84,7 @@ dependencies {
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
implementation("androidx.compose.material:material-icons-extended")
|
||||
implementation("androidx.compose.material:material")
|
||||
implementation("androidx.compose.foundation:foundation")
|
||||
|
||||
// Networking & Serialization
|
||||
|
||||
@@ -3,12 +3,13 @@
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@android:drawable/sym_def_app_icon"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@android:drawable/sym_def_app_icon"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.ExpApp">
|
||||
<activity
|
||||
@@ -20,6 +21,16 @@
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</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>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package com.expapp.trigger
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.ui.Modifier
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.ui.screens.MainScreen
|
||||
import com.expapp.trigger.ui.theme.DarkBackground
|
||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
enableEdgeToEdge()
|
||||
|
||||
val repository = DeviceRepository(SharedPrefsStorage(applicationContext))
|
||||
val triggerClient = TriggerClient()
|
||||
|
||||
setContent {
|
||||
ExpAppTheme {
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
color = DarkBackground
|
||||
) {
|
||||
MainScreen(
|
||||
repository = repository,
|
||||
triggerClient = triggerClient
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,5 +10,6 @@ data class DeviceConfig(
|
||||
val r2Url: String,
|
||||
val powerOnUrl: String,
|
||||
val powerOffUrl: String,
|
||||
val rebootUrl: String
|
||||
val rebootUrl: String,
|
||||
val statusUrl: String = ""
|
||||
)
|
||||
|
||||
@@ -5,7 +5,8 @@ import com.google.gson.JsonParser
|
||||
data class ParsedEndpoints(
|
||||
val powerOn: String,
|
||||
val powerOff: String,
|
||||
val reboot: String
|
||||
val reboot: String,
|
||||
val status: String = ""
|
||||
)
|
||||
|
||||
object R2ConfigParser {
|
||||
@@ -41,10 +42,16 @@ object R2ConfigParser {
|
||||
?: normalizedMap["reset"]
|
||||
?: throw IllegalArgumentException("Missing required endpoint key: 'reboot'")
|
||||
|
||||
val status = normalizedMap["status"]
|
||||
?: normalizedMap["ping"]
|
||||
?: normalizedMap["health"]
|
||||
?: ""
|
||||
|
||||
ParsedEndpoints(
|
||||
powerOn = powerOn,
|
||||
powerOff = powerOff,
|
||||
reboot = reboot
|
||||
reboot = reboot,
|
||||
status = status
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,6 +54,32 @@ class DeviceRepository(private val storage: KeyValueStorage) {
|
||||
addDevice(device)
|
||||
}
|
||||
|
||||
fun updateEndpoints(
|
||||
deviceId: String,
|
||||
powerOnUrl: String,
|
||||
powerOffUrl: String,
|
||||
rebootUrl: String,
|
||||
statusUrl: String = ""
|
||||
): Boolean {
|
||||
val current = getDevices().toMutableList()
|
||||
val index = current.indexOfFirst { it.id == deviceId }
|
||||
if (index != -1) {
|
||||
val old = current[index]
|
||||
val effectiveStatusUrl = if (statusUrl.isNotBlank()) statusUrl else old.statusUrl
|
||||
if (old.powerOnUrl != powerOnUrl || old.powerOffUrl != powerOffUrl || old.rebootUrl != rebootUrl || old.statusUrl != effectiveStatusUrl) {
|
||||
current[index] = old.copy(
|
||||
powerOnUrl = powerOnUrl,
|
||||
powerOffUrl = powerOffUrl,
|
||||
rebootUrl = rebootUrl,
|
||||
statusUrl = effectiveStatusUrl
|
||||
)
|
||||
saveDevices(current)
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
private fun saveDevices(devices: List<DeviceConfig>) {
|
||||
val json = gson.toJson(devices)
|
||||
storage.putString(storageKey, json)
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.parser.ParsedEndpoints
|
||||
import com.expapp.trigger.data.parser.R2ConfigParser
|
||||
import okhttp3.Call
|
||||
import okhttp3.Callback
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.Request
|
||||
import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import okhttp3.Response
|
||||
import java.io.IOException
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class TriggerClient(
|
||||
private val client: OkHttpClient = OkHttpClient.Builder()
|
||||
.connectTimeout(15, TimeUnit.SECONDS)
|
||||
.readTimeout(15, TimeUnit.SECONDS)
|
||||
.writeTimeout(15, TimeUnit.SECONDS)
|
||||
.build()
|
||||
) {
|
||||
private val jsonMediaType = "application/json; charset=utf-8".toMediaType()
|
||||
|
||||
private val mainHandler = try {
|
||||
val looper = android.os.Looper.getMainLooper()
|
||||
if (looper != null) android.os.Handler(looper) else null
|
||||
} catch (e: Throwable) {
|
||||
null
|
||||
}
|
||||
|
||||
private fun runOnMain(block: () -> Unit) {
|
||||
val handler = mainHandler
|
||||
if (handler != null) {
|
||||
handler.post(block)
|
||||
} else {
|
||||
block()
|
||||
}
|
||||
}
|
||||
|
||||
fun buildRequest(device: DeviceConfig, action: TriggerAction): Request {
|
||||
return when (action) {
|
||||
TriggerAction.POWER_ON -> {
|
||||
Request.Builder()
|
||||
.url(device.powerOnUrl)
|
||||
.get()
|
||||
.build()
|
||||
}
|
||||
TriggerAction.POWER_OFF -> {
|
||||
val jsonPayload = """{"node":"${device.node}"}"""
|
||||
val body = jsonPayload.toRequestBody(jsonMediaType)
|
||||
Request.Builder()
|
||||
.url(device.powerOffUrl)
|
||||
.addHeader("Content-Type", "application/json")
|
||||
.addHeader("X-Secret-Key", device.secretKey)
|
||||
.post(body)
|
||||
.build()
|
||||
}
|
||||
TriggerAction.REBOOT -> {
|
||||
val jsonPayload = """{"node":"${device.node}"}"""
|
||||
val body = jsonPayload.toRequestBody(jsonMediaType)
|
||||
Request.Builder()
|
||||
.url(device.rebootUrl)
|
||||
.addHeader("Content-Type", "application/json")
|
||||
.addHeader("X-Secret-Key", device.secretKey)
|
||||
.post(body)
|
||||
.build()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun sendTrigger(
|
||||
device: DeviceConfig,
|
||||
action: TriggerAction,
|
||||
callback: (TriggerResponse) -> Unit
|
||||
) {
|
||||
val request = try {
|
||||
buildRequest(device, action)
|
||||
} catch (e: Exception) {
|
||||
runOnMain {
|
||||
callback(
|
||||
TriggerResponse(
|
||||
isSuccess = false,
|
||||
statusCode = -1,
|
||||
message = "Invalid URL or configuration: ${e.message}"
|
||||
)
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
client.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain {
|
||||
callback(
|
||||
TriggerResponse(
|
||||
isSuccess = false,
|
||||
statusCode = -1,
|
||||
message = e.localizedMessage ?: "Network connection failed"
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use {
|
||||
val code = it.code
|
||||
val bodyText = it.body?.string().orEmpty()
|
||||
runOnMain {
|
||||
callback(
|
||||
TriggerResponse(
|
||||
isSuccess = it.isSuccessful,
|
||||
statusCode = code,
|
||||
message = if (bodyText.isNotEmpty()) bodyText else "HTTP $code"
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun fetchR2Config(
|
||||
url: String,
|
||||
callback: (Result<ParsedEndpoints>) -> Unit
|
||||
) {
|
||||
val request = try {
|
||||
Request.Builder().url(url).get().build()
|
||||
} catch (e: Exception) {
|
||||
runOnMain { callback(Result.failure(e)) }
|
||||
return
|
||||
}
|
||||
|
||||
client.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain { callback(Result.failure(e)) }
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use {
|
||||
if (!it.isSuccessful) {
|
||||
runOnMain {
|
||||
callback(Result.failure(IOException("Failed to fetch R2 JSON: HTTP ${it.code}")))
|
||||
}
|
||||
return
|
||||
}
|
||||
val jsonString = it.body?.string().orEmpty()
|
||||
val parseResult = R2ConfigParser.parse(jsonString)
|
||||
runOnMain { callback(parseResult) }
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun checkStatus(
|
||||
device: DeviceConfig,
|
||||
callback: (NodeStatus) -> Unit
|
||||
) {
|
||||
// Only use statusUrl from JSON config — no hardcoded fallback
|
||||
val baseStatusUrl = device.statusUrl.trim()
|
||||
|
||||
if (baseStatusUrl.isBlank()) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "NO STATUS URL"))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
val request = try {
|
||||
Request.Builder().url(baseStatusUrl).get().build()
|
||||
} catch (e: Exception) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "INVALID URL"))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
client.newCall(request).enqueue(object : Callback {
|
||||
override fun onFailure(call: Call, e: IOException) {
|
||||
runOnMain {
|
||||
callback(NodeStatus(isOnline = false, statusText = "OFFLINE"))
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResponse(call: Call, response: Response) {
|
||||
response.use {
|
||||
val body = it.body?.string().orEmpty().trim()
|
||||
if (body.startsWith("{")) {
|
||||
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"))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
enum class TriggerAction {
|
||||
POWER_ON,
|
||||
POWER_OFF,
|
||||
REBOOT
|
||||
}
|
||||
|
||||
data class TriggerResponse(
|
||||
val isSuccess: Boolean,
|
||||
val statusCode: Int,
|
||||
val message: String
|
||||
)
|
||||
|
||||
data class NodeStatus(
|
||||
val isOnline: Boolean,
|
||||
val statusText: String,
|
||||
val ip: String? = null,
|
||||
val uptime: String? = null,
|
||||
val onSinceIst: String? = null,
|
||||
val lastActiveAgo: String? = null,
|
||||
val lastActiveIst: String? = null,
|
||||
val timestamp: Long = System.currentTimeMillis()
|
||||
)
|
||||
@@ -0,0 +1,180 @@
|
||||
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.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.PowerOff
|
||||
import androidx.compose.material.icons.filled.PowerSettingsNew
|
||||
import androidx.compose.material.icons.filled.RestartAlt
|
||||
import androidx.compose.material.icons.filled.Warning
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.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.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.ui.theme.AmberBorder
|
||||
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.BorderDefault
|
||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
||||
import com.expapp.trigger.ui.theme.RedBorder
|
||||
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 ActionConfirmDialog(
|
||||
action: TriggerAction,
|
||||
deviceName: String,
|
||||
onConfirm: () -> Unit,
|
||||
onDismiss: () -> Unit
|
||||
) {
|
||||
val (actionName, actionIcon, accentColor, bgGradient, description) = when (action) {
|
||||
TriggerAction.POWER_ON -> Quintuple(
|
||||
"Power On", Icons.Default.PowerSettingsNew, GreenVibrant,
|
||||
listOf(Color(0xFF071A0F), Color(0xFF0C1118)),
|
||||
"This will send a wake signal to boot the remote machine."
|
||||
)
|
||||
TriggerAction.POWER_OFF -> Quintuple(
|
||||
"Power Off", Icons.Default.PowerOff, RedVibrant,
|
||||
listOf(Color(0xFF1A0007), Color(0xFF0C1118)),
|
||||
"This will shut down the remote machine. All running processes will stop."
|
||||
)
|
||||
TriggerAction.REBOOT -> Quintuple(
|
||||
"Reboot", Icons.Default.RestartAlt, AmberVibrant,
|
||||
listOf(Color(0xFF191000), Color(0xFF0C1118)),
|
||||
"This will gracefully restart the remote machine."
|
||||
)
|
||||
}
|
||||
|
||||
Dialog(onDismissRequest = onDismiss) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(24.dp))
|
||||
.background(
|
||||
brush = Brush.verticalGradient(bgGradient)
|
||||
)
|
||||
.border(1.dp, accentColor.copy(alpha = 0.25f), RoundedCornerShape(24.dp))
|
||||
.padding(28.dp)
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
// Icon circle
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(64.dp)
|
||||
.background(
|
||||
brush = Brush.radialGradient(
|
||||
listOf(accentColor.copy(alpha = 0.2f), Color.Transparent)
|
||||
),
|
||||
shape = CircleShape
|
||||
)
|
||||
.border(1.dp, accentColor.copy(alpha = 0.4f), CircleShape),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
imageVector = actionIcon,
|
||||
contentDescription = actionName,
|
||||
tint = accentColor,
|
||||
modifier = Modifier.size(30.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(20.dp))
|
||||
|
||||
Text(
|
||||
text = "Confirm $actionName",
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
Text(
|
||||
text = deviceName,
|
||||
fontSize = 13.sp,
|
||||
color = accentColor,
|
||||
fontWeight = FontWeight.SemiBold
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(14.dp))
|
||||
|
||||
Text(
|
||||
text = description,
|
||||
fontSize = 13.sp,
|
||||
color = TextSecondary,
|
||||
lineHeight = 20.sp
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(28.dp))
|
||||
|
||||
// Buttons row
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
TextButton(
|
||||
onClick = onDismiss,
|
||||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(BgElevated)
|
||||
.border(1.dp, BorderDefault, RoundedCornerShape(14.dp))
|
||||
) {
|
||||
Text("Cancel", color = TextSecondary, fontWeight = FontWeight.Medium)
|
||||
}
|
||||
|
||||
Button(
|
||||
onClick = onConfirm,
|
||||
modifier = Modifier.weight(1f),
|
||||
shape = RoundedCornerShape(14.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = accentColor.copy(alpha = 0.15f),
|
||||
contentColor = accentColor
|
||||
)
|
||||
) {
|
||||
Text(
|
||||
actionName,
|
||||
fontWeight = FontWeight.Bold,
|
||||
fontSize = 14.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Helper data class
|
||||
private data class Quintuple<A, B, C, D, E>(val a: A, val b: B, val c: C, val d: D, val e: E)
|
||||
|
||||
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component1() = a
|
||||
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component2() = b
|
||||
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component3() = c
|
||||
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component4() = d
|
||||
private operator fun <A, B, C, D, E> Quintuple<A, B, C, D, E>.component5() = e
|
||||
@@ -0,0 +1,201 @@
|
||||
package com.expapp.trigger.ui.components
|
||||
|
||||
import androidx.compose.animation.animateColorAsState
|
||||
import androidx.compose.animation.core.FastOutSlowInEasing
|
||||
import androidx.compose.animation.core.RepeatMode
|
||||
import androidx.compose.animation.core.animateFloat
|
||||
import androidx.compose.animation.core.animateFloatAsState
|
||||
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.interaction.MutableInteractionSource
|
||||
import androidx.compose.foundation.interaction.collectIsPressedAsState
|
||||
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.ripple.rememberRipple
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.remember
|
||||
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.draw.shadow
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
@Composable
|
||||
fun HugeActionButton(
|
||||
text: String,
|
||||
subtext: String,
|
||||
gradientColors: List<Color>,
|
||||
borderColor: Color,
|
||||
icon: ImageVector,
|
||||
isLoading: Boolean = false,
|
||||
enabled: Boolean = true,
|
||||
onClick: () -> Unit
|
||||
) {
|
||||
val interactionSource = remember { MutableInteractionSource() }
|
||||
val isPressed by interactionSource.collectIsPressedAsState()
|
||||
|
||||
val scale by animateFloatAsState(
|
||||
targetValue = if (isPressed && enabled) 0.97f else 1f,
|
||||
animationSpec = tween(100, easing = FastOutSlowInEasing),
|
||||
label = "button_scale"
|
||||
)
|
||||
|
||||
val borderAlpha by animateFloatAsState(
|
||||
targetValue = if (enabled) 1f else 0.25f,
|
||||
animationSpec = tween(300),
|
||||
label = "border_alpha"
|
||||
)
|
||||
|
||||
val contentAlpha = if (enabled) 1f else 0.35f
|
||||
val shape = RoundedCornerShape(20.dp)
|
||||
|
||||
// Pulsing glow when enabled
|
||||
val infiniteTransition = rememberInfiniteTransition(label = "glow")
|
||||
val glowAlpha by infiniteTransition.animateFloat(
|
||||
initialValue = 0.3f,
|
||||
targetValue = 0.65f,
|
||||
animationSpec = infiniteRepeatable(
|
||||
animation = tween(2000, easing = FastOutSlowInEasing),
|
||||
repeatMode = RepeatMode.Reverse
|
||||
),
|
||||
label = "glow_alpha"
|
||||
)
|
||||
|
||||
val shadowColor = borderColor.copy(alpha = if (enabled && !isLoading) glowAlpha * 0.5f else 0f)
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.scale(scale)
|
||||
.shadow(
|
||||
elevation = if (enabled) 16.dp else 0.dp,
|
||||
shape = shape,
|
||||
spotColor = shadowColor,
|
||||
ambientColor = shadowColor
|
||||
)
|
||||
.clip(shape)
|
||||
.background(
|
||||
brush = Brush.linearGradient(
|
||||
if (enabled) gradientColors
|
||||
else gradientColors.map { it.copy(alpha = 0.2f) }
|
||||
)
|
||||
)
|
||||
.border(
|
||||
width = 1.dp,
|
||||
brush = Brush.linearGradient(
|
||||
listOf(
|
||||
borderColor.copy(alpha = borderAlpha * 0.8f),
|
||||
borderColor.copy(alpha = borderAlpha * 0.2f),
|
||||
borderColor.copy(alpha = borderAlpha * 0.5f),
|
||||
)
|
||||
),
|
||||
shape = shape
|
||||
)
|
||||
.clickable(
|
||||
interactionSource = interactionSource,
|
||||
indication = rememberRipple(color = borderColor.copy(alpha = 0.4f)),
|
||||
enabled = enabled && !isLoading,
|
||||
onClick = onClick
|
||||
)
|
||||
.padding(horizontal = 24.dp, vertical = 20.dp)
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
// Icon circle with glow
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(52.dp)
|
||||
.background(
|
||||
brush = Brush.radialGradient(
|
||||
listOf(
|
||||
borderColor.copy(alpha = if (enabled) 0.25f else 0.08f),
|
||||
Color.Transparent
|
||||
)
|
||||
),
|
||||
shape = CircleShape
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
borderColor.copy(alpha = if (enabled) 0.4f else 0.1f),
|
||||
CircleShape
|
||||
),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
imageVector = icon,
|
||||
contentDescription = text,
|
||||
tint = borderColor.copy(alpha = contentAlpha),
|
||||
modifier = Modifier.size(26.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(18.dp))
|
||||
|
||||
Column {
|
||||
Text(
|
||||
text = text,
|
||||
fontSize = 18.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = Color.White.copy(alpha = contentAlpha),
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
Spacer(modifier = Modifier.height(3.dp))
|
||||
Text(
|
||||
text = subtext,
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Normal,
|
||||
color = Color.White.copy(alpha = contentAlpha * 0.6f)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if (isLoading) {
|
||||
CircularProgressIndicator(
|
||||
modifier = Modifier.size(24.dp),
|
||||
color = borderColor,
|
||||
strokeWidth = 2.5.dp,
|
||||
trackColor = borderColor.copy(alpha = 0.2f)
|
||||
)
|
||||
} else if (enabled) {
|
||||
// Chevron
|
||||
Text(
|
||||
text = "›",
|
||||
fontSize = 28.sp,
|
||||
color = borderColor.copy(alpha = 0.5f),
|
||||
fontWeight = FontWeight.Light
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
package com.expapp.trigger.ui.components
|
||||
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.slideInVertically
|
||||
import androidx.compose.animation.slideOutVertically
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
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.CheckCircle
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.ErrorOutline
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
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.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
@Composable
|
||||
fun StatusBanner(
|
||||
status: String?,
|
||||
isSuccess: Boolean?,
|
||||
onDismiss: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
AnimatedVisibility(
|
||||
visible = !status.isNullOrBlank(),
|
||||
enter = slideInVertically(initialOffsetY = { -it }) + fadeIn(),
|
||||
exit = slideOutVertically(targetOffsetY = { -it }) + fadeOut()
|
||||
) {
|
||||
val success = isSuccess == true
|
||||
val bgColor = if (success) Color(0xFF071A0F) else Color(0xFF190004)
|
||||
val border = if (success) Color(0xFF0E3B1E) else Color(0xFF3D0010)
|
||||
val iconColor = if (success) Color(0xFF22D47E) else Color(0xFFFF4757)
|
||||
val textColor = if (success) Color(0xFF34EE91) else Color(0xFFFF6B78)
|
||||
|
||||
Row(
|
||||
modifier = modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(bgColor)
|
||||
.border(1.dp, border, RoundedCornerShape(14.dp))
|
||||
.padding(start = 16.dp, end = 4.dp, top = 10.dp, bottom = 10.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
imageVector = if (success) Icons.Default.CheckCircle else Icons.Default.ErrorOutline,
|
||||
contentDescription = null,
|
||||
tint = iconColor,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Text(
|
||||
text = status.orEmpty(),
|
||||
color = textColor,
|
||||
fontSize = 13.sp,
|
||||
fontWeight = FontWeight.Medium,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
IconButton(onClick = onDismiss, modifier = Modifier.size(36.dp)) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Close,
|
||||
contentDescription = "Dismiss",
|
||||
tint = textColor.copy(alpha = 0.5f),
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,279 @@
|
||||
package com.expapp.trigger.ui.screens
|
||||
|
||||
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.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.imePadding
|
||||
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.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.Key
|
||||
import androidx.compose.material.icons.filled.Link
|
||||
import androidx.compose.material.icons.filled.Memory
|
||||
import androidx.compose.material.icons.filled.Storage
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
import androidx.compose.material.icons.filled.VisibilityOff
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.OutlinedTextFieldDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
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.sp
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.ui.components.StatusBanner
|
||||
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.TextMuted
|
||||
import com.expapp.trigger.ui.theme.TextPrimary
|
||||
import com.expapp.trigger.ui.theme.TextSecondary
|
||||
|
||||
@Composable
|
||||
fun AddDevicePage(
|
||||
triggerClient: TriggerClient,
|
||||
onDeviceAdded: (DeviceConfig) -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
var deviceName by remember { mutableStateOf("") }
|
||||
var nodeName by remember { mutableStateOf("debian") }
|
||||
var r2Url by remember { mutableStateOf("") }
|
||||
var secretKey by remember { mutableStateOf("") }
|
||||
var showKey by remember { mutableStateOf(false) }
|
||||
var isFetching by remember { mutableStateOf(false) }
|
||||
var errorMsg by remember { mutableStateOf<String?>(null) }
|
||||
var successMsg by remember { mutableStateOf<String?>(null) }
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.verticalScroll(rememberScrollState())
|
||||
.imePadding()
|
||||
.padding(horizontal = 16.dp, vertical = 16.dp)
|
||||
) {
|
||||
// Header
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(44.dp)
|
||||
.clip(RoundedCornerShape(13.dp))
|
||||
.background(GreenVibrant.copy(alpha = 0.12f))
|
||||
.border(1.dp, GreenVibrant.copy(alpha = 0.3f), RoundedCornerShape(13.dp)),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Add,
|
||||
null,
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(22.dp)
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.width(14.dp))
|
||||
Column {
|
||||
Text(
|
||||
"Add Device",
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary
|
||||
)
|
||||
Text(
|
||||
"Configure via Cloudflare R2 JSON",
|
||||
fontSize = 12.sp,
|
||||
color = TextMuted
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(20.dp))
|
||||
|
||||
StatusBanner(
|
||||
status = errorMsg ?: successMsg,
|
||||
isSuccess = errorMsg == null,
|
||||
onDismiss = { errorMsg = null; successMsg = null }
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
// Form card
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(20.dp))
|
||||
.background(Brush.verticalGradient(listOf(BgElevated, BgSurface)))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(20.dp))
|
||||
.padding(20.dp)
|
||||
) {
|
||||
val fieldColors = OutlinedTextFieldDefaults.colors(
|
||||
focusedBorderColor = GreenVibrant,
|
||||
unfocusedBorderColor = BorderDefault,
|
||||
focusedLabelColor = GreenVibrant,
|
||||
unfocusedLabelColor = TextSecondary,
|
||||
cursorColor = GreenVibrant,
|
||||
focusedTextColor = TextPrimary,
|
||||
unfocusedTextColor = TextPrimary,
|
||||
focusedPlaceholderColor = TextMuted,
|
||||
unfocusedPlaceholderColor= TextMuted
|
||||
)
|
||||
|
||||
Column(verticalArrangement = Arrangement.spacedBy(14.dp)) {
|
||||
OutlinedTextField(
|
||||
value = deviceName, onValueChange = { deviceName = it },
|
||||
label = { Text("Device Name") },
|
||||
placeholder = { Text("e.g. Home Server") },
|
||||
leadingIcon = { Icon(Icons.Default.Storage, null, tint = TextSecondary) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
colors = fieldColors,
|
||||
shape = RoundedCornerShape(14.dp)
|
||||
)
|
||||
|
||||
OutlinedTextField(
|
||||
value = nodeName, onValueChange = { nodeName = it },
|
||||
label = { Text("Node Identifier") },
|
||||
placeholder = { Text("e.g. debian") },
|
||||
leadingIcon = { Icon(Icons.Default.Memory, null, tint = TextSecondary) },
|
||||
singleLine = true,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
colors = fieldColors,
|
||||
shape = RoundedCornerShape(14.dp)
|
||||
)
|
||||
|
||||
OutlinedTextField(
|
||||
value = r2Url, onValueChange = { r2Url = it },
|
||||
label = { Text("Cloudflare R2 JSON URL") },
|
||||
placeholder = { Text("https://pub-xxx.r2.dev/config.json") },
|
||||
leadingIcon = { Icon(Icons.Default.Link, null, tint = TextSecondary) },
|
||||
singleLine = true,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
colors = fieldColors,
|
||||
shape = RoundedCornerShape(14.dp)
|
||||
)
|
||||
|
||||
OutlinedTextField(
|
||||
value = secretKey, onValueChange = { secretKey = it },
|
||||
label = { Text("Secret Key") },
|
||||
placeholder = { Text("Your API secret") },
|
||||
leadingIcon = { Icon(Icons.Default.Key, null, tint = TextSecondary) },
|
||||
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,
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
colors = fieldColors,
|
||||
shape = RoundedCornerShape(14.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(20.dp))
|
||||
|
||||
Button(
|
||||
onClick = {
|
||||
errorMsg = null; successMsg = null
|
||||
when {
|
||||
deviceName.isBlank() -> { errorMsg = "Enter a device name"; return@Button }
|
||||
r2Url.isBlank() -> { errorMsg = "Enter the Cloudflare R2 URL"; return@Button }
|
||||
secretKey.isBlank() -> { errorMsg = "Enter the secret key"; return@Button }
|
||||
}
|
||||
isFetching = true
|
||||
triggerClient.fetchR2Config(r2Url.trim()) { result ->
|
||||
isFetching = false
|
||||
result.onSuccess { ep ->
|
||||
val dev = DeviceConfig(
|
||||
name = deviceName.trim(),
|
||||
node = nodeName.trim().ifBlank { "debian" },
|
||||
secretKey = secretKey.trim(),
|
||||
r2Url = r2Url.trim(),
|
||||
powerOnUrl = ep.powerOn,
|
||||
powerOffUrl= ep.powerOff,
|
||||
rebootUrl = ep.reboot,
|
||||
statusUrl = ep.status
|
||||
)
|
||||
onDeviceAdded(dev)
|
||||
successMsg = "\"${dev.name}\" added successfully"
|
||||
deviceName = ""; r2Url = ""; secretKey = ""
|
||||
}.onFailure { ex ->
|
||||
errorMsg = "Failed: ${ex.message}"
|
||||
}
|
||||
}
|
||||
},
|
||||
enabled = !isFetching,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(54.dp),
|
||||
shape = RoundedCornerShape(16.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenVibrant.copy(alpha = 0.15f),
|
||||
contentColor = GreenVibrant,
|
||||
disabledContainerColor= GreenVibrant.copy(alpha = 0.05f),
|
||||
disabledContentColor = GreenVibrant.copy(alpha = 0.4f)
|
||||
)
|
||||
) {
|
||||
if (isFetching) {
|
||||
CircularProgressIndicator(
|
||||
color = GreenVibrant,
|
||||
modifier = Modifier.size(20.dp),
|
||||
strokeWidth = 2.dp,
|
||||
trackColor = GreenVibrant.copy(alpha = 0.2f)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Text("Fetching config…", fontWeight = FontWeight.SemiBold)
|
||||
} else {
|
||||
Icon(Icons.Default.Add, null, modifier = Modifier.size(18.dp))
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text("Add Device", fontSize = 16.sp, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(20.dp))
|
||||
|
||||
Text(
|
||||
text = "The JSON config must include: poweron, poweroff, reboot, and status URL keys.",
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted,
|
||||
lineHeight = 16.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,659 @@
|
||||
package com.expapp.trigger.ui.screens
|
||||
|
||||
import androidx.compose.animation.AnimatedContent
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.core.FastOutSlowInEasing
|
||||
import androidx.compose.animation.core.LinearEasing
|
||||
import androidx.compose.animation.core.RepeatMode
|
||||
import androidx.compose.animation.core.animateFloat
|
||||
import androidx.compose.animation.core.animateFloatAsState
|
||||
import androidx.compose.animation.core.infiniteRepeatable
|
||||
import androidx.compose.animation.core.rememberInfiniteTransition
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.togetherWith
|
||||
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.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
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.Edit
|
||||
import androidx.compose.material.icons.filled.PowerOff
|
||||
import androidx.compose.material.icons.filled.PowerSettingsNew
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.RestartAlt
|
||||
import androidx.compose.material.icons.filled.Schedule
|
||||
import androidx.compose.material.icons.filled.Terminal
|
||||
import androidx.compose.material.icons.filled.Visibility
|
||||
import androidx.compose.material.icons.filled.VisibilityOff
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.CircularProgressIndicator
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.OutlinedTextFieldDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.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.draw.rotate
|
||||
import androidx.compose.ui.draw.scale
|
||||
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.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.network.NodeStatus
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.ui.components.ActionConfirmDialog
|
||||
import com.expapp.trigger.ui.components.HugeActionButton
|
||||
import com.expapp.trigger.ui.components.StatusBanner
|
||||
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||
import com.expapp.trigger.ui.theme.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.OfflineBg
|
||||
import com.expapp.trigger.ui.theme.OfflineBorder
|
||||
import com.expapp.trigger.ui.theme.OfflineText
|
||||
import com.expapp.trigger.ui.theme.OnlineBg
|
||||
import com.expapp.trigger.ui.theme.OnlineBorder
|
||||
import com.expapp.trigger.ui.theme.OnlineText
|
||||
import com.expapp.trigger.ui.theme.PowerOffBorder
|
||||
import com.expapp.trigger.ui.theme.PowerOffGradient
|
||||
import com.expapp.trigger.ui.theme.PowerOnBorder
|
||||
import com.expapp.trigger.ui.theme.PowerOnGradient
|
||||
import com.expapp.trigger.ui.theme.RebootBorder
|
||||
import com.expapp.trigger.ui.theme.RebootGradient
|
||||
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 DevicePage(
|
||||
device: DeviceConfig,
|
||||
isLoading: Boolean,
|
||||
nodeStatus: NodeStatus?,
|
||||
isCheckingStatus: Boolean,
|
||||
lastStatus: String?,
|
||||
lastSuccess: Boolean?,
|
||||
onDismissStatus: () -> Unit,
|
||||
onRefreshStatus: () -> Unit,
|
||||
onTrigger: (TriggerAction) -> Unit,
|
||||
onDelete: (DeviceConfig) -> Unit,
|
||||
onSyncConfig: () -> Unit = {},
|
||||
onUpdateDevice: (DeviceConfig) -> Unit = {},
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
|
||||
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) {
|
||||
ActionConfirmDialog(
|
||||
action = pendingAction!!,
|
||||
deviceName = device.name,
|
||||
onConfirm = {
|
||||
val a = pendingAction!!
|
||||
pendingAction = null
|
||||
onTrigger(a)
|
||||
},
|
||||
onDismiss = { pendingAction = null }
|
||||
)
|
||||
}
|
||||
|
||||
if (showDeleteConfirm) {
|
||||
AlertDialog(
|
||||
onDismissRequest = { showDeleteConfirm = false },
|
||||
containerColor = BgSurface,
|
||||
shape = RoundedCornerShape(20.dp),
|
||||
title = { Text("Remove Device", color = TextPrimary, fontWeight = FontWeight.Bold) },
|
||||
text = {
|
||||
Text(
|
||||
"Remove \"${device.name}\" from your devices?",
|
||||
color = TextSecondary,
|
||||
fontSize = 14.sp
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
Button(
|
||||
onClick = { showDeleteConfirm = false; onDelete(device) },
|
||||
colors = ButtonDefaults.buttonColors(containerColor = RedVibrant.copy(alpha = 0.15f)),
|
||||
shape = RoundedCornerShape(12.dp)
|
||||
) { Text("Remove", color = RedVibrant, fontWeight = FontWeight.Bold) }
|
||||
},
|
||||
dismissButton = {
|
||||
TextButton(onClick = { showDeleteConfirm = false }) {
|
||||
Text("Cancel", color = TextSecondary)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
// Spin animation for refresh icon
|
||||
val infiniteTransition = rememberInfiniteTransition(label = "refresh_spin")
|
||||
val spinAngle by infiniteTransition.animateFloat(
|
||||
initialValue = 0f, targetValue = 360f,
|
||||
animationSpec = infiniteRepeatable(tween(900, easing = LinearEasing)),
|
||||
label = "spin"
|
||||
)
|
||||
|
||||
// Pulse for online dot
|
||||
val pulseScale by infiniteTransition.animateFloat(
|
||||
initialValue = 0.8f, targetValue = 1.5f,
|
||||
animationSpec = infiniteRepeatable(
|
||||
tween(1400, easing = FastOutSlowInEasing), RepeatMode.Reverse
|
||||
),
|
||||
label = "pulse_scale"
|
||||
)
|
||||
|
||||
val isOnline = nodeStatus?.isOnline
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
|
||||
// ── HEADER CARD ──────────────────────────────────────────────────
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(24.dp))
|
||||
.background(Brush.verticalGradient(listOf(BgElevated, BgSurface)))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(24.dp))
|
||||
) {
|
||||
// Top accent line that changes color with server state
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(1.dp)
|
||||
.background(
|
||||
Brush.horizontalGradient(
|
||||
listOf(
|
||||
Color.Transparent,
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.7f)
|
||||
false -> RedVibrant.copy(alpha = 0.5f)
|
||||
null -> BorderDefault.copy(alpha = 0.4f)
|
||||
},
|
||||
Color.Transparent
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 18.dp)
|
||||
) {
|
||||
// Title row
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(48.dp)
|
||||
.clip(RoundedCornerShape(14.dp))
|
||||
.background(
|
||||
Brush.radialGradient(
|
||||
listOf(
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.18f)
|
||||
false -> RedVibrant.copy(alpha = 0.12f)
|
||||
null -> BorderDefault.copy(alpha = 0.1f)
|
||||
},
|
||||
Color.Transparent
|
||||
)
|
||||
)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
when (isOnline) {
|
||||
true -> GreenVibrant.copy(alpha = 0.35f)
|
||||
false -> RedVibrant.copy(alpha = 0.25f)
|
||||
null -> BorderSubtle
|
||||
},
|
||||
RoundedCornerShape(14.dp)
|
||||
),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
tint = when (isOnline) {
|
||||
true -> GreenVibrant
|
||||
false -> RedVibrant.copy(alpha = 0.6f)
|
||||
null -> TextSecondary
|
||||
},
|
||||
modifier = Modifier.size(22.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(14.dp))
|
||||
|
||||
Column {
|
||||
Text(
|
||||
text = device.name,
|
||||
fontSize = 20.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = TextPrimary,
|
||||
maxLines = 1
|
||||
)
|
||||
Text(
|
||||
text = device.node,
|
||||
fontSize = 11.sp,
|
||||
color = TextMuted,
|
||||
fontFamily = FontFamily.Monospace,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Re-fetch R2 JSON config button
|
||||
IconButton(
|
||||
onClick = onSyncConfig,
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(AmberVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, AmberVibrant.copy(alpha = 0.2f), RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.CloudSync,
|
||||
contentDescription = "Re-fetch R2 JSON",
|
||||
tint = AmberVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
|
||||
// Edit device button
|
||||
IconButton(
|
||||
onClick = { showEditDialog = true },
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(BorderSubtle.copy(alpha = 0.3f))
|
||||
.border(1.dp, BorderSubtle, RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Edit,
|
||||
contentDescription = "Edit device",
|
||||
tint = TextSecondary,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
|
||||
// Refresh button (spins while checking)
|
||||
IconButton(
|
||||
onClick = { if (!isCheckingStatus) onRefreshStatus() },
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.12f)
|
||||
else BorderSubtle.copy(alpha = 0.3f)
|
||||
)
|
||||
.border(
|
||||
1.dp,
|
||||
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.3f)
|
||||
else BorderSubtle,
|
||||
RoundedCornerShape(10.dp)
|
||||
)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Refresh,
|
||||
contentDescription = "Refresh status",
|
||||
tint = if (isCheckingStatus) GreenVibrant else TextMuted,
|
||||
modifier = Modifier
|
||||
.size(18.dp)
|
||||
.rotate(if (isCheckingStatus) spinAngle else 0f)
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
|
||||
// Delete button
|
||||
IconButton(
|
||||
onClick = { showDeleteConfirm = true },
|
||||
modifier = Modifier
|
||||
.size(36.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(RedVibrant.copy(alpha = 0.08f))
|
||||
.border(1.dp, RedVibrant.copy(alpha = 0.15f), RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.DeleteOutline,
|
||||
contentDescription = "Remove device",
|
||||
tint = RedVibrant.copy(alpha = 0.7f),
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
// ── STATUS ROW ────────────────────────────────────────────
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
AnimatedContent(
|
||||
targetState = Triple(isOnline, isCheckingStatus, nodeStatus?.statusText),
|
||||
transitionSpec = { fadeIn(tween(300)) togetherWith fadeOut(tween(200)) },
|
||||
label = "status_badge"
|
||||
) { (online, checking, statusTxt) ->
|
||||
val badgeBg = if (checking) BgElevated else if (online == true) OnlineBg else OfflineBg
|
||||
val badgeBorder = if (checking) BorderDefault else if (online == true) OnlineBorder else OfflineBorder
|
||||
val dotColor = if (online == true) GreenVibrant else RedVibrant
|
||||
val labelColor = if (checking) TextSecondary else if (online == true) OnlineText else OfflineText
|
||||
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.background(badgeBg)
|
||||
.border(1.dp, badgeBorder, RoundedCornerShape(10.dp))
|
||||
.padding(horizontal = 12.dp, vertical = 7.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
if (checking) {
|
||||
CircularProgressIndicator(
|
||||
modifier = Modifier.size(9.dp),
|
||||
strokeWidth = 1.5.dp,
|
||||
color = TextSecondary,
|
||||
trackColor = Color.Transparent
|
||||
)
|
||||
} else {
|
||||
Box(
|
||||
modifier = Modifier.size(16.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
if (online == true) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(14.dp)
|
||||
.scale(pulseScale)
|
||||
.background(dotColor.copy(alpha = 0.25f), CircleShape)
|
||||
)
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.size(8.dp)
|
||||
.background(dotColor, CircleShape)
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.width(7.dp))
|
||||
Text(
|
||||
text = if (checking) "CHECKING" else (statusTxt ?: "UNKNOWN"),
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = labelColor,
|
||||
letterSpacing = 0.8.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// IP chip
|
||||
if (!nodeStatus?.ip.isNullOrBlank()) {
|
||||
Text(
|
||||
text = nodeStatus!!.ip!!,
|
||||
fontSize = 11.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 = 5.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── UPTIME / LAST SEEN BAR ─────────────────────────────────
|
||||
val showUptime = nodeStatus != null && !isCheckingStatus &&
|
||||
isOnline == true && !nodeStatus.uptime.isNullOrBlank()
|
||||
val showOffline = nodeStatus != null && !isCheckingStatus &&
|
||||
isOnline == false && !nodeStatus.lastActiveAgo.isNullOrBlank()
|
||||
|
||||
AnimatedVisibility(visible = showUptime || showOffline) {
|
||||
val barOnline = isOnline == true
|
||||
val barBg = if (barOnline) OnlineBg.copy(alpha = 0.6f) else OfflineBg.copy(alpha = 0.6f)
|
||||
val barBorder = if (barOnline) OnlineBorder.copy(alpha = 0.5f) else OfflineBorder.copy(alpha = 0.5f)
|
||||
val barColor = if (barOnline) OnlineText else OfflineText
|
||||
val barLabel = if (barOnline) "Uptime ${nodeStatus?.uptime}" else "Last seen ${nodeStatus?.lastActiveAgo}"
|
||||
val barDetail = if (barOnline) nodeStatus?.onSinceIst else nodeStatus?.lastActiveIst
|
||||
|
||||
Spacer(modifier = Modifier.height(12.dp))
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(12.dp))
|
||||
.background(barBg)
|
||||
.border(1.dp, barBorder, RoundedCornerShape(12.dp))
|
||||
.padding(horizontal = 14.dp, vertical = 8.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
Icons.Default.Schedule,
|
||||
null,
|
||||
tint = barColor,
|
||||
modifier = Modifier.size(13.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Text(
|
||||
text = barLabel,
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
color = barColor
|
||||
)
|
||||
if (!barDetail.isNullOrBlank()) {
|
||||
Text(
|
||||
text = " · $barDetail",
|
||||
fontSize = 11.sp,
|
||||
color = TextSecondary,
|
||||
maxLines = 1
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ── ACTION RESULT BANNER ─────────────────────────────────────────
|
||||
StatusBanner(
|
||||
status = lastStatus,
|
||||
isSuccess = lastSuccess,
|
||||
onDismiss = onDismissStatus
|
||||
)
|
||||
|
||||
// ── ACTION BUTTONS ───────────────────────────────────────────────
|
||||
val isPowerOnEnabled = isOnline != true && !isLoading
|
||||
val isRebootEnabled = isOnline != false && !isLoading
|
||||
val isPowerOffEnabled = isOnline != false && !isLoading
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(1f),
|
||||
verticalArrangement = Arrangement.spacedBy(10.dp, Alignment.CenterVertically)
|
||||
) {
|
||||
HugeActionButton(
|
||||
text = "Power On",
|
||||
subtext = if (isOnline == true) "Already online — unavailable" else "Send wake signal to boot",
|
||||
gradientColors = PowerOnGradient,
|
||||
borderColor = PowerOnBorder,
|
||||
icon = Icons.Default.PowerSettingsNew,
|
||||
isLoading = isLoading,
|
||||
enabled = isPowerOnEnabled,
|
||||
onClick = { pendingAction = TriggerAction.POWER_ON }
|
||||
)
|
||||
HugeActionButton(
|
||||
text = "Reboot",
|
||||
subtext = if (isOnline == false) "Offline — unavailable" else "Gracefully restart server",
|
||||
gradientColors = RebootGradient,
|
||||
borderColor = RebootBorder,
|
||||
icon = Icons.Default.RestartAlt,
|
||||
isLoading = isLoading,
|
||||
enabled = isRebootEnabled,
|
||||
onClick = { pendingAction = TriggerAction.REBOOT }
|
||||
)
|
||||
HugeActionButton(
|
||||
text = "Power Off",
|
||||
subtext = if (isOnline == false) "Offline — unavailable" else "Shut down remote machine",
|
||||
gradientColors = PowerOffGradient,
|
||||
borderColor = PowerOffBorder,
|
||||
icon = Icons.Default.PowerOff,
|
||||
isLoading = isLoading,
|
||||
enabled = isPowerOffEnabled,
|
||||
onClick = { pendingAction = TriggerAction.POWER_OFF }
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(4.dp))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,439 @@
|
||||
package com.expapp.trigger.ui.screens
|
||||
|
||||
import android.widget.Toast
|
||||
import androidx.compose.animation.core.FastOutSlowInEasing
|
||||
import androidx.compose.animation.core.animateFloatAsState
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||
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.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.pager.HorizontalPager
|
||||
import androidx.compose.foundation.pager.rememberPagerState
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material.icons.filled.SystemUpdate
|
||||
import androidx.compose.material.icons.filled.Terminal
|
||||
import androidx.compose.material3.CenterAlignedTopAppBar
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateMapOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.rotate
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalLifecycleOwner
|
||||
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.lifecycle.Lifecycle
|
||||
import androidx.lifecycle.LifecycleEventObserver
|
||||
import com.expapp.trigger.BuildConfig
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import com.expapp.trigger.data.repository.DeviceRepository
|
||||
import com.expapp.trigger.network.NodeStatus
|
||||
import com.expapp.trigger.network.TriggerAction
|
||||
import com.expapp.trigger.network.TriggerClient
|
||||
import com.expapp.trigger.ui.components.UpdateDialog
|
||||
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.BorderSubtle
|
||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
||||
import com.expapp.trigger.ui.theme.OnlineBg
|
||||
import com.expapp.trigger.ui.theme.OnlineBorder
|
||||
import com.expapp.trigger.ui.theme.OnlineText
|
||||
import com.expapp.trigger.ui.theme.TextMuted
|
||||
import com.expapp.trigger.ui.theme.TextPrimary
|
||||
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 kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun MainScreen(
|
||||
repository: DeviceRepository,
|
||||
triggerClient: TriggerClient,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val lifecycleOwner = LocalLifecycleOwner.current
|
||||
|
||||
var devices by remember { mutableStateOf(repository.getDevices()) }
|
||||
val pagerState = rememberPagerState(pageCount = { devices.size + 1 })
|
||||
|
||||
var isAppInForeground by remember { mutableStateOf(true) }
|
||||
DisposableEffect(lifecycleOwner) {
|
||||
val obs = LifecycleEventObserver { _, event ->
|
||||
isAppInForeground = when (event) {
|
||||
Lifecycle.Event.ON_RESUME -> true
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
lifecycleOwner.lifecycle.addObserver(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 downloadState by remember { mutableStateOf<DownloadState>(DownloadState.Idle) }
|
||||
var isCheckingUpdate by remember { mutableStateOf(false) }
|
||||
|
||||
fun checkAppUpdate(showToast: Boolean = false) {
|
||||
isCheckingUpdate = true
|
||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||
isCheckingUpdate = false
|
||||
when (result) {
|
||||
is UpdateCheckResult.UpdateAvailable -> {
|
||||
availableUpdate = result.info
|
||||
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 statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
||||
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
||||
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
||||
var isSyncing by remember { mutableStateOf(false) }
|
||||
|
||||
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
||||
if (showIndicator || nodeStatuses[device.id] == null) {
|
||||
checkingStatusMap[device.id] = true
|
||||
}
|
||||
triggerClient.checkStatus(device) { status ->
|
||||
checkingStatusMap[device.id] = false
|
||||
nodeStatuses[device.id] = status
|
||||
}
|
||||
}
|
||||
|
||||
fun syncEndpoints(showToast: Boolean = false) {
|
||||
val current = repository.getDevices()
|
||||
if (current.isEmpty()) {
|
||||
checkAppUpdate(showToast)
|
||||
return
|
||||
}
|
||||
isSyncing = true
|
||||
var updated = 0; var completed = 0
|
||||
val total = current.count { it.r2Url.isNotBlank() }
|
||||
if (total == 0) {
|
||||
isSyncing = false
|
||||
checkAppUpdate(showToast)
|
||||
return
|
||||
}
|
||||
current.filter { it.r2Url.isNotBlank() }.forEach { device ->
|
||||
triggerClient.fetchR2Config(device.r2Url) { result ->
|
||||
completed++
|
||||
result.onSuccess { ep ->
|
||||
val changed = repository.updateEndpoints(device.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
||||
if (changed) { updated++; devices = repository.getDevices() }
|
||||
}
|
||||
if (completed == total) {
|
||||
isSyncing = false
|
||||
if (showToast) Toast.makeText(
|
||||
context,
|
||||
if (updated > 0) "Endpoints updated" else "Already up to date",
|
||||
Toast.LENGTH_SHORT
|
||||
).show()
|
||||
checkAppUpdate(showToast)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Initial R2 sync and update check on launch
|
||||
LaunchedEffect(Unit) {
|
||||
syncEndpoints(false)
|
||||
checkAppUpdate(false)
|
||||
}
|
||||
|
||||
// Active 5-second polling — only while in foreground on a device page
|
||||
LaunchedEffect(pagerState.currentPage, isAppInForeground, devices.size) {
|
||||
if (!isAppInForeground) return@LaunchedEffect
|
||||
val page = pagerState.currentPage
|
||||
if (page >= devices.size) return@LaunchedEffect
|
||||
val dev = devices[page]
|
||||
while (isActive && isAppInForeground) {
|
||||
refreshStatus(dev, showIndicator = false)
|
||||
delay(5000L)
|
||||
}
|
||||
}
|
||||
|
||||
fun executeAction(device: DeviceConfig, action: TriggerAction) {
|
||||
loadingStates[device.id] = true
|
||||
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()
|
||||
coroutineScope.launch {
|
||||
delay(1500); refreshStatus(device, showIndicator = true)
|
||||
delay(4000); refreshStatus(device)
|
||||
delay(5000); refreshStatus(device)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Spin animation for sync button
|
||||
val rotationAngle by animateFloatAsState(
|
||||
targetValue = if (isSyncing) 360f else 0f,
|
||||
animationSpec = if (isSyncing) tween(900, easing = FastOutSlowInEasing) else tween(0),
|
||||
label = "sync_rotate"
|
||||
)
|
||||
|
||||
Scaffold(
|
||||
modifier = modifier.fillMaxSize(),
|
||||
containerColor = BgBase,
|
||||
topBar = {
|
||||
CenterAlignedTopAppBar(
|
||||
title = {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Icon(
|
||||
Icons.Default.Terminal,
|
||||
contentDescription = null,
|
||||
tint = GreenVibrant,
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Text(
|
||||
text = "DEVICE TRIGGER",
|
||||
fontSize = 14.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
letterSpacing = 2.sp,
|
||||
color = TextPrimary,
|
||||
fontFamily = FontFamily.Monospace
|
||||
)
|
||||
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
|
||||
if (devices.isNotEmpty() && onlineCount > 0) {
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.background(OnlineBg)
|
||||
.border(1.dp, OnlineBorder, CircleShape)
|
||||
.padding(horizontal = 8.dp, vertical = 2.dp)
|
||||
) {
|
||||
Text(
|
||||
"$onlineCount online",
|
||||
fontSize = 10.sp,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = OnlineText,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
actions = {
|
||||
if (availableUpdate != null) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.background(GreenVibrant.copy(alpha = 0.15f))
|
||||
.border(1.dp, GreenVibrant.copy(alpha = 0.4f), RoundedCornerShape(8.dp))
|
||||
.clickable { showUpdateDialog = true }
|
||||
.padding(horizontal = 8.dp, vertical = 5.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(Icons.Default.SystemUpdate, null, tint = GreenVibrant, modifier = Modifier.size(13.dp))
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
Text(
|
||||
"v${availableUpdate!!.versionName}",
|
||||
color = GreenVibrant,
|
||||
fontSize = 11.sp,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.width(4.dp))
|
||||
}
|
||||
IconButton(onClick = { syncEndpoints(true) }, enabled = !isSyncing) {
|
||||
Icon(
|
||||
Icons.Default.Refresh,
|
||||
"Sync",
|
||||
tint = if (isSyncing) TextMuted else GreenVibrant,
|
||||
modifier = Modifier.rotate(rotationAngle)
|
||||
)
|
||||
}
|
||||
IconButton(
|
||||
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } }
|
||||
) {
|
||||
Icon(Icons.Default.Add, "Add Device", tint = GreenVibrant)
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
|
||||
containerColor = BgSurface
|
||||
)
|
||||
)
|
||||
},
|
||||
bottomBar = {
|
||||
val total = devices.size + 1
|
||||
if (total > 1) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = 14.dp),
|
||||
horizontalArrangement = Arrangement.Center,
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
repeat(total) { i ->
|
||||
val selected = pagerState.currentPage == i
|
||||
val isAdd = i == devices.size
|
||||
val dotColor = when {
|
||||
selected && !isAdd -> GreenVibrant
|
||||
selected -> TextSecondary
|
||||
isAdd -> TextMuted.copy(alpha = 0.4f)
|
||||
else -> TextMuted.copy(alpha = 0.3f)
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(horizontal = 3.dp)
|
||||
.height(6.dp)
|
||||
.width(if (selected) 22.dp else 6.dp)
|
||||
.clip(if (selected) RoundedCornerShape(3.dp) else CircleShape)
|
||||
.background(dotColor)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
) { padding ->
|
||||
HorizontalPager(
|
||||
state = pagerState,
|
||||
modifier = Modifier.fillMaxSize().padding(padding)
|
||||
) { page ->
|
||||
if (page < devices.size) {
|
||||
val dev = devices[page]
|
||||
DevicePage(
|
||||
device = dev,
|
||||
isLoading = loadingStates[dev.id] == true,
|
||||
nodeStatus = nodeStatuses[dev.id],
|
||||
isCheckingStatus = checkingStatusMap[dev.id] == true,
|
||||
lastStatus = statusStates[dev.id]?.first,
|
||||
lastSuccess = statusStates[dev.id]?.second,
|
||||
onDismissStatus = { statusStates.remove(dev.id) },
|
||||
onRefreshStatus = { refreshStatus(dev, showIndicator = true) },
|
||||
onTrigger = { action -> executeAction(dev, action) },
|
||||
onDelete = { d -> repository.deleteDevice(d.id); devices = repository.getDevices() },
|
||||
onSyncConfig = {
|
||||
triggerClient.fetchR2Config(dev.r2Url) { result ->
|
||||
result.onSuccess { ep ->
|
||||
val changed = repository.updateEndpoints(dev.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
||||
devices = repository.getDevices()
|
||||
val msg = if (changed) "Endpoints updated from R2" else "Endpoints already up to date"
|
||||
statusStates[dev.id] = msg to true
|
||||
refreshStatus(dev, showIndicator = true)
|
||||
}.onFailure { ex ->
|
||||
statusStates[dev.id] = "Failed to fetch R2: ${ex.message}" to false
|
||||
}
|
||||
}
|
||||
},
|
||||
onUpdateDevice = { updated ->
|
||||
repository.updateDevice(updated)
|
||||
devices = repository.getDevices()
|
||||
if (updated.r2Url.isNotBlank() && updated.r2Url != dev.r2Url) {
|
||||
triggerClient.fetchR2Config(updated.r2Url) { result ->
|
||||
result.onSuccess { ep ->
|
||||
repository.updateEndpoints(updated.id, ep.powerOn, ep.powerOff, ep.reboot, ep.status)
|
||||
devices = repository.getDevices()
|
||||
statusStates[updated.id] = "Device & endpoints updated" to true
|
||||
refreshStatus(updated, showIndicator = true)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
statusStates[updated.id] = "Device updated" to true
|
||||
}
|
||||
}
|
||||
)
|
||||
} else {
|
||||
AddDevicePage(
|
||||
triggerClient = triggerClient,
|
||||
onDeviceAdded = { newDev ->
|
||||
repository.addDevice(newDev)
|
||||
devices = repository.getDevices()
|
||||
refreshStatus(newDev, showIndicator = true)
|
||||
coroutineScope.launch {
|
||||
val idx = devices.indexOfFirst { it.id == newDev.id }
|
||||
if (idx >= 0) pagerState.animateScrollToPage(idx)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 ->
|
||||
updateManager.installApk(file)
|
||||
},
|
||||
onDismiss = {
|
||||
showUpdateDialog = false
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
package com.expapp.trigger.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
// ── Background System ─────────────────────────────────────────────────────
|
||||
val BgDeep = Color(0xFF060911) // deepest black-navy
|
||||
val BgBase = Color(0xFF0C0F1A) // main bg
|
||||
val BgSurface = Color(0xFF111827) // card surface
|
||||
val BgElevated = Color(0xFF1A2235) // elevated panels
|
||||
val BgGlass = Color(0x14FFFFFF) // frosted glass overlay
|
||||
|
||||
// ── Border System ─────────────────────────────────────────────────────────
|
||||
val BorderSubtle = Color(0xFF1E2D47) // very subtle border
|
||||
val BorderDefault = Color(0xFF253450) // standard border
|
||||
val BorderStrong = Color(0xFF334D73) // stronger border on hover/focus
|
||||
|
||||
// ── Text ──────────────────────────────────────────────────────────────────
|
||||
val TextPrimary = Color(0xFFF1F5F9) // near-white
|
||||
val TextSecondary = Color(0xFF8899B4) // muted blue-grey
|
||||
val TextMuted = Color(0xFF4A5F7A) // very muted
|
||||
|
||||
// ── Power On / Green ──────────────────────────────────────────────────────
|
||||
val GreenVibrant = Color(0xFF22D47E) // primary green
|
||||
val GreenDim = Color(0xFF16A361) // darker green
|
||||
val GreenGlow = Color(0x4022D47E) // transparent glow
|
||||
val GreenBg = Color(0xFF071A11) // dark green tinted bg
|
||||
val GreenBorder = Color(0xFF0D3D22) // green border
|
||||
|
||||
// ── Reboot / Amber ────────────────────────────────────────────────────────
|
||||
val AmberVibrant = Color(0xFFFFB627) // primary amber
|
||||
val AmberDim = Color(0xFFC47E00) // darker amber
|
||||
val AmberGlow = Color(0x40FFB627) // transparent glow
|
||||
val AmberBg = Color(0xFF191000) // dark amber tinted bg
|
||||
val AmberBorder = Color(0xFF3D2C00) // amber border
|
||||
|
||||
// ── Power Off / Red ───────────────────────────────────────────────────────
|
||||
val RedVibrant = Color(0xFFFF4757) // primary red
|
||||
val RedDim = Color(0xFFCC2233) // darker red
|
||||
val RedGlow = Color(0x40FF4757) // transparent glow
|
||||
val RedBg = Color(0xFF190004) // dark red tinted bg
|
||||
val RedBorder = Color(0xFF3D0010) // red border
|
||||
|
||||
// ── Status Colors ─────────────────────────────────────────────────────────
|
||||
val OnlineDot = Color(0xFF22D47E)
|
||||
val OnlineBg = Color(0xFF071A11)
|
||||
val OnlineBorder = Color(0xFF0E3B1E)
|
||||
val OnlineText = Color(0xFF34EE91)
|
||||
|
||||
val OfflineDot = Color(0xFFFF4757)
|
||||
val OfflineBg = Color(0xFF190004)
|
||||
val OfflineBorder = Color(0xFF3D0010)
|
||||
val OfflineText = Color(0xFFFF6B78)
|
||||
|
||||
// ── Backwards-compat aliases (keep these so other files compile) ──────────
|
||||
val DarkBackground = BgBase
|
||||
val DarkSurface = BgSurface
|
||||
val DarkSurfaceVariant = BgElevated
|
||||
val DarkCardBorder = BorderDefault
|
||||
val PowerOnGreen = GreenVibrant
|
||||
val PowerOnGreenLight = GreenVibrant
|
||||
val PowerOnBorder = GreenVibrant
|
||||
val PowerOnGradient = listOf(Color(0xFF0E3D22), Color(0xFF061610))
|
||||
val RebootAmber = AmberVibrant
|
||||
val RebootAmberLight = AmberVibrant
|
||||
val RebootBorder = AmberVibrant
|
||||
val RebootGradient = listOf(Color(0xFF3D2800), Color(0xFF1A1000))
|
||||
val PowerOffRed = RedVibrant
|
||||
val PowerOffRedLight = RedVibrant
|
||||
val PowerOffBorder = RedVibrant
|
||||
val PowerOffGradient = listOf(Color(0xFF3D0010), Color(0xFF190004))
|
||||
val StatusOnlineBg = OnlineBg
|
||||
val StatusOnlineBorder = OnlineBorder
|
||||
val StatusOnlineText = OnlineText
|
||||
val StatusOfflineBg = OfflineBg
|
||||
val StatusOfflineBorder = OfflineBorder
|
||||
val StatusOfflineText = OfflineText
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.expapp.trigger.ui.theme
|
||||
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = GreenVibrant,
|
||||
secondary = AmberVibrant,
|
||||
tertiary = RedVibrant,
|
||||
background = BgBase,
|
||||
surface = BgSurface,
|
||||
onPrimary = Color.White,
|
||||
onSecondary = Color.White,
|
||||
onTertiary = Color.White,
|
||||
onBackground = TextPrimary,
|
||||
onSurface = TextPrimary,
|
||||
surfaceVariant = BgElevated,
|
||||
outline = BorderDefault
|
||||
)
|
||||
|
||||
@Composable
|
||||
fun ExpAppTheme(content: @Composable () -> Unit) {
|
||||
MaterialTheme(
|
||||
colorScheme = DarkColorScheme,
|
||||
content = content
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,285 @@
|
||||
package com.expapp.trigger.update
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
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
|
||||
) {
|
||||
val url = "https://api.github.com/repos/$githubRepo/releases/latest"
|
||||
|
||||
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 json = JsonParser.parseString(body).asJsonObject
|
||||
val tagName = json.get("tag_name")?.asString.orEmpty()
|
||||
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()) {
|
||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||
return
|
||||
}
|
||||
|
||||
val cleanRemoteVersion = tagName.removePrefix("v").removePrefix("V").trim()
|
||||
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
|
||||
|
||||
if (isNewerVersion(cleanRemoteVersion, cleanLocalVersion)) {
|
||||
val releaseInfo = ReleaseInfo(
|
||||
tagName = tagName,
|
||||
versionName = cleanRemoteVersion,
|
||||
title = title,
|
||||
changelog = changelog,
|
||||
downloadUrl = apkUrl,
|
||||
apkFileName = apkName,
|
||||
sizeBytes = apkSize
|
||||
)
|
||||
runOnMain {
|
||||
callback(UpdateCheckResult.UpdateAvailable(releaseInfo))
|
||||
}
|
||||
} 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
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
|
After Width: | Height: | Size: 5.3 KiB |
|
After Width: | Height: | Size: 5.3 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
|
After Width: | Height: | Size: 7.5 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 16 KiB |
@@ -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>
|
||||
@@ -12,7 +12,8 @@ class R2ConfigParserTest {
|
||||
{
|
||||
"poweron": "https://cosmos.linuxguy.space/poweron",
|
||||
"poweroff": "https://cosmos.linuxguy.space/poweroff",
|
||||
"reboot": "https://cosmos.linuxguy.space/reboot"
|
||||
"reboot": "https://cosmos.linuxguy.space/reboot",
|
||||
"status": "https://cosmos.linuxguy.space/status"
|
||||
}
|
||||
""".trimIndent()
|
||||
|
||||
@@ -22,6 +23,7 @@ class R2ConfigParserTest {
|
||||
assertEquals("https://cosmos.linuxguy.space/poweron", endpoints.powerOn)
|
||||
assertEquals("https://cosmos.linuxguy.space/poweroff", endpoints.powerOff)
|
||||
assertEquals("https://cosmos.linuxguy.space/reboot", endpoints.reboot)
|
||||
assertEquals("https://cosmos.linuxguy.space/status", endpoints.status)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -64,4 +64,56 @@ class DeviceRepositoryTest {
|
||||
assertEquals(1, remaining.size)
|
||||
assertEquals("2", remaining[0].id)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun updateEndpoints_whenEndpointsChange_updatesDeviceAndReturnsTrue() {
|
||||
val device = DeviceConfig(
|
||||
id = "dev-1",
|
||||
name = "Debian Server",
|
||||
node = "debian",
|
||||
secretKey = "Carbon@12",
|
||||
r2Url = "https://r2.example.com/config.json",
|
||||
powerOnUrl = "https://old.url/on",
|
||||
powerOffUrl = "https://old.url/off",
|
||||
rebootUrl = "https://old.url/reboot"
|
||||
)
|
||||
repository.addDevice(device)
|
||||
|
||||
val updated = repository.updateEndpoints(
|
||||
deviceId = "dev-1",
|
||||
powerOnUrl = "https://new.url/on",
|
||||
powerOffUrl = "https://new.url/off",
|
||||
rebootUrl = "https://new.url/reboot"
|
||||
)
|
||||
|
||||
assertTrue(updated)
|
||||
val saved = repository.getDevices().first { it.id == "dev-1" }
|
||||
assertEquals("https://new.url/on", saved.powerOnUrl)
|
||||
assertEquals("https://new.url/off", saved.powerOffUrl)
|
||||
assertEquals("https://new.url/reboot", saved.rebootUrl)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun updateEndpoints_whenEndpointsIdentical_returnsFalse() {
|
||||
val device = DeviceConfig(
|
||||
id = "dev-1",
|
||||
name = "Debian Server",
|
||||
node = "debian",
|
||||
secretKey = "Carbon@12",
|
||||
r2Url = "https://r2.example.com/config.json",
|
||||
powerOnUrl = "https://same.url/on",
|
||||
powerOffUrl = "https://same.url/off",
|
||||
rebootUrl = "https://same.url/reboot"
|
||||
)
|
||||
repository.addDevice(device)
|
||||
|
||||
val updated = repository.updateEndpoints(
|
||||
deviceId = "dev-1",
|
||||
powerOnUrl = "https://same.url/on",
|
||||
powerOffUrl = "https://same.url/off",
|
||||
rebootUrl = "https://same.url/reboot"
|
||||
)
|
||||
|
||||
org.junit.Assert.assertFalse(updated)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,246 @@
|
||||
package com.expapp.trigger.network
|
||||
|
||||
import com.expapp.trigger.data.model.DeviceConfig
|
||||
import okhttp3.mockwebserver.MockResponse
|
||||
import okhttp3.mockwebserver.MockWebServer
|
||||
import okio.Buffer
|
||||
import org.junit.After
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class TriggerClientTest {
|
||||
|
||||
private lateinit var server: MockWebServer
|
||||
private lateinit var client: TriggerClient
|
||||
|
||||
private val sampleDevice = DeviceConfig(
|
||||
id = "test-1",
|
||||
name = "My Debian",
|
||||
node = "debian",
|
||||
secretKey = "Carbon@12",
|
||||
r2Url = "http://localhost/config.json",
|
||||
powerOnUrl = "https://cosmos.linuxguy.space/poweron",
|
||||
powerOffUrl = "https://cosmos.linuxguy.space/poweroff",
|
||||
rebootUrl = "https://cosmos.linuxguy.space/reboot"
|
||||
)
|
||||
|
||||
@Before
|
||||
fun setup() {
|
||||
server = MockWebServer()
|
||||
server.start()
|
||||
client = TriggerClient()
|
||||
}
|
||||
|
||||
@After
|
||||
fun tearDown() {
|
||||
server.shutdown()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun buildRequest_powerOff_hasCorrectMethodHeaderAndBody() {
|
||||
val request = client.buildRequest(sampleDevice, TriggerAction.POWER_OFF)
|
||||
|
||||
assertEquals("POST", request.method)
|
||||
assertEquals("https://cosmos.linuxguy.space/poweroff", request.url.toString())
|
||||
assertEquals("Carbon@12", request.header("X-Secret-Key"))
|
||||
|
||||
val buffer = Buffer()
|
||||
request.body?.writeTo(buffer)
|
||||
val bodyString = buffer.readUtf8()
|
||||
assertEquals("""{"node":"debian"}""", bodyString)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun buildRequest_reboot_usesRebootUrl() {
|
||||
val request = client.buildRequest(sampleDevice, TriggerAction.REBOOT)
|
||||
|
||||
assertEquals("POST", request.method)
|
||||
assertEquals("https://cosmos.linuxguy.space/reboot", request.url.toString())
|
||||
assertEquals("Carbon@12", request.header("X-Secret-Key"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun buildRequest_powerOn_usesGetMethodWithoutSecretKey() {
|
||||
val request = client.buildRequest(sampleDevice, TriggerAction.POWER_ON)
|
||||
|
||||
assertEquals("GET", request.method)
|
||||
assertEquals("https://cosmos.linuxguy.space/poweron", request.url.toString())
|
||||
org.junit.Assert.assertNull(request.header("X-Secret-Key"))
|
||||
org.junit.Assert.assertNull(request.body)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun sendTrigger_withMockServer_executesAndReturnsResponse() {
|
||||
server.enqueue(
|
||||
MockResponse()
|
||||
.setResponseCode(200)
|
||||
.setBody("""{"status":"shutting down"}""")
|
||||
)
|
||||
|
||||
val localDevice = sampleDevice.copy(
|
||||
powerOffUrl = server.url("/poweroff").toString()
|
||||
)
|
||||
|
||||
val latch = CountDownLatch(1)
|
||||
var responseResult: TriggerResponse? = null
|
||||
|
||||
client.sendTrigger(localDevice, TriggerAction.POWER_OFF) { response ->
|
||||
responseResult = response
|
||||
latch.countDown()
|
||||
}
|
||||
|
||||
assertTrue(latch.await(3, TimeUnit.SECONDS))
|
||||
val response = responseResult!!
|
||||
assertTrue(response.isSuccess)
|
||||
assertEquals(200, response.statusCode)
|
||||
assertTrue(response.message.contains("shutting down"))
|
||||
|
||||
val recorded = server.takeRequest()
|
||||
assertEquals("POST", recorded.method)
|
||||
assertEquals("Carbon@12", recorded.getHeader("X-Secret-Key"))
|
||||
assertEquals("""{"node":"debian"}""", recorded.body.readUtf8())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun fetchR2Config_withMockServer_returnsParsedEndpoints() {
|
||||
server.enqueue(
|
||||
MockResponse()
|
||||
.setResponseCode(200)
|
||||
.setBody(
|
||||
"""
|
||||
{
|
||||
"poweron": "https://cosmos.linuxguy.space/poweron",
|
||||
"poweroff": "https://cosmos.linuxguy.space/poweroff",
|
||||
"reboot": "https://cosmos.linuxguy.space/reboot"
|
||||
}
|
||||
""".trimIndent()
|
||||
)
|
||||
)
|
||||
|
||||
val latch = CountDownLatch(1)
|
||||
var fetchResult: Result<*>? = null
|
||||
|
||||
client.fetchR2Config(server.url("/config.json").toString()) { result ->
|
||||
fetchResult = result
|
||||
latch.countDown()
|
||||
}
|
||||
|
||||
assertTrue(latch.await(3, TimeUnit.SECONDS))
|
||||
val result = fetchResult!!
|
||||
assertTrue(result.isSuccess)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun checkStatus_withJsonResponse_parsesOnlineAndIp() {
|
||||
server.enqueue(
|
||||
MockResponse()
|
||||
.setResponseCode(200)
|
||||
.setBody(
|
||||
"""
|
||||
{
|
||||
"node": "debian",
|
||||
"online": true,
|
||||
"status": "online",
|
||||
"ip": "100.85.63.44",
|
||||
"on_since_duration": "57m 14s",
|
||||
"on_since_ist": "2026-11-18 02:42:33 PM IST",
|
||||
"uptime": "57m 14s",
|
||||
"uptime_seconds": 3434
|
||||
}
|
||||
""".trimIndent()
|
||||
)
|
||||
)
|
||||
|
||||
val localDevice = sampleDevice.copy(
|
||||
statusUrl = server.url("/status").toString()
|
||||
)
|
||||
|
||||
val latch = CountDownLatch(1)
|
||||
var statusResult: NodeStatus? = null
|
||||
|
||||
client.checkStatus(localDevice) { status ->
|
||||
statusResult = status
|
||||
latch.countDown()
|
||||
}
|
||||
|
||||
assertTrue(latch.await(3, TimeUnit.SECONDS))
|
||||
val status = statusResult!!
|
||||
assertTrue(status.isOnline)
|
||||
assertEquals("ONLINE", status.statusText)
|
||||
assertEquals("100.85.63.44", status.ip)
|
||||
assertEquals("57m 14s", status.uptime)
|
||||
assertEquals("2026-11-18 02:42:33 PM IST", status.onSinceIst)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun checkStatus_withOfflineHttp503Json_parsesOfflineAndLastActive() {
|
||||
server.enqueue(
|
||||
MockResponse()
|
||||
.setResponseCode(503)
|
||||
.setBody(
|
||||
"""
|
||||
{
|
||||
"node": "debian",
|
||||
"online": false,
|
||||
"status": "offline",
|
||||
"ip": "100.85.63.44",
|
||||
"last_active_ist": "2026-11-18 03:36:58 PM IST",
|
||||
"last_active_time": "2026-11-18 15:36:58 IST",
|
||||
"last_active_ago": "4m 12s ago",
|
||||
"last_active_timestamp": 1794996418
|
||||
}
|
||||
""".trimIndent()
|
||||
)
|
||||
)
|
||||
|
||||
val localDevice = sampleDevice.copy(
|
||||
statusUrl = server.url("/status").toString()
|
||||
)
|
||||
|
||||
val latch = CountDownLatch(1)
|
||||
var statusResult: NodeStatus? = null
|
||||
|
||||
client.checkStatus(localDevice) { status ->
|
||||
statusResult = status
|
||||
latch.countDown()
|
||||
}
|
||||
|
||||
assertTrue(latch.await(3, TimeUnit.SECONDS))
|
||||
val status = statusResult!!
|
||||
assertEquals(false, status.isOnline)
|
||||
assertEquals("OFFLINE", status.statusText)
|
||||
assertEquals("100.85.63.44", status.ip)
|
||||
assertEquals("4m 12s ago", status.lastActiveAgo)
|
||||
assertEquals("2026-11-18 03:36:58 PM IST", status.lastActiveIst)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun checkStatus_withPlainText_parsesOnline() {
|
||||
server.enqueue(
|
||||
MockResponse()
|
||||
.setResponseCode(200)
|
||||
.setBody("ONLINE")
|
||||
)
|
||||
|
||||
val localDevice = sampleDevice.copy(
|
||||
statusUrl = server.url("/ping").toString()
|
||||
)
|
||||
|
||||
val latch = CountDownLatch(1)
|
||||
var statusResult: NodeStatus? = null
|
||||
|
||||
client.checkStatus(localDevice) { status ->
|
||||
statusResult = status
|
||||
latch.countDown()
|
||||
}
|
||||
|
||||
assertTrue(latch.await(3, TimeUnit.SECONDS))
|
||||
val status = statusResult!!
|
||||
assertTrue(status.isOnline)
|
||||
assertEquals("ONLINE", status.statusText)
|
||||
}
|
||||
}
|
||||
@@ -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"))
|
||||
}
|
||||
}
|
||||