feat(ios,android): fix table alignment, image forceLoad, badge model, select action, and expand test coverage

iOS fixes:
- Table horizontal alignment: add horizontalCellContentAlignment to TableCell model, implement
  alignment fallback chain (cell > colDef > row > table) in TableCellView
- Image forceLoad: add forceLoad property to Image model, bypass URL cache with timestamp parameter
- Image failure placeholder: show SF Symbol placeholder instead of invisible 0x0 frame on load failure
- Image selectAction: reorder modifiers so tap gesture attaches before frame expansion
- Badge: make text optional, add iconPosition/shape/tooltip properties, support Square/Rounded shapes,
  add missing icon mappings (Calendar, Tag, ErrorCircle, etc.)

Android fixes:
- Image forceLoad: add forceLoad property to Image model, disable Coil memory+disk cache
- TableCell alignment: add horizontalCellContentAlignment, include cell-level in fallback chain

Test scripts:
- Fix self-heal-dual.sh: remove local keyword outside functions, add || true to OCR checks under set -e
- Expand --category all to cover 286 testable cards (add root, templates, versioned)
- Add root, templates, versioned as standalone categories across all 5 test scripts

Author: VikrantSingh01

android/ac-core/src/main/kotlin/com/microsoft/adaptivecards/core/models/CardElement.kt

