[widget audit] toga.Button

android/src/toga_android/fonts.py

@@ -13,6 +13,7 @@
     SYSTEM_DEFAULT_FONT_SIZE,
 )
 from toga_android.libs.android.graphics import Typeface
+from toga_android.libs.android.util import TypedValue
 
 _FONT_CACHE = {}
 
@@ -21,31 +22,27 @@ class Font:
     def __init__(self, interface):
         self.interface = interface
 
-    def get_size(self):
-        # Default system font size on Android is 14sp (sp = dp, but is separately
-        # scalable in user settings). For what it's worth, Toga's default is 12pt.
-        if self.interface.size == SYSTEM_DEFAULT_FONT_SIZE:
-            font_size = 14
-        else:
-            font_size = self.interface.size
-        return float(font_size)
+    def apply(self, tv, default_size, default_typeface):
+        """Apply the font to the given native widget.
 
-    def get_style(self):
-        if self.interface.weight == BOLD:
-            if self.interface.style == ITALIC:
-                return Typeface.BOLD_ITALIC
-            else:
-                return Typeface.BOLD
-        elif self.interface.style == ITALIC:
-            return Typeface.ITALIC
+        :param tv: A native instance of TextView, or one of its subclasses.
+        :param default_size: The default font size of this widget, in pixels.
+        :param default_typeface: The default Typeface of this widget.
+        """
+        if self.interface.size == SYSTEM_DEFAULT_FONT_SIZE:
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, default_size)
         else:
-            return Typeface.NORMAL
+            # The default size for most widgets is 14sp, so mapping 1 Toga "point" to 1sp
+            # will give relative sizes that are consistent with desktop platforms. Using
+            # SP means font sizes will all change proportionately if the user adjusts the
+            # text size in the system settings.
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, self.interface.size)
 
-    def get_typeface(self):
+        cache_key = (self.interface, default_typeface)
         try:
-            family = _FONT_CACHE[self.interface]
+            typeface = _FONT_CACHE[cache_key]
         except KeyError:
-            family = None
+            typeface = None
             font_key = self.interface.registered_font_key(
                 self.interface.family,
                 weight=self.interface.weight,
@@ -57,36 +54,57 @@ def get_typeface(self):
                     self.interface.factory.paths.app / _REGISTERED_FONT_CACHE[font_key]
                 )
                 if os.path.isfile(font_path):
-                    family = Typeface.createFromFile(font_path)
+                    typeface = Typeface.createFromFile(font_path)
                     # If the typeface cannot be created, following Exception is thrown:
                     # E/Minikin: addFont failed to create font, invalid request
                     # It does not kill the app, but there is currently no way to
                     # catch this Exception on Android
                 else:
                     print(f"Registered font path {font_path!r} could not be found")
 
-            if family is None:
+            if typeface is None:
                 if self.interface.family is SYSTEM:
-                    family = Typeface.DEFAULT
+                    # The default button font is not marked as bold, but it has a weight
+                    # of "medium" (500), which is in between "normal" (400), and "bold"
+                    # (600 or 700). To preserve this, we use the widget's original
+                    # typeface as a starting point rather than Typeface.DEFAULT.
+                    typeface = default_typeface
                 elif self.interface.family is SERIF:
-                    family = Typeface.SERIF
+                    typeface = Typeface.SERIF
                 elif self.interface.family is SANS_SERIF:
-                    family = Typeface.SANS_SERIF
+                    typeface = Typeface.SANS_SERIF
                 elif self.interface.family is MONOSPACE:
-                    family = Typeface.MONOSPACE
+                    typeface = Typeface.MONOSPACE
                 elif self.interface.family is CURSIVE:
-                    family = Typeface.create("cursive", Typeface.NORMAL)
+                    typeface = Typeface.create("cursive", Typeface.NORMAL)
                 elif self.interface.family is FANTASY:
                     # Android appears to not have a fantasy font available by default,
                     # but if it ever does, we'll start using it. Android seems to choose
                     # a serif font when asked for a fantasy font.
-                    family = Typeface.create("fantasy", Typeface.NORMAL)
+                    typeface = Typeface.create("fantasy", Typeface.NORMAL)
                 else:
-                    family = Typeface.create(self.interface.family, Typeface.NORMAL)
+                    typeface = Typeface.create(self.interface.family, Typeface.NORMAL)
+
+            native_style = typeface.getStyle()
+            if self.interface.weight is not None:
+                native_style = set_bits(
+                    native_style, Typeface.BOLD, self.interface.weight == BOLD
+                )
+            if self.interface.style is not None:
+                native_style = set_bits(
+                    native_style, Typeface.ITALIC, self.interface.style == ITALIC
+                )
+            if native_style != typeface.getStyle():
+                typeface = Typeface.create(typeface, native_style)
+
+            _FONT_CACHE[cache_key] = typeface
+
+        tv.setTypeface(typeface)
 
-            family = (
-                family.__global__()
-            )  # store a JNI global reference to prevent objects from becoming stale
-            _FONT_CACHE[self.interface] = family
 
