Generate SSD button kinds from typed Jerboa
ober
f15d4b1775cb7345b92c043b78aa8ed626e3d178
--- a/.build.yml +++ b/.build.yml @@ -5,7 +5,7 @@ packages: - make=4.4.1-r4 sources: # Build dependency: full immutable commit, mirrored in dependencies.lock.json. - - "https://git.sr.ht/~lisp/jerboa#549bed276332a66bed4f912bcce12be451a2e38b" + - "https://git.sr.ht/~lisp/jerboa#f8fcc73d550c08d46f88df2e6cfcfdf8cc125299" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: @@ -14,6 +14,6 @@ tasks: test "$(apk info -v chez-scheme)" = chez-scheme-10.3.0-r2 test "$(apk info -v git)" = git-2.54.0-r0 test "$(apk info -v make)" = make-4.4.1-r4 - test "$(git -C ../jerboa rev-parse HEAD)" = 549bed276332a66bed4f912bcce12be451a2e38b - test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 9211c375e2589633d52787b40a2ac42cb758e4ec + test "$(git -C ../jerboa rev-parse HEAD)" = f8fcc73d550c08d46f88df2e6cfcfdf8cc125299 + test "$(git -C ../jerboa rev-parse 'HEAD^{tree}')" = 6cc0d02b2af10ec770f8febf6032ce602a38021c JERBOA="chez --libdirs .:../jerboa/lib --script" make test --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "549bed276332a66bed4f912bcce12be451a2e38b", - "tree": "9211c375e2589633d52787b40a2ac42cb758e4ec" + "commit": "f8fcc73d550c08d46f88df2e6cfcfdf8cc125299", + "tree": "6cc0d02b2af10ec770f8febf6032ce602a38021c" }, "assurance_tools": { "osv_scanner": { --- a/scripts/verify-supply-chain.sh +++ b/scripts/verify-supply-chain.sh @@ -3,8 +3,8 @@ set -eu repo=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd -P) lock="$repo/dependencies.lock.json" -jerboa_commit=549bed276332a66bed4f912bcce12be451a2e38b # gitsafe:ignore -jerboa_tree=9211c375e2589633d52787b40a2ac42cb758e4ec # gitsafe:ignore +jerboa_commit=f8fcc73d550c08d46f88df2e6cfcfdf8cc125299 # gitsafe:ignore +jerboa_tree=6cc0d02b2af10ec770f8febf6032ce602a38021c # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -9756,6 +9756,23 @@ "&dpi=" (int32->string (SsdSession-dpi session)))))))))))) + (typed-kotlin-file "com/sfb/ssdreview/ButtonKind.kt" + (typed-library (com sfb ssdreview) + (export ButtonKind) + (type Int32) + (type Float32) + (enum ButtonKind + ((backgroundColor : Int32) + (foregroundColor : Int32) + (textSp : Float32) + (heightDp : Int32)) + (PRIMARY (reviewPrimaryColor) (reviewWhiteColor) (float32 18.0) (int32 56)) + (ACCENT (reviewAccentColor) (reviewWhiteColor) (float32 18.0) (int32 56)) + (MODE (reviewModeColor) (reviewDarkTextColor) (float32 17.0) (int32 54)) + (NAV (reviewNavColor) (reviewWhiteColor) (float32 17.0) (int32 52)) + (NEUTRAL (reviewNeutralColor) (reviewDarkTextColor) (float32 15.0) (int32 48)) + (DANGER (reviewDangerColor) (reviewWhiteColor) (float32 16.0) (int32 50))))) + (kotlin-file-lines "com/sfb/ssdreview/MainActivity.kt" ( "package com.sfb.ssdreview" @@ -9912,15 +9929,6 @@ " return root" " }" "" - " private enum class ButtonKind(val backgroundColor: Int, val foregroundColor: Int, val textSp: Float, val heightDp: Int) {" - " PRIMARY(reviewPrimaryColor(), reviewWhiteColor(), 18f, 56)," - " ACCENT(reviewAccentColor(), reviewWhiteColor(), 18f, 56)," - " MODE(reviewModeColor(), reviewDarkTextColor(), 17f, 54)," - " NAV(reviewNavColor(), reviewWhiteColor(), 17f, 52)," - " NEUTRAL(reviewNeutralColor(), reviewDarkTextColor(), 15f, 48)," - " DANGER(reviewDangerColor(), reviewWhiteColor(), 16f, 50)" - " }" - "" " private fun dp(value: Int): Int = (value * resources.displayMetrics.density + 0.5f).toInt()" "" " private fun button(label: String, kind: ButtonKind = ButtonKind.NEUTRAL, action: () -> Unit): Button ="