Upgrade to Agsv2 + Astal (#533)
* migrate to astal * Reorganize project structure. * progress * Migrate Dashboard and Window Title modules. * Migrate clock and notification bar modules. * Remove unused code * Media menu * Rework network and volume modules * Finish custom modules. * Migrate battery bar module. * Update battery module and organize helpers. * Migrate workspace module. * Wrap up bar modules. * Checkpoint before I inevitbly blow something up. * Updates * Fix event propagation logic. * Type fixes * More type fixes * Fix padding for event boxes. * Migrate volume menu and refactor scroll event handlers. * network module WIP * Migrate network service. * Migrate bluetooth menu * Updates * Migrate notifications * Update scrolling behavior for custom modules. * Improve popup notifications and add timer functionality. * Migration notifications menu header/controls. * Migrate notifications menu and consolidate notifications menu code. * Migrate power menu. * Dashboard progress * Migrate dashboard * Migrate media menu. * Reduce media menu nesting. * Finish updating media menu bindings to navigate active player. * Migrate battery menu * Consolidate code * Migrate calendar menu * Fix workspace logic to update on client add/change/remove and consolidate code. * Migrate osd * Consolidate hyprland service connections. * Implement startup dropdown menu position allocation. * Migrate settings menu (WIP) * Settings dialo menu fixes * Finish Dashboard menu * Type updates * update submoldule for types * update github ci * ci * Submodule update * Ci updates * Remove type checking for now. * ci fix * Fix a bunch of stuff, losing track... need rest. Brb coffee * Validate dropdown menu before render. * Consolidate code and add auto-hide functionality. * Improve auto-hide behavior. * Consolidate audio menu code * Organize bluetooth code * Improve active player logic * Properly dismiss a notification on action button resolution. * Implement CLI command engine and migrate CLI commands. * Handle variable disposal * Bar component fixes and add hyprland startup rules. * Handle potentially null bindings network and bluetooth bindings. * Handle potentially null wired adapter. * Fix GPU stats * Handle poller for GPU * Fix gpu bar logic. * Clean up logic for stat bars. * Handle wifi and wired bar icon bindings. * Fix battery percentages * Fix switch behavior * Wifi staging fixes * Reduce redundant hyprland service calls. * Code cleanup * Document the option code and reduce redundant calls to optimize performance. * Remove outdated comment. * Add JSDocs * Add meson to build hyprpanel * Consistency updates * Organize commands * Fix images not showing up on notifications. * Remove todo * Move hyprpanel configuration to the ~/.config/hyprpanel directory and add utility commands. * Handle SRC directory for the bundled/built hyprpanel. * Add namespaces to all windows * Migrate systray * systray updates * Update meson to include ts, tsx and scss files. * Remove log from meson * Fix file choose path and make it float. * Added a command to check the dependency status * Update dep names. * Get scale directly from env * Add todo
This commit is contained in:
Jas Singh
GitHub
133
src/components/bar/modules/battery/index.tsx
Normal file
133
src/components/bar/modules/battery/index.tsx
Normal file
@@ -0,0 +1,133 @@
|
||||
import { batteryService } from 'src/lib/constants/services.js';
|
||||
import { Astal } from 'astal/gtk3';
|
||||
import { openMenu } from '../../utils/menu';
|
||||
import options from 'src/options';
|
||||
import { BarBoxChild } from 'src/lib/types/bar.js';
|
||||
import { runAsyncCommand, throttledScrollHandler } from 'src/components/bar/utils/helpers.js';
|
||||
import Variable from 'astal/variable';
|
||||
import { bind } from 'astal/binding.js';
|
||||
import AstalBattery from 'gi://AstalBattery?version=0.1';
|
||||
import { useHook } from 'src/lib/shared/hookHandler';
|
||||
import { onMiddleClick, onPrimaryClick, onScroll, onSecondaryClick } from 'src/lib/shared/eventHandlers';
|
||||
import { getBatteryIcon } from './helpers';
|
||||
|
||||
const { label: show_label, rightClick, middleClick, scrollUp, scrollDown, hideLabelWhenFull } = options.bar.battery;
|
||||
|
||||
const BatteryLabel = (): BarBoxChild => {
|
||||
const batIcon = Variable.derive(
|
||||
[bind(batteryService, 'percentage'), bind(batteryService, 'charging'), bind(batteryService, 'state')],
|
||||
(batPercent: number, batCharging: boolean, state: AstalBattery.State) => {
|
||||
const batCharged = state === AstalBattery.State.FULLY_CHARGED;
|
||||
|
||||
return getBatteryIcon(Math.floor(batPercent * 100), batCharging, batCharged);
|
||||
},
|
||||
);
|
||||
|
||||
const formatTime = (seconds: number): Record<string, number> => {
|
||||
const hours = Math.floor(seconds / 3600);
|
||||
const minutes = Math.floor((seconds % 3600) / 60);
|
||||
return { hours, minutes };
|
||||
};
|
||||
|
||||
const generateTooltip = (timeSeconds: number, isCharging: boolean, isCharged: boolean): string => {
|
||||
if (isCharged === true) {
|
||||
return 'Full';
|
||||
}
|
||||
|
||||
const { hours, minutes } = formatTime(timeSeconds);
|
||||
if (isCharging) {
|
||||
return `Time to full: ${hours} h ${minutes} min`;
|
||||
} else {
|
||||
return `Time to empty: ${hours} h ${minutes} min`;
|
||||
}
|
||||
};
|
||||
|
||||
const componentClassName = Variable.derive(
|
||||
[bind(options.theme.bar.buttons.style), bind(show_label)],
|
||||
(style, showLabel) => {
|
||||
const styleMap = {
|
||||
default: 'style1',
|
||||
split: 'style2',
|
||||
wave: 'style3',
|
||||
wave2: 'style3',
|
||||
};
|
||||
return `battery-container ${styleMap[style]} ${!showLabel ? 'no-label' : ''}`;
|
||||
},
|
||||
);
|
||||
|
||||
const componentTooltip = Variable.derive(
|
||||
[bind(batteryService, 'charging'), bind(batteryService, 'timeToFull'), bind(batteryService, 'timeToEmpty')],
|
||||
(isCharging, timeToFull, timeToEmpty) => {
|
||||
const timeRemaining = isCharging ? timeToFull : timeToEmpty;
|
||||
return generateTooltip(timeRemaining, isCharging, Math.floor(batteryService.percentage * 100) === 100);
|
||||
},
|
||||
);
|
||||
|
||||
const componentChildren = Variable.derive(
|
||||
[bind(show_label), bind(batteryService, 'percentage'), bind(hideLabelWhenFull)],
|
||||
(showLabel, percentage, hideLabelWhenFull) => {
|
||||
const isCharged = Math.round(percentage) === 100;
|
||||
|
||||
const icon = <label className={'bar-button-icon battery txt-icon'} label={batIcon()} />;
|
||||
const label = <label className={'bar-button-label battery'} label={`${Math.floor(percentage * 100)}%`} />;
|
||||
|
||||
const children = [icon];
|
||||
|
||||
if (showLabel && !(isCharged && hideLabelWhenFull)) {
|
||||
children.push(label);
|
||||
}
|
||||
|
||||
return children;
|
||||
},
|
||||
);
|
||||
|
||||
const component = (
|
||||
<box
|
||||
className={componentClassName()}
|
||||
tooltipText={componentTooltip()}
|
||||
onDestroy={() => {
|
||||
batIcon.drop();
|
||||
componentClassName.drop();
|
||||
componentTooltip.drop();
|
||||
componentChildren.drop();
|
||||
}}
|
||||
>
|
||||
{componentChildren()}
|
||||
</box>
|
||||
);
|
||||
|
||||
return {
|
||||
component,
|
||||
isVisible: true,
|
||||
boxClass: 'battery',
|
||||
props: {
|
||||
setup: (self: Astal.Button): void => {
|
||||
useHook(self, options.bar.scrollSpeed, () => {
|
||||
const throttledHandler = throttledScrollHandler(options.bar.scrollSpeed.get());
|
||||
|
||||
const disconnectPrimary = onPrimaryClick(self, (clicked, event) => {
|
||||
openMenu(clicked, event, 'energymenu');
|
||||
});
|
||||
|
||||
const disconnectSecondary = onSecondaryClick(self, (clicked, event) => {
|
||||
runAsyncCommand(rightClick.get(), { clicked, event });
|
||||
});
|
||||
|
||||
const disconnectMiddle = onMiddleClick(self, (clicked, event) => {
|
||||
runAsyncCommand(middleClick.get(), { clicked, event });
|
||||
});
|
||||
|
||||
const disconnectScroll = onScroll(self, throttledHandler, scrollUp.get(), scrollDown.get());
|
||||
return (): void => {
|
||||
disconnectPrimary();
|
||||
disconnectSecondary();
|
||||
disconnectMiddle();
|
||||
disconnectScroll();
|
||||
};
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
export { BatteryLabel };
|
||||
Reference in New Issue
Block a user