From 10cdecccf42c01da9d316a4d97453d2a6c0d3f60 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Fri, 11 Jul 2025 01:35:19 +0545 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20refactor(metrics,=20animatedcircula?= =?UTF-8?q?rprogressbar):=20replace=20AnimatedCircularProgressBar=20with?= =?UTF-8?q?=20CircularProgressBar=20in=20Metrics=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/dock/components/metrics.py | 3 +-- utils/animatedcircularprogressbar.py | 26 -------------------------- utils/animatedscale.py | 26 -------------------------- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 utils/animatedcircularprogressbar.py delete mode 100644 utils/animatedscale.py diff --git a/modules/dock/components/metrics.py b/modules/dock/components/metrics.py index 18ecb30..fa62818 100644 --- a/modules/dock/components/metrics.py +++ b/modules/dock/components/metrics.py @@ -10,7 +10,6 @@ from fabric.widgets.revealer import Revealer from gi.repository import GLib import config.data as data -from utils.animatedcircularprogressbar import AnimatedCircularProgressBar import utils.icons as icons @@ -156,7 +155,7 @@ class SingularMetric: self.icon_markup = icon self.icon = Label(name="metrics-icon", markup=icon) - self.circle = AnimatedCircularProgressBar( + self.circle = CircularProgressBar( name="metrics-circle", value=0, size=28, diff --git a/utils/animatedcircularprogressbar.py b/utils/animatedcircularprogressbar.py deleted file mode 100644 index 05f3f5a..0000000 --- a/utils/animatedcircularprogressbar.py +++ /dev/null @@ -1,26 +0,0 @@ -from fabric.widgets.circularprogressbar import CircularProgressBar -from utils.animator import Animator - -class AnimatedCircularProgressBar(CircularProgressBar): - def __init__(self, **kwargs): - super().__init__(**kwargs) - self.animator = ( - Animator( - bezier_curve=(0.15, 0.88, 0.68, 0.95), - duration=0.8, - min_value=self.min_value, - max_value=self.value, - tick_widget=self, - notify_value=lambda p, *_: self.set_value(p.value), - ) - .build() - .play() - .unwrap() - ) - - def animate_value(self, value: float): - self.animator.pause() - self.animator.min_value = self.value - self.animator.max_value = value - self.animator.play() - return \ No newline at end of file diff --git a/utils/animatedscale.py b/utils/animatedscale.py deleted file mode 100644 index db5d411..0000000 --- a/utils/animatedscale.py +++ /dev/null @@ -1,26 +0,0 @@ -from fabric.widgets.scale import Scale -from utils.animator import Animator - -class AnimatedScale(Scale): - def __init__(self, **kwargs): - super().__init__(**kwargs) - self.animator = ( - Animator( - bezier_curve=(0.15, 0.88, 0.68, 0.95), - duration=0.3, - min_value=self.min_value, - max_value=self.value, - tick_widget=self, - notify_value=lambda p, *_: self.set_value(p.value), - ) - .build() - .play() - .unwrap() - ) - - def animate_value(self, value: float): - self.animator.pause() - self.animator.min_value = self.value - self.animator.max_value = value - self.animator.play() - return \ No newline at end of file