create-droid 1.0.7 → 1.1.0

package/README.md

@@ -35,7 +35,12 @@ npx create-droid my-app
 
 Follow the interactive prompts:
 1.  **Project Name**: Defaults to directory name.
-2.  **UI Framework**: Choose **Jetpack Compose** (Modern declarative UI) or **XML Views** (Classic).
+2.  **Template Selection**:
+    *   **Jetpack Compose (Mobile)**: Modern phone/tablet starter.
+    *   **Compose with Navigation**: Includes Navigation, BottomBar, and multi-screen setup.
+    *   **Compose for TV**: Optimized for Android TV with `tv-material`.
+    *   **Compose Library**: Foundation for publishing reusable UI components.
+    *   **XML Views (Legacy)**: For maintenance or classic development.
 
 ### After Scaffolding
 
@@ -54,9 +59,10 @@ npm run build
 
 The generated project is **clean** and follows modern best practices. It includes a `package.json` with convenience scripts:
 
-*   `npm run dev`: Watches your code and auto-deploys changes (`./gradlew -t installDebug`).
-*   `npm run build`: Generates a release APK (`./gradlew assembleRelease`).
-*   `npm test`: Runs unit tests (`./gradlew test`).
+*   `npm run dev`: High-speed development loop. Watches code and auto-deploys via `--continuous` and `--configuration-cache`.
+*   `npm run build`: Generates a production release APK.
+*   `npm run clean:deep`: Purges all build artifacts and Gradle cache to reclaim disk space.
+*   `npm test`: Runs unit tests.
 
 ### 📱 ADB Scripts (Wireless Debugging)
 

package/dist/index.js

