Updates

bin/android-builder

@@ -5,45 +5,52 @@ AB_HOME="${ANDROID_BUILDER_HOME:-$HOME/android-builder}"
 SDK="$HOME/android-sdk"
 PLATFORM="${ANDROID_BUILDER_PLATFORM:-android-33}"
 
-install_packages() {
+get_project_name() {
-  echo "==> Installing Termux packages"
+  if [ -f settings.gradle ]; then
+    DETECTED_NAME="$(grep -E '^rootProject.name[[:space:]]*=' settings.gradle \
+      | sed -E 's/.*=[[:space:]]*["'\'']?([^"'\'' ]+)["'\'']?.*/\1/' \
+      | head -n 1)"
+
+    [ -n "$DETECTED_NAME" ] && echo "$DETECTED_NAME" && return
+  fi
+
+  basename "$PWD"
+}
+
+get_build_type() {
+  echo "${ANDROID_BUILDER_BUILD_TYPE:-debug}"
+}
+
+get_apk_path() {
+  case "$(get_build_type)" in
+    debug) echo "app/build/outputs/apk/debug/app-debug.apk" ;;
+    release) echo "app/build/outputs/apk/release/app-release.apk" ;;
+    *) return 1 ;;
+  esac
+}
+
+setup() {
+  echo "==> Installing packages"
   pkg update -y
   pkg install -y git curl wget unzip zip nano \
     openjdk-21 gradle aapt2 apksigner d8 dx android-tools
-}
 
