2 Commits
Author SHA1 Message Date
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
6 changed files with 127 additions and 79 deletions
+2 -2
View File
@@ -11,8 +11,8 @@ android {
applicationId = "com.expapp.trigger"
minSdk = 24
targetSdk = 34
versionCode = 10
versionName = "1.1.6"
versionCode = 12
versionName = "1.1.8"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
@@ -10,8 +10,16 @@ class AppSettings(private val storage: KeyValueStorage) {
private const val KEY_BIOMETRIC_ENABLED = "key_biometric_enabled"
private const val KEY_BG_MONITOR_ENABLED = "key_bg_monitor_enabled"
private const val KEY_LAST_STATUS_PREFIX = "last_status_"
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
get() = storage.getBoolean(KEY_BIOMETRIC_ENABLED, true)
set(value) = storage.putBoolean(KEY_BIOMETRIC_ENABLED, value)
@@ -31,7 +31,9 @@ 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.MoreVert
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material.icons.filled.DeleteOutline
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.PowerOff
@@ -119,6 +121,7 @@ fun DevicePage(
var pendingAction by remember { mutableStateOf<TriggerAction?>(null) }
var showDeleteConfirm by remember { mutableStateOf(false) }
var showEditDialog by remember { mutableStateOf(false) }
var showMenu by remember { mutableStateOf(false) }
if (showEditDialog) {
var editName by remember { mutableStateOf(device.name) }
@@ -391,10 +394,10 @@ fun DevicePage(
)
}
// Compact, non-overlapping button bar
// Compact, non-overlapping actions: Single Refresh + Overflow Menu
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
horizontalArrangement = Arrangement.spacedBy(6.dp)
) {
// Refresh button (syncs status & R2 endpoints)
IconButton(
@@ -428,38 +431,62 @@ fun DevicePage(
)
}
// Edit device button
IconButton(
onClick = { showEditDialog = true },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(BorderSubtle.copy(alpha = 0.25f))
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.Edit,
contentDescription = "Edit device",
tint = TextSecondary,
modifier = Modifier.size(16.dp)
)
}
// More Options Overflow (Edit / Delete)
Box {
IconButton(
onClick = { showMenu = true },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(BorderSubtle.copy(alpha = 0.25f))
.border(1.dp, BorderSubtle, RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.MoreVert,
contentDescription = "Device options",
tint = TextSecondary,
modifier = Modifier.size(18.dp)
)
}
// Delete button
IconButton(
onClick = { showDeleteConfirm = true },
modifier = Modifier
.size(34.dp)
.clip(RoundedCornerShape(9.dp))
.background(RedVibrant.copy(alpha = 0.08f))
.border(1.dp, RedVibrant.copy(alpha = 0.2f), RoundedCornerShape(9.dp))
) {
Icon(
imageVector = Icons.Default.DeleteOutline,
contentDescription = "Remove device",
tint = RedVibrant.copy(alpha = 0.8f),
modifier = Modifier.size(17.dp)
)
DropdownMenu(
expanded = showMenu,
onDismissRequest = { showMenu = false },
modifier = Modifier
.background(BgElevated)
.border(1.dp, BorderSubtle, RoundedCornerShape(12.dp))
) {
DropdownMenuItem(
text = { Text("Edit Device", color = TextPrimary) },
leadingIcon = {
Icon(
Icons.Default.Edit,
contentDescription = null,
tint = TextSecondary,
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 -> {
availableUpdate = result.info
showUpdateDialog = true
val newVer = result.info.versionName
if (appSettings.lastNotifiedUpdateVersion != newVer) {
appSettings.lastNotifiedUpdateVersion = newVer
com.expapp.trigger.worker.NotificationHelper.sendUpdateAvailableNotification(context, newVer)
}
if (isManual) {
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(
modifier = modifier.fillMaxSize(),
containerColor = BgBase,
@@ -336,52 +334,50 @@ fun MainScreen(
TopAppBar(
title = {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 2.dp)
verticalAlignment = Alignment.CenterVertically
) {
Icon(
Icons.Default.Terminal,
contentDescription = null,
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 = "DEVICE TRIGGER",
text = "TRIGGER",
fontSize = 12.sp,
fontWeight = FontWeight.Bold,
letterSpacing = 1.2.sp,
letterSpacing = 1.sp,
color = TextPrimary,
fontFamily = FontFamily.Monospace,
maxLines = 1
)
val onlineCount = devices.count { nodeStatuses[it.id]?.isOnline == true }
if (devices.isNotEmpty() && onlineCount > 0) {
Spacer(modifier = Modifier.width(6.dp))
Spacer(modifier = Modifier.width(4.dp))
Box(
modifier = Modifier
.clip(CircleShape)
.background(OnlineBg)
.border(1.dp, OnlineBorder, CircleShape)
.padding(horizontal = 6.dp, vertical = 2.dp)
.padding(horizontal = 5.dp, vertical = 1.dp)
) {
Text(
"$onlineCount on",
"$onlineCount",
fontSize = 9.sp,
fontWeight = FontWeight.Bold,
color = OnlineText,
letterSpacing = 0.5.sp
color = OnlineText
)
}
}
}
},
actions = {
// Update Button
// Update Button (only when update is ready)
if (availableUpdate != null) {
IconButton(
onClick = { showUpdateDialog = true },
modifier = Modifier.size(32.dp)
modifier = Modifier.size(30.dp)
) {
Box(contentAlignment = Alignment.TopEnd) {
Icon(
@@ -406,55 +402,39 @@ fun MainScreen(
historyLogs = historyRepository.getLogs()
showHistoryDialog = true
},
modifier = Modifier.size(32.dp)
modifier = Modifier.size(30.dp)
) {
Icon(
Icons.Default.History,
contentDescription = "Trigger History",
tint = TextSecondary,
modifier = Modifier.size(19.dp)
modifier = Modifier.size(18.dp)
)
}
// Settings Button
IconButton(
onClick = { showSettingsDialog = true },
modifier = Modifier.size(32.dp)
modifier = Modifier.size(30.dp)
) {
Icon(
Icons.Default.Settings,
contentDescription = "Settings",
tint = TextSecondary,
modifier = Modifier.size(19.dp)
)
}
// Unified Refresh / Sync Button
IconButton(
onClick = { refreshWholePage() },
enabled = !isSyncing && !isPullRefreshing,
modifier = Modifier.size(32.dp)
) {
Icon(
Icons.Default.Refresh,
"Refresh all",
tint = if (isSyncing || isPullRefreshing) TextMuted else GreenVibrant,
modifier = Modifier
.size(19.dp)
.rotate(if (isSyncing || isPullRefreshing) rotationAngle else 0f)
modifier = Modifier.size(18.dp)
)
}
// Add Device Button
IconButton(
onClick = { coroutineScope.launch { pagerState.animateScrollToPage(devices.size) } },
modifier = Modifier.size(32.dp)
modifier = Modifier.size(30.dp)
) {
Icon(
Icons.Default.Add,
"Add Device",
tint = GreenVibrant,
modifier = Modifier.size(20.dp)
modifier = Modifier.size(19.dp)
)
}
},
@@ -45,12 +45,16 @@ object NotificationHelper {
id: Int,
title: String,
message: String,
isSuccess: Boolean = true
isSuccess: Boolean = true,
extraAction: String? = null
): Boolean {
createNotificationChannel(context)
val intent = Intent(context, MainActivity::class.java).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
if (extraAction != null) {
putExtra("action_trigger", extraAction)
}
}
val pendingIntent = PendingIntent.getActivity(
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 {
return sendNotification(
context = context,
@@ -120,6 +120,24 @@ class ServerMonitorWorker(
}
}
// Check for app updates in the background 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
updateManager.checkForUpdate(currentVersion) { result ->
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()
}
}