3 Commits
Author SHA1 Message Date
Vaishno Singh bba5caf79d fix(ui,update): remove refresh button, rely on pull-to-refresh, sync update check in background worker (v1.1.9)
Build & Release Android APK / Build & Publish Release APK (push) Successful in 32m10s
2026-11-19 10:50:47 +05:30
Vaishno Singh d8eaceb314 fix(ui): eliminate button overlapping with overflow menu & clean top bar (v1.1.8)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:35:50 +05:30
Vaishno Singh 256cc6cfc8 feat: send notification when new app update is available (v1.1.7)
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
2026-11-19 10:24:51 +05:30
7 changed files with 219 additions and 189 deletions
+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger" applicationId = "com.expapp.trigger"
minSdk = 24 minSdk = 24
targetSdk = 34 targetSdk = 34
versionCode = 10 versionCode = 13
versionName = "1.1.6" versionName = "1.1.9"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
@@ -10,6 +10,14 @@ class AppSettings(private val storage: KeyValueStorage) {
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled" private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled" private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
private const val KEY_LAST_STATUS_PREFIX = "last_status_" private const val KEY_LAST_STATUS_PREFIX = "last_status_"
private const val KEY_LAST_NOTIFIED_VERSION = "key_last_notified_version"
}
var lastNotifiedUpdateVersion: String?
get() = storage.getString(KEY_LAST_NOTIFIED_VERSION, null)
set(value) {
if (value != null) storage.putString(KEY_LAST_NOTIFIED_VERSION, value)
else storage.remove(KEY_LAST_NOTIFIED_VERSION)
} }
var isBiometricEnabled: Boolean var isBiometricEnabled: Boolean
@@ -31,12 +31,13 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.CloudSync import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.PowerOff import androidx.compose.material.icons.filled.PowerOff
import androidx.compose.material.icons.filled.PowerSettingsNew import androidx.compose.material.icons.filled.PowerSettingsNew
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.icons.filled.RestartAlt import androidx.compose.material.icons.filled.RestartAlt
import androidx.compose.material.icons.filled.Schedule import androidx.compose.material.icons.filled.Schedule
import androidx.compose.material.icons.filled.Terminal import androidx.compose.material.icons.filled.Terminal
@@ -119,6 +120,7 @@ fun DevicePage(
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) } var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
var showDeleteConfirm by remember { mutableStateOf(false) } var showDeleteConfirm by remember { mutableStateOf(false) }
var showEditDialog by remember { mutableStateOf(false) } var showEditDialog by remember { mutableStateOf(false) }
var showMenu by remember { mutableStateOf(false) }
if (showEditDialog) { if (showEditDialog) {
var editName by remember { mutableStateOf(device.name) } var editName by remember { mutableStateOf(device.name) }
@@ -259,15 +261,8 @@ fun DevicePage(
) )
} }
// 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 // Pulse for online dot
val infiniteTransition = rememberInfiniteTransition(label = "pulse_transition")
val pulseScale by infiniteTransition.animateFloat( val pulseScale by infiniteTransition.animateFloat(
initialValue = 0.8f, targetValue = 1.5f, initialValue = 0.8f, targetValue = 1.5f,
animationSpec = infiniteRepeatable( animationSpec = infiniteRepeatable(
@@ -391,46 +386,10 @@ fun DevicePage(
) )
} }
// Compact, non-overlapping button bar // Device options menu (Edit / Delete)
Row( Box {
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
// Refresh button (syncs status & R2 endpoints)
IconButton( IconButton(
onClick = { onClick = { showMenu = true },
if (!isCheckingStatus) {
onRefreshStatus()
onSyncConfig()
}
},
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.15f)
else BorderSubtle.copy(alpha = 0.25f)
)
.border(
1.dp,
if (isCheckingStatus) GreenVibrant.copy(alpha = 0.4f)
else BorderSubtle,
RoundedCornerShape(9.dp)
)
) {
Icon(
imageVector = Icons.Default.Refresh,
contentDescription = "Refresh server",
tint = if (isCheckingStatus) GreenVibrant else TextSecondary,
modifier = Modifier
.size(17.dp)
.rotate(if (isCheckingStatus) spinAngle else 0f)
)
}
// Edit device button
IconButton(
onClick = { showEditDialog = true },
modifier = Modifier modifier = Modifier
.size(34.dp) .size(34.dp)
.clip(RoundedCornerShape(9.dp)) .clip(RoundedCornerShape(9.dp))
@@ -438,27 +397,49 @@ fun DevicePage(
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) { ) {
Icon( Icon(
imageVector = Icons.Default.Edit, imageVector = Icons.Default.MoreVert,
contentDescription = "Edit device", contentDescription = "Device options",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(16.dp) modifier = Modifier.size(18.dp)
) )
} }
// Delete button DropdownMenu(
IconButton( expanded = showMenu,
onClick = { showDeleteConfirm = true }, onDismissRequest = { showMenu = false },
modifier = Modifier modifier = Modifier
.size(34.dp) .background(BgElevated)
.clip(RoundedCornerShape(9.dp)) .border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
.background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) { ) {
DropdownMenuItem(
text = { Text("Edit Device", color = TextPrimary) },
leadingIcon = {
Icon( Icon(
imageVector = Icons.Default.DeleteOutline, Icons.Default.Edit,
contentDescription = "Remove device", contentDescription = null,
tint = RedVibrant.copy(alpha = 0.8f), tint = TextSecondary,
modifier = Modifier.size(17.dp) modifier = Modifier.size(18.dp)
)
},
onClick = {
showMenu = false
showEditDialog = true
}
)
DropdownMenuItem(
text = { Text("Remove Device", color = RedVibrant) },
leadingIcon = {
Icon(
Icons.Default.DeleteOutline,
contentDescription = null,
tint = RedVibrant,
modifier = Modifier.size(18.dp)
)
},
onClick = {
showMenu = false
showDeleteConfirm = true
}
) )
} }
} }
@@ -210,6 +210,11 @@ fun MainScreen(
is UpdateCheckResult.UpdateAvailable -> { is UpdateCheckResult.UpdateAvailable -> {
availableUpdate = result.info availableUpdate = result.info
showUpdateDialog = true showUpdateDialog = true
val newVer = result.info.versionName
if (appSettings.lastNotifiedUpdateVersion != newVer) {
appSettings.lastNotifiedUpdateVersion = newVer
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer)
}
if (isManual) { if (isManual) {
Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show() Toast.makeText(context, "New update available: v${result.info.versionName}!", Toast.LENGTH_SHORT).show()
} }
@@ -322,13 +327,6 @@ fun MainScreen(
} }
} }
// 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( Scaffold(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),
containerColor = BgBase, containerColor = BgBase,
@@ -336,52 +334,50 @@ fun MainScreen(
TopAppBar( TopAppBar(
title = { title = {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically
modifier = Modifier.padding(start = 2.dp)
) { ) {
Icon( Icon(
Icons.Default.Terminal, Icons.Default.Terminal,
contentDescription = null, contentDescription = null,
tint = GreenVibrant, tint = GreenVibrant,
modifier = Modifier.size(18.dp) modifier = Modifier.size(16.dp)
) )
Spacer(modifier = Modifier.width(6.dp)) Spacer(modifier = Modifier.width(4.dp))
Text( Text(
text = "DEVICE TRIGGER", text = "TRIGGER",
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
letterSpacing = 1.2.sp, letterSpacing = 1.sp,
color = TextPrimary, color = TextPrimary,
fontFamily = FontFamily.Monospace, fontFamily = FontFamily.Monospace,
maxLines = 1 maxLines = 1
) )
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true } val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
if (devices.isNotEmpty() && onlineCount > 0) { if (devices.isNotEmpty() && onlineCount > 0) {
Spacer(modifier = Modifier.width(6.dp)) Spacer(modifier = Modifier.width(4.dp))
Box( Box(
modifier = Modifier modifier = Modifier
.clip(CircleShape) .clip(CircleShape)
.background(OnlineBg) .background(OnlineBg)
.border(1.dp, OnlineBorder, CircleShape) .border(1.dp, OnlineBorder, CircleShape)
.padding(horizontal = 6.dp, vertical = 2.dp) .padding(horizontal = 5.dp, vertical = 1.dp)
) { ) {
Text( Text(
"$onlineCount on", "$onlineCount",
fontSize = 9.sp, fontSize = 9.sp,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = OnlineText, color = OnlineText
letterSpacing = 0.5.sp
) )
} }
} }
} }
}, },
actions = { actions = {
// Update Button // Update Button (only when update is ready)
if (availableUpdate != null) { if (availableUpdate != null) {
IconButton( IconButton(
onClick = { showUpdateDialog = true }, onClick = { showUpdateDialog = true },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Box(contentAlignment = Alignment.TopEnd) { Box(contentAlignment = Alignment.TopEnd) {
Icon( Icon(
@@ -406,55 +402,39 @@ fun MainScreen(
historyLogs = historyRepository.getLogs() historyLogs = historyRepository.getLogs()
showHistoryDialog = true showHistoryDialog = true
}, },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.History, Icons.Default.History,
contentDescription = "Trigger History", contentDescription = "Trigger History",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(19.dp) modifier = Modifier.size(18.dp)
) )
} }
// Settings Button // Settings Button
IconButton( IconButton(
onClick = { showSettingsDialog = true }, onClick = { showSettingsDialog = true },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.Settings, Icons.Default.Settings,
contentDescription = "Settings", contentDescription = "Settings",
tint = TextSecondary, tint = TextSecondary,
modifier = Modifier.size(19.dp) modifier = Modifier.size(18.dp)
)
}
// Unified Refresh / Sync Button
IconButton(
onClick = { refreshWholePage() },
enabled = !isSyncing && !isPullRefreshing,
modifier = Modifier.size(32.dp)
) {
Icon(
Icons.Default.Refresh,
"Refresh all",
tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
modifier = Modifier
.size(19.dp)
.rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f)
) )
} }
// Add Device Button // Add Device Button
IconButton( IconButton(
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } }, onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
modifier = Modifier.size(32.dp) modifier = Modifier.size(30.dp)
) { ) {
Icon( Icon(
Icons.Default.Add, Icons.Default.Add,
"Add Device", "Add Device",
tint = GreenVibrant, tint = GreenVibrant,
modifier = Modifier.size(20.dp) modifier = Modifier.size(19.dp)
) )
} }
}, },
@@ -44,15 +44,11 @@ class UpdateManager(
} }
/** /**
* Checks GitHub Releases API for the latest published release. * Synchronously checks GitHub Releases API for the latest published release.
* Suitable for use inside background workers (e.g. WorkManager CoroutineWorker).
*/ */
fun checkForUpdate( fun checkForUpdateSync(currentVersionName: String): UpdateCheckResult {
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Query releases list so we always inspect the highest semantic version
val url = "https://api.github.com/repos/$githubRepo/releases" val url = "https://api.github.com/repos/$githubRepo/releases"
val request = Request.Builder() val request = Request.Builder()
.url(url) .url(url)
.addHeader("Accept", "application/vnd.github.v3+json") .addHeader("Accept", "application/vnd.github.v3+json")
@@ -60,33 +56,29 @@ class UpdateManager(
.get() .get()
.build() .build()
okHttpClient.newCall(request).enqueue(object : Callback { return try {
override fun onFailure(call: Call, e: IOException) { val response = okHttpClient.newCall(request).execute()
runOnMain {
callback(UpdateCheckResult.Error("Network error: ${e.localizedMessage}"))
}
}
override fun onResponse(call: Call, response: Response) {
response.use { res -> response.use { res ->
if (res.code == 404) { if (res.code == 404) {
runOnMain { callback(UpdateCheckResult.UpToDate) } return UpdateCheckResult.UpToDate
return
} }
if (!res.isSuccessful) { if (!res.isSuccessful) {
runOnMain { return UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates")
callback(UpdateCheckResult.Error("HTTP ${res.code}: Unable to check updates")) }
val body = res.body?.string().orEmpty()
parseReleases(body, currentVersionName)
}
} catch (e: Exception) {
UpdateCheckResult.Error("Network error: ${e.localizedMessage}")
} }
return
} }
val body = res.body?.string().orEmpty() private fun parseReleases(body: String, currentVersionName: String): UpdateCheckResult {
try { return try {
val jsonElement = JsonParser.parseString(body) val jsonElement = JsonParser.parseString(body)
val releasesArray = if (jsonElement.isJsonArray) { val releasesArray = if (jsonElement.isJsonArray) {
jsonElement.asJsonArray jsonElement.asJsonArray
} else { } else {
// In case a single release object was returned
val arr = com.google.gson.JsonArray() val arr = com.google.gson.JsonArray()
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject) if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
arr arr
@@ -143,24 +135,61 @@ class UpdateManager(
} }
if (highestRelease == null) { if (highestRelease == null) {
runOnMain { callback(UpdateCheckResult.UpToDate) } return UpdateCheckResult.UpToDate
return
} }
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim() val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) { if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
runOnMain { UpdateCheckResult.UpdateAvailable(highestRelease)
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
}
} else { } else {
runOnMain { callback(UpdateCheckResult.UpToDate) } UpdateCheckResult.UpToDate
} }
} catch (e: Exception) { } catch (e: Exception) {
UpdateCheckResult.Error("Failed to parse update info: ${e.message}")
}
}
/**
* Checks GitHub Releases API for the latest published release.
*/
fun checkForUpdate(
currentVersionName: String,
callback: (UpdateCheckResult) -> Unit
) {
// Query releases list so we always inspect the highest semantic version
val url = "https://api.github.com/repos/$githubRepo/releases"
val request = Request.Builder()
.url(url)
.addHeader("Accept", "application/vnd.github.v3+json")
.addHeader("User-Agent", "ServerControlApp")
.get()
.build()
okHttpClient.newCall(request).enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
runOnMain { runOnMain {
callback(UpdateCheckResult.Error("Failed to parse update info: ${e.message}")) 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()
val result = parseReleases(body, currentVersionName)
runOnMain { callback(result) }
} }
} }
}) })
@@ -45,12 +45,16 @@ object NotificationHelper {
id: Int, id: Int,
title: String, title: String,
message: String, message: String,
isSuccess: Boolean = true isSuccess: Boolean = true,
extraAction: String? = null
): Boolean { ): Boolean {
createNotificationChannel(context) createNotificationChannel(context)
val intent = Intent(context, MainActivity::class.java).apply { val intent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
if (extraAction != null) {
putExtra("action_trigger", extraAction)
}
} }
val pendingIntent = PendingIntent.getActivity( val pendingIntent = PendingIntent.getActivity(
context, context,
@@ -81,6 +85,17 @@ object NotificationHelper {
} }
} }
fun sendUpdateAvailableNotification(context: Context, newVersion: String): Boolean {
return sendNotification(
context = context,
id = 8888,
title = "🚀 Update Available: v$newVersion",
message = "A new version (v$newVersion) of Device Trigger is ready to install. Tap to update!",
isSuccess = true,
extraAction = "open_update"
)
}
fun sendTestNotification(context: Context): Boolean { fun sendTestNotification(context: Context): Boolean {
return sendNotification( return sendNotification(
context = context, context = context,
@@ -120,6 +120,23 @@ class ServerMonitorWorker(
} }
} }
// Check for app updates in the background synchronously and notify if a new update is found
try {
val updateManager = com.expapp.trigger.update.UpdateManager(appContext)
val currentVersion = com.expapp.trigger.BuildConfig.VERSION_NAME
val result = updateManager.checkForUpdateSync(currentVersion)
if (result is com.expapp.trigger.update.UpdateCheckResult.UpdateAvailable) {
val newVer = result.info.versionName
val lastNotified = appSettings.lastNotifiedUpdateVersion
if (lastNotified != newVer) {
appSettings.lastNotifiedUpdateVersion = newVer
NotificationHelper.sendUpdateAvailableNotification(appContext, newVer)
}
}
} catch (_: Exception) {
// Ignore background check failure
}
return Result.success() return Result.success()
} }
} }