[widget audit] toga.DateInput, toga.TimeInput

android/src/toga_android/factory.py

@@ -8,7 +8,7 @@
 from .widgets.box import Box
 from .widgets.button import Button
 from .widgets.canvas import Canvas
-from .widgets.datepicker import DatePicker
+from .widgets.dateinput import DateInput
 from .widgets.detailedlist import DetailedList
 from .widgets.imageview import ImageView
 from .widgets.label import Label
@@ -22,7 +22,7 @@
 from .widgets.switch import Switch
 from .widgets.table import Table
 from .widgets.textinput import TextInput
-from .widgets.timepicker import TimePicker
+from .widgets.timeinput import TimeInput
 from .widgets.webview import WebView
 from .window import Window
 
@@ -37,7 +37,7 @@ def not_implemented(feature):
     "Button",
     "Canvas",
     "Command",
-    "DatePicker",
+    "DateInput",
     "Font",
     "Icon",
     "Image",
@@ -54,7 +54,7 @@ def not_implemented(feature):
     "Switch",
     "Table",
     "TextInput",
-    "TimePicker",
+    "TimeInput",
     "WebView",
     "Window",
     "DetailedList",

android/src/toga_android/widgets/dateinput.py

@@ -0,0 +1,73 @@
+from datetime import date, datetime, time
+
+from ..libs.android import R__drawable
+from ..libs.android.widget import (
+    DatePickerDialog,
+    DatePickerDialog__OnDateSetListener as OnDateSetListener,
+)
+from .internal.pickers import PickerBase
+
+NO_MIN = date(1799, 1, 1)
+NO_MAX = date(9999, 1, 1)
+
+
+def py_date(native_date):
+    return date.fromtimestamp(native_date / 1000)
+
+
+def native_date(py_date):
+    return int(datetime.combine(py_date, time.min).timestamp() * 1000)
+
+
+class DatePickerListener(OnDateSetListener):
+    def __init__(self, impl):
+        super().__init__()
+        self.impl = impl
+
+    def onDateSet(self, view, year, month_0, day):
+        self.impl.set_value(date(year, month_0 + 1, day))
+
+
+class DateInput(PickerBase):
+    @classmethod
+    def _get_icon(cls):
+        return R__drawable.ic_menu_my_calendar
+
+    def create(self):
+        super().create()
+        self.native.setText("1970-01-01")  # Dummy value used during initialization
+
+    def get_value(self):
+        return date.fromisoformat(str(self.native.getText()))
+
+    def set_value(self, value):
+        self.native.setText(value.isoformat())
+        self._dialog.updateDate(value.year, value.month - 1, value.day)
+        self.interface.on_change(None)
+
+    def get_min_date(self):
+        result = py_date(self._picker.getMinDate())
+        return None if (result == NO_MIN) else result
+
+    def set_min_date(self, value):
+        self._picker.setMinDate(native_date(NO_MIN if value is None else value))
+
+    def get_max_date(self):
+        result = py_date(self._picker.getMaxDate())
+        return None if (result == NO_MAX) else result
+
+    def set_max_date(self, value):
+        self._picker.setMaxDate(native_date(NO_MAX if value is None else value))
+
+    def _create_dialog(self):
+        return DatePickerDialog(
+            self._native_activity,
+            DatePickerListener(self),
+            2000,  # year
+            0,  # month (0 = January)
+            1,  # day
+        )
+
+    @property
+    def _picker(self):
+        return self._dialog.getDatePicker()

android/src/toga_android/widgets/internal/pickers.py

@@ -1,33 +1,33 @@
 from abc import ABC, abstractmethod
 
+from travertino.size import at_least
+
 from ...libs.android.view import OnClickListener, View__MeasureSpec
 from ...libs.android.widget import EditText
-from ..base import Widget
+from ..label import TextViewWidget
 
 
 class TogaPickerClickListener(OnClickListener):
-    def __init__(self, picker_impl):
+    def __init__(self, impl):
         super().__init__()
-        self.picker_impl = picker_impl
+        self.impl = impl
 
     def onClick(self, _):
