Keep MainActivity helper slice behavior neutral
ober
ec9ef2e4583e7c3c63d2bf6c3e05a3eab8d51a7a
--- a/templates/original-tactics-parts/MainActivity.kt.ss +++ b/templates/original-tactics-parts/MainActivity.kt.ss @@ -3,30 +3,20 @@ (def fragment '((typed-kotlin-file "com/jerboa/originaltactics/MainActivity.kt" (kotlin-imports (android graphics Color) - (android view View) (org json JSONObject)) (typed-library (com jerboa originaltactics) - (export ShipChoice FireTargetChoice TruthMatch FullscreenPanelSpec - CommandTone mainActivityShipChoiceDisplay - mainActivityFireTargetShipTarget autoEventDelayMillis - isPhaserWeapon weaponSortBucket actorLabel fireGroupName - hudActionLabel seekingSortBucket shortDefenseKind - truncateForLog isInterestingEvent) + (export autoEventDelayMillis isPhaserWeapon weaponSortBucket + actorLabel fireGroupName hudActionLabel seekingSortBucket + shortDefenseKind truncateForLog isInterestingEvent) (type Any) (type Float32) (type Int32) (type JSONObject) - (type View) (extern (mainActivityColorRgb (red : Int32) (green : Int32) (blue : Int32)) : Int32 (kotlin-call Color rgb)) - (extern (mainActivityTargetValue - (target : JSONObject) - (key : String) - (fallback : String)) : String - (kotlin-member-call optString)) (extern (mainActivityEventType (event : JSONObject) (key : String) @@ -37,62 +27,6 @@ (old : String) (replacement : String)) : String (kotlin-member-call replace)) - (def (mainActivityShipChoiceDisplay - (name : String) - (race : String) - (source : String) - (page : Int32)) : String - (if (and (equal? source "ssd-truth") (> page (int32 0))) - (string-append - name - (string-append " p" (int32->string page))) - (if (equal? source "ssd-truth") - name - (if (or (string-blank? race) - (string-contains? - (string-lowercase name) - (string-lowercase race))) - name - (string-append race (string-append " " name)))))) - (def (mainActivityFireTargetShipTarget - (target : JSONObject)) : (Nullable String) - (let ((value - (mainActivityTargetValue target "target" ""))) - (if (or (equal? value "alpha") (equal? value "beta")) - (nullable-some value) - (nullable-none String)))) - (class ShipChoice - ((id : String (property val)) - (name : String (property val)) - (race : String (property val)) - (source : String (property val)) - (page : Int32 (property val))) - (val display : String - (mainActivityShipChoiceDisplay name race source page)) - (def (toString) : String - (modifiers override) - display)) - (class FireTargetChoice - ((key : String (property val)) - (label : String (property val)) - (target : JSONObject (property val))) - (val shipTarget : (Nullable String) - (mainActivityFireTargetShipTarget target))) - (class TruthMatch - ((entry : JSONObject (property val)) - (score : Int32 (property val)) - (overlap : Int32 (property val)) - (diff : Int32 (property val)))) - (class FullscreenPanelSpec - ((title : String (property val)) - (factory : (-> View) (property val)))) - (enum CommandTone () - (NAV) - (PRIMARY) - (WEAPON) - (AUTO) - (DANGER) - (UTILITY)) (val UI_BG : Int32 (mainActivityColorRgb (int32 6) (int32 10) (int32 16)) (modifiers private))