Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented Selection.set_font() for Android #2130

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Implemented Selection.set_font() for Android #2130

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
37d6551
implemented TogaSpinnerAdapter
t-arn Sep 14, 2023
f8d428c
fixed some bugs; applied black
t-arn Sep 19, 2023
e95e04d
added remaining Adapter methods
t-arn Sep 19, 2023
e94c038
Renamed TogaSpinnerAdapter to TogaArrayAdapter
t-arn Sep 23, 2023
057afb7
Fixed logic to get the default values
t-arn Sep 24, 2023
27e93cc
removed examples/tutorial0/static
t-arn Sep 24, 2023
c5f1378
Added news fragment
t-arn Sep 24, 2023
e3e95a6
Mergedbranch 'main' into selection_setfontV2_5b94842
t-arn Sep 26, 2023
7a26027
cleanup;
t-arn Sep 26, 2023
d019817
Merge branch 'main' into selection_setfontV2_5b94842
t-arn Oct 3, 2023
67a16fd
added testbed probes
t-arn Oct 3, 2023
99644e4
fixed testbed probe
t-arn Oct 3, 2023
c172e07
fixed set_font() so it also works after widget creation
t-arn Oct 3, 2023
19951dd
Fixed set_font(), so get_textsize() and get_typeface() return the cor…
t-arn Oct 3, 2023
c8a34db
Removed impl.get_textsize() and impl.get_typeface();
t-arn Oct 5, 2023
9a50e01
Removed cache font values;
t-arn Oct 8, 2023
aa1b2d3
Merge branch 'main' into selection_setfontV2_5b94842
t-arn Oct 11, 2023
5afcc4c
Replaced Font.appy() with Label.set_textview_font()
t-arn Oct 11, 2023
5417c42
Changed testbed to reset changed attributes one by one to avoid trigg…
t-arn Oct 11, 2023
de8694a
fixups
t-arn Oct 11, 2023
a8207cd
Reverted changes in testbed properties.py
t-arn Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 86 additions & 3 deletions android/src/toga_android/widgets/selection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

from android import R
from android.view import View
from android.widget import AdapterView, ArrayAdapter, Spinner
from android.widget import AdapterView, ArrayAdapter, Spinner, SpinnerAdapter

from . import label
from .base import Widget


Expand All @@ -20,14 +21,90 @@ def onNothingSelected(self, parent):
self.impl.on_change(None)


class TogaArrayAdapter(dynamic_proxy(SpinnerAdapter)):
def __init__(self, impl):
super().__init__()
self.impl = impl
self._default_textsize = -1
self._default_typeface = None
self.adapter = ArrayAdapter(
self.impl._native_activity, R.layout.simple_spinner_item
)
self.adapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item)

def apply_font(self, tv):
if self.impl._font_impl and tv:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How/when does this method get invoked when tv is None?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During the creation of the widget, this can happen.

label.set_textview_font(
tv,
self.impl._font_impl,
self._default_typeface,
self._default_textsize,
)

def cache_textview_defaults(self, tv):
self._default_textsize = tv.getTextSize()
self._default_typeface = tv.getTypeface()

def getDropDownView(self, position, convertView, parent):
tv = self.adapter.getDropDownView(position, convertView, parent)
self.apply_font(tv)
return tv

def getView(self, position, convertView, parent):
tv = self.adapter.getView(position, convertView, parent)
if self._default_textsize == -1:
self.cache_textview_defaults(tv)
self.apply_font(tv)
return tv

def clear(self):
return self.adapter.clear()

def getAutofillOptions(self):
return self.adapter.getAutofillOptions()

def getCount(self):
return self.adapter.getCount()

def getItem(self, position):
return self.adapter.getItem(position)

def getItemId(self, position):
return self.adapter.getItemId(position)

def getItemViewType(self, position):
return self.adapter.getItemViewType(position)

def getViewTypeCount(self):
return self.adapter.getViewTypeCount()

def hasStableIds(self):
return self.adapter.hasStableIds()

def insert(self, object, index):
return self.adapter.insert(object, index)

def isEmpty(self):
return self.adapter.isEmpty()

def registerDataSetObserver(self, observer):
self.adapter.registerDataSetObserver(observer)

def remove(self, object):
self.adapter.remove(object)

def unregisterDataSetObserver(self, observer):
self.adapter.unregisterDataSetObserver(observer)


class Selection(Widget):
focusable = False
_font_impl = None

def create(self):
self.native = Spinner(self._native_activity, Spinner.MODE_DROPDOWN)
self.native.setOnItemSelectedListener(TogaOnItemSelectedListener(impl=self))
self.adapter = ArrayAdapter(self._native_activity, R.layout.simple_spinner_item)
self.adapter.setDropDownViewResource(R.layout.simple_spinner_dropdown_item)
self.adapter = TogaArrayAdapter(impl=self)
self.native.setAdapter(self.adapter)
self.last_selection = None

Expand Down Expand Up @@ -87,3 +164,9 @@ def rehint(self):
self.native.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
self.interface.intrinsic.width = at_least(self.native.getMeasuredWidth())
self.interface.intrinsic.height = self.native.getMeasuredHeight()

