refactor: moved status button to core views

Author: vlad-ed-git

app/contracts/view.py

@@ -174,34 +174,6 @@ def __init__(self, onStateChanged: Callable[[ContractStates], None]):
         self.state_to_filter_btns_map = {}
         self.on_state_changed_callback = onStateChanged
 
-    def filter_button(
-        self,
-        state: ContractStates,
-        label: str,
-        onClick: Callable[[ContractStates], None],
-        tooltip: str,
-    ):
-        """Creates a filter button for the given state"""
-        button = ElevatedButton(
-            text=label,
-            col={"xs": 6, "sm": 3, "lg": 2},
-            on_click=lambda e: onClick(state),
-            height=dimens.CLICKABLE_PILL_HEIGHT,
-            color=colors.PRIMARY_COLOR
-            if state == self.current_state
-            else colors.GRAY_COLOR,
-            tooltip=tooltip,
-            style=ButtonStyle(
-                elevation={
-                    utils.PRESSED: 3,
-                    utils.SELECTED: 3,
-                    utils.HOVERED: 4,
-                    utils.OTHER_CONTROL_STATES: 2,
-                },
-            ),
-        )
-        return button
-
     def on_filter_button_clicked(self, state: ContractStates):
         """sets the new state and updates selected button"""
         self.state_to_filter_btns_map[self.current_state].color = colors.GRAY_COLOR
@@ -213,13 +185,13 @@ def on_filter_button_clicked(self, state: ContractStates):
     def set_filter_buttons(self):
         """Sets all the filter buttons"""
         for state in ContractStates:
-            button = self.filter_button(
+            self.state_to_filter_btns_map[state] = views.TStatusFilterBtn(
                 label=state.__str__(),
-                state=state,
-                onClick=self.on_filter_button_clicked,
+                is_current_state=self.current_state.value == state.value,
+                on_click_params=state,
+                on_click=self.on_filter_button_clicked,
                 tooltip=state.tooltip(),
             )
-            self.state_to_filter_btns_map[state] = button
 
     def build(self):
         """Builds the filter buttons"""

app/core/views.py

@@ -18,6 +18,7 @@
     PopupMenuButton,
     PopupMenuItem,
     ProgressBar,
+    ButtonStyle,
     margin,
     NavigationRail,
     Row,
@@ -908,3 +909,30 @@ def __init__(self, form_controls: list[UserControl]):
                 ),
             ),
         )
+
+
+class TStatusFilterBtn(ElevatedButton):
+    def __init__(
+        self,
+        label: str,
+        is_current_state: bool,
+        on_click: Callable,
+        tooltip: str,
+        on_click_params: any,
+    ):
+        return super().__init__(
+            text=label,
+            col={"xs": 6, "sm": 3, "lg": 2},
+            on_click=lambda e: on_click(on_click_params),
+            height=dimens.CLICKABLE_PILL_HEIGHT,
+            color=colors.PRIMARY_COLOR if is_current_state else colors.GRAY_COLOR,
+            tooltip=tooltip,
+            style=ButtonStyle(
+                elevation={
+                    utils.PRESSED: 3,
+                    utils.SELECTED: 3,
+                    utils.HOVERED: 4,
+                    utils.OTHER_CONTROL_STATES: 2,
+                },
+            ),
+        )

app/projects/view.py

@@ -210,11 +210,11 @@ def __str__(self):
 
     def tooltip(self):
         """returns the tooltip for the filter button"""
-        if self is ProjectStates.ACTIVE.value:
+        if self is ProjectStates.ACTIVE:
             return "Not completed and not due."
-        elif self is ProjectStates.UPCOMING.value:
+        elif self is ProjectStates.UPCOMING:
             return "Scheduled for the future."
-        elif self is ProjectStates.COMPLETED.value:
+        elif self is ProjectStates.COMPLETED:
             return "Marked as completed."
         else:
             return "All projects."
@@ -225,56 +225,28 @@ class ProjectFiltersView(UserControl):
 
     def __init__(self, onStateChanged: Callable[[ProjectStates], None]):
         super().__init__()
-        self.currentState = ProjectStates.ALL
+        self.current_state = ProjectStates.ALL
         self.stateTofilterButtonsMap = {}
         self.onStateChangedCallback = onStateChanged
 
-    def filter_button(
-        self,
-        state: ProjectStates,
-        label: str,
-        onClick: Callable[[ProjectStates], None],
-        tooltip: str,
-    ):
-        """creates a filter button for project status"""
-        button = ElevatedButton(
-            text=label,
-            col={"xs": 6, "sm": 3, "lg": 2},
-            on_click=lambda e: onClick(state),
-            height=dimens.CLICKABLE_PILL_HEIGHT,
-            color=colors.PRIMARY_COLOR
-            if state == self.currentState
-            else colors.GRAY_COLOR,
-            tooltip=tooltip,
-            style=ButtonStyle(
-                elevation={
-                    utils.PRESSED: 3,
-                    utils.SELECTED: 3,
-                    utils.HOVERED: 4,
-                    utils.OTHER_CONTROL_STATES: 2,
-                },
-            ),
-        )
-        return button
-
     def on_filter_button_clicked(self, state: ProjectStates):
         """sets the new state and updates selected button"""
-        self.stateTofilterButtonsMap[self.currentState].color = colors.GRAY_COLOR
-        self.currentState = state
-        self.stateTofilterButtonsMap[self.currentState].color = colors.PRIMARY_COLOR
+        self.stateTofilterButtonsMap[self.current_state].color = colors.GRAY_COLOR
+        self.current_state = state
+        self.stateTofilterButtonsMap[self.current_state].color = colors.PRIMARY_COLOR
         self.update()
         self.onStateChangedCallback(state)
 
     def set_filter_buttons(self):
         """sets the filter buttons for each project state"""
         for state in ProjectStates:
-            button = self.filter_button(
+            self.stateTofilterButtonsMap[state] = views.TStatusFilterBtn(
                 label=state.__str__(),
-                state=state,
-                onClick=self.on_filter_button_clicked,
+                is_current_state=state.value == self.current_state.value,
+                on_click=self.on_filter_button_clicked,
+                on_click_params=state,
                 tooltip=state.tooltip(),
             )
-            self.stateTofilterButtonsMap[state] = button
 
     def build(self):
         """builds the filter buttons"""