Generate SSD activity constants from typed Jerboa

ober

ed59a45ed6baa012e116cc6e60a9282757fa5e53

diff --git a/templates/ssd-review.ss b/templates/ssd-review.ss
index 64c02a9..4a910e1 100644
--- a/templates/ssd-review.ss
+++ b/templates/ssd-review.ss
@@ -10954,39 +10954,98 @@
        "        }"
        "    }"
        ""
-       "    companion object {"
-       "        private const val DPI = 144"
-       "        private const val REQ_OPEN_PDF = 10"
-       "        private const val REQ_EXPORT_ZIP = 20"
-       "        private const val REQ_IMPORT_ZIP = 30"
-       "        private const val REQ_SYNC_TREE = 40"
-       "        private const val REQ_OPEN_SSD_PDF_TREE = 50"
-       "        private const val REQ_READ_STORAGE = 60"
-       "        private const val PREF_SSD_PDF_TREE_URI = \"ssd_pdf_tree_uri\""
-       "        private const val PREF_LAST_PDF_URI = \"last_pdf_uri\""
-       "        private const val PREF_LAST_PDF_NAME = \"last_pdf_name\""
-       "        private const val PREF_LAST_PDF_SHA1 = \"last_pdf_sha1\""
-       "        private const val PREF_LAST_PAGE_INDEX = \"last_page_index\""
-       "        private const val PREF_LAST_PAGE_COUNT = \"last_page_count\""
-       "        private const val PREF_LAST_VIEWPORT_PAGE_INDEX = \"last_viewport_page_index\""
-       "        private const val PREF_LAST_VIEWPORT_SCALE = \"last_viewport_scale\""
-       "        private const val PREF_LAST_VIEWPORT_OFFSET_X = \"last_viewport_offset_x\""
-       "        private const val PREF_LAST_VIEWPORT_OFFSET_Y = \"last_viewport_offset_y\""
-       "        private const val PREF_LAST_VIEWPORT_ROTATION = \"last_viewport_rotation\""
-       "        private const val PREF_LAST_VIEWPORT_IMAGE_WIDTH = \"last_viewport_image_width\""
-       "        private const val PREF_LAST_VIEWPORT_IMAGE_HEIGHT = \"last_viewport_image_height\""
-       "        private const val MAX_SSD_PDF_SCAN_DEPTH = 8"
-       "        private const val MAX_SSD_PDF_CHOICES = 1000"
-       "        private const val FAST_TRUTH_GROUP_THRESHOLD = 5"
-       "        @Volatile private var clientCrashLoggerInstalled = false"
-       "        private const val CLIENT_LOG_ENDPOINT = \"https://10.66.60.2:8799/api/client-log\""
-       "        private const val CLIENT_LOG_CONNECT_TIMEOUT_MS = 2500"
-       "        private const val CLIENT_LOG_READ_TIMEOUT_MS = 1500"
-       "        private const val CLIENT_LOG_CRASH_TIMEOUT_MS = 1500"
-       "        private const val CLIENT_LOG_STACK_CHARS = 12000"
-       "    }"
        "}"
        ))
