Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff989afcc1 |
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 4
|
versionCode = 5
|
||||||
versionName = "1.1.0"
|
versionName = "1.1.1"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ import com.expapp.trigger.ui.screens.MainScreen
|
|||||||
import com.expapp.trigger.ui.theme.DarkBackground
|
import com.expapp.trigger.ui.theme.DarkBackground
|
||||||
import com.expapp.trigger.ui.theme.ExpAppTheme
|
import com.expapp.trigger.ui.theme.ExpAppTheme
|
||||||
import com.expapp.trigger.widget.ServerWidgetProvider
|
import com.expapp.trigger.widget.ServerWidgetProvider
|
||||||
|
import com.expapp.trigger.worker.NotificationHelper
|
||||||
import com.expapp.trigger.worker.ServerMonitorWorker
|
import com.expapp.trigger.worker.ServerMonitorWorker
|
||||||
|
|
||||||
class MainActivity : FragmentActivity() {
|
class MainActivity : FragmentActivity() {
|
||||||
@@ -50,11 +51,39 @@ class MainActivity : FragmentActivity() {
|
|||||||
private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null)
|
private var activeNfcWritePayload by mutableStateOf<NfcTriggerPayload?>(null)
|
||||||
private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null)
|
private var nfcWriteResult by mutableStateOf<Result<Unit>?>(null)
|
||||||
|
|
||||||
|
private var isNotificationPermissionGranted by mutableStateOf(false)
|
||||||
|
private var onNotificationPermissionGrantedCallback: (() -> Unit)? = null
|
||||||
|
|
||||||
private val notificationPermissionLauncher =
|
private val notificationPermissionLauncher =
|
||||||
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
|
registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
|
||||||
if (isGranted && appSettings.isBackgroundMonitoringEnabled) {
|
isNotificationPermissionGranted = isGranted || NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
if (isGranted) {
|
||||||
|
NotificationHelper.createNotificationChannel(this)
|
||||||
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
ServerMonitorWorker.schedule(this)
|
ServerMonitorWorker.schedule(this)
|
||||||
}
|
}
|
||||||
|
onNotificationPermissionGrantedCallback?.invoke()
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "Notification permission is required for alerts", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
onNotificationPermissionGrantedCallback = null
|
||||||
|
}
|
||||||
|
|
||||||
|
fun requestNotificationPermission(onGranted: () -> Unit = {}) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
== PackageManager.PERMISSION_GRANTED
|
||||||
|
) {
|
||||||
|
isNotificationPermissionGranted = true
|
||||||
|
onGranted()
|
||||||
|
} else {
|
||||||
|
onNotificationPermissionGrantedCallback = onGranted
|
||||||
|
notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
onGranted()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@@ -66,6 +95,9 @@ class MainActivity : FragmentActivity() {
|
|||||||
appSettings = AppSettings(applicationContext)
|
appSettings = AppSettings(applicationContext)
|
||||||
historyRepository = TriggerHistoryRepository(applicationContext)
|
historyRepository = TriggerHistoryRepository(applicationContext)
|
||||||
|
|
||||||
|
NotificationHelper.createNotificationChannel(this)
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
|
|
||||||
// Request notification permission on Android 13+
|
// Request notification permission on Android 13+
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
|
||||||
@@ -77,7 +109,6 @@ class MainActivity : FragmentActivity() {
|
|||||||
|
|
||||||
// Initialize background server monitoring
|
// Initialize background server monitoring
|
||||||
if (appSettings.isBackgroundMonitoringEnabled) {
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
ServerMonitorWorker.createNotificationChannel(this)
|
|
||||||
ServerMonitorWorker.schedule(this)
|
ServerMonitorWorker.schedule(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,6 +131,18 @@ class MainActivity : FragmentActivity() {
|
|||||||
onResult(success)
|
onResult(success)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||||
|
onRequestNotificationPermission = {
|
||||||
|
requestNotificationPermission()
|
||||||
|
},
|
||||||
|
onSendTestNotification = {
|
||||||
|
val ok = NotificationHelper.sendTestNotification(this)
|
||||||
|
if (ok) {
|
||||||
|
Toast.makeText(this, "Test notification sent!", Toast.LENGTH_SHORT).show()
|
||||||
|
} else {
|
||||||
|
Toast.makeText(this, "Notification failed to send. Check system permissions.", Toast.LENGTH_LONG).show()
|
||||||
|
}
|
||||||
|
},
|
||||||
nfcWriteResult = nfcWriteResult,
|
nfcWriteResult = nfcWriteResult,
|
||||||
onStartNfcWriting = { payload ->
|
onStartNfcWriting = { payload ->
|
||||||
nfcWriteResult = null
|
nfcWriteResult = null
|
||||||
@@ -117,6 +160,7 @@ class MainActivity : FragmentActivity() {
|
|||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
isNotificationPermissionGranted = NotificationHelper.areNotificationsEnabled(this)
|
||||||
if (NfcHelper.isNfcSupported(this)) {
|
if (NfcHelper.isNfcSupported(this)) {
|
||||||
NfcHelper.enableForegroundDispatch(this)
|
NfcHelper.enableForegroundDispatch(this)
|
||||||
}
|
}
|
||||||
@@ -129,6 +173,15 @@ class MainActivity : FragmentActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onStop() {
|
||||||
|
super.onStop()
|
||||||
|
// When leaving the app, trigger an immediate one-time check & ensure worker is scheduled
|
||||||
|
if (appSettings.isBackgroundMonitoringEnabled) {
|
||||||
|
ServerMonitorWorker.runOnce(this)
|
||||||
|
ServerMonitorWorker.schedule(this)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun onNewIntent(intent: Intent) {
|
override fun onNewIntent(intent: Intent) {
|
||||||
super.onNewIntent(intent)
|
super.onNewIntent(intent)
|
||||||
setIntent(intent)
|
setIntent(intent)
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
package com.expapp.trigger.ui.components
|
package com.expapp.trigger.ui.components
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.net.Uri
|
||||||
|
import android.os.Build
|
||||||
|
import android.provider.Settings
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
@@ -19,7 +23,11 @@ import androidx.compose.material.icons.filled.Close
|
|||||||
import androidx.compose.material.icons.filled.Fingerprint
|
import androidx.compose.material.icons.filled.Fingerprint
|
||||||
import androidx.compose.material.icons.filled.Nfc
|
import androidx.compose.material.icons.filled.Nfc
|
||||||
import androidx.compose.material.icons.filled.Notifications
|
import androidx.compose.material.icons.filled.Notifications
|
||||||
|
import androidx.compose.material.icons.filled.NotificationsActive
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
|
import androidx.compose.material.icons.filled.Warning
|
||||||
|
import androidx.compose.material3.Button
|
||||||
|
import androidx.compose.material3.ButtonDefaults
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.Surface
|
import androidx.compose.material3.Surface
|
||||||
@@ -30,17 +38,20 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.clip
|
import androidx.compose.ui.draw.clip
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
import androidx.compose.ui.text.font.FontFamily
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
import androidx.compose.ui.window.Dialog
|
import androidx.compose.ui.window.Dialog
|
||||||
import com.expapp.trigger.BuildConfig
|
import com.expapp.trigger.BuildConfig
|
||||||
|
import com.expapp.trigger.ui.theme.AmberVibrant
|
||||||
import com.expapp.trigger.ui.theme.BgCard
|
import com.expapp.trigger.ui.theme.BgCard
|
||||||
import com.expapp.trigger.ui.theme.BgElevated
|
import com.expapp.trigger.ui.theme.BgElevated
|
||||||
import com.expapp.trigger.ui.theme.BgSurface
|
import com.expapp.trigger.ui.theme.BgSurface
|
||||||
import com.expapp.trigger.ui.theme.BorderSubtle
|
import com.expapp.trigger.ui.theme.BorderSubtle
|
||||||
import com.expapp.trigger.ui.theme.GreenVibrant
|
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.TextMuted
|
||||||
import com.expapp.trigger.ui.theme.TextPrimary
|
import com.expapp.trigger.ui.theme.TextPrimary
|
||||||
import com.expapp.trigger.ui.theme.TextSecondary
|
import com.expapp.trigger.ui.theme.TextSecondary
|
||||||
@@ -53,9 +64,14 @@ fun SettingsDialog(
|
|||||||
onBgMonitorToggled: (Boolean) -> Unit,
|
onBgMonitorToggled: (Boolean) -> Unit,
|
||||||
isBiometricAvailable: Boolean,
|
isBiometricAvailable: Boolean,
|
||||||
isNfcAvailable: Boolean,
|
isNfcAvailable: Boolean,
|
||||||
|
isNotificationPermissionGranted: Boolean,
|
||||||
|
onRequestNotificationPermission: () -> Unit,
|
||||||
|
onSendTestNotification: () -> Unit,
|
||||||
onOpenNfcWriter: () -> Unit,
|
onOpenNfcWriter: () -> Unit,
|
||||||
onDismiss: () -> Unit
|
onDismiss: () -> Unit
|
||||||
) {
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
|
||||||
Dialog(onDismissRequest = onDismiss) {
|
Dialog(onDismissRequest = onDismiss) {
|
||||||
Surface(
|
Surface(
|
||||||
modifier = Modifier.fillMaxWidth(0.95f),
|
modifier = Modifier.fillMaxWidth(0.95f),
|
||||||
@@ -151,7 +167,7 @@ fun SettingsDialog(
|
|||||||
|
|
||||||
Spacer(modifier = Modifier.height(12.dp))
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|
||||||
// Background Monitor Setting
|
// Background Monitor Setting Card
|
||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxWidth()
|
.fillMaxWidth()
|
||||||
@@ -160,6 +176,7 @@ fun SettingsDialog(
|
|||||||
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
.border(1.dp, BorderSubtle, RoundedCornerShape(14.dp))
|
||||||
.padding(14.dp)
|
.padding(14.dp)
|
||||||
) {
|
) {
|
||||||
|
Column {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier.fillMaxWidth(),
|
modifier = Modifier.fillMaxWidth(),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
@@ -167,7 +184,7 @@ fun SettingsDialog(
|
|||||||
Icon(
|
Icon(
|
||||||
Icons.Default.Notifications,
|
Icons.Default.Notifications,
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
tint = if (isBgMonitorEnabled) GreenVibrant else TextMuted,
|
tint = if (isBgMonitorEnabled && isNotificationPermissionGranted) GreenVibrant else TextMuted,
|
||||||
modifier = Modifier.size(28.dp)
|
modifier = Modifier.size(28.dp)
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.width(12.dp))
|
Spacer(modifier = Modifier.width(12.dp))
|
||||||
@@ -180,14 +197,19 @@ fun SettingsDialog(
|
|||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(2.dp))
|
Spacer(modifier = Modifier.height(2.dp))
|
||||||
Text(
|
Text(
|
||||||
"Notify outside app if servers go offline or online",
|
"Alert outside app when servers go offline or online",
|
||||||
color = TextMuted,
|
color = TextMuted,
|
||||||
fontSize = 11.sp
|
fontSize = 11.sp
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Switch(
|
Switch(
|
||||||
checked = isBgMonitorEnabled,
|
checked = isBgMonitorEnabled,
|
||||||
onCheckedChange = { onBgMonitorToggled(it) },
|
onCheckedChange = { enabled ->
|
||||||
|
if (enabled && !isNotificationPermissionGranted) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
}
|
||||||
|
onBgMonitorToggled(enabled)
|
||||||
|
},
|
||||||
colors = SwitchDefaults.colors(
|
colors = SwitchDefaults.colors(
|
||||||
checkedThumbColor = GreenVibrant,
|
checkedThumbColor = GreenVibrant,
|
||||||
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
checkedTrackColor = GreenVibrant.copy(alpha = 0.3f),
|
||||||
@@ -196,6 +218,77 @@ fun SettingsDialog(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Warning banner if notification permission is blocked
|
||||||
|
if (isBgMonitorEnabled && !isNotificationPermissionGranted) {
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
Box(
|
||||||
|
modifier = Modifier
|
||||||
|
.fillMaxWidth()
|
||||||
|
.clip(RoundedCornerShape(8.dp))
|
||||||
|
.background(AmberVibrant.copy(alpha = 0.12f))
|
||||||
|
.border(1.dp, AmberVibrant.copy(alpha = 0.3f), RoundedCornerShape(8.dp))
|
||||||
|
.clickable {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
} else {
|
||||||
|
val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
|
||||||
|
putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
|
||||||
|
}
|
||||||
|
context.startActivity(intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.padding(8.dp)
|
||||||
|
) {
|
||||||
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.Warning,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = AmberVibrant,
|
||||||
|
modifier = Modifier.size(16.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(6.dp))
|
||||||
|
Text(
|
||||||
|
"Notification permission missing. Tap to enable.",
|
||||||
|
color = AmberVibrant,
|
||||||
|
fontSize = 11.sp,
|
||||||
|
fontWeight = FontWeight.Medium
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send Test Notification button
|
||||||
|
Spacer(modifier = Modifier.height(10.dp))
|
||||||
|
Button(
|
||||||
|
onClick = {
|
||||||
|
if (!isNotificationPermissionGranted) {
|
||||||
|
onRequestNotificationPermission()
|
||||||
|
} else {
|
||||||
|
onSendTestNotification()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
colors = ButtonDefaults.buttonColors(
|
||||||
|
containerColor = if (isNotificationPermissionGranted) GreenVibrant.copy(alpha = 0.15f) else AmberVibrant.copy(alpha = 0.15f)
|
||||||
|
),
|
||||||
|
shape = RoundedCornerShape(8.dp),
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
Icons.Default.NotificationsActive,
|
||||||
|
contentDescription = null,
|
||||||
|
tint = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||||
|
modifier = Modifier.size(16.dp)
|
||||||
|
)
|
||||||
|
Spacer(modifier = Modifier.width(8.dp))
|
||||||
|
Text(
|
||||||
|
text = if (isNotificationPermissionGranted) "Send Test Notification" else "Grant Permission & Test",
|
||||||
|
color = if (isNotificationPermissionGranted) GreenVibrant else AmberVibrant,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
fontWeight = FontWeight.SemiBold
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(12.dp))
|
Spacer(modifier = Modifier.height(12.dp))
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ import androidx.compose.animation.fadeOut
|
|||||||
import androidx.compose.animation.togetherWith
|
import androidx.compose.animation.togetherWith
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.border
|
import androidx.compose.foundation.border
|
||||||
|
import androidx.compose.foundation.rememberScrollState
|
||||||
|
import androidx.compose.foundation.verticalScroll
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
@@ -274,10 +276,12 @@ fun DevicePage(
|
|||||||
)
|
)
|
||||||
|
|
||||||
val isOnline = nodeStatus?.isOnline
|
val isOnline = nodeStatus?.isOnline
|
||||||
|
val scrollState = rememberScrollState()
|
||||||
|
|
||||||
Column(
|
Column(
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
|
.verticalScroll(scrollState)
|
||||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||||
verticalArrangement = Arrangement.spacedBy(12.dp)
|
verticalArrangement = Arrangement.spacedBy(12.dp)
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import androidx.compose.foundation.layout.width
|
|||||||
import androidx.compose.foundation.pager.HorizontalPager
|
import androidx.compose.foundation.pager.HorizontalPager
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
import androidx.compose.foundation.pager.rememberPagerState
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
import androidx.compose.foundation.shape.CircleShape
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
import androidx.compose.material.ExperimentalMaterialApi
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Add
|
import androidx.compose.material.icons.filled.Add
|
||||||
import androidx.compose.material.icons.filled.History
|
import androidx.compose.material.icons.filled.History
|
||||||
@@ -29,12 +29,15 @@ import androidx.compose.material.icons.filled.Refresh
|
|||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.material.icons.filled.SystemUpdate
|
import androidx.compose.material.icons.filled.SystemUpdate
|
||||||
import androidx.compose.material.icons.filled.Terminal
|
import androidx.compose.material.icons.filled.Terminal
|
||||||
import androidx.compose.material3.TopAppBar
|
import androidx.compose.material.pullrefresh.PullRefreshIndicator
|
||||||
|
import androidx.compose.material.pullrefresh.pullRefresh
|
||||||
|
import androidx.compose.material.pullrefresh.rememberPullRefreshState
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||||
import androidx.compose.material3.Icon
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.IconButton
|
import androidx.compose.material3.IconButton
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.Text
|
import androidx.compose.material3.Text
|
||||||
|
import androidx.compose.material3.TopAppBar
|
||||||
import androidx.compose.material3.TopAppBarDefaults
|
import androidx.compose.material3.TopAppBarDefaults
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.DisposableEffect
|
import androidx.compose.runtime.DisposableEffect
|
||||||
@@ -94,7 +97,11 @@ import kotlinx.coroutines.delay
|
|||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
|
@OptIn(
|
||||||
|
ExperimentalFoundationApi::class,
|
||||||
|
ExperimentalMaterial3Api::class,
|
||||||
|
ExperimentalMaterialApi::class
|
||||||
|
)
|
||||||
@Composable
|
@Composable
|
||||||
fun MainScreen(
|
fun MainScreen(
|
||||||
repository: DeviceRepository,
|
repository: DeviceRepository,
|
||||||
@@ -102,6 +109,9 @@ fun MainScreen(
|
|||||||
appSettings: AppSettings,
|
appSettings: AppSettings,
|
||||||
historyRepository: TriggerHistoryRepository,
|
historyRepository: TriggerHistoryRepository,
|
||||||
requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) },
|
requestBiometricAuth: (title: String, subtitle: String, onResult: (Boolean) -> Unit) -> Unit = { _, _, cb -> cb(true) },
|
||||||
|
isNotificationPermissionGranted: Boolean = true,
|
||||||
|
onRequestNotificationPermission: () -> Unit = {},
|
||||||
|
onSendTestNotification: () -> Unit = {},
|
||||||
nfcWriteResult: Result<Unit>? = null,
|
nfcWriteResult: Result<Unit>? = null,
|
||||||
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
|
onStartNfcWriting: (NfcTriggerPayload) -> Unit = {},
|
||||||
onStopNfcWriting: () -> Unit = {},
|
onStopNfcWriting: () -> Unit = {},
|
||||||
@@ -141,36 +151,12 @@ fun MainScreen(
|
|||||||
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
var isBiometricEnabled by remember { mutableStateOf(appSettings.isBiometricEnabled) }
|
||||||
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
var isBgMonitorEnabled by remember { mutableStateOf(appSettings.isBackgroundMonitoringEnabled) }
|
||||||
|
|
||||||
fun checkAppUpdate(showToast: Boolean = false) {
|
|
||||||
isCheckingUpdate = true
|
|
||||||
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
|
||||||
isCheckingUpdate = false
|
|
||||||
when (result) {
|
|
||||||
is UpdateCheckResult.UpdateAvailable -> {
|
|
||||||
availableUpdate = result.info
|
|
||||||
if (showToast || dismissedVersion != result.info.versionName) {
|
|
||||||
showUpdateDialog = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is UpdateCheckResult.UpToDate -> {
|
|
||||||
if (showToast) {
|
|
||||||
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is UpdateCheckResult.Error -> {
|
|
||||||
if (showToast) {
|
|
||||||
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
val loadingStates = remember { mutableStateMapOf<String, Boolean>() }
|
||||||
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
val statusStates = remember { mutableStateMapOf<String, Pair<String, Boolean>>() }
|
||||||
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
val nodeStatuses = remember { mutableStateMapOf<String, NodeStatus>() }
|
||||||
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
val checkingStatusMap = remember { mutableStateMapOf<String, Boolean>() }
|
||||||
var isSyncing by remember { mutableStateOf(false) }
|
var isSyncing by remember { mutableStateOf(false) }
|
||||||
|
var isPullRefreshing by remember { mutableStateOf(false) }
|
||||||
|
|
||||||
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
fun refreshStatus(device: DeviceConfig, showIndicator: Boolean = false) {
|
||||||
if (showIndicator || nodeStatuses[device.id] == null) {
|
if (showIndicator || nodeStatuses[device.id] == null) {
|
||||||
@@ -179,6 +165,8 @@ fun MainScreen(
|
|||||||
triggerClient.checkStatus(device) { status ->
|
triggerClient.checkStatus(device) { status ->
|
||||||
checkingStatusMap[device.id] = false
|
checkingStatusMap[device.id] = false
|
||||||
nodeStatuses[device.id] = status
|
nodeStatuses[device.id] = status
|
||||||
|
// Keep background monitoring synced with the latest live status
|
||||||
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,6 +199,60 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun checkAppUpdate(showToast: Boolean = false) {
|
||||||
|
isCheckingUpdate = true
|
||||||
|
updateManager.checkForUpdate(BuildConfig.VERSION_NAME) { result ->
|
||||||
|
isCheckingUpdate = false
|
||||||
|
when (result) {
|
||||||
|
is UpdateCheckResult.UpdateAvailable -> {
|
||||||
|
availableUpdate = result.info
|
||||||
|
if (showToast || dismissedVersion != result.info.versionName) {
|
||||||
|
showUpdateDialog = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is UpdateCheckResult.UpToDate -> {
|
||||||
|
if (showToast) {
|
||||||
|
Toast.makeText(context, "App is up to date (v${BuildConfig.VERSION_NAME})", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is UpdateCheckResult.Error -> {
|
||||||
|
if (showToast) {
|
||||||
|
Toast.makeText(context, "Update check failed: ${result.message}", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pull-to-refresh entire page handler
|
||||||
|
fun refreshWholePage() {
|
||||||
|
isPullRefreshing = true
|
||||||
|
coroutineScope.launch {
|
||||||
|
// 1. Sync R2 endpoints
|
||||||
|
syncEndpoints(showToast = false)
|
||||||
|
|
||||||
|
// 2. Poll status for all configured devices
|
||||||
|
devices.forEach { dev ->
|
||||||
|
refreshStatus(dev, showIndicator = true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Check for app updates
|
||||||
|
checkAppUpdate(showToast = false)
|
||||||
|
|
||||||
|
// 4. Update home screen widgets
|
||||||
|
ServerWidgetProvider.updateAllWidgets(context)
|
||||||
|
|
||||||
|
delay(750)
|
||||||
|
isPullRefreshing = false
|
||||||
|
Toast.makeText(context, "Page refreshed", Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val pullRefreshState = rememberPullRefreshState(
|
||||||
|
refreshing = isPullRefreshing,
|
||||||
|
onRefresh = { refreshWholePage() }
|
||||||
|
)
|
||||||
|
|
||||||
// Initial R2 sync and update check on launch
|
// Initial R2 sync and update check on launch
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
syncEndpoints(false)
|
syncEndpoints(false)
|
||||||
@@ -475,11 +517,16 @@ fun MainScreen(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
) { innerPadding ->
|
) { innerPadding ->
|
||||||
HorizontalPager(
|
// Pull to refresh container enclosing HorizontalPager
|
||||||
state = pagerState,
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(innerPadding)
|
.padding(innerPadding)
|
||||||
|
.pullRefresh(pullRefreshState)
|
||||||
|
) {
|
||||||
|
HorizontalPager(
|
||||||
|
state = pagerState,
|
||||||
|
modifier = Modifier.fillMaxSize()
|
||||||
) { page ->
|
) { page ->
|
||||||
if (page < devices.size) {
|
if (page < devices.size) {
|
||||||
val dev = devices[page]
|
val dev = devices[page]
|
||||||
@@ -519,6 +566,15 @@ fun MainScreen(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PullRefreshIndicator(
|
||||||
|
refreshing = isPullRefreshing,
|
||||||
|
state = pullRefreshState,
|
||||||
|
modifier = Modifier.align(Alignment.TopCenter),
|
||||||
|
backgroundColor = BgElevated,
|
||||||
|
contentColor = GreenVibrant
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Trigger History Dialog
|
// Trigger History Dialog
|
||||||
@@ -550,7 +606,6 @@ fun MainScreen(
|
|||||||
isBgMonitorEnabled = enabled
|
isBgMonitorEnabled = enabled
|
||||||
appSettings.isBackgroundMonitoringEnabled = enabled
|
appSettings.isBackgroundMonitoringEnabled = enabled
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
ServerMonitorWorker.createNotificationChannel(context)
|
|
||||||
ServerMonitorWorker.schedule(context)
|
ServerMonitorWorker.schedule(context)
|
||||||
} else {
|
} else {
|
||||||
ServerMonitorWorker.cancel(context)
|
ServerMonitorWorker.cancel(context)
|
||||||
@@ -558,6 +613,9 @@ fun MainScreen(
|
|||||||
},
|
},
|
||||||
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
isBiometricAvailable = BiometricHelper.isBiometricAvailable(context),
|
||||||
isNfcAvailable = NfcHelper.isNfcSupported(context),
|
isNfcAvailable = NfcHelper.isNfcSupported(context),
|
||||||
|
isNotificationPermissionGranted = isNotificationPermissionGranted,
|
||||||
|
onRequestNotificationPermission = onRequestNotificationPermission,
|
||||||
|
onSendTestNotification = onSendTestNotification,
|
||||||
onOpenNfcWriter = {
|
onOpenNfcWriter = {
|
||||||
showNfcWriteDialog = true
|
showNfcWriteDialog = true
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package com.expapp.trigger.worker
|
||||||
|
|
||||||
|
import android.app.Notification
|
||||||
|
import android.app.NotificationChannel
|
||||||
|
import android.app.NotificationManager
|
||||||
|
import android.app.PendingIntent
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.os.Build
|
||||||
|
import androidx.core.app.NotificationCompat
|
||||||
|
import androidx.core.app.NotificationManagerCompat
|
||||||
|
import com.expapp.trigger.MainActivity
|
||||||
|
import com.expapp.trigger.R
|
||||||
|
|
||||||
|
object NotificationHelper {
|
||||||
|
const val CHANNEL_ID = "server_status_channel"
|
||||||
|
const val CHANNEL_NAME = "Server Status Alerts"
|
||||||
|
|
||||||
|
fun areNotificationsEnabled(context: Context): Boolean {
|
||||||
|
return NotificationManagerCompat.from(context).areNotificationsEnabled()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createNotificationChannel(context: Context) {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||||
|
val channel = NotificationChannel(
|
||||||
|
CHANNEL_ID,
|
||||||
|
CHANNEL_NAME,
|
||||||
|
NotificationManager.IMPORTANCE_HIGH
|
||||||
|
).apply {
|
||||||
|
description = "Alerts when your servers go offline or come back online"
|
||||||
|
enableVibration(true)
|
||||||
|
vibrationPattern = longArrayOf(0, 300, 200, 300)
|
||||||
|
enableLights(true)
|
||||||
|
lightColor = Color.GREEN
|
||||||
|
lockscreenVisibility = Notification.VISIBILITY_PUBLIC
|
||||||
|
}
|
||||||
|
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||||
|
manager.createNotificationChannel(channel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun sendNotification(
|
||||||
|
context: Context,
|
||||||
|
id: Int,
|
||||||
|
title: String,
|
||||||
|
message: String,
|
||||||
|
isSuccess: Boolean = true
|
||||||
|
): Boolean {
|
||||||
|
createNotificationChannel(context)
|
||||||
|
|
||||||
|
val intent = Intent(context, MainActivity::class.java).apply {
|
||||||
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
||||||
|
}
|
||||||
|
val pendingIntent = PendingIntent.getActivity(
|
||||||
|
context,
|
||||||
|
id,
|
||||||
|
intent,
|
||||||
|
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
val accentColor = if (isSuccess) 0xFF22C55E.toInt() else 0xFFFF4757.toInt()
|
||||||
|
|
||||||
|
val notification = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||||
|
.setSmallIcon(R.drawable.ic_notification)
|
||||||
|
.setColor(accentColor)
|
||||||
|
.setContentTitle(title)
|
||||||
|
.setContentText(message)
|
||||||
|
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
|
||||||
|
.setPriority(NotificationCompat.PRIORITY_MAX)
|
||||||
|
.setDefaults(NotificationCompat.DEFAULT_ALL)
|
||||||
|
.setAutoCancel(true)
|
||||||
|
.setContentIntent(pendingIntent)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
return try {
|
||||||
|
NotificationManagerCompat.from(context).notify(id, notification)
|
||||||
|
true
|
||||||
|
} catch (e: SecurityException) {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun sendTestNotification(context: Context): Boolean {
|
||||||
|
return sendNotification(
|
||||||
|
context = context,
|
||||||
|
id = 9999,
|
||||||
|
title = "🔔 Test Alert: Notifications Working",
|
||||||
|
message = "Server status notifications are properly configured and working on this device!",
|
||||||
|
isSuccess = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,22 +1,15 @@
|
|||||||
package com.expapp.trigger.worker
|
package com.expapp.trigger.worker
|
||||||
|
|
||||||
import android.app.NotificationChannel
|
|
||||||
import android.app.NotificationManager
|
|
||||||
import android.app.PendingIntent
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
|
||||||
import android.os.Build
|
|
||||||
import androidx.core.app.NotificationCompat
|
|
||||||
import androidx.core.app.NotificationManagerCompat
|
|
||||||
import androidx.work.Constraints
|
import androidx.work.Constraints
|
||||||
import androidx.work.CoroutineWorker
|
import androidx.work.CoroutineWorker
|
||||||
import androidx.work.ExistingPeriodicWorkPolicy
|
import androidx.work.ExistingPeriodicWorkPolicy
|
||||||
|
import androidx.work.ExistingWorkPolicy
|
||||||
import androidx.work.NetworkType
|
import androidx.work.NetworkType
|
||||||
|
import androidx.work.OneTimeWorkRequestBuilder
|
||||||
import androidx.work.PeriodicWorkRequestBuilder
|
import androidx.work.PeriodicWorkRequestBuilder
|
||||||
import androidx.work.WorkManager
|
import androidx.work.WorkManager
|
||||||
import androidx.work.WorkerParameters
|
import androidx.work.WorkerParameters
|
||||||
import com.expapp.trigger.MainActivity
|
|
||||||
import com.expapp.trigger.R
|
|
||||||
import com.expapp.trigger.data.repository.AppSettings
|
import com.expapp.trigger.data.repository.AppSettings
|
||||||
import com.expapp.trigger.data.repository.DeviceRepository
|
import com.expapp.trigger.data.repository.DeviceRepository
|
||||||
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
import com.expapp.trigger.data.repository.SharedPrefsStorage
|
||||||
@@ -30,9 +23,11 @@ class ServerMonitorWorker(
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val WORK_NAME = "server_status_periodic_monitor"
|
const val WORK_NAME = "server_status_periodic_monitor"
|
||||||
const val CHANNEL_ID = "server_status_channel"
|
const val ONE_TIME_WORK_NAME = "server_status_one_time_check"
|
||||||
|
|
||||||
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
|
fun schedule(context: Context, repeatIntervalMinutes: Long = 15) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
val constraints = Constraints.Builder()
|
val constraints = Constraints.Builder()
|
||||||
.setRequiredNetworkType(NetworkType.CONNECTED)
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
.build()
|
.build()
|
||||||
@@ -46,28 +41,36 @@ class ServerMonitorWorker(
|
|||||||
|
|
||||||
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
|
WorkManager.getInstance(context).enqueueUniquePeriodicWork(
|
||||||
WORK_NAME,
|
WORK_NAME,
|
||||||
ExistingPeriodicWorkPolicy.KEEP,
|
ExistingPeriodicWorkPolicy.UPDATE,
|
||||||
workRequest
|
workRequest
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun runOnce(context: Context) {
|
||||||
|
NotificationHelper.createNotificationChannel(context)
|
||||||
|
|
||||||
|
val constraints = Constraints.Builder()
|
||||||
|
.setRequiredNetworkType(NetworkType.CONNECTED)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
val oneTimeRequest = OneTimeWorkRequestBuilder<ServerMonitorWorker>()
|
||||||
|
.setConstraints(constraints)
|
||||||
|
.build()
|
||||||
|
|
||||||
|
WorkManager.getInstance(context).enqueueUniqueWork(
|
||||||
|
ONE_TIME_WORK_NAME,
|
||||||
|
ExistingWorkPolicy.REPLACE,
|
||||||
|
oneTimeRequest
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fun cancel(context: Context) {
|
fun cancel(context: Context) {
|
||||||
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
|
WorkManager.getInstance(context).cancelUniqueWork(WORK_NAME)
|
||||||
|
WorkManager.getInstance(context).cancelUniqueWork(ONE_TIME_WORK_NAME)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun createNotificationChannel(context: Context) {
|
fun createNotificationChannel(context: Context) {
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
NotificationHelper.createNotificationChannel(context)
|
||||||
val channel = NotificationChannel(
|
|
||||||
CHANNEL_ID,
|
|
||||||
"Server Status Alerts",
|
|
||||||
NotificationManager.IMPORTANCE_HIGH
|
|
||||||
).apply {
|
|
||||||
description = "Alerts when your servers go offline or come back online"
|
|
||||||
enableVibration(true)
|
|
||||||
}
|
|
||||||
val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
|
||||||
manager.createNotificationChannel(channel)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,8 +80,6 @@ class ServerMonitorWorker(
|
|||||||
return Result.success()
|
return Result.success()
|
||||||
}
|
}
|
||||||
|
|
||||||
createNotificationChannel(appContext)
|
|
||||||
|
|
||||||
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
val repository = DeviceRepository(SharedPrefsStorage(appContext))
|
||||||
val devices = repository.getDevices()
|
val devices = repository.getDevices()
|
||||||
if (devices.isEmpty()) {
|
if (devices.isEmpty()) {
|
||||||
@@ -96,48 +97,31 @@ class ServerMonitorWorker(
|
|||||||
// Save new status
|
// Save new status
|
||||||
appSettings.setLastStatus(device.id, status.isOnline)
|
appSettings.setLastStatus(device.id, status.isOnline)
|
||||||
|
|
||||||
// If we have a prior status recorded and it flipped, notify
|
// Determine if notification is needed
|
||||||
if (previousStatus != null && previousStatus != status.isOnline) {
|
if (previousStatus != null && previousStatus != status.isOnline) {
|
||||||
sendNotification(
|
NotificationHelper.sendNotification(
|
||||||
device.id.hashCode(),
|
context = appContext,
|
||||||
if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
id = device.id.hashCode(),
|
||||||
if (status.isOnline) {
|
title = if (status.isOnline) "✅ Server Back Online" else "⚠️ Server Offline",
|
||||||
|
message = if (status.isOnline) {
|
||||||
"${device.name} is now online and reachable."
|
"${device.name} is now online and reachable."
|
||||||
} else {
|
} else {
|
||||||
"${device.name} is unreachable or offline."
|
"${device.name} is unreachable or offline."
|
||||||
}
|
},
|
||||||
|
isSuccess = status.isOnline
|
||||||
|
)
|
||||||
|
} else if (previousStatus == null && !status.isOnline) {
|
||||||
|
// Initial check revealed server is offline
|
||||||
|
NotificationHelper.sendNotification(
|
||||||
|
context = appContext,
|
||||||
|
id = device.id.hashCode(),
|
||||||
|
title = "⚠️ Server Offline",
|
||||||
|
message = "${device.name} is currently unreachable or offline.",
|
||||||
|
isSuccess = false
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result.success()
|
return Result.success()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun sendNotification(id: Int, title: String, message: String) {
|
|
||||||
val intent = Intent(appContext, MainActivity::class.java).apply {
|
|
||||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
|
|
||||||
}
|
|
||||||
val pendingIntent = PendingIntent.getActivity(
|
|
||||||
appContext,
|
|
||||||
id,
|
|
||||||
intent,
|
|
||||||
PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0)
|
|
||||||
)
|
|
||||||
|
|
||||||
val notification = NotificationCompat.Builder(appContext, CHANNEL_ID)
|
|
||||||
.setSmallIcon(R.mipmap.ic_launcher)
|
|
||||||
.setContentTitle(title)
|
|
||||||
.setContentText(message)
|
|
||||||
.setStyle(NotificationCompat.BigTextStyle().bigText(message))
|
|
||||||
.setPriority(NotificationCompat.PRIORITY_HIGH)
|
|
||||||
.setAutoCancel(true)
|
|
||||||
.setContentIntent(pendingIntent)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
try {
|
|
||||||
NotificationManagerCompat.from(appContext).notify(id, notification)
|
|
||||||
} catch (e: SecurityException) {
|
|
||||||
// Android 13+ permission might not be granted yet
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
|
||||||
|
</vector>
|
||||||
Reference in New Issue
Block a user