SeedSigner Icons v2

src/seedsigner/gui/components.py

@@ -28,7 +28,7 @@ class GUIConstants:
  REGTEST_COLOR = "#00caf1"
 
  ICON_FONT_NAME__FONT_AWESOME = "Font_Awesome_6_Free-Solid-900"
- ICON_FONT_NAME__SEEDSIGNER = "seedsigner-glyphs"
+ ICON_FONT_NAME__SEEDSIGNER = "seedsigner-icons"
  ICON_FONT_SIZE = 22
  ICON_INLINE_FONT_SIZE = 24
  ICON_LARGE_BUTTON_SIZE = 36
@@ -69,10 +69,6 @@ class FontAwesomeIconConstants:
  ANGLE_RIGHT = "\uf105"
  ANGLE_UP = "\uf106"
  CAMERA = "\uf030"
- CARET_DOWN = "\uf0d7"
- CARET_LEFT = "\uf0d9"
- CARET_RIGHT = "\uf0da"
- CARET_UP = "\uf0d8"
  CHEVRON_UP = "\uf077"
  CHEVRON_DOWN = "\uf078"
  SOLID_CIRCLE_CHECK = "\uf058"
@@ -85,46 +81,59 @@ class FontAwesomeIconConstants:
  DICE_FOUR = "\uf524"
  DICE_FIVE = "\uf523"
  DICE_SIX = "\uf526"
- GEAR = "\uf013"
- KEY = "\uf084"
  KEYBOARD = "\uf11c"
  LOCK = "\uf023"
  MAP = "\uf279"
  PAPER_PLANE = "\uf1d8"
  PEN = "\uf304"
- PLUS = "+"
- POWER_OFF = "\uf011"
  ROTATE_RIGHT = "\uf2f9"
- SCREWDRIVER_WRENCH = "\uf7d9"
+ SDCARD = "\uf7c2"
  SQUARE = "\uf0c8"
  SQUARE_CARET_DOWN = "\uf150"
  SQUARE_CARET_LEFT = "\uf191"
  SQUARE_CARET_RIGHT = "\uf152"
  SQUARE_CARET_UP = "\uf151"
  SQUARE_CHECK = "\uf14a"
- TRIANGLE_EXCLAMATION = "\uf071"
  UNLOCK = "\uf09c"
- QRCODE = "\uf029"
  X = "\u0058"
- SDCARD = "\uf7c2"
 
 
-class SeedSignerCustomIconConstants:
- LARGE_CHEVRON_LEFT = "\ue900"
- SMALL_CHEVRON_RIGHT = "\ue901"
- PAGE_UP = "\ue903"
- PAGE_DOWN = "\ue902"
- PLUS = "\ue904"
- CIRCLE_CHECK = "\ue907"
- CIRCLE_EXCLAMATION = "\ue908"
- CIRCLE_X = "\ue909"
- FINGERPRINT = "\ue90a"
- PATH = "\ue90b"
- BITCOIN_LOGO_STRAIGHT = "\ue90c"
- BITCOIN_LOGO_TILTED = "\ue90d"
+class SeedSignerIconConstants:
+ SCAN = "\ue900"
+ SEEDS = "\ue901"
+ SETTINGS = "\ue902"
+ TOOLS = "\ue903"
+
+ BACK = "\ue904"
+ CHEVRON_DOWN = "\ue905"
+ CHEVRON_LEFT = "\ue906"
+ CHEVRON_RIGHT = "\ue907"
+ CHEVRON_UP = "\ue908"
+ CLOSE = "\ue909"
+ PAGE_DOWN = "\ue90a"
+ PAGE_UP = "\ue90b"
+ PLUS = "\ue90c"
+ POWER = "\ue90d"
+
+ ERROR = "\ue90e"
+ SUCCESS = "\ue90f"
+ WARNING = "\ue910"
+
+ ADDRESS = "\ue911"
+ CHANGE = "\ue912"
+ DERIVATION = "\ue913"
+ FEE = "\ue914"
+ FINGERPRINT = "\ue915"
+ PASSPHRASE = "\ue916"
+
+ BITCOIN = "\ue917"
+ BITCOIN_ALT = "\ue918"
+ BRIGHTNESS = "\ue919"
+ MICROSD = "\ue91a"
+ QRCODE = "\ue91b"
 
- MIN_VALUE = LARGE_CHEVRON_LEFT
- MAX_VALUE = BITCOIN_LOGO_TILTED
+ MIN_VALUE = SCAN
+ MAX_VALUE = QRCODE
 
 
 
@@ -425,14 +434,14 @@ def render(self):
 class Icon(BaseComponent):
  screen_x: int = 0
  screen_y: int = 0