@@ -20,10 +20,13 @@ export async function run(args) {
         {
             type: 'select',
             name: 'uiType',
-            message: 'Select UI Framework:',
+            message: 'Select Template:',
             choices: [
-                { title: 'Jetpack Compose (Recommended)', value: 'compose' },
-                { title: 'XML Views (Legacy)', value: 'views' }
+                { title: 'Jetpack Compose (Mobile)', value: 'compose', description: 'Recommended for phone/tablet apps' },
+                { title: 'Compose with Navigation', value: 'mobile-compose-navigation', description: 'Includes Navigation, BottomBar, Screens' },
+                { title: 'Compose for TV', value: 'tv-compose', description: 'Optimized for Android TV (Leanback)' },
+                { title: 'Compose Library', value: 'compose-library', description: 'Scaffold for publishing UI libraries' },
+                { title: 'XML Views (Legacy)', value: 'views', description: 'Classic View-based Android development' }
             ],
             initial: 0
         }

package/dist/template/generateProject.js

@@ -8,19 +8,24 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 export async function generateProject(options) {
     const { projectPath, projectName, uiType, sdkPath } = options;
+    const isLibrary = uiType === 'compose-library';
+    const moduleName = isLibrary ? 'library' : 'app';
     // 1. Ensure target directory
     await fs.ensureDir(projectPath);
     // 2. Resolve template paths
     const templateRoot = path.resolve(__dirname, '../../templates');
     const baseTemplate = path.join(templateRoot, 'base');
-    const uiTemplateName = uiType === 'compose' ? 'ui-compose' : 'ui-views';
-    const uiTemplate = path.join(templateRoot, uiTemplateName);
+    const uiTemplate = path.join(templateRoot, uiType);
     if (!fs.existsSync(baseTemplate)) {
         throw new Error(`Template not found at ${baseTemplate}`);
     }
     // 3. Copy Base
     logger.info(`Copying base template from ${baseTemplate}...`);
     await fs.copy(baseTemplate, projectPath);
+    if (isLibrary) {
+        // Remove default app module if it's a library
+        await fs.remove(path.join(projectPath, 'app'));
+    }
     // Rename _gitignore to .gitignore
     const gitignorePath = path.join(projectPath, '_gitignore');
     if (fs.existsSync(gitignorePath)) {
@@ -37,49 +42,53 @@ export async function generateProject(options) {
     // Replace in settings.gradle.kts
     await patchFile(path.join(projectPath, 'settings.gradle.kts'), {
         '{{PROJECT_NAME}}': projectName,
+        'include(":app")': `include(":${moduleName}")`
     });
-    // Replace in app/build.gradle.kts
-    await patchFile(path.join(projectPath, 'app/build.gradle.kts'), {
+    // Replace in module build.gradle.kts
+    const moduleBuildFile = path.join(projectPath, moduleName, 'build.gradle.kts');
+    await patchFile(moduleBuildFile, {
         '{{APPLICATION_ID}}': packageName,
         '{{COMPILE_SDK}}': CONSTANTS.COMPILE_SDK.toString(),
         '{{MIN_SDK}}': CONSTANTS.MIN_SDK.toString(),
         '{{TARGET_SDK}}': CONSTANTS.TARGET_SDK.toString(),
     });
-    // Replace in app/src/main/res/values/strings.xml
-    await patchFile(path.join(projectPath, 'app/src/main/res/values/strings.xml'), {
-        '{{PROJECT_NAME}}': projectName,
-    });
+    // Replace in strings.xml
+    const stringsPath = path.join(projectPath, moduleName, 'src/main/res/values/strings.xml');
+    if (fs.existsSync(stringsPath)) {
+        await patchFile(stringsPath, {
+            '{{PROJECT_NAME}}': projectName,
+        });
+    }
     // Handle Source Code Relocation
-    const srcBase = path.join(projectPath, 'app/src/main/java');
+    const srcBase = path.join(projectPath, moduleName, 'src/main/java');
     const oldPackagePath = path.join(srcBase, 'com/example/template');
     const newPackagePath = path.join(srcBase, ...packageName.split('.'));
     if (fs.existsSync(oldPackagePath)) {
         await fs.move(oldPackagePath, newPackagePath, { overwrite: true });
         // Recursive file patching for package statement
         await patchSourceFiles(newPackagePath, packageName);
-        // Clean up empty dirs (com/example/template -> com/example -> com)
-        // Only if empty.
+        // Clean up empty dirs
         await cleanEmptyDirs(srcBase);
     }
     // Create local.properties with SDK location
     const localProperties = `sdk.dir=${sdkPath}`;
     await fs.writeFile(path.join(projectPath, 'local.properties'), localProperties);
-    // 6. Setup NPM Scripts (The "Vite-like" experience)
+    // 6. Setup NPM Scripts
     logger.info('Adding npm convenience scripts...');
     const packageJson = {
         name: projectName.toLowerCase().replace(/[^a-z0-9-]/g, '-'),
         version: "0.1.0",
         private: true,
         scripts: {
-            "dev": "./gradlew installDebug --continuous --configuration-cache --parallel --offline",
+            "dev": `./gradlew installDebug --continuous --configuration-cache --parallel --offline`,
             "start": "npm run dev",
-            "build": "./gradlew assembleRelease",
-            "build:debug": "./gradlew assembleDebug",
-            "test": "./gradlew test",
-            "lint": "./gradlew lint",
-            "clean": "./gradlew clean",
-            "clean:deep": "rm -rf .gradle app/build build",
-            "help": "./gradlew --help",
+            "build": `./gradlew assembleRelease`,
+            "build:debug": `./gradlew assembleDebug`,
+            "test": `./gradlew test`,
+            "lint": `./gradlew lint`,
+            "clean": `./gradlew clean`,
+            "clean:deep": "rm -rf .gradle app/build build library/build",
+            "help": `./gradlew --help`,
             "adb": "node scripts/adb.js",
             "adb:devices": "npm run adb devices",
             "adb:connect": "npm run adb connect",
@@ -89,12 +98,6 @@ export async function generateProject(options) {
         }
     };
     await fs.writeJSON(path.join(projectPath, 'package.json'), packageJson, { spaces: 2 });
-    // Ensure scripts dir exists (since we copy base first, but adb.js is new)
-    // Wait, templates/base/scripts/adb.js is ALREADY in the base template.
-    // We just need to ensure the `scripts` folder is copied correctly.
-    // Since we copy `templates/base`, it should be fine.
-    // Make scripts executable if needed (node doesn't need +x but good practice)
-    // await fs.chmod(path.join(projectPath, 'scripts/adb.js'), 0o755);
     // 7. Initialize Git
     try {
         logger.info('Initializing git repository...');
@@ -104,7 +107,7 @@ export async function generateProject(options) {
         logger.success('Git repository initialized.');
     }
     catch (e) {
-        logger.warn('Failed to initialize git repository. You may need to run "git init" manually.');
+        logger.warn('Failed to initialize git repository.');
     }
 }
 async function patchFile(filePath, replacements) {
@@ -132,11 +135,6 @@ async function patchSourceFiles(dir, packageName) {
     }
 }
 async function cleanEmptyDirs(dir) {
-    // Basic cleanup: remove com/example/template if empty
-    // We moved content from com/example/template to new path.
-    // So we check if com/example/template is empty, then com/example, then com.
-    // This is tricky because we don't know the exact depth of the old structure easily without hardcoding.
-    // Hardcoded for "com/example/template":
     const oldPath = path.join(dir, 'com/example/template');
     try {
         if (fs.existsSync(oldPath) && (await fs.readdir(oldPath)).length === 0) {
@@ -151,7 +149,5 @@ async function cleanEmptyDirs(dir) {
             }
         }
     }
-    catch (e) {
-        // Ignore errors during cleanup
-    }
+    catch (e) { }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-droid",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "The fastest way to start an Android project. No Studio required.",
   "author": "YELrhilassi",
   "license": "MIT",

package/templates/compose-library/library/build.gradle.kts

@@ -0,0 +1,46 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "{{APPLICATION_ID}}"
+    compileSdk = {{COMPILE_SDK}}
+
+    defaultConfig {
+        minSdk = {{MIN_SDK}}
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.material3)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

package/templates/compose-library/library/src/main/java/com/example/template/ExampleComponent.kt

@@ -0,0 +1,16 @@
+package {{PACKAGE_NAME}}
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+
+/**
+ * An example component from your library.
+ */
+@Composable
+fun LibraryGreeting(name: String, modifier: Modifier = Modifier) {
+    Text(
+        text = "Hello $name from the Library!",
+        modifier = modifier
+    )
+}

package/templates/mobile-compose-navigation/app/build.gradle.kts

@@ -0,0 +1,56 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "{{APPLICATION_ID}}"
+    compileSdk = {{COMPILE_SDK}}
+
+    defaultConfig {
+        applicationId = "{{APPLICATION_ID}}"
+        minSdk = {{MIN_SDK}}
+        targetSdk = {{TARGET_SDK}}
+        versionCode = 1
+        versionName = "1.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    
+    // Navigation
+    implementation("androidx.navigation:navigation-compose:2.7.7")
+    
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

package/templates/mobile-compose-navigation/app/src/main/AndroidManifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.MyApplication">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

package/templates/mobile-compose-navigation/app/src/main/java/com/example/template/MainActivity.kt

@@ -0,0 +1,84 @@
+package {{PACKAGE_NAME}}
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            MainScreen()
+        }
+    }
+}
+
+sealed class Screen(val route: String, val label: String, val icon: @Composable () -> Unit) {
+    object Home : Screen("home", "Home", { Icon(Icons.Filled.Home, contentDescription = null) })
+    object Settings : Screen("settings", "Settings", { Icon(Icons.Filled.Settings, contentDescription = null) })
+}
+
+@Composable
+fun MainScreen() {
+    val navController = rememberNavController()
+    val items = listOf(Screen.Home, Screen.Settings)
+
+    MaterialTheme {
+        Scaffold(
+            bottomBar = {
+                NavigationBar {
+                    val navBackStackEntry by navController.currentBackStackEntryAsState()
+                    val currentDestination = navBackStackEntry?.destination
+                    items.forEach { screen ->
+                        NavigationBarItem(
+                            icon = screen.icon,
+                            label = { Text(screen.label) },
+                            selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
+                            onClick = {
+                                navController.navigate(screen.route) {
+                                    popUpTo(navController.graph.findStartDestination().id) {
+                                        saveState = true
+                                    }
+                                    launchSingleTop = true
+                                    restoreState = true
+                                }
+                            }
+                        )
+                    }
+                }
+            }
+        ) { innerPadding ->
+            NavHost(navController, startDestination = Screen.Home.route, Modifier.padding(innerPadding)) {
+                composable(Screen.Home.route) { HomeScreen() }
+                composable(Screen.Settings.route) { SettingsScreen() }
+            }
+        }
+    }
+}
+
+@Composable
+fun HomeScreen() {
+    Surface {
+        Text("Welcome Home!")
+    }
+}
+
+@Composable
+fun SettingsScreen() {
+    Surface {
+        Text("Settings Screen")
+    }
+}

package/templates/tv-compose/app/build.gradle.kts

@@ -0,0 +1,53 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+}
+
+android {
+    namespace = "{{APPLICATION_ID}}"
+    compileSdk = {{COMPILE_SDK}}
+
+    defaultConfig {
+        applicationId = "{{APPLICATION_ID}}"
+        minSdk = {{MIN_SDK}}
+        targetSdk = {{TARGET_SDK}}
+        versionCode = 1
+        versionName = "1.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    
+    // TV Compose
+    implementation("androidx.tv:tv-foundation:1.0.0-alpha10")
+    implementation("androidx.tv:tv-material:1.0.0-alpha10")
+    
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+}

package/templates/tv-compose/app/src/main/AndroidManifest.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-feature android:name="android.software.leanback" android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:banner="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.MyApplication">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

package/templates/tv-compose/app/src/main/java/com/example/template/MainActivity.kt

@@ -0,0 +1,64 @@
+package {{PACKAGE_NAME}}
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.tv.material3.*
+
+class MainActivity : ComponentActivity() {
+    @OptIn(ExperimentalTvMaterial3Api::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            MaterialTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    shape = ClickableSurfaceDefaults.shape(),
+                    color = ClickableSurfaceDefaults.color()
+                ) {
+                    TvContent()
+                }
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Composable
+fun TvContent() {
+    Column(
+        modifier = Modifier.padding(48.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        Text(
+            text = "Welcome to Android TV",
+            style = MaterialTheme.typography.displayMedium
+        )
+        
+        Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+            repeat(5) { index ->
+                StandardCard(index)
+            }
+        }
+    }
+}
+
+@OptIn(ExperimentalTvMaterial3Api::class)
+@Composable
+fun StandardCard(index: Int) {
+    Surface(
+        onClick = { /* Handle click */ },
+        modifier = Modifier.size(150.dp, 100.dp),
+        shape = ClickableSurfaceDefaults.shape(shape = MaterialTheme.shapes.medium),
+        color = ClickableSurfaceDefaults.color(focusedColor = Color.White)
+    ) {
+        Box(contentAlignment = androidx.compose.ui.Alignment.Center) {
+            Text("Item $index")
+        }
+    }
+}