-        return family
+def set_bits(input, mask, enable=True):
+    if enable:
+        output = input | mask
+    else:
+        output = input & ~mask
+    return output

android/src/toga_android/libs/android/graphics.py

@@ -10,5 +10,6 @@
 Path__Direction = JavaClass("android/graphics/Path$Direction")
 Paint__Style = JavaClass("android/graphics/Paint$Style")
 PorterDuff__Mode = JavaClass("android/graphics/PorterDuff$Mode")
+PorterDuffColorFilter = JavaClass("android/graphics/PorterDuffColorFilter")
 Rect = JavaClass("android/graphics/Rect")
 Typeface = JavaClass("android/graphics/Typeface")

android/src/toga_android/widgets/base.py

@@ -116,9 +116,10 @@ def set_background_color(self, color):
     # a default implementation because it often overwrites other aspects of the widget's
     # appearance.
     def set_background_color_simple(self, value):
-        self.native.setBackgroundColor(
-            native_color(TRANSPARENT if (value is None) else value)
-        )
+        if value is None:
+            self.native.setBackgroundColor(native_color(TRANSPARENT))
+        else:
+            self.native.setBackgroundColor(native_color(value))
 
     def set_alignment(self, alignment):
         pass  # If appropriate, a widget subclass will implement this.

android/src/toga_android/widgets/button.py

@@ -1,12 +1,12 @@
 from travertino.size import at_least
 
+from toga.colors import TRANSPARENT
 from toga_android.colors import native_color
 
-from ..libs.android.graphics import PorterDuff__Mode
-from ..libs.android.util import TypedValue
+from ..libs.android.graphics import PorterDuff__Mode, PorterDuffColorFilter
 from ..libs.android.view import OnClickListener, View__MeasureSpec
 from ..libs.android.widget import Button as A_Button
-from .base import Widget
+from .label import TextViewWidget
 
 
 class TogaOnClickListener(OnClickListener):
@@ -19,36 +19,32 @@ def onClick(self, _view):
             self.button_impl.interface.on_press(widget=self.button_impl.interface)
 
 
-class Button(Widget):
+class Button(TextViewWidget):
     def create(self):
         self.native = A_Button(self._native_activity)
         self.native.setOnClickListener(TogaOnClickListener(button_impl=self))
+        self.cache_textview_defaults()
+
+    def get_text(self):
+        return str(self.native.getText())
 
     def set_text(self, text):
-        self.native.setText(self.interface.text)
+        self.native.setText(text)
 
     def set_enabled(self, value):
         self.native.setEnabled(value)
 
-    def set_font(self, font):
-        if font:
-            self.native.setTextSize(TypedValue.COMPLEX_UNIT_SP, font._impl.get_size())
-            self.native.setTypeface(font._impl.get_typeface(), font._impl.get_style())
-
     def set_on_press(self, handler):
         # No special handling required
         pass
 
-    def set_color(self, value):
-        if value:
-            self.native.setTextColor(native_color(value))
-
     def set_background_color(self, value):
-        if value:
-            # do not use self.native.setBackgroundColor - this messes with the button style!
-            self.native.getBackground().setColorFilter(
-                native_color(value), PorterDuff__Mode.MULTIPLY
-            )
+        # Do not use self.native.setBackgroundColor - this messes with the button style!
+        self.native.getBackground().setColorFilter(
+            None
+            if value is None or value == TRANSPARENT
+            else PorterDuffColorFilter(native_color(value), PorterDuff__Mode.SRC_IN)
+        )
 
     def rehint(self):
         # Like other text-viewing widgets, Android crashes when rendering

android/src/toga_android/widgets/label.py

@@ -2,31 +2,38 @@
 
 from toga_android.colors import native_color
 
-from ..libs.android.util import TypedValue
 from ..libs.android.view import Gravity, View__MeasureSpec
 from ..libs.android.widget import TextView
 from .base import Widget, align
 
 
-class Label(Widget):
+class TextViewWidget(Widget):
+    def cache_textview_defaults(self):
+        self._default_text_color = self.native.getCurrentTextColor()
+        self._default_text_size = self.native.getTextSize()
+        self._default_typeface = self.native.getTypeface()
+
+    def set_font(self, font):
+        font._impl.apply(self.native, self._default_text_size, self._default_typeface)
+
+    def set_color(self, value):
+        if value is None:
+            self.native.setTextColor(self._default_text_color)
+        else:
+            self.native.setTextColor(native_color(value))
+
+
+class Label(TextViewWidget):
     def create(self):
         self.native = TextView(self._native_activity)
+        self.cache_textview_defaults()
 
     def set_text(self, value):
         self.native.setText(value)
 
-    def set_font(self, font):
-        if font:
-            self.native.setTextSize(TypedValue.COMPLEX_UNIT_SP, font._impl.get_size())
-            self.native.setTypeface(font._impl.get_typeface(), font._impl.get_style())
-
     def set_background_color(self, value):
         self.set_background_color_simple(value)
 
