fix(components,templates): restore hello-world on iOS and Android

owenthcarey · owenthcarey · commit d7ac93be2021 · 2025-10-30T00:21:02.000-07:00
diff --git a/src/pythonnative/button.py b/src/pythonnative/button.py
@@ -79,7 +79,7 @@ class _PNButtonHandler(NSObject):  # type: ignore[valid-type]
         _callback: Optional[Callable[[], None]] = None
 
         @objc_method
-        def onTap_(self, sender: Any) -> None:
+        def onTap_(self, sender: object) -> None:
             try:
                 callback = self._callback
                 if callback is not None:
diff --git a/src/pythonnative/scroll_view.py b/src/pythonnative/scroll_view.py
@@ -72,9 +72,26 @@ def __init__(self) -> None:
 
         def add_view(self, view: Any) -> None:
             self.views.append(view)
-            # Ensure view is a subview of scrollview
-            if view.native_instance not in self.native_instance.subviews:
+            # Add as subview and size child to fill scroll view by default so content is visible
+            try:
                 self.native_instance.addSubview_(view.native_instance)
+            except Exception:
+                pass
+            # Default layout: if the child has no size yet, size it to fill the scroll view
+            # and enable flexible width/height. If the child is already sized explicitly,
+            # leave it unchanged.
+            try:
+                frame = getattr(view.native_instance, "frame")
+                size = getattr(frame, "size", None)
+                width = getattr(size, "width", 0) if size is not None else 0
+                height = getattr(size, "height", 0) if size is not None else 0
+                if width <= 0 or height <= 0:
+                    bounds = self.native_instance.bounds
+                    view.native_instance.setFrame_(bounds)
+                    # UIViewAutoresizingFlexibleWidth (2) | UIViewAutoresizingFlexibleHeight (16)
+                    view.native_instance.setAutoresizingMask_(2 | 16)
+            except Exception:
+                pass
 
         @staticmethod
         def wrap(view: Any) -> "ScrollView":
diff --git a/src/pythonnative/templates/android_template/app/build.gradle b/src/pythonnative/templates/android_template/app/build.gradle
@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace 'com.pythonnative.android_template'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.pythonnative.android_template"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
diff --git a/src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml b/src/pythonnative/templates/android_template/app/src/main/res/navigation/nav_graph.xml
@@ -16,7 +16,7 @@
         <argument
             android:name="args_json"
             app:argType="string"
-            android:nullable="true" />
+            app:nullable="true" />
     </fragment>
 
 </navigation>
diff --git a/src/pythonnative/templates/android_template/build.gradle b/src/pythonnative/templates/android_template/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
     id 'com.chaquo.python' version '14.0.2' apply false
 }
diff --git a/src/pythonnative/templates/android_template/gradle/wrapper/gradle-wrapper.properties b/src/pythonnative/templates/android_template/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jun 19 11:09:16 PDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