-configure_java() {
   echo "==> Configuring Java"
-
+  JAVA_BIN="$(command -v java)"
-  JAVA_BIN="$(command -v java || true)"
-
-  if [ -z "$JAVA_BIN" ]; then
-    echo "ERROR: java not found after installing openjdk-21."
-    exit 1
-  fi
-
   JAVA_HOME_DETECTED="$(dirname "$(dirname "$(readlink -f "$JAVA_BIN")")")"
-
   export JAVA_HOME="$JAVA_HOME_DETECTED"
   export PATH="$JAVA_HOME/bin:$PATH"
 
   touch "$HOME/.bashrc"
-
+  grep -q 'ANDROID_BUILDER_JAVA_HOME' "$HOME/.bashrc" || cat >> "$HOME/.bashrc" <<EOF2
-  grep -q 'ANDROID_BUILDER_JAVA_HOME' "$HOME/.bashrc" || cat >> "$HOME/.bashrc" <<EOF
 
 # Java for AndroidBuilder
 export JAVA_HOME=$JAVA_HOME_DETECTED
 export PATH=\$JAVA_HOME/bin:\$PATH
 export ANDROID_BUILDER_JAVA_HOME=\$JAVA_HOME
-EOF
+EOF2
 
-  java -version
-  echo "JAVA_HOME=$JAVA_HOME"
-}
-
-install_cmdline_tools() {
   echo "==> Installing Android SDK cmdline-tools"
-
   mkdir -p "$SDK/cmdline-tools"
   cd "$SDK/cmdline-tools"
 
@@ -53,107 +60,229 @@ install_cmdline_tools() {
     mv cmdline-tools latest
     rm cmdline-tools.zip
   fi
-}
 
-configure_android_environment() {
+  export ANDROID_HOME="$SDK"
-  echo "==> Configuring Android SDK environment"
+  export ANDROID_SDK_ROOT="$SDK"
+  export PATH="$SDK/cmdline-tools/latest/bin:$PATH"
 
-  touch "$HOME/.bashrc"
+  grep -q 'ANDROID_HOME' "$HOME/.bashrc" || cat >> "$HOME/.bashrc" <<'EOF2'
-
-  grep -q 'ANDROID_HOME' "$HOME/.bashrc" || cat >> "$HOME/.bashrc" <<'EOF'
 
 # AndroidBuilder SDK environment
 export ANDROID_HOME=$HOME/android-sdk
 export ANDROID_SDK_ROOT=$ANDROID_HOME
 export PATH=$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
-EOF
+EOF2
 
-  export ANDROID_HOME="$SDK"
-  export ANDROID_SDK_ROOT="$SDK"
-  export PATH="$SDK/cmdline-tools/latest/bin:$PATH"
-}
-
-accept_licenses() {
   echo "==> Accepting Android SDK licenses"
-
   mkdir -p "$SDK/licenses"
-
+  cat > "$SDK/licenses/android-sdk-license" <<'EOF2'
-  cat > "$SDK/licenses/android-sdk-license" <<'EOF'
 24333f8a63b6825ea9c5514f83c2829b004d1fee
 d56f5187479451eabf01fb78af6dfcb131a6481e
 8933bad161af4178b1185d1a37fbf41ea5269c55
-EOF
+EOF2
-}
 
-install_sdk_platform() {
   echo "==> Installing SDK platform: $PLATFORM"
-
-  command -v java >/dev/null || {
-    echo "ERROR: Java is not available."
-    exit 1
-  }
-
-  command -v sdkmanager >/dev/null || {
-    echo "ERROR: sdkmanager not found."
-    exit 1
-  }
-
   sdkmanager "platforms;$PLATFORM"
-}
 
-configure_gradle() {
   echo "==> Writing Gradle config"
-
   mkdir -p "$HOME/.gradle"
-
+  cat > "$HOME/.gradle/gradle.properties" <<EOF2
-  cat > "$HOME/.gradle/gradle.properties" <<EOF
 org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
 android.aapt2FromMavenOverride=$PREFIX/bin/aapt2
-EOF
+EOF2
-}
-
-setup() {
-  install_packages
-  configure_java
-  install_cmdline_tools
-  configure_android_environment
-  accept_licenses
-  install_sdk_platform
-  configure_gradle
 
   echo
   echo "Setup complete."
-  echo "Run:"
-  echo "  source ~/.bashrc"
-  echo "  android-builder doctor"
 }
 
 doctor() {
   echo "AndroidBuilder Doctor"
   echo
 
-  echo "Java:"
+  java -version
-  java -version || true
+  echo
+  gradle -v | grep Gradle
+  echo
+  aapt2 version
   echo
 
-  echo "Gradle:"
-  gradle -v | grep Gradle || true
-  echo
-
-  echo "AAPT2:"
-  aapt2 version || true
-  echo
-
-  echo "SDK:"
-  echo "$SDK"
   test -f "$SDK/platforms/$PLATFORM/android.jar" \
     && echo "android.jar: found" \
     || echo "android.jar: missing"
 }
 
+new_project() {
+  NAME="$1"
+  TEMPLATE="hello"
+  shift || true
+
+  while [ $# -gt 0 ]; do
+    case "$1" in
+      --template|-t)
+        TEMPLATE="$2"
+        shift 2
+        ;;
+      *)
+        echo "Unknown option: $1"
+        exit 1
+        ;;
+    esac
+  done
+
+  if [ -z "$NAME" ]; then
+    echo "Usage: android-builder new MyApp [--template hello|empty]"
+    exit 1
+  fi
+
+  case "$TEMPLATE" in
+    hello) create_base_project "$NAME" "Hello, World!" ;;
+    empty) create_base_project "$NAME" "" ;;
+    *)
+      echo "Unknown template: $TEMPLATE"
+      echo "Available templates: hello, empty"
+      exit 1
+      ;;
+  esac
+}
+
+create_base_project() {
+  NAME="$1"
+  MESSAGE="$2"
+  PACKAGE="com.example.$(echo "$NAME" | tr '[:upper:]' '[:lower:]' | tr -cd 'a-z0-9')"
+  PACKAGE_PATH="$(echo "$PACKAGE" | tr '.' '/')"
+
+  mkdir -p "$NAME/app/src/main/java/$PACKAGE_PATH"
+  mkdir -p "$NAME/app/src/main/res/values"
+
+  cat > "$NAME/settings.gradle" <<EOF2
+pluginManagement { repositories { google(); mavenCentral(); gradlePluginPortal() } }
+dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS); repositories { google(); mavenCentral() } }
+rootProject.name="$NAME"
+include(":app")
+EOF2
+
+  cat > "$NAME/build.gradle" <<'EOF2'
+// Root build file intentionally minimal.
+EOF2
+
+  cat > "$NAME/gradle.properties" <<EOF2
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.daemon=true
+org.gradle.parallel=true
+org.gradle.caching=true
+android.aapt2FromMavenOverride=$PREFIX/bin/aapt2
+EOF2
+
+  cat > "$NAME/local.properties" <<EOF2
+sdk.dir=$SDK
+EOF2
+
+  cat > "$NAME/app/build.gradle" <<EOF2
+plugins {
+    id 'com.android.application' version '8.5.2'
+}
+
+android {
+    namespace '$PACKAGE'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "$PACKAGE"
+        minSdk 24
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+    }
+}
+EOF2
+
+  cat > "$NAME/app/src/main/AndroidManifest.xml" <<'EOF2'
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme">
+        <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>
+EOF2
+
+  cat > "$NAME/app/src/main/res/values/strings.xml" <<EOF2
+<resources>
+    <string name="app_name">$NAME</string>
+</resources>
+EOF2
+
+  cat > "$NAME/app/src/main/res/values/styles.xml" <<'EOF2'
+<resources>
+    <style name="AppTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
+EOF2
+
+  cat > "$NAME/app/src/main/java/$PACKAGE_PATH/MainActivity.java" <<EOF2
+package $PACKAGE;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+public class MainActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        LinearLayout layout = new LinearLayout(this);
+        layout.setGravity(Gravity.CENTER);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(32, 32, 32, 32);
+
+        TextView title = new TextView(this);
+        title.setText("$NAME");
+        title.setTextSize(30);
+        title.setGravity(Gravity.CENTER);
+
+        TextView message = new TextView(this);
+        message.setText("$MESSAGE");
+        message.setTextSize(18);
+        message.setGravity(Gravity.CENTER);
+
+        layout.addView(title);
+        layout.addView(message);
+
+        setContentView(layout);
+    }
+}
+EOF2
+
+  cat > "$NAME/gradlew" <<'EOF2'
+#!/data/data/com.termux/files/usr/bin/bash
+set -e
+exec gradle "$@"
+EOF2
+
+  chmod +x "$NAME/gradlew"
+
+  echo "Created project: $NAME"
+  echo
+  echo "Next:"
+  echo "  cd $NAME"
+  echo "  android-builder build"
+  echo "  android-builder export"
+}
+
 build() {
   test -f local.properties || echo "sdk.dir=$SDK" > local.properties
 
@@ -165,15 +294,61 @@ build() {
   fi
 }
 
-install_apk() {
+export_apk() {
-  APK=$(find . -path "*/build/outputs/apk/debug/*.apk" -type f | head -n 1)
+  APK="$(get_apk_path)"
+  BUILD_TYPE="$(get_build_type)"
 
-  if [ -z "$APK" ]; then
+  if [ ! -f "$APK" ]; then
-    echo "No debug APK found."
+    echo "No $BUILD_TYPE APK found."
+    echo
+    echo "Run:"
+    echo "  android-builder build"
     exit 1
   fi
 
-  termux-open "$APK"
+  if [ ! -d "$HOME/storage" ]; then
+    echo "==> Termux storage has not been configured."
+    echo "==> Requesting storage permission..."
+    echo
+
+    termux-setup-storage
+
+    echo
+    echo "Please grant storage permission, then run:"
+    echo "  android-builder export"
+    exit 0
+  fi
+
+  EXPORT_DIR="$HOME/storage/documents"
+  mkdir -p "$EXPORT_DIR"
+
+  PROJECT_NAME="$(get_project_name)"
+  DEST="$EXPORT_DIR/${PROJECT_NAME}.apk"
+
+  echo "==> Exporting APK..."
+
+  cp -f "$APK" "$DEST"
+  sync
+
+  SIZE="$(du -h "$DEST" | cut -f1)"
+
+  echo
+  echo "✓ Export complete!"
+  echo
+  echo "Project:"
+  echo "  $PROJECT_NAME"
+  echo
+  echo "Build:"
+  echo "  $BUILD_TYPE"
+  echo
+  echo "Size:"
+  echo "  $SIZE"
+  echo
+  echo "Location:"
+  echo "  $DEST"
+  echo
+  echo "Open your file manager, browse to Documents,"
+  echo "then tap ${PROJECT_NAME}.apk to install or share it."
 }
 
 help() {
@@ -182,8 +357,10 @@ help() {
   echo "Usage:"
   echo "  android-builder setup"
   echo "  android-builder doctor"
+  echo "  android-builder new MyApp"
+  echo "  android-builder new MyApp --template empty"
   echo "  android-builder build"
-  echo "  android-builder install"
+  echo "  android-builder export"
 }
 
 COMMAND="$1"
@@ -192,8 +369,9 @@ shift || true
 case "$COMMAND" in
   setup) setup "$@" ;;
   doctor) doctor "$@" ;;
+  new) new_project "$@" ;;
   build) build "$@" ;;
-  install) install_apk "$@" ;;
+  export) export_apk "$@" ;;
   help|-h|--help|"") help ;;
   *)
     echo "Unknown command: $COMMAND"