-        self.picker_impl._create_dialog()
+        self.impl._dialog.show()
 
 
-class PickerBase(Widget, ABC):
+class PickerBase(TextViewWidget, ABC):
     @classmethod
     @abstractmethod
     def _get_icon(cls):
         raise NotImplementedError
 
-    @classmethod
     @abstractmethod
-    def _get_hint(cls):
+    def _create_dialog(self):
         raise NotImplementedError
 
     def create(self):
-        self._value = None
-        self._dialog = None
+        self._dialog = self._create_dialog()
         self.native = EditText(self._native_activity)
         self.native.setFocusable(False)
         self.native.setClickable(False)
@@ -36,10 +36,10 @@ def create(self):
         self.native.setLongClickable(False)
         self.native.setOnClickListener(TogaPickerClickListener(self))
         self.native.setCompoundDrawablesWithIntrinsicBounds(self._get_icon(), 0, 0, 0)
-        self.native.setHint(self._get_hint())
+        self.cache_textview_defaults()
 
     def rehint(self):
-        self.interface.intrinsic.width = self.native.getMeasuredWidth()
+        self.interface.intrinsic.width = at_least(300)
         # Refuse to call measure() if widget has no container, i.e., has no LayoutParams.
         # On Android, EditText's measure() throws NullPointerException if the widget has no
         # LayoutParams.

android/src/toga_android/widgets/label.py

@@ -19,6 +19,12 @@ def cache_textview_defaults(self):
     def set_font(self, font):
         font._impl.apply(self.native, self._default_text_size, self._default_typeface)
 
+    def set_background_color(self, value):
+        # In the case of EditText, his causes any custom color to hide the bottom border
+        # line, but it's better than set_background_filter, which affects *only* the
+        # bottom border line.
+        self.set_background_simple(value)
+
     def set_color(self, value):
         if value is None:
             self.native.setTextColor(self._default_text_color)
@@ -49,9 +55,6 @@ def get_text(self):
     def set_text(self, value):
         self.native.setText(value)
 
-    def set_background_color(self, value):
-        self.set_background_simple(value)
-
     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/textinput.py

@@ -94,11 +94,6 @@ def set_placeholder(self, value):
     def set_alignment(self, value):
         self.set_textview_alignment(value, Gravity.CENTER_VERTICAL)
 
-    def set_background_color(self, value):
-        # This causes any custom color to hide the bottom border line, but it's better
-        # than set_background_filter, which affects *only* the bottom border line.
-        self.set_background_simple(value)
-
     def set_error(self, error_message):
         self.native.setError(error_message)
 

android/src/toga_android/widgets/timeinput.py

@@ -0,0 +1,62 @@
+from datetime import time
+
+from ..libs.android import R__drawable
+from ..libs.android.widget import (
+    TimePickerDialog,
+    TimePickerDialog__OnTimeSetListener as OnTimeSetListener,
+)
+from .internal.pickers import PickerBase
+
+
+class TimePickerListener(OnTimeSetListener):
+    def __init__(self, impl):
+        super().__init__()
+        self.impl = impl
+
+    def onTimeSet(self, view, hour, minute):
+        self.impl.set_value(time(hour, minute))
+
+
+class TimeInput(PickerBase):
+    @classmethod
+    def _get_icon(cls):
+        return R__drawable.ic_menu_recent_history
+
+    def create(self):
+        super().create()
+
+        # Dummy values used during initialization
+        self.native.setText("00:00")
+        self._min_time = None
+        self._max_time = None
+
+    def get_value(self):
+        return time.fromisoformat(str(self.native.getText()))
+
+    def set_value(self, value):
+        self.native.setText(value.isoformat(timespec="minutes"))
+        self._dialog.updateTime(value.hour, value.minute)
+        self.interface.on_change(None)
+
+    # Unlike DatePicker, TimePicker does not natively support min or max, so these
+    # properties currently have no effect.
+    def get_min_time(self):
+        return self._min_time
+
+    def set_min_time(self, value):
+        self._min_time = value
+
+    def get_max_time(self):
+        return self._max_time
+
+    def set_max_time(self, value):
+        self._max_time = value
+
+    def _create_dialog(self):
+        return TimePickerDialog(
+            self._native_activity,
+            TimePickerListener(self),
+            0,  # hour
+            0,  # minute
+            True,  # is24HourView
+        )