- icon_name: str = SeedSignerCustomIconConstants.BITCOIN_LOGO_TILTED
+ icon_name: str = SeedSignerIconConstants.BITCOIN_ALT
  icon_size: int = GUIConstants.ICON_FONT_SIZE
  icon_color: str = GUIConstants.BODY_FONT_COLOR
 
  def __post_init__(self):
  super().__post_init__()
 
- if SeedSignerCustomIconConstants.MIN_VALUE <= self.icon_name and self.icon_name <= SeedSignerCustomIconConstants.MAX_VALUE:
+ if SeedSignerIconConstants.MIN_VALUE <= self.icon_name and self.icon_name <= SeedSignerIconConstants.MAX_VALUE:
  self.icon_font = Fonts.get_font(GUIConstants.ICON_FONT_NAME__SEEDSIGNER, self.icon_size, file_extension="otf")
  else:
  self.icon_font = Fonts.get_font(GUIConstants.ICON_FONT_NAME__FONT_AWESOME, self.icon_size, file_extension="otf")
@@ -859,7 +868,7 @@ def __post_init__(self):
  btc_icon = Icon(
  image_draw=draw,
  canvas=self.paste_image,
- icon_name=SeedSignerCustomIconConstants.BITCOIN_LOGO_TILTED,
+ icon_name=SeedSignerIconConstants.BITCOIN_ALT,
  icon_color=btc_color,
  icon_size=self.icon_size,
  screen_x=0,
@@ -947,7 +956,7 @@ def __post_init__(self):
  btc_icon = Icon(
  image_draw=draw,
  canvas=self.paste_image,
- icon_name=SeedSignerCustomIconConstants.BITCOIN_LOGO_TILTED,
+ icon_name=SeedSignerIconConstants.BITCOIN_ALT,
  icon_color=btc_color,
  icon_size=self.icon_size,
  screen_x=0,
@@ -1279,7 +1288,7 @@ def __post_init__(self):
 
  if self.show_back_button:
  self.left_button = IconButton(
- icon_name=SeedSignerCustomIconConstants.LARGE_CHEVRON_LEFT,
+ icon_name=SeedSignerIconConstants.BACK,
  icon_size=GUIConstants.ICON_INLINE_FONT_SIZE,
  screen_x=GUIConstants.EDGE_PADDING,
  screen_y=GUIConstants.EDGE_PADDING,
@@ -1289,7 +1298,7 @@ def __post_init__(self):
 
  if self.show_power_button:
  self.right_button = IconButton(
- icon_name=FontAwesomeIconConstants.POWER_OFF,
+ icon_name=SeedSignerIconConstants.POWER,
  icon_size=GUIConstants.ICON_INLINE_FONT_SIZE,
  screen_x=self.width - GUIConstants.TOP_NAV_BUTTON_SIZE - GUIConstants.EDGE_PADDING,
  screen_y=GUIConstants.EDGE_PADDING,

src/seedsigner/gui/screens/psbt_screens.py

@@ -7,7 +7,7 @@
 from seedsigner.models.threads import BaseThread
 
 from .screen import ButtonListScreen, WarningScreen
-from ..components import (BtcAmount, Button, Icon, FontAwesomeIconConstants, IconTextLine, FormattedAddress, GUIConstants, Fonts, SeedSignerCustomIconConstants, TextArea,
+from ..components import (BtcAmount, Button, Icon, FontAwesomeIconConstants, IconTextLine, FormattedAddress, GUIConstants, Fonts, SeedSignerIconConstants, TextArea,
  calc_bezier_curve, linear_interp)
 
 
@@ -655,7 +655,7 @@ def __post_init__(self):
  # Adjust the vertical spacing
  screen_y -= GUIConstants.COMPONENT_PADDING
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  value_text=f"""{"Multisig" if self.is_multisig else self.fingerprint}: {"Change" if self.is_change_derivation_path else "Addr"} #{self.derivation_path_addr_index}""",
  is_text_centered=False,
@@ -665,7 +665,7 @@ def __post_init__(self):
 
  if self.is_change_addr_verified:
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.CIRCLE_CHECK,
+ icon_name=SeedSignerIconConstants.SUCCESS,
  icon_color="#00dd00",
  value_text="Address verified!",
  is_text_centered=False,

src/seedsigner/gui/screens/screen.py

@@ -11,7 +11,7 @@
 from seedsigner.models.settings import SettingsConstants
 
 from ..components import (FontAwesomeIconConstants, GUIConstants, BaseComponent, Button, Icon, IconButton,
- LargeIconButton, SeedSignerCustomIconConstants, TopNav, TextArea, load_image, ToastOverlay,
+ LargeIconButton, SeedSignerIconConstants, TopNav, TextArea, load_image, ToastOverlay,
  Fonts)
 
 from seedsigner.hardware.buttons import HardwareButtonsConstants, HardwareButtons
@@ -692,7 +692,7 @@ def add_brightness_tips(self, image: Image.Image) -> None:
  canvas=rectangle,
  screen_x=GUIConstants.EDGE_PADDING*2 + 1,
  screen_y=GUIConstants.COMPONENT_PADDING + 4, # +4 fudge factor to account for where the chevron is drawn relative to baseline
- icon_name=FontAwesomeIconConstants.CHEVRON_UP,
+ icon_name=SeedSignerIconConstants.CHEVRON_UP,
  icon_size=GUIConstants.BODY_FONT_SIZE,
  )
  chevron_up_icon.render()
@@ -702,7 +702,7 @@ def add_brightness_tips(self, image: Image.Image) -> None:
  canvas=rectangle,
  screen_x=chevron_up_icon.screen_x,
  screen_y=chevron_up_icon.screen_y + chevron_up_icon.icon_size + GUIConstants.BODY_LINE_SPACING,
- icon_name=FontAwesomeIconConstants.CHEVRON_DOWN,
+ icon_name=SeedSignerIconConstants.CHEVRON_DOWN,
  icon_size=chevron_up_icon.icon_size,
  )
  chevron_down_icon.render()
@@ -824,7 +824,7 @@ def _run(self):
 @dataclass
 class LargeIconStatusScreen(ButtonListScreen):
  title: str = "Success!"
- status_icon_name: str = SeedSignerCustomIconConstants.CIRCLE_CHECK
+ status_icon_name: str = SeedSignerIconConstants.SUCCESS
  status_icon_size: int = GUIConstants.ICON_PRIMARY_SCREEN_SIZE
  status_color: str = GUIConstants.SUCCESS_COLOR
  status_headline: str = "Success!" # The colored text under the large icon
@@ -948,7 +948,7 @@ def __post_init__(self):
 @dataclass
 class WarningScreen(WarningEdgesMixin, LargeIconStatusScreen):
  title: str = "Caution"
- status_icon_name: str = SeedSignerCustomIconConstants.CIRCLE_EXCLAMATION
+ status_icon_name: str = SeedSignerIconConstants.WARNING
  status_color: str = "yellow"
  status_headline: str = "Privacy Leak!" # The colored text under the alert icon
 
@@ -1242,15 +1242,15 @@ def _render(self):
  if self.action == MicroSD.ACTION__REMOVED:
 
  self.toast = ToastOverlay(
- icon_name=FontAwesomeIconConstants.SDCARD,
+ icon_name=SeedSignerIconConstants.MICROSD,
  color=GUIConstants.NOTIFICATION_COLOR,
  label_text="MicroSD removed"
  )
 
  elif self.action == MicroSD.ACTION__INSERTED:
 
  self.toast = ToastOverlay(
- icon_name=FontAwesomeIconConstants.SDCARD,
+ icon_name=SeedSignerIconConstants.MICROSD,
  color=GUIConstants.NOTIFICATION_COLOR,
  label_text="MicroSD inserted"
  )

src/seedsigner/gui/screens/seed_screens.py

@@ -15,7 +15,7 @@
 
 from .screen import RET_CODE__BACK_BUTTON, BaseScreen, BaseTopNavScreen, ButtonListScreen, KeyboardScreen, WarningEdgesMixin
 from ..components import (Button, FontAwesomeIconConstants, Fonts, FormattedAddress, IconButton,
- IconTextLine, SeedSignerCustomIconConstants, TextArea, GUIConstants,
+ IconTextLine, SeedSignerIconConstants, TextArea, GUIConstants,
  calc_text_centering)
 
 from seedsigner.gui.keyboard import Keyboard, TextEntryDisplay
@@ -421,7 +421,7 @@ def __post_init__(self):
  super().__post_init__()
 
  self.fingerprint_icontl = IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  icon_size=GUIConstants.ICON_FONT_SIZE + 12,
  label_text="fingerprint",
@@ -441,7 +441,7 @@ class SeedOptionsScreen(ButtonListScreen):
  has_passphrase: bool = False
 
  def __post_init__(self):
- self.top_nav_icon_name = SeedSignerCustomIconConstants.FINGERPRINT
+ self.top_nav_icon_name = SeedSignerIconConstants.FINGERPRINT
  self.top_nav_icon_color = "blue"
  self.title = self.fingerprint
  self.is_button_text_centered = False
@@ -584,7 +584,7 @@ def __post_init__(self):
 
  # Set up the fingerprint and passphrase displays
  self.fingerprint_line = IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  label_text="Fingerprint",
  value_text=self.fingerprint,
@@ -594,7 +594,7 @@ def __post_init__(self):
  self.components.append(self.fingerprint_line)
 
  self.derivation_line = IconTextLine(
- icon_name=SeedSignerCustomIconConstants.PATH,
+ icon_name=SeedSignerIconConstants.DERIVATION,
  label_text="Derivation",
  value_text=self.derivation_path,
  screen_x=GUIConstants.COMPONENT_PADDING,
@@ -1009,7 +1009,7 @@ def __post_init__(self):
  super().__post_init__()
 
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  label_text="changes fingerprint",
  value_text=f"{self.fingerprint_without} >> {self.fingerprint_with}",

src/seedsigner/gui/screens/tools_screens.py

@@ -3,7 +3,7 @@
 from PIL.Image import Image
 from seedsigner.gui.keyboard import Keyboard, TextEntryDisplay
 from seedsigner.hardware.camera import Camera
-from seedsigner.gui.components import FontAwesomeIconConstants, Fonts, FormattedAddress, GUIConstants, IconTextLine, SeedSignerCustomIconConstants, TextArea
+from seedsigner.gui.components import FontAwesomeIconConstants, Fonts, FormattedAddress, GUIConstants, IconTextLine, SeedSignerIconConstants, TextArea
 
 from seedsigner.gui.screens.screen import RET_CODE__BACK_BUTTON, BaseScreen, BaseTopNavScreen, ButtonListScreen, KeyboardScreen
 from seedsigner.hardware.buttons import HardwareButtonsConstants
@@ -362,7 +362,7 @@ def __post_init__(self):
  ))
 
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  label_text="fingerprint",
  value_text=self.fingerprint,
@@ -386,7 +386,7 @@ def __post_init__(self):
 
  if self.fingerprint:
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.FINGERPRINT,
+ icon_name=SeedSignerIconConstants.FINGERPRINT,
  icon_color="blue",
  label_text="Fingerprint",
  value_text=self.fingerprint,
@@ -396,15 +396,15 @@ def __post_init__(self):
 
  if self.script_type != SettingsConstants.CUSTOM_DERIVATION:
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.PATH,
+ icon_name=SeedSignerIconConstants.DERIVATION,
  label_text="Derivation",
  value_text=SettingsDefinition.get_settings_entry(attr_name=SettingsConstants.SETTING__SCRIPT_TYPES).get_selection_option_display_name_by_value(value=self.script_type),
  screen_x=GUIConstants.EDGE_PADDING,
  screen_y=self.components[-1].screen_y + self.components[-1].height + GUIConstants.COMPONENT_PADDING,
  ))
  else:
  self.components.append(IconTextLine(
- icon_name=SeedSignerCustomIconConstants.PATH,
+ icon_name=SeedSignerIconConstants.DERIVATION,
  label_text="Derivation",
  value_text=self.custom_derivation_path,
  screen_x=GUIConstants.EDGE_PADDING,

src/seedsigner/views/psbt_views.py

@@ -6,7 +6,7 @@
 from embit.networks import NETWORKS
 from seedsigner.controller import Controller
 
-from seedsigner.gui.components import FontAwesomeIconConstants, SeedSignerCustomIconConstants
+from seedsigner.gui.components import FontAwesomeIconConstants, SeedSignerIconConstants
 from seedsigner.models.encode_qr import EncodeQR
 from seedsigner.models.psbt_parser import PSBTParser
 from seedsigner.models.qr_type import QRType
@@ -21,7 +21,7 @@
 
 
 class PSBTSelectSeedView(View):
- SCAN_SEED = ("Scan a seed", FontAwesomeIconConstants.QRCODE)
+ SCAN_SEED = ("Scan a seed", SeedSignerIconConstants.QRCODE)
  TYPE_12WORD = ("Enter 12-word seed", FontAwesomeIconConstants.KEYBOARD)
  TYPE_24WORD = ("Enter 24-word seed", FontAwesomeIconConstants.KEYBOARD)
  button_data = []
@@ -41,7 +41,7 @@ def run(self):
  # Doesn't look like this seed can sign the current PSBT
  button_str += " (?)"
 
- self.button_data.append((button_str, SeedSignerCustomIconConstants.FINGERPRINT, "blue"))
+ self.button_data.append((button_str, SeedSignerIconConstants.FINGERPRINT, "blue"))
 
  self.button_data.append(self.SCAN_SEED)
  self.button_data.append(self.TYPE_12WORD)
@@ -531,7 +531,7 @@ def run(self):
  # Just a WarningScreen here; only use DireWarningScreen for true security risks.
  selected_menu_num = WarningScreen(
  title="PSBT Error",
- status_icon_name=SeedSignerCustomIconConstants.CIRCLE_EXCLAMATION,
+ status_icon_name=SeedSignerIconConstants.WARNING,
  status_headline="Signing Failed",
  text="Signing with this seed did not add a valid signature.",
  button_data=["Select Diff Seed"],