Basic toolkit impls provide a full widget system (#2585)

* Basic toolkit impls provide a full widget system

Further simplifying what it takes to get off the ground using Redwood with the Basic schema.

* Update redwood-basic-view/src/main/kotlin/app/cash/redwood/basic/view/ViewImage.kt

Co-authored-by: Colin White <[email protected]>

---------

Co-authored-by: Colin White <[email protected]>

Author: JakeWharton

gradle/libs.versions.toml

@@ -73,6 +73,10 @@ jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "
 jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jbCompose" }
 jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jbCompose" }
 
+coil-compose = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil" }
+coil-core = { module = "io.coil-kt.coil3:coil-core", version.ref = "coil" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
+
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.9.0" }
 burst = { module = "app.cash.burst:burst", version.ref = "burst" }
 burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version.ref = "burst" }
@@ -91,9 +95,6 @@ zipline-loader = { module = "app.cash.zipline:zipline-loader", version.ref = "zi
 paparazzi-gradlePlugin = { module = "app.cash.paparazzi:paparazzi-gradle-plugin", version.ref = "paparazzi" }
 paparazzi = { module = "app.cash.paparazzi:paparazzi", version.ref = "paparazzi" }
 jimfs = "com.google.jimfs:jimfs:1.3.0"
-coil-compose = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil" }
-coil-core = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
-coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 turbine = "app.cash.turbine:turbine:1.2.0"
 ktlint = "com.pinterest.ktlint:ktlint-cli:1.3.1"
 ktlintComposeRules = "io.nlopez.compose.rules:ktlint:0.4.22"

redwood-basic-composeui/api/android/redwood-basic-composeui.api

@@ -9,6 +9,10 @@ public final class app/cash/redwood/basic/composeui/ComposeUiRedwoodBasicWidgetF
 	public fun TextInput ()Lapp/cash/redwood/basic/widget/TextInput;
 }
 
+public final class app/cash/redwood/basic/composeui/ComposeUiRedwoodBasicWidgetFactoryKt {
+	public static final fun ComposeUiRedwoodBasicWidgetSystem (Lcoil3/ImageLoader;)Lapp/cash/redwood/basic/widget/RedwoodBasicWidgetSystem;
+}
+
 public final class app/cash/redwood/basic/composeui/ThemeKt {
 	public static final fun RedwoodBasicTheme (ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
 	public static final fun getTypography ()Landroidx/compose/material/Typography;

redwood-basic-composeui/api/jvm/redwood-basic-composeui.api

@@ -9,6 +9,10 @@ public final class app/cash/redwood/basic/composeui/ComposeUiRedwoodBasicWidgetF
 	public fun TextInput ()Lapp/cash/redwood/basic/widget/TextInput;
 }
 
+public final class app/cash/redwood/basic/composeui/ComposeUiRedwoodBasicWidgetFactoryKt {
+	public static final fun ComposeUiRedwoodBasicWidgetSystem (Lcoil3/ImageLoader;)Lapp/cash/redwood/basic/widget/RedwoodBasicWidgetSystem;
+}
+
 public final class app/cash/redwood/basic/composeui/ThemeKt {
 	public static final fun RedwoodBasicTheme (ZLkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V
 	public static final fun getTypography ()Landroidx/compose/material/Typography;

redwood-basic-composeui/api/redwood-basic-composeui.klib.api

@@ -24,6 +24,7 @@ final val app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_Comp
 final val app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiText$stableprop // app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiText$stableprop|#static{}app_cash_redwood_basic_composeui_ComposeUiText$stableprop[0]
 final val app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiTextInput$stableprop // app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiTextInput$stableprop|#static{}app_cash_redwood_basic_composeui_ComposeUiTextInput$stableprop[0]
 
+final fun app.cash.redwood.basic.composeui/ComposeUiRedwoodBasicWidgetSystem(coil3/ImageLoader): app.cash.redwood.basic.widget/RedwoodBasicWidgetSystem<kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>> // app.cash.redwood.basic.composeui/ComposeUiRedwoodBasicWidgetSystem|ComposeUiRedwoodBasicWidgetSystem(coil3.ImageLoader){}[0]
 final fun app.cash.redwood.basic.composeui/RedwoodBasicTheme(kotlin/Boolean, kotlin/Function2<androidx.compose.runtime/Composer, kotlin/Int, kotlin/Unit>, androidx.compose.runtime/Composer?, kotlin/Int, kotlin/Int) // app.cash.redwood.basic.composeui/RedwoodBasicTheme|RedwoodBasicTheme(kotlin.Boolean;kotlin.Function2<androidx.compose.runtime.Composer,kotlin.Int,kotlin.Unit>;androidx.compose.runtime.Composer?;kotlin.Int;kotlin.Int){}[0]
 final fun app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiButton$stableprop_getter(): kotlin/Int // app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiButton$stableprop_getter|app_cash_redwood_basic_composeui_ComposeUiButton$stableprop_getter(){}[0]
 final fun app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiImage$stableprop_getter(): kotlin/Int // app.cash.redwood.basic.composeui/app_cash_redwood_basic_composeui_ComposeUiImage$stableprop_getter|app_cash_redwood_basic_composeui_ComposeUiImage$stableprop_getter(){}[0]

redwood-basic-composeui/build.gradle

@@ -12,10 +12,12 @@ kotlin {
     commonMain {
       dependencies {
         api projects.redwoodBasicWidget
+        api libs.coil.compose
+        api libs.jetbrains.compose.material
+        implementation projects.redwoodLayoutComposeui
+        implementation projects.redwoodLazylayoutComposeui
         implementation projects.redwoodWidgetCompose
-        implementation libs.jetbrains.compose.material
         implementation libs.jetbrains.compose.ui
-        implementation libs.coil.compose
       }
     }
   }

redwood-basic-composeui/src/commonMain/kotlin/app/cash/redwood/basic/composeui/ComposeUiRedwoodBasicWidgetFactory.kt

@@ -20,8 +20,11 @@ import app.cash.redwood.basic.modifier.Reuse
 import app.cash.redwood.basic.widget.Button
 import app.cash.redwood.basic.widget.Image
 import app.cash.redwood.basic.widget.RedwoodBasicWidgetFactory
+import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
 import app.cash.redwood.basic.widget.Text
 import app.cash.redwood.basic.widget.TextInput
+import app.cash.redwood.layout.composeui.ComposeUiRedwoodLayoutWidgetFactory
+import app.cash.redwood.lazylayout.composeui.ComposeUiRedwoodLazyLayoutWidgetFactory
 import coil3.ImageLoader
 
 public class ComposeUiRedwoodBasicWidgetFactory(
@@ -34,3 +37,14 @@ public class ComposeUiRedwoodBasicWidgetFactory(
   override fun Reuse(value: @Composable () -> Unit, modifier: Reuse) {
   }
 }
+
+@Suppress("FunctionName") // Acting like a type.
+public fun ComposeUiRedwoodBasicWidgetSystem(
+  imageLoader: ImageLoader,
+): RedwoodBasicWidgetSystem<@Composable (() -> Unit)> {
+  return RedwoodBasicWidgetSystem(
+    RedwoodBasic = ComposeUiRedwoodBasicWidgetFactory(imageLoader),
+    RedwoodLayout = ComposeUiRedwoodLayoutWidgetFactory(),
+    RedwoodLazyLayout = ComposeUiRedwoodLazyLayoutWidgetFactory(),
+  )
+}

redwood-basic-dom/api/redwood-basic-dom.klib.api

@@ -15,3 +15,5 @@ final class app.cash.redwood.basic.dom/HTMLElementRedwoodBasicWidgetFactory : ap
     final fun Text(): app.cash.redwood.basic.widget/Text<org.w3c.dom/HTMLElement> // app.cash.redwood.basic.dom/HTMLElementRedwoodBasicWidgetFactory.Text|Text(){}[0]
     final fun TextInput(): app.cash.redwood.basic.widget/TextInput<org.w3c.dom/HTMLElement> // app.cash.redwood.basic.dom/HTMLElementRedwoodBasicWidgetFactory.TextInput|TextInput(){}[0]
 }
+
+final fun app.cash.redwood.basic.dom/HTMLElementRedwoodBasicWidgetSystem(org.w3c.dom/Document): app.cash.redwood.basic.widget/RedwoodBasicWidgetSystem<org.w3c.dom/HTMLElement> // app.cash.redwood.basic.dom/HTMLElementRedwoodBasicWidgetSystem|HTMLElementRedwoodBasicWidgetSystem(org.w3c.dom.Document){}[0]

redwood-basic-dom/build.gradle

@@ -10,6 +10,8 @@ kotlin {
     commonMain {
       dependencies {
         api projects.redwoodBasicWidget
+        implementation projects.redwoodLayoutDom
+        implementation projects.redwoodLazylayoutDom
       }
     }
   }

redwood-basic-dom/src/commonMain/kotlin/app/cash/redwood/basic/dom/HTMLElementRedwoodBasicWidgetFactory.kt

@@ -21,8 +21,11 @@ import app.cash.redwood.basic.modifier.Reuse
 import app.cash.redwood.basic.widget.Button
 import app.cash.redwood.basic.widget.Image
 import app.cash.redwood.basic.widget.RedwoodBasicWidgetFactory
+import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
 import app.cash.redwood.basic.widget.Text
 import app.cash.redwood.basic.widget.TextInput
+import app.cash.redwood.layout.dom.HTMLElementRedwoodLayoutWidgetFactory
+import app.cash.redwood.lazylayout.dom.HTMLElementRedwoodLazyLayoutWidgetFactory
 import org.w3c.dom.Document
 import org.w3c.dom.HTMLButtonElement
 import org.w3c.dom.HTMLElement
@@ -41,6 +44,17 @@ public class HTMLElementRedwoodBasicWidgetFactory(
   }
 }
 
+@Suppress("FunctionName") // Acting like a type.
+public fun HTMLElementRedwoodBasicWidgetSystem(
+  document: Document,
+): RedwoodBasicWidgetSystem<HTMLElement> {
+  return RedwoodBasicWidgetSystem(
+    RedwoodBasic = HTMLElementRedwoodBasicWidgetFactory(document),
+    RedwoodLayout = HTMLElementRedwoodLayoutWidgetFactory(document),
+    RedwoodLazyLayout = HTMLElementRedwoodLazyLayoutWidgetFactory(document),
+  )
+}
+
 private class HtmlTextInput(
   override val value: HTMLInputElement,
 ) : TextInput<HTMLElement> {

redwood-basic-uiview/api/redwood-basic-uiview.klib.api

@@ -15,3 +15,5 @@ final class app.cash.redwood.basic.uiview/UIViewRedwoodBasicWidgetFactory : app.
     final fun Text(): app.cash.redwood.basic.widget/Text<platform.UIKit/UIView> // app.cash.redwood.basic.uiview/UIViewRedwoodBasicWidgetFactory.Text|Text(){}[0]
     final fun TextInput(): app.cash.redwood.basic.widget/TextInput<platform.UIKit/UIView> // app.cash.redwood.basic.uiview/UIViewRedwoodBasicWidgetFactory.TextInput|TextInput(){}[0]
 }
+
+final fun app.cash.redwood.basic.uiview/UIViewRedwoodBasicWidgetSystem(): app.cash.redwood.basic.widget/RedwoodBasicWidgetSystem<platform.UIKit/UIView> // app.cash.redwood.basic.uiview/UIViewRedwoodBasicWidgetSystem|UIViewRedwoodBasicWidgetSystem(){}[0]

redwood-basic-uiview/build.gradle

@@ -10,6 +10,8 @@ kotlin {
     commonMain {
       dependencies {
         api projects.redwoodBasicWidget
+        implementation projects.redwoodLayoutUiview
+        implementation projects.redwoodLazylayoutUiview
       }
     }
   }

redwood-basic-uiview/src/commonMain/kotlin/app/cash/redwood/basic/uiview/UIViewRedwoodBasicWidgetFactory.kt

@@ -19,8 +19,11 @@ import app.cash.redwood.basic.modifier.Reuse
 import app.cash.redwood.basic.widget.Button
 import app.cash.redwood.basic.widget.Image
 import app.cash.redwood.basic.widget.RedwoodBasicWidgetFactory
+import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
 import app.cash.redwood.basic.widget.Text
 import app.cash.redwood.basic.widget.TextInput
+import app.cash.redwood.layout.uiview.UIViewRedwoodLayoutWidgetFactory
+import app.cash.redwood.lazylayout.uiview.UIViewRedwoodLazyLayoutWidgetFactory
 import platform.UIKit.UIView
 
 @ObjCName("UIViewRedwoodBasicWidgetFactory", exact = true)
@@ -34,3 +37,12 @@ public class UIViewRedwoodBasicWidgetFactory : RedwoodBasicWidgetFactory<UIView>
 
   override fun Reuse(value: UIView, modifier: Reuse) {}
 }
+
+@Suppress("FunctionName") // Acting like a type.
+public fun UIViewRedwoodBasicWidgetSystem(): RedwoodBasicWidgetSystem<UIView> {
+  return RedwoodBasicWidgetSystem(
+    RedwoodBasic = UIViewRedwoodBasicWidgetFactory(),
+    RedwoodLayout = UIViewRedwoodLayoutWidgetFactory(),
+    RedwoodLazyLayout = UIViewRedwoodLazyLayoutWidgetFactory(),
+  )
+}

redwood-basic-view/api/redwood-basic-view.api

@@ -1,5 +1,5 @@
 public final class app/cash/redwood/basic/view/ViewRedwoodBasicWidgetFactory : app/cash/redwood/basic/widget/RedwoodBasicWidgetFactory {
-	public fun <init> (Landroid/content/Context;)V
+	public fun <init> (Landroid/content/Context;Lcoil3/ImageLoader;)V
 	public fun Button ()Lapp/cash/redwood/basic/widget/Button;
 	public fun Image ()Lapp/cash/redwood/basic/widget/Image;
 	public fun Reuse (Landroid/view/View;Lapp/cash/redwood/basic/modifier/Reuse;)V
@@ -8,3 +8,7 @@ public final class app/cash/redwood/basic/view/ViewRedwoodBasicWidgetFactory : a
 	public fun TextInput ()Lapp/cash/redwood/basic/widget/TextInput;
 }
 
+public final class app/cash/redwood/basic/view/ViewRedwoodBasicWidgetFactoryKt {
+	public static final fun ViewRedwoodBasicWidgetSystem (Landroid/content/Context;Lcoil3/ImageLoader;)Lapp/cash/redwood/basic/widget/RedwoodBasicWidgetSystem;
+}
+

redwood-basic-view/build.gradle

@@ -8,6 +8,8 @@ redwoodBuild {
 dependencies {
   api projects.redwoodBasicWidget
   api libs.coil.core
+  implementation projects.redwoodLayoutView
+  implementation projects.redwoodLazylayoutView
   implementation libs.androidx.core
   implementation libs.google.material
 }

redwood-basic-view/src/main/kotlin/app/cash/redwood/basic/view/ViewImage.kt

@@ -21,10 +21,13 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import app.cash.redwood.Modifier
 import app.cash.redwood.basic.widget.Image
-import coil3.load
+import coil3.ImageLoader
+import coil3.request.ImageRequest
+import coil3.request.target
 
 internal class ViewImage(
   override val value: ImageView,
+  private val imageLoader: ImageLoader,
 ) : Image<View> {
   init {
     val size = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 48F, value.resources.displayMetrics).toInt()
@@ -34,7 +37,11 @@ internal class ViewImage(
   override var modifier: Modifier = Modifier
 
   override fun url(url: String) {
-    value.load(url)
+    val request = ImageRequest.Builder(value.context)
+      .target(value)
+      .data(url)
+      .build()
+    imageLoader.enqueue(request)
   }
 
   override fun onClick(onClick: (() -> Unit)?) {

redwood-basic-view/src/main/kotlin/app/cash/redwood/basic/view/ViewRedwoodBasicWidgetFactory.kt

@@ -24,16 +24,33 @@ import app.cash.redwood.basic.modifier.Reuse
 import app.cash.redwood.basic.widget.Button
 import app.cash.redwood.basic.widget.Image
 import app.cash.redwood.basic.widget.RedwoodBasicWidgetFactory
+import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
 import app.cash.redwood.basic.widget.Text
 import app.cash.redwood.basic.widget.TextInput
+import app.cash.redwood.layout.view.ViewRedwoodLayoutWidgetFactory
+import app.cash.redwood.lazylayout.view.ViewRedwoodLazyLayoutWidgetFactory
+import coil3.ImageLoader
 
 public class ViewRedwoodBasicWidgetFactory(
   private val context: Context,
+  private val imageLoader: ImageLoader,
 ) : RedwoodBasicWidgetFactory<View> {
   override fun TextInput(): TextInput<View> = ViewTextInput(context)
   override fun Text(): Text<View> = ViewText(TextView(context))
-  override fun Image(): Image<View> = ViewImage(ImageView(context))
+  override fun Image(): Image<View> = ViewImage(ImageView(context), imageLoader)
   override fun Button(): Button<View> = ViewButton(PlatformButton(context))
   override fun Reuse(value: View, modifier: Reuse) {
   }
 }
+
+@Suppress("FunctionName") // Acting like a type.
+public fun ViewRedwoodBasicWidgetSystem(
+  context: Context,
+  imageLoader: ImageLoader,
+): RedwoodBasicWidgetSystem<View> {
+  return RedwoodBasicWidgetSystem(
+    RedwoodBasic = ViewRedwoodBasicWidgetFactory(context, imageLoader),
+    RedwoodLayout = ViewRedwoodLayoutWidgetFactory(context),
+    RedwoodLazyLayout = ViewRedwoodLazyLayoutWidgetFactory(context),
+  )
+}

samples/counter/android-composeui/build.gradle

@@ -6,8 +6,6 @@ dependencies {
   implementation projects.samples.counter.presenter
   implementation projects.redwoodComposeui
   implementation projects.redwoodBasicComposeui
-  implementation projects.redwoodLayoutComposeui
-  implementation projects.redwoodLazylayoutComposeui
   implementation libs.coil.network.okhttp
   implementation libs.kotlinx.coroutines.android
   implementation libs.google.material

samples/counter/android-composeui/src/main/kotlin/com/example/redwood/counter/android/composeui/MainActivity.kt

@@ -18,24 +18,26 @@ package com.example.redwood.counter.android.composeui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import app.cash.redwood.basic.composeui.ComposeUiRedwoodBasicWidgetFactory
+import app.cash.redwood.basic.composeui.ComposeUiRedwoodBasicWidgetSystem
 import app.cash.redwood.basic.composeui.RedwoodBasicTheme
-import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
 import app.cash.redwood.composeui.RedwoodContent
-import app.cash.redwood.layout.composeui.ComposeUiRedwoodLayoutWidgetFactory
-import app.cash.redwood.lazylayout.composeui.ComposeUiRedwoodLazyLayoutWidgetFactory
 import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.serviceLoaderEnabled
 import com.example.redwood.counter.presenter.Counter
 
 class MainActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 
-    val widgetSystem = RedwoodBasicWidgetSystem(
-      RedwoodBasic = ComposeUiRedwoodBasicWidgetFactory(ImageLoader(this)),
-      RedwoodLayout = ComposeUiRedwoodLayoutWidgetFactory(),
-      RedwoodLazyLayout = ComposeUiRedwoodLazyLayoutWidgetFactory(),
-    )
+    val imageLoader = ImageLoader.Builder(this)
+      .serviceLoaderEnabled(false)
+      .components {
+        add(OkHttpNetworkFetcherFactory())
+      }
+      .build()
+
+    val widgetSystem = ComposeUiRedwoodBasicWidgetSystem(imageLoader)
 
     setContent {
       RedwoodBasicTheme {

samples/counter/android-views/build.gradle

@@ -5,11 +5,10 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 dependencies {
   implementation projects.samples.counter.presenter
   implementation projects.redwoodBasicView
-  implementation projects.redwoodLayoutView
-  implementation projects.redwoodLazylayoutView
   implementation projects.redwoodWidget
   implementation libs.kotlinx.coroutines.android
   implementation libs.google.material
+  implementation libs.coil.network.okhttp
   implementation libs.androidx.core
   implementation libs.androidx.appCompat
 

samples/counter/android-views/src/main/kotlin/com/example/redwood/counter/android/views/MainActivity.kt

@@ -17,13 +17,13 @@ package com.example.redwood.counter.android.views
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import app.cash.redwood.basic.view.ViewRedwoodBasicWidgetFactory
-import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
+import app.cash.redwood.basic.view.ViewRedwoodBasicWidgetSystem
 import app.cash.redwood.compose.AndroidUiDispatcher
 import app.cash.redwood.compose.RedwoodComposition
-import app.cash.redwood.layout.view.ViewRedwoodLayoutWidgetFactory
-import app.cash.redwood.lazylayout.view.ViewRedwoodLazyLayoutWidgetFactory
 import app.cash.redwood.widget.RedwoodLayout
+import coil3.ImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
+import coil3.serviceLoaderEnabled
 import com.example.redwood.counter.presenter.Counter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
@@ -37,14 +37,17 @@ class MainActivity : AppCompatActivity() {
     val redwoodView = RedwoodLayout(this, onBackPressedDispatcher)
     setContentView(redwoodView)
 
+    val imageLoader = ImageLoader.Builder(this)
+      .serviceLoaderEnabled(false)
+      .components {
+        add(OkHttpNetworkFetcherFactory())
+      }
+      .build()
+
     val composition = RedwoodComposition(
       scope = scope,
       view = redwoodView,
-      widgetSystem = RedwoodBasicWidgetSystem(
-        RedwoodBasic = ViewRedwoodBasicWidgetFactory(this),
-        RedwoodLayout = ViewRedwoodLayoutWidgetFactory(this),
-        RedwoodLazyLayout = ViewRedwoodLazyLayoutWidgetFactory(this),
-      ),
+      widgetSystem = ViewRedwoodBasicWidgetSystem(this, imageLoader),
     )
     composition.setContent {
       Counter()

samples/counter/browser/src/commonMain/kotlin/com/example/redwood/counter/browser/main.kt

@@ -15,12 +15,9 @@
  */
 package com.example.redwood.counter.browser
 
-import app.cash.redwood.basic.dom.HTMLElementRedwoodBasicWidgetFactory
-import app.cash.redwood.basic.widget.RedwoodBasicWidgetSystem
+import app.cash.redwood.basic.dom.HTMLElementRedwoodBasicWidgetSystem
 import app.cash.redwood.compose.RedwoodComposition
 import app.cash.redwood.compose.WindowAnimationFrameClock
-import app.cash.redwood.layout.dom.HTMLElementRedwoodLayoutWidgetFactory
-import app.cash.redwood.lazylayout.dom.HTMLElementRedwoodLazyLayoutWidgetFactory
 import app.cash.redwood.widget.asRedwoodView
 import com.example.redwood.counter.presenter.Counter
 import kotlinx.browser.document
@@ -36,11 +33,7 @@ fun main() {
   val composition = RedwoodComposition(
     scope = GlobalScope + WindowAnimationFrameClock,
     view = content.asRedwoodView(),
-    widgetSystem = RedwoodBasicWidgetSystem(
-      RedwoodBasic = HTMLElementRedwoodBasicWidgetFactory(document),
-      RedwoodLayout = HTMLElementRedwoodLayoutWidgetFactory(document),
-      RedwoodLazyLayout = HTMLElementRedwoodLazyLayoutWidgetFactory(document),
-    ),
+    widgetSystem = HTMLElementRedwoodBasicWidgetSystem(document),
   )
   composition.setContent {
     Counter()

samples/counter/desktop-composeui/build.gradle

@@ -15,7 +15,5 @@ dependencies {
   implementation projects.samples.counter.presenter
   implementation projects.redwoodComposeui
   implementation projects.redwoodBasicComposeui
-  implementation projects.redwoodLayoutComposeui
-  implementation projects.redwoodLazylayoutComposeui
   implementation libs.coil.network.okhttp
 }