Fix formatting in messages

Author: enzet

emmio/learn/teacher.py

@@ -21,7 +21,7 @@
     SentencesCollection,
     SentenceTranslations,
 )
-from emmio.ui import Element, Interface
+from emmio.ui import Colorized, Element, Interface, Text
 from emmio.user.data import UserData
 
 __author__ = "Sergey Vartanov"
@@ -411,7 +411,7 @@ def print_sentence(
         if show_index:
             text += f" ({index + 1}/{len(rated_sentences)})"
 
-        result: str = ""
+        result: Text = Text()
 
         words: list[tuple[str, SentenceElement]] = (
             sentence_translations.sentence.get_words(
@@ -422,15 +422,15 @@ def print_sentence(
 
         for current_word, type_ in words:
             if type_ == SentenceElement.SYMBOL:
-                result += current_word
+                result.add(current_word)
             elif current_word.lower() == word:
-                result += ESCAPE_CHARACTER * len(current_word)
+                result.add(ESCAPE_CHARACTER * len(current_word))
             elif self.user_data.is_known_or_not_a_word(
                 current_word.lower(), self.learning.learning_language
             ):
-                result += "[green]" + current_word + "[/green]"
+                result.add(Colorized(current_word, color="green"))
             else:
-                result += "[grey]" + current_word + "[/grey]"
+                result.add(Colorized(current_word, color="grey"))
                 all_known = False
 
         self.interface.print(result)

emmio/run.py

@@ -24,10 +24,13 @@
 from emmio.lists.frequency_list import FrequencyList
 from emmio.ui import (
     Block,
+    Colorized,
+    Formatted,
     Header,
     InlineElement,
     Interface,
     Table,
+    Text,
     Title,
     progress,
 )
@@ -501,29 +504,30 @@ async def stat_lexicon(self) -> None:
                 if rate_year_before is not None and rate is not None
                 else 0.0
             )
-            change_text: str = ""
+            change_text: InlineElement
             match change:
                 case float() as change if change >= 0.1:
-                    change_text = f"[green]▲ +{change:.1f}[/green]"
+                    change_text = Colorized(f"▲ +{change:.1f}", color="green")
                 case float() as change if change <= -0.1:
-                    change_text = f"[red]▼ {change:.1f}[/red]"
+                    change_text = Colorized(f"▼ {change:.1f}", color="red")
                 case _:
-                    change_text = ""
+                    change_text = Text("")
             if not rate:
                 continue
-            rows.append(
-                [
-                    f"[bold]{lexicon.language.get_code()}[/bold]"
-                    f" {lexicon.language.get_name()}",
-                    progress(need),
-                    (
-                        f"{abs(rate):.1f}  " + progress(int(rate * 10))
-                        if rate is not None
-                        else "N/A"
-                    ),
-                    change_text,
-                ]
+            code: Formatted = Formatted(
+                lexicon.language.get_code(), format_="bold"
             )
+            row: list[InlineElement | str] = [
+                Text().add(code).add(" " + lexicon.language.get_name()),
+                progress(need),
+                (
+                    f"{abs(rate):.1f}  " + progress(int(rate * 10))
+                    if rate is not None
+                    else "N/A"
+                ),
+                change_text,
+            ]
+            rows.append(row)
 
         self.interface.print(
             Table(

tests/test_command_line/test_learn.py

@@ -159,15 +159,15 @@ def test_learn_with_sentences(capsys: CaptureFixture[str]) -> None:
             Learn new words for Norwegian Bokmål
             New question.
             yes
-            [green]hei[/green], [grey]Maria[/grey], __
+            hei, Maria, __
             hi, Maria, yes
-            __, [grey]Maria[/grey]
+            __, Maria
             yes, Maria
             ja
             yes
             New question.
             what
-            ___? [green]ja[/green]!
+            ___? ja!
             <Reveal translations>
             what? yes!
             hva