Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brighter colours when coloured icons is on #104

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Brighter colours when coloured icons is on #104

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a9aca6
Gradle 8
rlees85 Oct 30, 2023
32c05b8
No dark icons
rlees85 Oct 30, 2023
d67cc33
Force brighter colours
rlees85 Nov 17, 2023
09365d5
Fix errors
rlees85 Nov 17, 2023
f618a18
Account for transparency
rlees85 Nov 18, 2023
dbd28c0
Update with master
rlees85 May 14, 2024
bbaae16
Fixes for updated master
rlees85 May 14, 2024
32e8b68
Merge branch 'master' into notification_nodark
rlees85 Jun 3, 2024
f2b88b3
Seperate out colour boosting into a helper and try to fix linting fai…
rlees85 Jun 27, 2024
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
22 changes: 21 additions & 1 deletion app/src/main/java/io/github/domi04151309/alwayson/services/NotificationService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.app.Notification
import android.content.Intent
import android.graphics.Color
import android.graphics.drawable.Icon
import android.os.Handler
import android.os.Looper
Expand All @@ -14,6 +15,7 @@
import io.github.domi04151309.alwayson.helpers.JSON
import io.github.domi04151309.alwayson.helpers.Rules
import io.github.domi04151309.alwayson.receivers.CombinedServiceReceiver
import kotlin.math.roundToInt
import org.json.JSONArray

class NotificationService : NotificationListenerService() {
Expand Down Expand Up @@ -81,10 +83,28 @@
}
if (!apps.contains(notification.packageName)) {
apps += notification.packageName

var color: Int = notification.notification.color

val colorRed: Int = Color.red(color)
val colorGreen: Int = Color.green(color)
val colorBlue: Int = Color.blue(color)

color = if ((colorRed < 1) && (colorGreen < 1) && (colorBlue < 1)) {
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Color.WHITE
} else {
val rgbMax: Int = maxOf(colorRed, colorGreen, colorBlue)
val rgbFactor: Float = 255 / rgbMax.toFloat()
val newRed: Int = minOf(255, (colorRed * rgbFactor).roundToInt())
val newGreen: Int = minOf(255, (colorGreen * rgbFactor).roundToInt())
val newBlue: Int = minOf(255, (colorBlue * rgbFactor).roundToInt())
Color.rgb(newRed, newGreen, newBlue)
}

icons.add(
Pair(
notification.notification.smallIcon,
notification.notification.color,
color,
),
)
}
Expand Down
Loading