Add Chaquopy to Android template

owenthcarey · owenthcarey · commit 41cf420ead6c · 2023-06-19T16:06:31.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
@@ -36,17 +36,17 @@ class MainActivity : AppCompatActivity() {
 //        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 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")
 //        val pyLayout = createConstraintLayoutModule.callAttr("create_constraint_layout", this).toJava(ConstraintLayout::class.java)
 //        layoutMain.addView(pyLayout)
 
-        val createRecyclerViewModule = py.getModule("create_recycler_view")
-        val pyRecyclerView = createRecyclerViewModule.callAttr("create_recycler_view", this).toJava(RecyclerView::class.java)
-        layoutMain.addView(pyRecyclerView)
+//        val createRecyclerViewModule = py.getModule("create_recycler_view")
+//        val pyRecyclerView = createRecyclerViewModule.callAttr("create_recycler_view", this).toJava(RecyclerView::class.java)
+//        layoutMain.addView(pyRecyclerView)
 
         // Existing code for displaying plot
 //        val imageView = findViewById<ImageView>(R.id.image_home)
diff --git a/apps/templates/android_template/app/build.gradle b/apps/templates/android_template/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'com.chaquo.python'
 }
 
 android {
@@ -15,6 +16,20 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+        }
+        python {
+            version "3.8"
+            pip {
+                install "matplotlib"
+                install "pythonnative"
+
+                // "-r"` followed by a requirements filename, relative to the
+                // project directory:
+//                install "-r", "requirements.txt"
+            }
+        }
     }
 
     buildTypes {
diff --git a/apps/templates/android_template/build.gradle b/apps/templates/android_template/build.gradle
@@ -3,4 +3,5 @@ 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.chaquo.python' version '14.0.2' apply false
 }

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,5 @@ plugins {`
`3`	`3`	`id 'com.android.application' version '8.0.2' apply false`
`4`	`4`	`id 'com.android.library' version '8.0.2' apply false`
`5`	`5`	`id 'org.jetbrains.kotlin.android' version '1.8.20' apply false`
	`6`	`+ id 'com.chaquo.python' version '14.0.2' apply false`
`6`	`7`	`}`