pythonnative 0.13.1__tar.gz → 0.14.0__tar.gz

{pythonnative-0.13.1/src/pythonnative.egg-info → pythonnative-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonnative
-Version: 0.13.1
+Version: 0.14.0
 Summary: Cross-platform native UI toolkit for Android and iOS
 Author: Owen Carey
 License: MIT License

{pythonnative-0.13.1 → pythonnative-0.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pythonnative"
-version = "0.13.1"
+version = "0.14.0"
 description = "Cross-platform native UI toolkit for Android and iOS"
 authors = [
   { name = "Owen Carey" }
@@ -63,6 +63,7 @@ Documentation = "https://docs.pythonnative.com/"
 
 
 
+
 [tool.setuptools.packages.find]
 where = ["src"]
 

{pythonnative-0.13.1 → pythonnative-0.14.0}/src/pythonnative/__init__.py

@@ -41,7 +41,7 @@ Example:
     ```
 """
 
-__version__ = "0.13.1"
+__version__ = "0.14.0"
 
 from .alerts import Alert
 from .animated import Animated, AnimatedValue

{pythonnative-0.13.1 → pythonnative-0.14.0}/src/pythonnative/native_views/android.py

@@ -1116,10 +1116,41 @@ class TabBarHandler(AndroidViewHandler):
             menu.clear()
             for i, item in enumerate(items):
                 title = item.get("title", item.get("name", ""))
-                menu.add(0, i, i, str(title))
+                menu_item = menu.add(0, i, i, str(title))
+                res_id = self._resolve_icon(item.get("icon"))
+                if res_id:
+                    try:
+                        menu_item.setIcon(res_id)
+                    except Exception:
+                        pass
         except Exception:
             pass
 
+    def _resolve_icon(self, icon: Any) -> int:
+        """Resolve a tab icon spec to an `android.R.drawable.*` res id.
+
+        Accepts a bare string (treated as the drawable's field name on
+        ``android.R.drawable``) or a dict of the form
+        ``{"ios": "...", "android": "ic_menu_home"}``. Returns ``0``
+        when the icon can't be resolved, which the caller treats as
+        "no icon".
+        """
+        if icon is None:
+            return 0
+        name: Any = None
+        if isinstance(icon, str):
+            name = icon
+        elif isinstance(icon, dict):
+            name = icon.get("android")
+        if not name:
+            return 0
+        try:
+            RDrawable = jclass("android.R$drawable")
+            res_id = getattr(RDrawable, str(name), 0)
+            return int(res_id) if res_id else 0
+        except Exception:
+            return 0
+
     def _set_active(self, bnv: Any, active: Any, items: list) -> None:
         if active and items:
             for i, item in enumerate(items):

{pythonnative-0.13.1 → pythonnative-0.14.0}/src/pythonnative/native_views/ios.py

@@ -2345,13 +2345,38 @@ class TabBarHandler(IOSViewHandler):
 
     def _set_bar_items(self, tab_bar: Any, items: list) -> None:
         UITabBarItem = ObjCClass("UITabBarItem")
+        UIImage = ObjCClass("UIImage")
         bar_items = []
         for i, item in enumerate(items):
             title = item.get("title", item.get("name", ""))
-            bar_item = UITabBarItem.alloc().initWithTitle_image_tag_(str(title), None, i)
+            image = self._resolve_icon(UIImage, item.get("icon"))
+            bar_item = UITabBarItem.alloc().initWithTitle_image_tag_(str(title), image, i)
             bar_items.append(bar_item)
         tab_bar.setItems_animated_(bar_items, False)
 
+    def _resolve_icon(self, UIImage: Any, icon: Any) -> Any:
+        """Resolve a tab icon spec to a UIImage, or return None.
+
+        Accepts a bare string (treated as an SF Symbol name) or a dict
+        of the form ``{"ios": "house.fill", "android": "..."}``. SF
+        Symbols are looked up via ``UIImage.systemImageNamed:``; names
+        that don't resolve produce a text-only tab.
+        """
+        if icon is None:
+            return None
+        name: Any = None
+        if isinstance(icon, str):
+            name = icon
+        elif isinstance(icon, dict):
+            name = icon.get("ios")
+        if not name:
+            return None
+        try:
+            image = UIImage.systemImageNamed_(str(name))
+            return image if image else None
+        except Exception:
+            return None
+
     def _set_active(self, tab_bar: Any, active: Any, items: list) -> None:
         if not active or not items:
             return

{pythonnative-0.13.1 → pythonnative-0.14.0}/src/pythonnative/navigation.py

@@ -570,10 +570,14 @@ def _tab_navigator_impl(screens: Any = None, initial_route: Optional[str] = None
     if screen_def is None:
         screen_def = screen_map[screen_list[0].name]
 
-    tab_items: List[Dict[str, str]] = []
+    tab_items: List[Dict[str, Any]] = []
     for s in screen_list:
         if isinstance(s, _ScreenDef):
-            tab_items.append({"name": s.name, "title": s.options.get("title", s.name)})
+            item: Dict[str, Any] = {"name": s.name, "title": s.options.get("title", s.name)}
+            icon = s.options.get("tab_bar_icon")
+            if icon is not None:
+                item["icon"] = icon
+            tab_items.append(item)
 
     def on_tab_select(name: str) -> None:
         switch_tab(name)
@@ -639,8 +643,17 @@ def create_tab_navigator() -> Any:
                 name: Route name and default tab title.
                 component: A `@component` function rendered when this
                     tab is active.
-                options: Optional per-screen settings (e.g.,
-                    `{"title": "..."}`).
+                options: Optional per-screen settings. Recognized keys:
+
+                    - `title` (str): Tab label.
+                    - `tab_bar_icon` (str | dict): Native system icon
+                      identifier. A string is used on every platform; a
+                      dict like `{"ios": "house.fill", "android":
+                      "ic_menu_home"}` selects per platform. iOS values
+                      are resolved via SF Symbols
+                      (`UIImage.systemImageNamed_`); Android values are
+                      resolved against `android.R.drawable.<name>`.
+                      Names that don't resolve fall back to text-only.
 
             Returns:
                 A `_ScreenDef` consumed by `Navigator(...)`.

{pythonnative-0.13.1 → pythonnative-0.14.0/src/pythonnative.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pythonnative
-Version: 0.13.1
+Version: 0.14.0
 Summary: Cross-platform native UI toolkit for Android and iOS
 Author: Owen Carey
 License: MIT License

{pythonnative-0.13.1 → pythonnative-0.14.0}/tests/test_navigation.py

@@ -629,6 +629,66 @@ def test_tab_navigator_renders_native_tab_bar() -> None:
     assert callable(tab_bar.props["on_tab_select"])
 
 
+def test_tab_navigator_forwards_tab_bar_icon() -> None:
+    """`tab_bar_icon` (string or per-platform dict) reaches the TabBar element."""
+    Tab = create_tab_navigator()
+
+    @component
+    def ScreenA() -> Element:
+        return Element("Text", {"text": "a"}, [])
+
+    @component
+    def ScreenB() -> Element:
+        return Element("Text", {"text": "b"}, [])
+
+    @component
+    def ScreenC() -> Element:
+        return Element("Text", {"text": "c"}, [])
+
+    backend = MockBackend()
+    rec = Reconciler(backend)
+    rec._screen_re_render = lambda: None
+
+    el = Tab.Navigator(
+        Tab.Screen(
+            "TabA",
+            component=ScreenA,
+            options={"title": "Tab A", "tab_bar_icon": "house.fill"},
+        ),
+        Tab.Screen(
+            "TabB",
+            component=ScreenB,
+            options={
+                "title": "Tab B",
+                "tab_bar_icon": {"ios": "gearshape.fill", "android": "ic_menu_preferences"},
+            },
+        ),
+        Tab.Screen("TabC", component=ScreenC, options={"title": "Tab C"}),
+    )
+    root = rec.mount(el)
+
+    def find_tab_bar(view: MockView) -> Any:
+        if view.type_name == "TabBar":
+            return view
+        for c in view.children:
+            r = find_tab_bar(c)
+            if r is not None:
+                return r
+        return None
+
+    tab_bar = find_tab_bar(root)
+    assert tab_bar is not None
+    assert tab_bar.props["items"] == [
+        {"name": "TabA", "title": "Tab A", "icon": "house.fill"},
+        {
+            "name": "TabB",
+            "title": "Tab B",
+            "icon": {"ios": "gearshape.fill", "android": "ic_menu_preferences"},
+        },
+        {"name": "TabC", "title": "Tab C"},
+    ]
+
+
 def test_tab_navigator_empty_screens() -> None:
     Tab = create_tab_navigator()