From 710b19d955a2cc12bc6db6b7f8017bf271ee91c1 Mon Sep 17 00:00:00 2001
From: Ewan Croft <contact@ewancroft.uk>
Date: Wed, 14 Oct 2026 14:10:43 +0100
Subject: [PATCH] fix(android): host HiltTestActivity in the debug app, not the
 test APK

HiltTestActivity was declared only in the androidTest manifest, so it ran in
the test APK's process (uk.ewancroft.inkwell.debug.test). The test rule
launches it into the app's process (uk.ewancroft.inkwell.debug), so every
launch failed with 'Intent ... resolved to different process'. That is the
remaining failure named in d893bf6 (InkwellNavHostTest and
AccessibilitySemanticsTest).

Move the activity and its manifest entry into app/src/debug so it is part of
the debug app. Release builds are unaffected.

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
---
 .../app/src/androidTest/AndroidManifest.xml   | 23 -------------------
 Android/app/src/debug/AndroidManifest.xml     | 21 +++++++++++++++++
 .../uk/ewancroft/inkwell/HiltTestActivity.kt  |  3 ++-
 3 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 Android/app/src/androidTest/AndroidManifest.xml
 create mode 100644 Android/app/src/debug/AndroidManifest.xml
 rename Android/app/src/{androidTest => debug}/java/uk/ewancroft/inkwell/HiltTestActivity.kt (83%)

diff --git a/Android/app/src/androidTest/AndroidManifest.xml b/Android/app/src/androidTest/AndroidManifest.xml
deleted file mode 100644
index 64331104..00000000
--- a/Android/app/src/androidTest/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Instrumentation-only manifest additions.
-
-  HiltTestActivity is an empty @AndroidEntryPoint host for composable-level
-  tests (see HiltTestActivity.kt). It is not part of the shipped app and never
-  reaches the release manifest — this file is merged into the androidTest APK
-  only.
-
-  The theme is a framework one, not @style/Theme.Inkwell: the test APK links
-  against its own resource namespace and cannot see the app's styles. It only
-  has to be a valid no-action-bar host — every screen under test supplies its
-  own colours through InkwellTheme in Compose.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application>
-        <activity
-            android:name="uk.ewancroft.inkwell.HiltTestActivity"
-            android:exported="false"
-            android:theme="@android:style/Theme.Material.Light.NoActionBar" />
-    </application>
-</manifest>
diff --git a/Android/app/src/debug/AndroidManifest.xml b/Android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000..c3d74e27
--- /dev/null
+++ b/Android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Debug-only manifest additions.
+
+  HiltTestActivity is an empty @AndroidEntryPoint host for composable-level
+  tests (see HiltTestActivity.kt). It must live in the app APK, not the
+  androidTest APK: the test rule launches it into the app's process, so
+  declaring it only in the test APK makes the launch resolve to a different
+  process ("resolved to different process ...debug.test").
+
+  It is part of the debug variant only and never reaches the release manifest.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name="uk.ewancroft.inkwell.HiltTestActivity"
+            android:exported="false"
+            android:theme="@android:style/Theme.Material.Light.NoActionBar" />
+    </application>
+</manifest>
diff --git a/Android/app/src/androidTest/java/uk/ewancroft/inkwell/HiltTestActivity.kt b/Android/app/src/debug/java/uk/ewancroft/inkwell/HiltTestActivity.kt
similarity index 83%
rename from Android/app/src/androidTest/java/uk/ewancroft/inkwell/HiltTestActivity.kt
rename to Android/app/src/debug/java/uk/ewancroft/inkwell/HiltTestActivity.kt
index f44e62e5..da85ab3e 100644
--- a/Android/app/src/androidTest/java/uk/ewancroft/inkwell/HiltTestActivity.kt
+++ b/Android/app/src/debug/java/uk/ewancroft/inkwell/HiltTestActivity.kt
@@ -12,7 +12,8 @@ import dagger.hilt.android.AndroidEntryPoint
  * ViewModel factory and nothing else, so a test can mount exactly the
  * composable it means to exercise.
  *
- * Declared in `app/src/androidTest/AndroidManifest.xml`.
+ * Declared in `app/src/debug/AndroidManifest.xml`, so it runs in the app process
+ * that the test rule launches it into.
  */
 @AndroidEntryPoint
 class HiltTestActivity : ComponentActivity()