-    def set_color(self, color):
-        if color:
-            self.native.setTextColor(native_color(color))
-
     def rehint(self):
         # Refuse to rehint an Android TextView if it has no LayoutParams yet.
         # Calling measure() on an Android TextView w/o LayoutParams raises NullPointerException.

android/src/toga_android/widgets/multilinetextinput.py

@@ -1,13 +1,12 @@
 from travertino.size import at_least
 
 from toga.constants import LEFT
-from toga_android.colors import native_color
 
 from ..libs.android.text import InputType, TextWatcher
-from ..libs.android.util import TypedValue
 from ..libs.android.view import Gravity
 from ..libs.android.widget import EditText
-from .base import Widget, align
+from .base import align
+from .label import TextViewWidget
 
 
 class TogaTextWatcher(TextWatcher):
@@ -27,7 +26,7 @@ def onTextChanged(self, _charSequence, _start, _before, _count):
         pass
 
 
-class MultilineTextInput(Widget):
+class MultilineTextInput(TextViewWidget):
     def create(self):
         self._textChangedListener = None
         self.native = EditText(self._native_activity)
@@ -36,6 +35,7 @@ def create(self):
         )
         # Set default alignment
         self.set_alignment(LEFT)
+        self.cache_textview_defaults()
 
     def get_value(self):
         return self.native.getText().toString()
@@ -55,15 +55,6 @@ def set_alignment(self, value):
             return
         self.native.setGravity(Gravity.TOP | align(value))
 
-    def set_color(self, color):
-        if color:
-            self.native.setTextColor(native_color(color))
-
-    def set_font(self, font):
-        if font:
-            self.native.setTextSize(TypedValue.COMPLEX_UNIT_SP, font._impl.get_size())
-            self.native.setTypeface(font._impl.get_typeface(), font._impl.get_style())
-
     def set_value(self, value):
         self.native.setText(value)
 

android/src/toga_android/widgets/numberinput.py

@@ -3,10 +3,10 @@
 from travertino.size import at_least
 
 from ..libs.android.text import InputType, TextWatcher
-from ..libs.android.util import TypedValue
 from ..libs.android.view import Gravity, View__MeasureSpec
 from ..libs.android.widget import EditText
-from .base import Widget, align
+from .base import align
+from .label import TextViewWidget
 
 
 def decimal_from_string(s):
@@ -48,7 +48,7 @@ def onTextChanged(self, _charSequence, _start, _before, _count):
         pass
 
 
-class NumberInput(Widget):
+class NumberInput(TextViewWidget):
     def create(self):
         self.native = EditText(self._native_activity)
         self.native.addTextChangedListener(TogaNumberInputWatcher(self))
@@ -59,6 +59,7 @@ def create(self):
             | InputType.TYPE_NUMBER_FLAG_DECIMAL
             | InputType.TYPE_NUMBER_FLAG_SIGNED
         )
+        self.cache_textview_defaults()
 
     def set_readonly(self, value):
         self.native.setFocusable(not value)
@@ -70,11 +71,6 @@ def set_placeholder(self, value):
     def set_alignment(self, value):
         self.native.setGravity(Gravity.CENTER_VERTICAL | align(value))
 
-    def set_font(self, font):
-        if font:
-            self.native.setTextSize(TypedValue.COMPLEX_UNIT_SP, font._impl.get_size())
-            self.native.setTypeface(font._impl.get_typeface(), font._impl.get_style())
-
     def set_value(self, value):
         # Store a string in the Android widget. The `afterTextChanged` method
         # will call the user on_change handler.

android/src/toga_android/widgets/switch.py

@@ -1,12 +1,11 @@
 from travertino.size import at_least
 
-from ..libs.android.util import TypedValue
 from ..libs.android.view import View__MeasureSpec
 from ..libs.android.widget import (
     CompoundButton__OnCheckedChangeListener,
     Switch as A_Switch,
 )
-from .base import Widget
+from .label import TextViewWidget
 
 
 class OnCheckedChangeListener(CompoundButton__OnCheckedChangeListener):
@@ -19,10 +18,11 @@ def onCheckedChanged(self, _button, _checked):
             self._impl.interface.on_change(widget=self._impl.interface)
 
 
-class Switch(Widget):
+class Switch(TextViewWidget):
     def create(self):
         self.native = A_Switch(self._native_activity)
         self.native.setOnCheckedChangeListener(OnCheckedChangeListener(self))
+        self.cache_textview_defaults()
 
     def set_text(self, text):
         # When changing the text, Android needs a `setSingleLine(False)` call in order
@@ -39,11 +39,6 @@ def set_value(self, value):
     def get_value(self):
         return self.native.isChecked()
 
-    def set_font(self, font):
-        if font:
-            self.native.setTextSize(TypedValue.COMPLEX_UNIT_SP, font._impl.get_size())
-            self.native.setTypeface(font._impl.get_typeface(), font._impl.get_style())
-
     def set_on_change(self, handler):
         # No special handling required
         pass