Fixes:#3868 Added Android Bundle Support

example/javalib/android/1-hello-world/app/AndroidManifest.xml

@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.helloworld.app">
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-sdk android:targetSdkVersion="35"/>
-    <application android:label="Hello World" android:debuggable="true">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.helloworld.app" android:versionCode="1" android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="35"/>
+    <application android:label="@string/app_name" android:theme="@android:style/Theme.Light.NoTitleBar" android:debuggable="true">
         <activity android:name=".MainActivity"
                 android:exported="true">
             <intent-filter>

example/javalib/android/1-hello-world/app/resources/values/colors.xml

@@ -0,0 +1,4 @@
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="text_green">#34A853</color>
+</resources>

example/javalib/android/1-hello-world/app/resources/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">HelloWorldApp</string>
+    <string name="hello_world">Hello, World Java!</string>
+</resources>

example/javalib/android/1-hello-world/app/src/main/java/com/helloworld/app/MainActivity.java

@@ -14,19 +14,25 @@ protected void onCreate(Bundle savedInstanceState) {
     // Create a new TextView
     TextView textView = new TextView(this);
 
-    // Set the text to "Hello, World!"
-    textView.setText("Hello, World!");
+    // Set the text to the string resource
+    textView.setText(getString(R.string.hello_world));
 
     // Set text size
     textView.setTextSize(32);
 
     // Center the text within the view
     textView.setGravity(Gravity.CENTER);
 
-    // Set layout parameters (width and height)
+    // Set the layout parameters (width and height)
     textView.setLayoutParams(
         new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
 
+    // Set the text color using a resource
+    textView.setTextColor(getResources().getColor(R.color.text_green));
+
+    // Set the background color using a resource
+    textView.setBackgroundColor(getResources().getColor(R.color.white));
+
     // Set the content view to display the TextView
     setContentView(textView);
   }

example/javalib/android/2-app-bundle/build.mill

@@ -0,0 +1,24 @@
+package build
+
+import mill._
+import kotlinlib._
+import coursier.maven.MavenRepository
+import mill.javalib.android.{AndroidSdkModule, AndroidAppBundle}
+
+object androidSdkModule0 extends AndroidSdkModule {
+  def buildToolsVersion = "35.0.0"
+}
+
+object bundle extends AndroidAppBundle {
+  def androidSdkModule = mill.define.ModuleRef(androidSdkModule0)
+}
+
+/** Usage
+
+> ./mill show bundle.androidBundle
+".../out/bundle/androidBundle.dest/bundle.aab"
+
+> ./mill show bundle.androidApk
+".../out/bundle/androidApk.dest/universal.apk"
+
+*/

example/javalib/android/2-app-bundle/bundle/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.helloworld.app" android:versionCode="1" android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="35"/>
+    <application android:label="@string/app_name" android:theme="@android:style/Theme.Light.NoTitleBar" android:debuggable="true">
+        <activity android:name=".MainActivity"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

example/javalib/android/2-app-bundle/bundle/resources/values/colors.xml

@@ -0,0 +1,4 @@
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="text_green">#34A853</color>
+</resources>

example/javalib/android/2-app-bundle/bundle/resources/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">HelloWorldBundleApp</string>
+    <string name="hello_world">Hello, World Bundle!</string>
+</resources>

example/javalib/android/2-app-bundle/bundle/src/main/java/com/helloworld/app/MainActivity.java

@@ -0,0 +1,39 @@
+package com.helloworld.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.TextView;
+
+public class MainActivity extends Activity {
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // Create a new TextView
+    TextView textView = new TextView(this);
+
+    // Set the text to the string resource
+    textView.setText(getString(R.string.hello_world));
+
+    // Set text size
+    textView.setTextSize(32);
+
+    // Center the text within the view
+    textView.setGravity(Gravity.CENTER);
+
+    // Set the layout parameters (width and height)
+    textView.setLayoutParams(
+        new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+
+    // Set the text color using a resource
+    textView.setTextColor(getResources().getColor(R.color.text_green));
+
+    // Set the background color using a resource
+    textView.setBackgroundColor(getResources().getColor(R.color.white));
+
+    // Set the content view to display the TextView
+    setContentView(textView);
+  }
+}

example/kotlinlib/android/1-hello-world/app/AndroidManifest.xml

@@ -1,7 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.helloworld.app">
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-sdk android:targetSdkVersion="35"/>
-    <application android:label="Hello World" android:debuggable="true">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.helloworld.app" android:versionCode="1" android:versionName="1.0">
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="35"/>
+    <application android:label="@string/app_name" android:theme="@android:style/Theme.Light.NoTitleBar" android:debuggable="true">
         <activity android:name=".MainActivity"
                 android:exported="true">
             <intent-filter>

example/kotlinlib/android/1-hello-world/app/resources/values/colors.xml

@@ -0,0 +1,4 @@
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="text_green">#34A853</color>
+</resources>

example/kotlinlib/android/1-hello-world/app/resources/values/strings.xml

@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">HelloWorldApp</string>
+    <string name="hello_world">Hello, World Kotlin!</string>
+</resources>

example/kotlinlib/android/1-hello-world/app/src/main/kotlin/com/helloworld/app/MainActivity.kt → example/kotlinlib/android/1-hello-world/app/src/main/java/com/helloworld/app/MainActivity.kt

@@ -2,9 +2,9 @@ package com.helloworld.app
 
 import android.app.Activity
 import android.os.Bundle
-import android.widget.TextView
 import android.view.Gravity
 import android.view.ViewGroup.LayoutParams
+import android.widget.TextView
 
 class MainActivity : Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -13,8 +13,8 @@ class MainActivity : Activity() {
         // Create a new TextView
         val textView = TextView(this)
 
-        // Set the text to "Hello, World!"
-        textView.text = "Hello, World Kotlin!"
+        // Set the text to the string resource
+        textView.text = getString(R.string.hello_world)
 
         // Set text size
         textView.textSize = 32f
@@ -23,10 +23,13 @@ class MainActivity : Activity() {
         textView.gravity = Gravity.CENTER
 
         // Set layout parameters (width and height)
-        textView.layoutParams = LayoutParams(
-            LayoutParams.MATCH_PARENT,
-            LayoutParams.MATCH_PARENT
-        )
+        textView.layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+
+        // Set the text color using a resource
+        textView.setTextColor(getColor(R.color.text_green)) // Using hex color code directly
+
+        // Set the background color using a resource
+        textView.setBackgroundColor(getColor(R.color.white)) // Using hex color code directly
 
         // Set the content view to display the TextView
         setContentView(textView)

example/kotlinlib/android/1-hello-world/build.mill

@@ -22,7 +22,7 @@ object androidSdkModule0 extends AndroidSdkModule {
 // Actual android application
 object app extends AndroidAppKotlinModule {
 
-  def kotlinVersion = "2.0.0"
+  def kotlinVersion = "2.0.20"
   def androidSdkModule = mill.define.ModuleRef(androidSdkModule0)
 }