Update Android template

owenthcarey · owenthcarey · commit 8abdb264eadb · 2023-06-22T13:53:25.000-07:00
diff --git a/apps/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt b/apps/android_pythonnative_3/app/src/main/java/com/pythonnative/pythonnative/MainActivity.kt
@@ -8,6 +8,7 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import android.graphics.Color
+import android.view.View
 import android.widget.LinearLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
@@ -23,25 +24,25 @@ import org.json.JSONObject
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val layoutMain = findViewById<ConstraintLayout>(R.id.layout_main)
+//        setContentView(R.layout.activity_main)
+//        val layoutMain = findViewById<ConstraintLayout>(R.id.layout_main)
 
         // Initialize Chaquopy
         if (!Python.isStarted()) {
             Python.start(AndroidPlatform(this))
         }
         val py = Python.getInstance()
 
+        val pyModule = py.getModule("app/main")
+        val pyLayout = pyModule.callAttr("main", this).toJava(View::class.java)
+        setContentView(pyLayout)
+
 //        val createButtonModule = py.getModule("create_button")
 //        val pyButton = createButtonModule.callAttr("create_button", this).toJava(Button::class.java)
 //        layoutMain.addView(pyButton)
 
-        val createWidgetsModule = py.getModule("create_widgets")
-        val pyLayout = createWidgetsModule.callAttr("create_widgets", this).toJava(LinearLayout::class.java)
-        layoutMain.addView(pyLayout)
-
-//        val createLayoutModule = py.getModule("create_pn_layout")
-//        val pyLayout = createLayoutModule.callAttr("create_pn_layout", this).toJava(LinearLayout::class.java)
+//        val createWidgetsModule = py.getModule("create_widgets")
+//        val pyLayout = createWidgetsModule.callAttr("create_widgets", this).toJava(LinearLayout::class.java)
 //        layoutMain.addView(pyLayout)
 
 //        val createConstraintLayoutModule = py.getModule("create_constraint_layout")
diff --git a/apps/android_pythonnative_3/app/src/main/python/app/__init__.py b/apps/android_pythonnative_3/app/src/main/python/app/__init__.py
diff --git a/apps/android_pythonnative_3/app/src/main/python/app/main.py b/apps/android_pythonnative_3/app/src/main/python/app/main.py
@@ -0,0 +1,17 @@
+import pythonnative as pn
+
+
+def main(context):
+    layout = pn.LinearLayout(context)
+
+    label = pn.Label(context, "This is a PythonNative label")
+    layout.add_view(label)
+
+    button = pn.Button(context, "Click me")
+    layout.add_view(button)
+
+    for i in range(100):
+        button = pn.Button(context, "Click me")
+        layout.add_view(button)
+
+    return layout.native_instance
diff --git a/libs/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt b/libs/templates/android_template/app/src/main/java/com/pythonnative/android_template/MainActivity.kt
@@ -2,10 +2,22 @@ package com.pythonnative.android_template
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import com.chaquo.python.Python
+import com.chaquo.python.android.AndroidPlatform
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        // setContentView(R.layout.activity_main)
+
+        // Initialize Chaquopy
+        if (!Python.isStarted()) {
+            Python.start(AndroidPlatform(this))
+        }
+        val py = Python.getInstance()
+        val pyModule = py.getModule("app/main")
+        val pyLayout = pyModule.callAttr("main", this).toJava(View::class.java)
+        setContentView(pyLayout)
     }
 }
