feat(kotlin-compose): design system + 33 components + gallery_kt + e2e android emulator + scaffolder fixes

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

app.md

@@ -1,5 +1,6 @@
 ---
 name: counter_kt
+domain: tools
 description: "Counter demo: validates FnTheme + Material3 + state + tests"
 tags: [demo, counter, kotlin, compose, android]
 lang: kt
@@ -10,6 +11,7 @@ repo_url: "https://gitea.organic-machine.com/dataforge/counter_kt"
 uses_functions:
   - fn_theme_kt_ui
   - fn_tokens_kt_ui
+  - fn_spacing_kt_ui
 uses_types: []
 e2e_checks:
   - id: unit

app/build.gradle.kts

@@ -56,6 +56,7 @@ dependencies {
     testImplementation("io.github.takahirom.roborazzi:roborazzi:1.20.0")
     testImplementation("io.github.takahirom.roborazzi:roborazzi-compose:1.20.0")
     testImplementation("io.github.takahirom.roborazzi:roborazzi-junit-rule:1.20.0")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.02.00"))
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")

app/src/androidTest/kotlin/com/fnregistry/counterkt/MainActivityTest.kt

@@ -1,8 +1,10 @@
 package com.fnregistry.counterkt
 
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
@@ -15,9 +17,31 @@ class MainActivityTest {
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
     @Test
-    fun appLaunchesAndShowsReadyText() {
+    fun startsAtZero() {
-        composeTestRule
+        composeTestRule.onNodeWithTag("counter_value")
-            .onNodeWithText("counter_kt ready")
             .assertIsDisplayed()
+            .assertTextEquals("0")
+    }
+
+    @Test
+    fun incrementBumpsCounter() {
+        composeTestRule.onNodeWithTag("btn_increment").performClick()
+        composeTestRule.onNodeWithTag("btn_increment").performClick()
+        composeTestRule.onNodeWithTag("btn_increment").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("3")
+    }
+
+    @Test
+    fun decrementDropsCounter() {
+        composeTestRule.onNodeWithTag("btn_decrement").performClick()
+        composeTestRule.onNodeWithTag("btn_decrement").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("-2")
+    }
+
+    @Test
+    fun resetReturnsToZero() {
+        repeat(5) { composeTestRule.onNodeWithTag("btn_increment").performClick() }
+        composeTestRule.onNodeWithTag("btn_reset").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("0")
     }
 }

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        android:theme="@android:style/Theme.Material.Light.NoActionBar">
 
         <activity
             android:name=".MainActivity"

app/src/main/kotlin/com/fnregistry/counterkt/MainActivity.kt

@@ -3,11 +3,26 @@ package com.fnregistry.counterkt
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import fn.compose.theme.FnSpacing
 import fn.compose.theme.FnTheme
 
 class MainActivity : ComponentActivity() {
@@ -16,9 +31,57 @@ class MainActivity : ComponentActivity() {
         setContent {
             FnTheme {
                 Surface(modifier = Modifier.fillMaxSize()) {
-                    Text("counter_kt ready")
+                    CounterScreen()
                 }
             }
         }
     }
 }
+
+@Composable
+fun CounterScreen(initial: Int = 0) {
+    var count by remember { mutableIntStateOf(initial) }
+    CounterContent(
+        count = count,
+        onIncrement = { count++ },
+        onDecrement = { count-- },
+        onReset = { count = 0 },
+    )
+}
+
+@Composable
+fun CounterContent(
+    count: Int,
+    onIncrement: () -> Unit,
+    onDecrement: () -> Unit,
+    onReset: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(FnSpacing.lg),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = "$count",
+            style = MaterialTheme.typography.displayLarge,
+            modifier = Modifier.testTag("counter_value"),
+        )
+        Spacer(Modifier.height(FnSpacing.lg))
+        Row(horizontalArrangement = Arrangement.spacedBy(FnSpacing.md)) {
+            Button(
+                onClick = onDecrement,
+                modifier = Modifier.testTag("btn_decrement"),
+            ) { Text("-") }
+            Button(
+                onClick = onReset,
+                modifier = Modifier.testTag("btn_reset"),
+            ) { Text("Reset") }
+            Button(
+                onClick = onIncrement,
+                modifier = Modifier.testTag("btn_increment"),
+            ) { Text("+") }
+        }
+    }
+}

app/src/test/kotlin/com/fnregistry/counterkt/CounterLogicTest.kt

@@ -0,0 +1,35 @@
+package com.fnregistry.counterkt
+
+import androidx.compose.ui.test.assertTextEquals
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.GraphicsMode
+
+@RunWith(RobolectricTestRunner::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+class CounterLogicTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    @Test
+    fun incrementsAndDecrementsViaState() {
+        composeTestRule.setContent { CounterScreen() }
+
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("0")
+        composeTestRule.onNodeWithTag("btn_increment").performClick()
+        composeTestRule.onNodeWithTag("btn_increment").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("2")
+
+        composeTestRule.onNodeWithTag("btn_decrement").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("1")
+
+        composeTestRule.onNodeWithTag("btn_reset").performClick()
+        composeTestRule.onNodeWithTag("counter_value").assertTextEquals("0")
+    }
+}

app/src/test/kotlin/com/fnregistry/counterkt/ExampleScreenshotTest.kt

@@ -1,9 +1,9 @@
 package com.fnregistry.counterkt
 
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.ui.test.junit4.createComposeRule
-import com.github.takahirom.roborazzi.RoborazziRule
+import androidx.compose.ui.test.onRoot
+import com.github.takahirom.roborazzi.captureRoboImage
 import fn.compose.theme.FnTheme
 import org.junit.Rule
 import org.junit.Test
@@ -18,22 +18,24 @@ class ExampleScreenshotTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    @get:Rule
+    private fun render(count: Int, name: String) {
-    val roborazziRule = RoborazziRule(
-        options = RoborazziRule.Options(
-            outputDirectoryPath = "src/test/snapshots/images",
-        ),
-    )
-
-    @Test
-    fun screenshotFnThemeSurface() {
         composeTestRule.setContent {
             FnTheme {
                 Surface {
-                    Text("counter_kt screenshot")
+                    CounterContent(
+                        count = count,
+                        onIncrement = {},
+                        onDecrement = {},
+                        onReset = {},
+                    )
                 }
             }
         }
-        // Captura automaticamente al finalizar el test via RoborazziRule
+        composeTestRule.onRoot()
+            .captureRoboImage("src/test/snapshots/images/counter_$name.png")
     }
+
+    @Test fun snapshotZero()     = render(0, "zero")
+    @Test fun snapshotPositive() = render(42, "positive_42")
+    @Test fun snapshotNegative() = render(-7, "negative_7")
 }

gradlew

@@ -1,7 +1,251 @@
-#!/usr/bin/env bash
+#!/bin/sh
-# Gradle wrapper stub — descarga gradle-wrapper.jar si no existe.
+
-# En CI / en WSL instalar el wrapper real con: gradle wrapper --gradle-version 8.6
+#
-set -euo pipefail
+# Copyright © 2015-2021 the original authors.
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+#
-exec "$SCRIPT_DIR/gradle/wrapper/gradlew" "$@" 2>/dev/null || \
+# Licensed under the Apache License, Version 2.0 (the "License");
-    exec gradle "$@"
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"