From 38fd7195efb41726b0620aa92bf69ee2fa32f1db Mon Sep 17 00:00:00 2001 From: end-4 <97237370+end-4@users.noreply.github.com> Date: Fri, 29 Mar 2024 19:04:07 +0700 Subject: [PATCH] fix low battery notif --- .config/ags/config.js | 1 + .config/ags/modules/.configuration/user_options.js | 3 +++ .config/ags/services/messages.js | 9 +++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.config/ags/config.js b/.config/ags/config.js index 7103b2a7..c0c31782 100644 --- a/.config/ags/config.js +++ b/.config/ags/config.js @@ -6,6 +6,7 @@ import App from 'resource:///com/github/Aylur/ags/app.js' import * as Utils from 'resource:///com/github/Aylur/ags/utils.js' // Stuff import userOptions from './modules/.configuration/user_options.js'; +import { firstRunWelcome } from './services/messages.js'; // Widgets import { Bar, BarCornerTopleft, BarCornerTopright } from './modules/bar/main.js'; import Cheatsheet from './modules/cheatsheet/main.js'; diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js index 60b45d2f..ca472cd1 100644 --- a/.config/ags/modules/.configuration/user_options.js +++ b/.config/ags/modules/.configuration/user_options.js @@ -26,6 +26,9 @@ let configOptions = { 'battery': { 'low': 20, 'critical': 10, + 'warnLevels': [20, 15, 5], + 'warnTitles': ["Low battery", "Very low battery", 'Critical Battery'], + 'warnMessages': ["Plug in the charger", "You there?", 'PLUG THE CHARGER ALREADY'], }, 'music': { 'preferredPlayer': "plasma-browser-integration", diff --git a/.config/ags/services/messages.js b/.config/ags/services/messages.js index ad84bad8..82035bca 100644 --- a/.config/ags/services/messages.js +++ b/.config/ags/services/messages.js @@ -28,9 +28,6 @@ export async function firstRunWelcome() { } } -const BATTERY_WARN_LEVELS = [20, 15, 5]; -const BATTERY_WARN_TITLES = ["Low battery", "Very low battery", 'Critical Battery'] -const BATTERY_WARN_BODIES = ["Plug in the charger", "You there?", 'PLUG THE CHARGER ALREADY'] var batteryWarned = false; async function batteryMessage() { const perc = Battery.percent; @@ -39,11 +36,11 @@ async function batteryMessage() { batteryWarned = false; return; } - for (let i = BATTERY_WARN_LEVELS.length - 1; i >= 0; i--) { - if (perc <= BATTERY_WARN_LEVELS[i] && !charging && !batteryWarned) { + for (let i = userOptions.battery.warnLevels.length - 1; i >= 0; i--) { + if (perc <= userOptions.battery.warnLevels[i] && !charging && !batteryWarned) { batteryWarned = true; Utils.execAsync(['bash', '-c', - `notify-send "${BATTERY_WARN_TITLES[i]}" "${BATTERY_WARN_BODIES[i]}" -u critical -a 'ags' &` + `notify-send "${userOptions.battery.warnTitles[i]}" "${userOptions.battery.warnMessages[i]}" -u critical -a '${APP_NAME}' &` ]).catch(print); break; }