further cleanup

Author: tstromberg

.gitignore

@@ -2,6 +2,10 @@
 *.apk
 *.aab
 
+# Keystore files (keep private!)
+*.keystore
+*.jks
+
 # Files for the ART/Dalvik VM
 *.dex
 

Makefile

@@ -1,12 +1,40 @@
-.PHONY: all release sideload clean rebuild-icons
+.PHONY: all release sideload clean lint format rebuild-icons
 
 # Default target: build debug APK
 all:
 	./gradlew assembleDebug
+	@mkdir -p out
+	@cp app/build/outputs/apk/debug/app-debug.apk out/heisenberg-debug.apk
+	@echo "\nDebug APK built and copied to out/:"
+	@ls -lh out/heisenberg-debug.apk
 
-# Build release APK
+# Build release APK (signs with ~/android.jks or $ANDROID_KEYSTORE if present)
 release:
+	@KEYSTORE_PATH=$${ANDROID_KEYSTORE:-$$HOME/android.jks}; \
+	if [ ! -f "$$KEYSTORE_PATH" ]; then \
+		echo "Warning: Keystore not found at $$KEYSTORE_PATH"; \
+		echo "Creating default debug keystore..."; \
+		keytool -genkeypair -v \
+			-keystore "$$HOME/android.jks" \
+			-alias key0 \
+			-keyalg RSA \
+			-keysize 2048 \
+			-validity 10000 \
+			-storepass android \
+			-keypass android \
+			-dname "CN=Android Debug, OU=Android, O=Android, L=Unknown, ST=Unknown, C=US"; \
+		echo "Created debug keystore at $$HOME/android.jks with alias 'key0'"; \
+	fi
 	./gradlew assembleRelease
+	@mkdir -p out
+	@if [ -f app/build/outputs/apk/release/app-release.apk ]; then \
+		cp app/build/outputs/apk/release/app-release.apk out/heisenberg-release.apk; \
+		echo "\nSigned release APK built and copied to out/:"; \
+	else \
+		cp app/build/outputs/apk/release/app-release-unsigned.apk out/heisenberg-release-unsigned.apk; \
+		echo "\nUnsigned release APK built and copied to out/:"; \
+	fi
+	@ls -lh out/heisenberg-release*.apk
 
 # Build and install debug APK via adb
 sideload:
@@ -15,6 +43,15 @@ sideload:
 # Clean build artifacts
 clean:
 	./gradlew clean
+	@rm -rf out
+
+# Run ktlint checks
+lint:
+	./gradlew ktlintCheck
+
+# Auto-format code with ktlint
+format:
+	./gradlew ktlintFormat
 
 # Generate launcher icons from source PNG (expects icon.png in project root)
 rebuild-icons:

README.md

@@ -25,12 +25,38 @@ A minimalist Android app that wakes your device screen when motion or ambient li
 ### Build Commands
 
 ```bash
-make              # Build debug APK
-make release      # Build release APK
-make sideload     # Build and install via adb
-make clean        # Clean build artifacts
+make              # Build debug APK → out/heisenberg-debug.apk
+make release      # Build release APK → out/heisenberg-release.apk (auto-signed)
+make sideload     # Build and install debug APK via adb
+make lint         # Run ktlint code style checks
+make format       # Auto-format code with ktlint
+make clean        # Clean build artifacts (including out/ directory)
 ```
 
+All built APKs are automatically copied to the `out/` directory for easy access.
+
+### Signing Configuration
+
+Release builds use `~/android.jks` by default. Configure signing credentials via:
+
+**Option 1: Environment variables** (recommended for CI/CD)
+```bash
+export ANDROID_KEYSTORE=/path/to/your/keystore.jks       # Optional, defaults to ~/android.jks
+export ANDROID_KEYSTORE_PASSWORD=your_store_password
+export ANDROID_KEY_ALIAS=your_key_alias                  # e.g., key0, androiddebugkey
+export ANDROID_KEY_PASSWORD=your_key_password            # Optional, defaults to store password
+```
+
+**Option 2: gradle.properties** (for local development)
+```properties
+# ~/.gradle/gradle.properties or ./gradle.properties
+android.keystorePassword=your_store_password
+android.keyAlias=your_key_alias
+android.keyPassword=your_key_password
+```
+
+If `~/android.jks` doesn't exist, a debug keystore will be auto-generated.
+
 Or use Gradle directly:
 ```bash
 ./gradlew assembleDebug

app/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
 }
 
 android {
@@ -11,17 +12,51 @@ android {
         applicationId = "com.heisenberg.lux"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 4
+        versionName = "0.4.1"
+    }
+
+    signingConfigs {
+        create("release") {
+            // Use keystore from environment variable or default locations
+            val keystorePath = System.getenv("ANDROID_KEYSTORE")
+                ?: "${System.getProperty("user.home")}/android.jks"
+            val keystoreFile = file(keystorePath)
+
+            if (keystoreFile.exists()) {
+                println("Using keystore: $keystorePath")
+                storeFile = keystoreFile
+                // Try environment variables first, then Gradle properties, then defaults
+                storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
+                    ?: project.findProperty("android.keystorePassword") as String?
+                    ?: "android"
+                keyAlias = System.getenv("ANDROID_KEY_ALIAS")
+                    ?: project.findProperty("android.keyAlias") as String?
+                    ?: "key0"
+                keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
+                    ?: project.findProperty("android.keyPassword") as String?
+                    ?: storePassword // Use store password as key password if not specified
+                println("Using key alias: $keyAlias")
+            } else {
+                println("Warning: Keystore not found at $keystorePath - release build will be unsigned")
+            }
+        }
     }
 
     buildTypes {
         release {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
+            // Sign if keystore exists, otherwise build unsigned
+            signingConfig =
+                if (rootProject.file("heisenberg.keystore").exists()) {
+                    signingConfigs.getByName("release")
+                } else {
+                    null
+                }
         }
     }
 
@@ -39,6 +74,16 @@ android {
     }
 }
 
+ktlint {
+    version.set("1.0.1")
+    android.set(true)
+    ignoreFailures.set(false)
+    reporters {
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
+        reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
+    }
+}
+
 dependencies {
     // Minimal dependencies - only what's needed for CameraX and lifecycle
     implementation("androidx.appcompat:appcompat:1.6.1")

app/src/main/kotlin/com/heisenberg/lux/BootReceiver.kt

@@ -7,7 +7,10 @@ import android.util.Log
 import androidx.core.content.ContextCompat
 
 class BootReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
         if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
             Log.i(TAG, "Boot completed, checking if service should start")