def set_font(self, font):
self._font_impl = font._impl
tv = self.native.getSelectedView()
if tv:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As above - how/when is this branch not triggered?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

During the creation of the widget, I saw that set_font() is called and tv was null

self.adapter.apply_font(tv)
5 changes: 3 additions & 2 deletions android/tests_backend/widgets/selection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
class SelectionProbe(SimpleProbe):
native_class = Spinner
supports_justify = False
default_font_size = 16

def assert_resizes_on_content_change(self):
xfail("Selection doesn't resize on content changes on this backend")
Expand All @@ -22,11 +23,11 @@ def color(self):

@property
def typeface(self):
xfail("Can't change the font of Selection on this backend")
return self.impl.native.getSelectedView().getTypeface()

@property
def text_size(self):
xfail("Can't change the font of Selection on this backend")
return self.impl.native.getSelectedView().getTextSize()

@property
def background_color(self):
Expand Down
1 change: 1 addition & 0 deletions changes/2130.misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The set_font() method has been implemented for Selection on Android
36 changes: 31 additions & 5 deletions examples/selection/selection/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import toga
from toga.constants import COLUMN, ROW
from toga.constants import COLUMN, ITALIC, ROW
from toga.fonts import FANTASY
from toga.style import Pack


Expand All @@ -18,6 +19,9 @@ def startup(self):
# Main window of the application with title and size
self.main_window = toga.MainWindow(title=self.name, size=(640, 400))

# set font toggle
self.big_font = False

# set up common styles
label_style = Pack(flex=1, padding_right=24)
box_style = Pack(direction=ROW, padding=10)
Expand All @@ -29,6 +33,14 @@ def startup(self):
accessor="name",
items=self.DATA_OPTIONS,
)
self.styled_selection = toga.Selection(
style=Pack(
width=200,
padding=24,
font_family="serif",
),
items=["Curium", "Titanium", "Copernicium"],
)

self.main_window.content = toga.Box(
children=[
Expand Down Expand Up @@ -86,10 +98,7 @@ def startup(self):
style=box_style,
children=[
toga.Label("Use some style!", style=label_style),
toga.Selection(
style=Pack(width=200, padding=24),
items=["Curium", "Titanium", "Copernicium"],
),
self.styled_selection,
],
),
toga.Box(
Expand All @@ -110,6 +119,12 @@ def startup(self):
),
],
),
toga.Box(
style=box_style,
children=[
toga.Button("Change font", on_press=self.change_font),
],
),
],
style=Pack(direction=COLUMN, padding=24),
)
Expand Down Expand Up @@ -137,6 +152,17 @@ def report_selection(self, widget):
f"Source: {self.source_selection.value.name} has weight {self.source_selection.value.weight}"
)

def change_font(self, widget):
self.big_font = not self.big_font
if self.big_font:
self.styled_selection.style.font_size = 30
self.styled_selection.style.font_style = ITALIC
self.styled_selection.style.font_family = FANTASY
else:
del self.styled_selection.style.font_size
del self.styled_selection.style.font_style
self.styled_selection.style.font_family = "serif"


def main():
# App name and namespace
Expand Down
8 changes: 6 additions & 2 deletions testbed/tests/widgets/properties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,13 @@ async def test_font(widget, probe, verify_font_sizes):
if verify_font_sizes[1]:
assert probe.height > orig_height

# Reset to original family and size.
del widget.style.font_family
# Reset to original size.
del widget.style.font_size
await probe.redraw(message="Widget text should be reset to original size")
probe.assert_font_size(SYSTEM_DEFAULT_FONT_SIZE)

# Reset to original family
del widget.style.font_family
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This clearly makes the test pass, but I think it is masking the underlying problem.

Running the test in --slow mode can be illustrative, as you can see the changes that are happening at a speed that is observable.

In this case, using --slow highlights that there's a problem. If you revert your change to this test, you can see that after deleting the two font properties, the widget is still tall - that is, the test failure is reporting a problem correctly.

If you change the order of the deletions - deleting the family, then the size - the widget height is correct, and the test passes.

So - introducing the extra probe redraw here actually isn't the fix. It's the fact that you've changed the order of the deletions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made all kinds of changes to test_font() and although, it visually looked ok (with --slow), the test failed when checking the resetted widget height. Doing the same kind of changes in the selection example works, though. There, the widget height does not only look ok, Spinner.getHeight() in fact returns its original value.

So, if you've found a better way to make the testbed work, please apply these changes to this PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't speak to your own personal setup - but the CI setup reveals the problem, and I can reproduce the problem locally, so this isn't an oddity of the testbed. There's a problem here that needs to be resolved.

What you're looking for is the amout of space above the text in the widget. The text has the right sized font, but there's a border above the widget (and presumably below as well), which effectively represents the old widget size, with the smaller text vertically centered in that space.

As for a fix... you're the person proposing the change. It's up to you to fix problems that are found. I'm telling you by way of code review that the change you've made to the test suite isn't acceptable. Maybe @mhsmith has some more ideas about places to look for a fix, but we both have other development priorities (not the least of which is finally getting the next Toga release out the door), so we're not in a position to drop everything to hunt a bug that isn't a high priority for us personally.

await probe.redraw(
message="Widget text should be reset to original family and size"
)
Expand Down