Move SSD activity bitmap update to typed Kotlin
ober
a47cc31a4222c3e5f0dd41e33976815085777e89
--- a/templates/ssd-review.ss +++ b/templates/ssd-review.ss @@ -4650,6 +4650,7 @@ mainActivitySetSsdAreaMode mainActivityClearInteractionModes mainActivityStartAppendInteraction mainActivityStartSsdAreaInteraction + mainActivityShowBitmapAndClearSession ssdBrowserResumeReady focusChangeShouldShowDropdown dialogReadyToShowDropdown focusedDialogReadyToShowDropdown permissionResultGranted downloadAccessBeforeRuntimePermissions @@ -4769,6 +4770,10 @@ (activity : MainActivity) (session : (Nullable SsdSession))) : Unit (kotlin-member-set currentSession)) + (extern (mainActivityCurrentBitmapSet + (activity : MainActivity) + (bitmap : (Nullable Bitmap))) : Unit + (kotlin-member-set currentBitmap)) (extern (mainActivitySelectedGroupIdSet (activity : MainActivity) (id : (Nullable String))) : Unit @@ -5308,6 +5313,14 @@ (mainActivityCurrentSessionSet activity (nullable-some session)) (mainActivitySelectGroupId activity view (nullable-none String)) (reviewViewShowSession view session))) + (def (mainActivityShowBitmapAndClearSession + (activity : MainActivity) + (view : SsdReviewView) + (bitmap : Bitmap)) : Unit + (begin + (mainActivityCurrentBitmapSet activity (nullable-some bitmap)) + (reviewViewShowBitmap view bitmap) + (mainActivityClearSession activity view))) (def (mainActivitySetAppendMode (activity : MainActivity) (enabled : Bool)) : Unit (mainActivityAppendModeSet activity enabled)) @@ -6782,7 +6795,7 @@ " private var pdfSha1: String = \"\"" " private var pageIndex: Int = 0" " private var pageCount: Int = 0" - " private var currentBitmap: Bitmap? = null" + " internal var currentBitmap: Bitmap? = null" " internal var currentSession: SsdSession? = null" " internal var selectedGroupId: String? = null" " internal var appendMode: Boolean = false" @@ -7270,9 +7283,7 @@ " val bitmap = renderPdfPage(uri, renderPageIndex)" " runOnUiThread {" " if (isStaleLoad(renderGeneration, uri, renderPageIndex)) return@runOnUiThread" - " currentBitmap = bitmap" - " reviewViewShowBitmap(reviewView, bitmap)" - " mainActivityClearSession(this, reviewView)" + " mainActivityShowBitmapAndClearSession(this, reviewView, bitmap)" " restoreViewportAfterLayout(restoredViewport)" " setStatus(renderedLoadingTruthStatus(renderPdfName, renderPageIndex, renderPageCount))" " detectCurrent("