@@ -87,6 +87,7 @@ data class Image(
     val selectAction: CardAction? = null,
     val targetWidth: String? = null,
     val themedUrls: Map<String, String>? = null,
+    val forceLoad: Boolean? = null,
     /** Explicit pixel height from JSON (e.g. "32px"). Extracted by CardElementSerializer because
      *  the base `height` field is typed as BlockElementHeight enum. */
     @Transient val pixelHeight: String? = null
@@ -385,6 +386,7 @@ data class TableCell(
     val selectAction: CardAction? = null,
     val style: ContainerStyle? = null,
     val verticalContentAlignment: VerticalContentAlignment? = null,
+    val horizontalCellContentAlignment: HorizontalAlignment? = null,
     val bleed: Boolean? = null,
     val backgroundImage: BackgroundImage? = null,
     val minHeight: String? = null,

android/ac-rendering/src/main/kotlin/com/microsoft/adaptivecards/rendering/composables/ImageView.kt

@@ -18,6 +18,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
+import coil.request.CachePolicy
 import coil.decode.SvgDecoder
 import coil.request.ImageRequest
 import com.microsoft.adaptivecards.core.models.Image
@@ -90,6 +91,10 @@ fun ImageView(
             if (isSvg) {
                 decoderFactory(SvgDecoder.Factory())
             }
+            if (element.forceLoad == true) {
+                memoryCachePolicy(CachePolicy.DISABLED)
+                diskCachePolicy(CachePolicy.DISABLED)
+            }
         }
         .crossfade(true)
         .build()

android/ac-rendering/src/main/kotlin/com/microsoft/adaptivecards/rendering/composables/MediaAndTableViews.kt

@@ -144,8 +144,9 @@ fun TableView(
                         ?: element.verticalCellContentAlignment
                         ?: VerticalContentAlignment.Top
 
-                    // Resolve horizontal alignment (colDef > row > table)
-                    val horizontalAlign = colDef?.horizontalCellContentAlignment
+                    // Resolve horizontal alignment (cell > colDef > row > table)
+                    val horizontalAlign = cell.horizontalCellContentAlignment
+                        ?: colDef?.horizontalCellContentAlignment
                         ?: row.horizontalCellContentAlignment
                         ?: element.horizontalCellContentAlignment
 

ios/Sources/ACCore/Models/ContainerTypes.swift

@@ -464,6 +464,7 @@ public struct TableCell: Codable, Equatable, Identifiable {
     public let type: String = "TableCell"
     public var items: [CardElement]?  // Optional to support cells with inline text
     public var style: ContainerStyle?
+    public var horizontalCellContentAlignment: HorizontalAlignment?
     public var verticalContentAlignment: VerticalAlignment?
     public var bleed: Bool?
     public var backgroundImage: BackgroundImage?
@@ -485,6 +486,7 @@ public struct TableCell: Codable, Equatable, Identifiable {
     public init(
         items: [CardElement]? = nil,
         style: ContainerStyle? = nil,
+        horizontalCellContentAlignment: HorizontalAlignment? = nil,
         verticalContentAlignment: VerticalAlignment? = nil,
         bleed: Bool? = nil,
         backgroundImage: BackgroundImage? = nil,
@@ -494,6 +496,7 @@ public struct TableCell: Codable, Equatable, Identifiable {
     ) {
         self.items = items
         self.style = style
+        self.horizontalCellContentAlignment = horizontalCellContentAlignment
         self.verticalContentAlignment = verticalContentAlignment
         self.bleed = bleed
         self.backgroundImage = backgroundImage
@@ -615,13 +618,14 @@ public struct Image: Codable, Equatable, Identifiable {
     public var targetWidth: String?
     public var themedUrls: [String: String]?
     public var backgroundColor: String?
+    public var forceLoad: Bool?
     public var fallback: CardElement?
 
     enum CodingKeys: String, CodingKey {
         case type, id, url, altText, size, style, width, height
         case horizontalAlignment, selectAction, spacing, separator
         case isVisible, requires, targetWidth, themedUrls
-        case backgroundColor, fallback
+        case backgroundColor, forceLoad, fallback
     }
 
     // Stable identifier using id property or url as fallback
@@ -649,6 +653,7 @@ public struct Image: Codable, Equatable, Identifiable {
         targetWidth: String? = nil,
         themedUrls: [String: String]? = nil,
         backgroundColor: String? = nil,
+        forceLoad: Bool? = nil,
         fallback: CardElement? = nil
     ) {
         self.id = id
@@ -667,6 +672,7 @@ public struct Image: Codable, Equatable, Identifiable {
         self.targetWidth = targetWidth
         self.themedUrls = themedUrls
         self.backgroundColor = backgroundColor
+        self.forceLoad = forceLoad
         self.fallback = fallback
     }
 
@@ -694,6 +700,7 @@ public struct Image: Codable, Equatable, Identifiable {
             self.themedUrls = nil
         }
         self.backgroundColor = try container.decodeIfPresent(String.self, forKey: .backgroundColor)
+        self.forceLoad = try container.decodeIfPresent(Bool.self, forKey: .forceLoad)
         self.fallback = try container.decodeIfPresent(CardElement.self, forKey: .fallback)
     }
 }

ios/Sources/ACCore/Models/Elements/Badge.swift

@@ -10,38 +10,47 @@ import Foundation
 public struct Badge: Codable, Equatable {
     public let type: String
     public var id: String?
-    public var text: String
+    public var text: String?
     public var style: String?
     public var appearance: String?
     public var icon: String?
+    public var iconPosition: String?
     public var size: String?
+    public var shape: String?
     public var horizontalAlignment: String?
     public var spacing: Spacing?
     public var isVisible: Bool?
     public var targetWidth: String?
+    public var tooltip: String?
 
     public init(
-        text: String,
+        text: String? = nil,
         id: String? = nil,
         style: String? = nil,
         appearance: String? = nil,
         icon: String? = nil,
+        iconPosition: String? = nil,
         size: String? = nil,
+        shape: String? = nil,
         horizontalAlignment: String? = nil,
         spacing: Spacing? = nil,
         isVisible: Bool? = nil,
-        targetWidth: String? = nil
+        targetWidth: String? = nil,
+        tooltip: String? = nil
     ) {
         self.type = "Badge"
         self.id = id
         self.text = text
         self.style = style
         self.appearance = appearance
         self.icon = icon
+        self.iconPosition = iconPosition
         self.size = size
+        self.shape = shape
         self.horizontalAlignment = horizontalAlignment
         self.spacing = spacing
         self.isVisible = isVisible
         self.targetWidth = targetWidth
+        self.tooltip = tooltip
     }
 }

ios/Sources/ACRendering/Views/BadgeView.swift

@@ -12,28 +12,45 @@ struct BadgeView: View {
 
     var body: some View {
         HStack(spacing: 4) {
-            if let iconName = badge.icon {
+            if badge.iconPosition?.lowercased() != "after", let iconName = badge.icon {
+                Image(systemName: sfSymbolName(for: iconName))
+                    .font(.system(size: fontSize))
+            }
+            if let text = badge.text, !text.isEmpty {
+                Text(text)
+                    .font(.system(size: fontSize, weight: .medium))
+            }
+            if badge.iconPosition?.lowercased() == "after", let iconName = badge.icon {
                 Image(systemName: sfSymbolName(for: iconName))
                     .font(.system(size: fontSize))
             }
-            Text(badge.text)
-                .font(.system(size: fontSize, weight: .medium))
         }
         .foregroundColor(foregroundColor)
         .padding(.horizontal, horizontalPadding)
         .padding(.vertical, verticalPadding)
         .background(backgroundColor)
-        .clipShape(Capsule())
+        .clipShape(badgeShape)
         .overlay(
-            Capsule()
-                .strokeBorder(strokeColor, lineWidth: isTint ? 1 : 0)
+            badgeShape
+                .stroke(strokeColor, lineWidth: isTint ? 1 : 0)
         )
         .frame(
             maxWidth: badge.horizontalAlignment == nil ? nil : .infinity,
             alignment: alignment
         )
     }
 
+    private var badgeShape: AnyShape {
+        switch badge.shape?.lowercased() {
+        case "square":
+            return AnyShape(RoundedRectangle(cornerRadius: 4))
+        case "rounded":
+            return AnyShape(RoundedRectangle(cornerRadius: 8))
+        default:
+            return AnyShape(Capsule())
+        }
+    }
+
     private var isTint: Bool {
         badge.appearance?.lowercased() == "tint"
     }
@@ -102,7 +119,13 @@ struct BadgeView: View {
 
     private func sfSymbolName(for fluentName: String) -> String {
         let map: [String: String] = [
+            "calendar": "calendar",
             "checkmarkcircle": "checkmark.circle",
+            "errorcircle": "xmark.circle",
+            "imagecircle": "photo.circle",
+            "important": "exclamationmark.circle",
+            "tag": "tag",
+            "tooltipquote": "text.bubble",
             "warning": "exclamationmark.triangle",
             "clock": "clock",
             "people": "person.2",

ios/Sources/ACRendering/Views/ImageView.swift

@@ -59,7 +59,7 @@ struct ImageView: View {
             } else if isSVG {
                 svgView
             } else {
-                AsyncImage(url: URL(string: image.url)) { phase in
+                AsyncImage(url: imageURL) { phase in
                     switch phase {
                     case .empty:
                         if let w = imageWidth, let h = imageHeight {
@@ -97,12 +97,12 @@ struct ImageView: View {
             }
         }
         .background(backgroundColorValue)
-        .frame(maxWidth: .infinity, alignment: frameAlignment)
-        .spacing(image.spacing, hostConfig: hostConfig)
-        .separator(image.separator, hostConfig: hostConfig)
         .selectAction(image.selectAction) { action in
             actionHandler.handle(action, delegate: actionDelegate, viewModel: viewModel)
         }
+        .frame(maxWidth: .infinity, alignment: frameAlignment)
+        .spacing(image.spacing, hostConfig: hostConfig)
+        .separator(image.separator, hostConfig: hostConfig)
         .accessibilityElement(label: image.altText ?? "Image")
     }
 
@@ -143,6 +143,19 @@ struct ImageView: View {
 
     // MARK: - Sizing
 
+    private var imageURL: URL? {
+        guard let url = URL(string: image.url) else { return nil }
+        if image.forceLoad == true {
+            // Append cache-busting parameter to bypass URL cache
+            var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+            var queryItems = components?.queryItems ?? []
+            queryItems.append(URLQueryItem(name: "_t", value: "\(Date().timeIntervalSince1970)"))
+            components?.queryItems = queryItems
+            return components?.url ?? url
+        }
+        return url
+    }
+
     private var backgroundColorValue: Color {
         if let bgColor = image.backgroundColor, !bgColor.isEmpty {
             return Color(hex: bgColor)

ios/Sources/ACRendering/Views/TableView.swift

@@ -25,7 +25,10 @@ struct TableView: View {
                             cell: cell,
                             isHeader: isHeaderRow,
                             hostConfig: hostConfig,
-                            depth: depth
+                            depth: depth,
+                            table: table,
+                            row: row,
+                            columnDef: table.columns?.indices.contains(cellIndex) == true ? table.columns?[cellIndex] : nil
                         )
                         .frame(maxWidth: .infinity)
                         .if(hasColumnWeight(at: cellIndex)) { view in
@@ -66,6 +69,9 @@ struct TableCellView: View {
     let isHeader: Bool
     let hostConfig: HostConfig
     var depth: Int = 0
+    var table: ACCore.Table? = nil
+    var row: ACCore.TableRow? = nil
+    var columnDef: TableColumnDefinition? = nil
 
     @EnvironmentObject var viewModel: CardViewModel
 
@@ -80,7 +86,7 @@ struct TableCellView: View {
                         AreaGridLayoutView(items: items, gridLayout: gridLayout, hostConfig: hostConfig, depth: depth)
                     }
                 } else {
-                    VStack(spacing: 0) {
+                    VStack(alignment: resolvedHStackAlignment, spacing: 0) {
                         ForEach(items) { element in
                             if viewModel.isElementVisible(elementId: element.elementId) {
                                 if isHeader {
@@ -98,28 +104,49 @@ struct TableCellView: View {
                     .frame(minHeight: 20)
             }
         }
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: verticalContentAlignment)
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: combinedAlignment)
         .frame(minHeight: minHeight)
         .padding(.horizontal, CGFloat(hostConfig.table.cellSpacing))
         .padding(.vertical, CGFloat(hostConfig.table.cellSpacing))
         .containerStyle(cell.style, hostConfig: hostConfig)
     }
 
-    private var verticalContentAlignment: Alignment {
-        guard let alignment = cell.verticalContentAlignment else {
-            return .center
-        }
-
+    private var resolvedHStackAlignment: SwiftUI.HorizontalAlignment {
+        let alignment = cell.horizontalCellContentAlignment
+            ?? columnDef?.horizontalCellContentAlignment
+            ?? row?.horizontalCellContentAlignment
+            ?? table?.horizontalCellContentAlignment
         switch alignment {
-        case .top:
-            return .top
-        case .center:
-            return .center
-        case .bottom:
-            return .bottom
+        case .center: return .center
+        case .right: return .trailing
+        default: return .leading
         }
     }
 
+    private var combinedAlignment: Alignment {
+        let h: SwiftUI.HorizontalAlignment = {
+            let alignment = cell.horizontalCellContentAlignment
+                ?? columnDef?.horizontalCellContentAlignment
+                ?? row?.horizontalCellContentAlignment
+                ?? table?.horizontalCellContentAlignment
+            switch alignment {
+            case .center: return .center
+            case .right: return .trailing
+            default: return .leading
+            }
+        }()
+
+        let v: SwiftUI.VerticalAlignment = {
+            switch cell.verticalContentAlignment {
+            case .top: return .top
+            case .bottom: return .bottom
+            default: return .center
+            }
+        }()
+
+        return Alignment(horizontal: h, vertical: v)
+    }
+
     private var minHeight: CGFloat? {
         guard let minHeightStr = cell.minHeight else { return nil }
         return CGFloat(Int(minHeightStr.replacingOccurrences(of: "px", with: "")) ?? 0)