quizzy 0.2.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

quizzy/app.py

@@ -3,10 +3,13 @@ from __future__ import annotations
 import argparse
 import pathlib
 
-from textual import app, containers, log, message, reactive, screen, widgets
+from textual import app, binding, containers, log, message, reactive, screen, widgets
 
 from quizzy import __version__, models
 
+NoCorrectAnswerType = type("NoCorrectAnswerType", (object,), {})
+NoCorrectAnswer = NoCorrectAnswerType()
+
 
 def get_arg_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog=__name__.split(".")[0], description="A terminal quiz app")
@@ -15,9 +18,16 @@ def get_arg_parser() -> argparse.ArgumentParser:
     return parser
 
 
-class AnswerScreen(screen.ModalScreen[models.Team | None]):
+QuestionScreenResult = models.Team | NoCorrectAnswerType | None
+
+
+class AnswerScreen(screen.ModalScreen[QuestionScreenResult], can_focus=True):
     NOONE_ANSWERED_ID = "__noone-answered"
 
+    BINDINGS = [
+        binding.Binding("escape", "no_correct_answer", "Dismiss", key_display="Esc"),
+    ]
+
     def __init__(self, category: str, question: models.Question, teams: list[models.Team]) -> None:
         super().__init__(classes="question-answer-screen")
         self.category = category
@@ -32,7 +42,7 @@ class AnswerScreen(screen.ModalScreen[models.Team | None]):
         answer_widget = widgets.Markdown(self.question.answer, id="answer")
         answer_widget.border_title = "Answer"
 
