Move SSD area mode selection to typed Kotlin
ober
fd51bd0ebb12ffa056c63b45efccec1abd74ec52
--- 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#af4e25b78c7dbfee06a40057c5b951f032f234de" + - "https://git.sr.ht/~lisp/jerboa#16d9b38de7ea4d1c90c12087d94775958450d207" # The second source is the build subject selected by the SourceHut submitter. - https://git.sr.ht/~lisp/jerboa-android tasks: --- a/dependencies.lock.json +++ b/dependencies.lock.json @@ -11,8 +11,8 @@ "generator_runtime": { "name": "jerboa", "repository": "https://git.sr.ht/~lisp/jerboa", - "commit": "af4e25b78c7dbfee06a40057c5b951f032f234de", - "tree": "6380710ae1d3ba7c6a3dfd5321f725d511d9e492" + "commit": "16d9b38de7ea4d1c90c12087d94775958450d207", + "tree": "b29d882643d64238e849ba26ed665a69d9388831" }, "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=af4e25b78c7dbfee06a40057c5b951f032f234de # gitsafe:ignore -jerboa_tree=6380710ae1d3ba7c6a3dfd5321f725d511d9e492 # gitsafe:ignore +jerboa_commit=16d9b38de7ea4d1c90c12087d94775958450d207 # gitsafe:ignore +jerboa_tree=b29d882643d64238e849ba26ed665a69d9388831 # gitsafe:ignore gradle_sha=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 jdk_macos_sha=8fa1eff40bb637a33613b2ccb8b12c70dc3661cc22cf8e784943715769a05336 jdk_linux_sha=d8afc263758141a66e0e3aafc321e783f7016696f4eaea067d340a269037d331 --- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -4672,6 +4672,7 @@ mainActivitySetSsdAreaMode mainActivityClearInteractionModes mainActivityStartAppendInteraction mainActivityStartSsdAreaInteraction + mainActivityStartSsdAreaInteractionForSelection mainActivityShowBitmapAndClearSession mainActivitySetReopenSsdBrowserOnResume mainActivitySetPageIndex mainActivitySetPdfIdentity @@ -5597,6 +5598,13 @@ (mainActivitySetAppendMode activity #f) (mainActivitySetSsdAreaMode activity #t) (reviewViewSetSelectMode view #t #f))) + (def (mainActivityStartSsdAreaInteractionForSelection + (activity : MainActivity) + (view : SsdReviewView) + (selectedId : (Nullable String))) : Unit + (begin + (mainActivityStartSsdAreaInteraction activity view) + (reviewViewSelectGroupId view selectedId))) (def (mainActivitySetReopenSsdBrowserOnResume (activity : MainActivity) (enabled : Bool)) : Unit @@ -7467,8 +7475,7 @@ "" " private fun startSsdAreaMode() {" " if (sessionMissing(currentSession)) return" - " mainActivityStartSsdAreaInteraction(this, reviewView)" - " reviewViewSelectGroupId(reviewView, selectedGroupId)" + " mainActivityStartSsdAreaInteractionForSelection(this, reviewView, selectedGroupId)" " reviewView.performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)" " setStatus(\"SSD area mode: drag around the ship SSD; tags outside that area will be removed\")" " }"