Remove Rubicon from Android

owenthcarey · owenthcarey · commit be188819eff2 · 2023-06-02T10:39:58.000-07:00
diff --git a/apps/android_pythonnative_3/app/build.gradle b/apps/android_pythonnative_3/app/build.gradle
@@ -22,7 +22,6 @@ android {
         python {
             pip {
                 install "matplotlib"
-                install "rubicon-java"
             }
         }
     }
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
@@ -27,40 +27,45 @@ class MainActivity : AppCompatActivity() {
         if (!Python.isStarted()) {
             Python.start(AndroidPlatform(this))
         }
-
         val py = Python.getInstance()
+        val createButtonModule = py.getModule("create_button")
+        val pyButton = createButtonModule.callAttr("create_button", this).toJava(Button::class.java)
+        val layoutMain = findViewById<ConstraintLayout>(R.id.layout_main)
+        layoutMain.addView(pyButton)
 
-        // Generate UI from Python
-        val uiLayoutModule = py.getModule("ui_layout")
-        val layoutJson = uiLayoutModule.callAttr("generate_layout").toString()
-        val layout = JSONObject(layoutJson)
-        val widgets = layout.getJSONArray("widgets")
-
-        for (i in 0 until widgets.length()) {
-            val widget = widgets.getJSONObject(i)
-            when (widget.getString("type")) {
-                "Button" -> {
-                    val button = Button(this)
-                    button.text = widget.getJSONObject("properties").getString("text")
-                    button.setTextColor(Color.parseColor(widget.getJSONObject("properties").getString("textColor")))
-                    button.setBackgroundColor(Color.parseColor(widget.getJSONObject("properties").getString("backgroundColor")))
+        // TODO: Run python module and get button
 
-                    if (widget.has("eventHandlers") && widget.getJSONObject("eventHandlers").has("onClick")) {
-                        val onClickFunctionName = widget.getJSONObject("eventHandlers").getString("onClick")
-                        val onClickFunction = py.getModule("ui_layout").get(onClickFunctionName)
-
-                        button.setOnClickListener {
-                            onClickFunction?.call()
-                        }
-                    }
-
-                    // Add button to your layout here
-                    val layoutMain = findViewById<ConstraintLayout>(R.id.layout_main)
-                    layoutMain.addView(button)
-                }
-                // Handle other widget types...
-            }
-        }
+        // Generate UI from Python
+//        val uiLayoutModule = py.getModule("ui_layout")
+//        val layoutJson = uiLayoutModule.callAttr("generate_layout").toString()
+//        val layout = JSONObject(layoutJson)
+//        val widgets = layout.getJSONArray("widgets")
+//
+//        for (i in 0 until widgets.length()) {
+//            val widget = widgets.getJSONObject(i)
+//            when (widget.getString("type")) {
+//                "Button" -> {
+//                    val button = Button(this)
+//                    button.text = widget.getJSONObject("properties").getString("text")
+//                    button.setTextColor(Color.parseColor(widget.getJSONObject("properties").getString("textColor")))
+//                    button.setBackgroundColor(Color.parseColor(widget.getJSONObject("properties").getString("backgroundColor")))
+//
+//                    if (widget.has("eventHandlers") && widget.getJSONObject("eventHandlers").has("onClick")) {
+//                        val onClickFunctionName = widget.getJSONObject("eventHandlers").getString("onClick")
+//                        val onClickFunction = py.getModule("ui_layout").get(onClickFunctionName)
+//
+//                        button.setOnClickListener {
+//                            onClickFunction?.call()
+//                        }
+//                    }
+//
+//                    // Add button to your layout here
+//                    val layoutMain = findViewById<ConstraintLayout>(R.id.layout_main)
+//                    layoutMain.addView(button)
+//                }
+//                // Handle other widget types...
+//            }
+//        }
 
         // Existing code for displaying plot
 //        val imageView = findViewById<ImageView>(R.id.image_home)
diff --git a/apps/android_pythonnative_3/app/src/main/python/create_button.py b/apps/android_pythonnative_3/app/src/main/python/create_button.py
@@ -1,10 +1,8 @@
-from rubicon.java import JavaClass
-
-Button = JavaClass("android/widget/Button")
+from java import cast, chaquopy, dynamic_proxy, jarray, jclass
 
 
 def create_button(context):
+    Button = jclass("android.widget.Button")
     button = Button(context)
-    button.setId(hash(button))
     button.setText("Button created in Python")
-    return button.getId()
+    return button

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ android {`
`22`	`22`	`python {`
`23`	`23`	`pip {`
`24`	`24`	`install "matplotlib"`
`25`		`- install "rubicon-java"`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`}`