-        whoanswered = containers.HorizontalGroup(
+        who_answered = containers.HorizontalGroup(
             *[
                 containers.Vertical(widgets.Button(team.name, id=team_id, variant="primary"))
                 for team_id, team in self.teams.items()
@@ -40,12 +50,12 @@ class AnswerScreen(screen.ModalScreen[models.Team | None]):
             id="who-answered",
             classes="horizontal-100",
         )
-        whoanswered.border_title = "Who Answered Correctly?"
+        who_answered.border_title = "Who Answered Correctly?"
 
         container = containers.Grid(
             question_widget,
             answer_widget,
-            whoanswered,
+            who_answered,
             containers.Horizontal(
                 widgets.Button(
                     "😭 No one answered correctly 😭", id=self.NOONE_ANSWERED_ID, variant="error", classes="button-100"
@@ -57,18 +67,25 @@ class AnswerScreen(screen.ModalScreen[models.Team | None]):
         )
 
         container.border_title = f"{self.category} - {self.question.value} points"
+        yield widgets.Footer()
         yield container
 
+    def action_no_correct_answer(self) -> None:
+        self.dismiss(NoCorrectAnswer)
+
     def on_button_pressed(self, event: widgets.Button.Pressed) -> None:
         if event.button.id == self.NOONE_ANSWERED_ID:
-            self.dismiss(None)
+            self.dismiss(NoCorrectAnswer)
         elif event.button.id in self.teams:
             team = self.teams[event.button.id]
             self.dismiss(team)
 
 
-class QuestionScreen(screen.ModalScreen[models.Team | None]):
+class QuestionScreen(screen.ModalScreen[QuestionScreenResult], can_focus=True):
     SHOW_ANSWER_ID = "show-answer"
+    BINDINGS = [
+        binding.Binding("escape", "dismiss(None)", "Dismiss"),
+    ]
 
     def __init__(self, category: str, question: models.Question, teams: list[models.Team]) -> None:
         super().__init__(classes="question-answer-screen")
@@ -91,17 +108,22 @@ class QuestionScreen(screen.ModalScreen[models.Team | None]):
         )
 
         container.border_title = f"{self.category} - {self.question.value} points"
+        yield widgets.Footer()
         yield container
 
     def on_button_pressed(self, event: widgets.Button.Pressed) -> None:
-        def dismiss(team: models.Team | None) -> None:
+        def dismiss(team: QuestionScreenResult) -> None:
             self.dismiss(team)
 
         if event.button.id == self.SHOW_ANSWER_ID:
+            event.stop()
             self.app.push_screen(AnswerScreen(self.category, self.question, self.teams), dismiss)
 
 
-class TeamScore(containers.Vertical):
+class TeamScore(containers.Horizontal):
+    MODIFIER_BUTTON_VALUE = 100
+    _ADD_BUTTON_ID = f"add-{MODIFIER_BUTTON_VALUE}"
+    _SUBTRACT_BUTTON_ID = f"subtract-{MODIFIER_BUTTON_VALUE}"
     score = reactive.reactive(0, recompose=True)
 
     def __init__(self, team: models.Team) -> None:
@@ -112,6 +134,22 @@ class TeamScore(containers.Vertical):
 
     def compose(self) -> app.ComposeResult:
         yield widgets.Static(str(self.score))
+        yield containers.Horizontal(
+            widgets.Button("+ 100", id=self._ADD_BUTTON_ID, variant="success"),
+            widgets.Button("- 100", id=self._SUBTRACT_BUTTON_ID, variant="error"),
+            classes="modifier-buttons-container",
+        )
+
+    def on_button_pressed(self, event: widgets.Button.Pressed) -> None:
+        if event.button.id == self._ADD_BUTTON_ID:
+            self.score += self.MODIFIER_BUTTON_VALUE
+            event.stop()
+        elif event.button.id == self._SUBTRACT_BUTTON_ID:
+            if self.score <= self.MODIFIER_BUTTON_VALUE:
+                self.score = 0
+            else:
+                self.score -= self.MODIFIER_BUTTON_VALUE
+            event.stop()
 
     def watch_score(self, score: int) -> None:
         """
@@ -152,13 +190,14 @@ class QuestionButton(widgets.Button):
         self.disabled = question.answered
 
     def on_click(self) -> None:
-        # First, disable the button to prevent multiple clicks
-        self.disabled = True
-        self.question.answered = True
-
-        def wait_for_result(team: models.Team | None) -> None:
+        def wait_for_result(team: QuestionScreenResult) -> None:
             if team is None:
-                log("question-button: No-one answered the question")
+                return
+            # First, disable the button to prevent multiple clicks
+            self.disabled = True
+            self.question.answered = True
+            if isinstance(team, NoCorrectAnswerType):
+                log("question-button: No one answered the question")
             else:
                 log(f"question-button: {team.id} answered the question")
                 self.post_message(self.Answered(team, self.question.value))
@@ -206,3 +245,6 @@ class QuizzyApp(app.App[None]):
 
     def on_question_button_answered(self, event: QuestionButton.Answered) -> None:
         self.scoreboard_widget.update_team_score(event.team.id, event.value)
+
+    def on_mount(self) -> None:
+        self.theme = "textual-light"

quizzy/quizzy.tcss

@@ -1,8 +1,28 @@
 TeamScore {
-  border: solid $primary;
+  border: round $primary;
   align: center top;
   height: 3;
   margin: 1;
+
+  Static {
+    max-width: 50%;
+  }
+
+  Horizontal.modifier-buttons-container {
+    align:  right middle;
+
+    Button {
+      margin: 0 2;
+      padding: 0;
+      min-width: 8;
+      border: none;
+      width: 8;
+      &:focus {
+        /* Disable reversing for text of focussed buttons in the team score row */
+        text-style: bold;
+      }
+    }
+  }
 }
 
 
@@ -15,20 +35,20 @@ TeamScore {
   height: 80%;
   min-height: 40;
   padding: 0 2;
-  border: solid $primary;
+  border: round $primary;
   background: $surface;
   content-align: center middle;
 
   #question {
     content-align: center middle;
     padding: 2;
-    border: solid $foreground 80%;
+    border: round $foreground 80%;
   }
 
   #answer {
     content-align: center middle;
     padding: 2;
-    border: solid $success 80%;
+    border: round $success 80%;
 
   }
 }
@@ -59,7 +79,7 @@ AnswerScreen {
     grid-rows: 40% 40% 5 4;
 
     #who-answered {
-      border: solid $foreground 80%;
+      border: round $foreground 80%;
       Button {
         margin: 0 1;
         width: 100%;

{quizzy-0.2.0.dist-info → quizzy-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quizzy
-Version: 0.2.0
+Version: 0.3.1
 Summary: A Python TUI quiz app
 Author-email: Jonas Ehrlich <jonas.ehrlich@gmail.com>
 License-Expression: MIT

quizzy-0.3.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+quizzy/__init__.py,sha256=IILIKzO2OO60Rhsh3SqhdKHDf7XI_RLRwzztBGZZmHY,78
+quizzy/__main__.py,sha256=TxTz5dT__4--aF49xzShPppphmYLCNYKMraPhp6scIc,117
+quizzy/app.py,sha256=4Eh_c-kmM9T0MlfOmf4huYxdgFMWwQ_eCDzamLE81zQ,9312
+quizzy/models.py,sha256=JrAc2IvtXByIKNg_lX7uQMK19zwi2WsYcNbttXccbOs,1265
+quizzy/quizzy.tcss,sha256=VcPEGQ1J7oGatPf3kB-Hzo9AHQdrI7cOV8hDT_l9-3A,1810
+quizzy-0.3.1.dist-info/METADATA,sha256=XPzfP0l-hLMlOBw19NNmXHfLTSOWKG9qyfHZkB_no1Q,1590
+quizzy-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+quizzy-0.3.1.dist-info/entry_points.txt,sha256=2RiVMgcS4h7TM59u9dyBQFm53cG6Eyekmb8fqZ5rXHM,48
+quizzy-0.3.1.dist-info/licenses/LICENSE,sha256=JWN3MACgsucm6y_rlL_2MUzst0-wNh-Wab3XkxtfVzM,1070
+quizzy-0.3.1.dist-info/RECORD,,

quizzy-0.2.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-quizzy/__init__.py,sha256=IILIKzO2OO60Rhsh3SqhdKHDf7XI_RLRwzztBGZZmHY,78
-quizzy/__main__.py,sha256=TxTz5dT__4--aF49xzShPppphmYLCNYKMraPhp6scIc,117
-quizzy/app.py,sha256=QP4pZsIYXlzvyd_laf-VhlQzy1Lw8rRIc-UDnoi8PLY,7693
-quizzy/models.py,sha256=JrAc2IvtXByIKNg_lX7uQMK19zwi2WsYcNbttXccbOs,1265
-quizzy/quizzy.tcss,sha256=ixFfm8pT_JLdL0XZ-4n8u0fs3l9lAHWQa3-q9d4bRRU,1455
-quizzy-0.2.0.dist-info/METADATA,sha256=GGo2imhK6FbqVeaA83L-i8E-ook8d2rBKN0E6FQWLLg,1590
-quizzy-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-quizzy-0.2.0.dist-info/entry_points.txt,sha256=2RiVMgcS4h7TM59u9dyBQFm53cG6Eyekmb8fqZ5rXHM,48
-quizzy-0.2.0.dist-info/licenses/LICENSE,sha256=JWN3MACgsucm6y_rlL_2MUzst0-wNh-Wab3XkxtfVzM,1070
-quizzy-0.2.0.dist-info/RECORD,,