Merge the rest of brush graph code into main

app/build.gradle.kts

@@ -66,6 +66,11 @@ android {
             isIncludeAndroidResources = true
         }
     }
+
+    sourceSets {
+        getByName("test").kotlin.srcDir("src/testShared/java")
+        getByName("androidTest").kotlin.srcDir("src/testShared/java")
+    }
 }
 
 roborazzi {
@@ -82,6 +87,8 @@ dependencies {
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.compose.material.icons.core)
+    implementation(libs.androidx.compose.material.icons.extended)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.navigation.runtime.ktx)

app/src/androidTest/java/com/example/cahier/CahierListDetailTest.kt

@@ -28,13 +28,19 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.example.cahier.core.data.FakeNotesRepository
 import com.example.cahier.features.home.HomePane
 import com.example.cahier.features.home.viewmodel.HomeScreenViewModel
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class CahierListDetailTest {
-    @get:Rule
+    @get:Rule(order = 0)
+    val hiltRule = HiltAndroidRule(this)
+
+    @get:Rule(order = 1)
     val composeTestRule = createComposeRule()
 
     private val fakeViewModel = HomeScreenViewModel(FakeNotesRepository())
@@ -83,6 +89,7 @@ class CahierListDetailTest {
         HomePane(
             navigateToCanvas = { _ -> },
             navigateToDrawingCanvas = { _ -> },
+            navigateToBrushGraph = {},
             navigateUp = {},
             forceCompact = forceCompact,
             homeScreenViewModel = fakeViewModel

app/src/androidTest/java/com/example/cahier/core/data/OfflineNotesRepositoryTest.kt

@@ -8,6 +8,7 @@ import androidx.ink.strokes.ImmutableStrokeInputBatch
 import androidx.ink.strokes.Stroke
 import androidx.test.core.app.ApplicationProvider
 import com.example.cahier.core.ui.Converters
+import com.example.cahier.developer.brushdesigner.data.CustomBrushDao
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
@@ -36,12 +37,14 @@ class OfflineNotesRepositoryTest {
     private val testDispatcher = UnconfinedTestDispatcher()
     private lateinit var repository: OfflineNotesRepository
     private val noteDao: NoteDao = mock()
+    private val customBrushDao: CustomBrushDao = mock()
 
     @Before
-    fun setup() {
+    fun setup() = runTest {
         Dispatchers.setMain(testDispatcher)
+        whenever(customBrushDao.getAllCustomBrushesSync(any())).thenReturn(emptyList())
         val context = ApplicationProvider.getApplicationContext<Context>()
-        repository = OfflineNotesRepository(noteDao, context)
+        repository = OfflineNotesRepository(noteDao, context, customBrushDao, mock())
     }
 
     @After
@@ -87,6 +90,7 @@ class OfflineNotesRepositoryTest {
         verify(noteDao).updateNote(note.copy(isFavorite = true))
     }
 
+
     @Test
     fun getAllNotesStream_returns_flow_from_DAO() = runTest {
         val notes = listOf(Note(id = 1), Note(id = 2))

app/src/androidTest/java/com/example/cahier/core/utils/PointerInputUtilTest.kt

@@ -31,16 +31,22 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
+@HiltAndroidTest
 class PointerInputUtilTest {
 
-    @get:Rule
+    @get:Rule(order = 0)
+    val hiltRule = HiltAndroidRule(this)
+
+    @get:Rule(order = 1)
     val composeTestRule = createComposeRule()
 
     @Test

app/src/androidTest/java/com/example/cahier/developer/brushdesigner/viewmodel/BrushDesignerViewModelTest.kt

@@ -1,8 +1,9 @@
 package com.example.cahier.developer.brushdesigner.viewmodel
 
 import android.content.Context
-import android.graphics.Bitmap
 import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.example.cahier.core.ui.CahierTextureBitmapStore
 import com.example.cahier.developer.brushdesigner.data.BrushDesignerRepository
 import com.example.cahier.developer.brushdesigner.data.CustomBrushDao
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -16,14 +17,15 @@ import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
 import org.junit.After
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 import javax.inject.Inject
 
+@RunWith(AndroidJUnit4::class)
 @OptIn(ExperimentalCoroutinesApi::class)
 @HiltAndroidTest
 class BrushDesignerViewModelTest {
@@ -51,7 +53,10 @@ class BrushDesignerViewModelTest {
         repository.updateActiveBrushProto(defaultProto())
 
         val context = ApplicationProvider.getApplicationContext<Context>()
-        viewModel = BrushDesignerViewModel(context, repository, customBrushDao)
+        viewModel = BrushDesignerViewModel(
+            context, repository,
+            CahierTextureBitmapStore(context), customBrushDao
+        )
     }
 
     /** Produces a clean default [ProtoBrushFamily] matching the repository's initial state. */
@@ -141,7 +146,6 @@ class BrushDesignerViewModelTest {
     @Test
     fun saveToPalette_persists_to_dao() = runTest {
         val brushName = "Test Persistence Brush"
-        viewModel.updateClientBrushFamilyId("test-id")
 
         viewModel.saveToPalette(brushName).join()
 
@@ -153,36 +157,14 @@ class BrushDesignerViewModelTest {
     fun previewBrushFamily_is_null_on_invalid_proto() = runTest {
         val invalidRepo = BrushDesignerRepository()
         invalidRepo.updateActiveBrushProto(ink.proto.BrushFamily.newBuilder().build())
-
+        val context = ApplicationProvider.getApplicationContext<Context>()
         val vm = BrushDesignerViewModel(
-            ApplicationProvider.getApplicationContext(),
+            context,
             invalidRepo,
+            CahierTextureBitmapStore(context),
             customBrushDao
         )
 
         assertNull(vm.previewBrushFamily.value)
     }
-
-    @Test
-    fun setTextureStore_immediately_syncs_proto_textures() = runTest {
-        val context = ApplicationProvider.getApplicationContext<Context>()
-        val testTextureId = "test-texture"
-        val testBitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888)
-
-        val baos = java.io.ByteArrayOutputStream()
-        testBitmap.compress(Bitmap.CompressFormat.PNG, 100, baos)
-        val textureBytes = com.google.protobuf.ByteString.copyFrom(baos.toByteArray())
-
-        val protoWithTexture = viewModel.activeBrushProto.value.toBuilder()
-            .putTextureIdToBitmap(testTextureId, textureBytes)
-            .build()
-        repository.updateActiveBrushProto(protoWithTexture)
-
-        val store = com.example.cahier.core.ui.CahierTextureBitmapStore(context)
-        assertNull(store[testTextureId])
-
-        viewModel.setTextureStore(store)
-
-        assertNotNull(store[testTextureId])
-    }
 }