Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
applicationId = "com.sameerasw.essentials"
minSdk = 26
targetSdk = 36
versionCode = 27
versionName = "11.3"
versionCode = 28
versionName = "11.4"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,16 @@ class BatteryNotificationService : Service() {
settingsRepository = SettingsRepository(this)
createNotificationChannel()
settingsRepository.registerOnSharedPreferenceChangeListener(preferenceChangeListener)

startForeground(NOTIF_ID, buildBaseNotification(getString(R.string.feat_batteries_title), ""))

updateNotification()
}

override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
startForeground(NOTIF_ID, buildBaseNotification(getString(R.string.feat_batteries_title), ""))
}
updateNotification()
return START_STICKY
}
Expand Down Expand Up @@ -77,26 +83,39 @@ class BatteryNotificationService : Service() {

private fun updateNotification() {
val batteryItems = fetchBatteryData()
if (batteryItems.isEmpty()) {
stopForeground(true)
stopSelf()
return

val notification = if (batteryItems.isEmpty()) {
buildBaseNotification(
getString(R.string.feat_batteries_title),
getString(R.string.battery_notification_no_devices)
)
} else {
val bitmap = createCompositeBitmap(batteryItems)
NotificationCompat.Builder(this, CHANNEL_ID)
.setSmallIcon(R.drawable.rounded_battery_charging_60_24)
.setLargeIcon(bitmap)
.setStyle(NotificationCompat.BigPictureStyle()
.bigPicture(bitmap)
.bigLargeIcon(null as Bitmap?))
.setContentTitle(getString(R.string.feat_batteries_title))
.setPriority(NotificationCompat.PRIORITY_LOW)
.setOngoing(true)
.setSilent(true)
.build()
}

val bitmap = createCompositeBitmap(batteryItems)
val notification = NotificationCompat.Builder(this, CHANNEL_ID)
startForeground(NOTIF_ID, notification)
}

private fun buildBaseNotification(title: String, content: String): Notification {
return NotificationCompat.Builder(this, CHANNEL_ID)
.setSmallIcon(R.drawable.rounded_battery_charging_60_24)
.setLargeIcon(bitmap)
.setStyle(NotificationCompat.BigPictureStyle()
.bigPicture(bitmap)
.bigLargeIcon(null as Bitmap?))
.setContentTitle(getString(R.string.feat_batteries_title))
.setContentTitle(title)
.setContentText(content)
.setPriority(NotificationCompat.PRIORITY_LOW)
.setOngoing(true)
.setSilent(true)
.build()

startForeground(NOTIF_ID, notification)
}

private fun fetchBatteryData(): List<BatteryItemData> {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@
<string name="update_channel_name">App Updates</string>
<string name="update_channel_desc">Notifications for new app updates</string>
<string name="notification_update_available">Update available</string>
<string name="battery_notification_no_devices">No devices connected</string>

<string name="label_unknown">Unknown</string>
<string name="network_type_5g">5G</string>
Expand Down