+    (typed-kotlin-file "com/sfb/ssdreview/MainActivityConstants.kt"
+      (typed-library (com sfb ssdreview)
+        (export DPI
+                REQ_OPEN_PDF
+                REQ_EXPORT_ZIP
+                REQ_IMPORT_ZIP
+                REQ_SYNC_TREE
+                REQ_OPEN_SSD_PDF_TREE
+                REQ_READ_STORAGE
+                PREF_SSD_PDF_TREE_URI
+                PREF_LAST_PDF_URI
+                PREF_LAST_PDF_NAME
+                PREF_LAST_PDF_SHA1
+                PREF_LAST_PAGE_INDEX
+                PREF_LAST_PAGE_COUNT
+                PREF_LAST_VIEWPORT_PAGE_INDEX
+                PREF_LAST_VIEWPORT_SCALE
+                PREF_LAST_VIEWPORT_OFFSET_X
+                PREF_LAST_VIEWPORT_OFFSET_Y
+                PREF_LAST_VIEWPORT_ROTATION
+                PREF_LAST_VIEWPORT_IMAGE_WIDTH
+                PREF_LAST_VIEWPORT_IMAGE_HEIGHT
+                MAX_SSD_PDF_SCAN_DEPTH
+                MAX_SSD_PDF_CHOICES
+                FAST_TRUTH_GROUP_THRESHOLD
+                clientCrashLoggerInstalled
+                CLIENT_LOG_ENDPOINT
+                CLIENT_LOG_CONNECT_TIMEOUT_MS
+                CLIENT_LOG_READ_TIMEOUT_MS
+                CLIENT_LOG_CRASH_TIMEOUT_MS
+                CLIENT_LOG_STACK_CHARS)
+        (type Int32)
+        (val DPI : Int32 (int32 144)
+          (modifiers internal const))
+        (val REQ_OPEN_PDF : Int32 (int32 10)
+          (modifiers internal const))
+        (val REQ_EXPORT_ZIP : Int32 (int32 20)
+          (modifiers internal const))
+        (val REQ_IMPORT_ZIP : Int32 (int32 30)
+          (modifiers internal const))
+        (val REQ_SYNC_TREE : Int32 (int32 40)
+          (modifiers internal const))
+        (val REQ_OPEN_SSD_PDF_TREE : Int32 (int32 50)
+          (modifiers internal const))
+        (val REQ_READ_STORAGE : Int32 (int32 60)
+          (modifiers internal const))
+        (val PREF_SSD_PDF_TREE_URI : String "ssd_pdf_tree_uri"
+          (modifiers internal const))
+        (val PREF_LAST_PDF_URI : String "last_pdf_uri"
+          (modifiers internal const))
+        (val PREF_LAST_PDF_NAME : String "last_pdf_name"
+          (modifiers internal const))
+        (val PREF_LAST_PDF_SHA1 : String "last_pdf_sha1"
+          (modifiers internal const))
+        (val PREF_LAST_PAGE_INDEX : String "last_page_index"
+          (modifiers internal const))
+        (val PREF_LAST_PAGE_COUNT : String "last_page_count"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_PAGE_INDEX : String "last_viewport_page_index"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_SCALE : String "last_viewport_scale"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_OFFSET_X : String "last_viewport_offset_x"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_OFFSET_Y : String "last_viewport_offset_y"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_ROTATION : String "last_viewport_rotation"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_IMAGE_WIDTH : String "last_viewport_image_width"
+          (modifiers internal const))
+        (val PREF_LAST_VIEWPORT_IMAGE_HEIGHT : String "last_viewport_image_height"
+          (modifiers internal const))
+        (val MAX_SSD_PDF_SCAN_DEPTH : Int32 (int32 8)
+          (modifiers internal const))
+        (val MAX_SSD_PDF_CHOICES : Int32 (int32 1000)
+          (modifiers internal const))
+        (val FAST_TRUTH_GROUP_THRESHOLD : Int32 (int32 5)
+          (modifiers internal const))
+        (var clientCrashLoggerInstalled : Bool #f
+          (modifiers @Volatile internal))
+        (val CLIENT_LOG_ENDPOINT : String "https://10.66.60.2:8799/api/client-log"
+          (modifiers internal const))
+        (val CLIENT_LOG_CONNECT_TIMEOUT_MS : Int32 (int32 2500)
+          (modifiers internal const))
+        (val CLIENT_LOG_READ_TIMEOUT_MS : Int32 (int32 1500)
+          (modifiers internal const))
+        (val CLIENT_LOG_CRASH_TIMEOUT_MS : Int32 (int32 1500)
+          (modifiers internal const))
+        (val CLIENT_LOG_STACK_CHARS : Int32 (int32 12000)
+          (modifiers internal const))))
     (typed-kotlin-file "com/sfb/ssdreview/AndroidBitmap.kt"
       (kotlin-imports (android graphics Bitmap))
       (typed-library (com sfb ssdreview)