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

Add OptionContainer for iOS #2259

Merged
merged 18 commits into from
Dec 13, 2023
Merged

Add OptionContainer for iOS #2259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d8b071f
Initial implementation of OptionContainer on iOS
freakboy3742 Dec 5, 2023
66ead6f
Correct 2 oversights in Cocoa backend.
freakboy3742 Dec 5, 2023
b13d9c3
Add testbed for iOS OptionContainer.
freakboy3742 Dec 6, 2023
e44480f
Add configurability of icons into core API.
freakboy3742 Dec 6, 2023
e9f4782
Update OptionContainer docs to reflect iOS changes.
freakboy3742 Dec 6, 2023
81d983c
Add changenote.
freakboy3742 Dec 6, 2023
2111fc2
Corrected test coverage for icons.
freakboy3742 Dec 6, 2023
3775c0e
Correct winforms OptionContainer API usage.
freakboy3742 Dec 6, 2023
4a9d6dc
Allow for enabled to be passed at construction.
freakboy3742 Dec 11, 2023
8180bda
Apply doc cleanups from code review
freakboy3742 Dec 11, 2023
01e12ef
Correct whitespace.
freakboy3742 Dec 11, 2023
007816e
Make the OptionItem constructor public.
freakboy3742 Dec 12, 2023
29d68b8
Tweaks to docstrings and type annotations.
freakboy3742 Dec 12, 2023
c13130e
Attempt to use type aliases to improve docs.
freakboy3742 Dec 12, 2023
a68e8ce
Add docstring references for types.
freakboy3742 Dec 12, 2023
362c65e
Correct Py3.8 compatibility.
freakboy3742 Dec 12, 2023
8cbb78d
Add a backwards compatibility shim.
freakboy3742 Dec 12, 2023
b1cedde
Formatting cleanups for docs.
freakboy3742 Dec 12, 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
2 changes: 2 additions & 0 deletions core/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ dev = [
"pytest-freezer == 0.4.8",
"setuptools-scm == 8.0.4",
"tox == 4.11.4",
# typing-extensions needed for TypeAlias added in Py 3.10
"typing-extensions == 4.9.0 ; python_version < '3.10'"
]
docs = [
"furo == 2023.9.10",
Expand Down
6 changes: 5 additions & 1 deletion core/src/toga/icons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
from __future__ import annotations

import sys
from pathlib import Path
from typing import TYPE_CHECKING

import toga
from toga.platform import get_platform_factory

if TYPE_CHECKING:
from typing import TypeAlias
if sys.version_info < (3, 10):
from typing_extensions import TypeAlias
else:
from typing import TypeAlias
Comment on lines +11 to +14
Copy link
Member

Choose a reason for hiding this comment

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

You can leave as-is if you want (since I'll have to handle all this in #2252) but you don't have to worry about a conditional import. pyupgrade will automatically switch to using only typing to import TypeAlias once 3.9 is no longer supported.


IconContent: TypeAlias = str | Path | toga.Icon | None

Expand Down
6 changes: 5 additions & 1 deletion core/src/toga/widgets/optioncontainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from __future__ import annotations

import sys
from typing import TYPE_CHECKING, Any, Protocol, overload

import toga
Expand All @@ -8,7 +9,10 @@
from .base import Widget

if TYPE_CHECKING:
from typing import TypeAlias
if sys.version_info < (3, 10):
from typing_extensions import TypeAlias
else:
from typing import TypeAlias

from toga.icons import IconContent

Expand Down