Fix icons not displayed in 2 grid and Fix Import of IRPLUS xml file using NEC protocol

Author: Kame

android/local.properties

@@ -1,5 +1,5 @@
 sdk.dir=/usr/lib/android-sdk
 flutter.sdk=/home/intra/snap/flutter/common/flutter
 flutter.buildMode=release
-flutter.versionName=2.0.12
-flutter.versionCode=24
+flutter.versionName=2.0.13
+flutter.versionCode=25

fastlane/metadata/android/en-US/changelogs/25.txt

@@ -0,0 +1,13 @@
+[NEW]
+Add more icons (459 icons)
+Unified button naming across app (text/image/icon + icon names). 
+Fixed 2-grid icon rendering. Added command search in macro and quick-tile pickers. 
+Added macro step visual previews. 
+Added Undo snackbars for button/macro/device-control removals. 
+Improved empty states with "What next" + CTA (incl. Quick Settings "Set Power tile"). 
+Added color contrast normalization/accessibility for custom button colors. 
+Added Semantics/touch-target and large-text tweaks.
+
+[BUG]
+Fix icons not displayed in 2 grid
+Fix Import of IRPLUS xml file using NEC protocol

lib/utils/button_color_accessibility.dart

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+
+const double _kMinContrastRatio = 4.5;
+
+Color normalizeAccessibleButtonColor(Color color) {
+  Color candidate = color.withAlpha(0xFF);
+  Color fg = bestButtonForeground(candidate);
+  if (_contrastRatio(candidate, fg) >= _kMinContrastRatio) return candidate;
+
+  final hsl = HSLColor.fromColor(candidate);
+  final useLightText = fg == Colors.white;
+  for (int i = 0; i < 12; i++) {
+    final nextLightness = (hsl.lightness + (useLightText ? -0.04 : 0.04))
+        .clamp(0.0, 1.0);
+    candidate = hsl.withLightness(nextLightness).toColor().withAlpha(0xFF);
+    fg = bestButtonForeground(candidate);
+    if (_contrastRatio(candidate, fg) >= _kMinContrastRatio) return candidate;
+  }
+
+  return candidate;
+}
+
+Color bestButtonForeground(Color background) {
+  final bg = background.withAlpha(0xFF);
+  final whiteRatio = _contrastRatio(bg, Colors.white);
+  final blackRatio = _contrastRatio(bg, Colors.black);
+  return whiteRatio >= blackRatio ? Colors.white : Colors.black;
+}
+
+Color resolveButtonBackground(Color? customColor, Color fallback) {
+  if (customColor == null) return fallback;
+  return normalizeAccessibleButtonColor(customColor);
+}
+
+Color resolveButtonForeground(Color? customColor, Color fallback) {
+  if (customColor == null) return fallback;
+  return bestButtonForeground(normalizeAccessibleButtonColor(customColor));
+}
+
+double _contrastRatio(Color a, Color b) {
+  final la = a.computeLuminance();
+  final lb = b.computeLuminance();
+  final light = la > lb ? la : lb;
+  final dark = la > lb ? lb : la;
+  return (light + 0.05) / (dark + 0.05);
+}

lib/utils/button_label.dart

@@ -0,0 +1,30 @@
+import 'package:irblaster_controller/utils/remote.dart';
+import 'package:irblaster_controller/widgets/icon_picker.dart';
+
+String displayButtonLabel(
+  IRButton button, {
+  String fallback = 'Unnamed',
+  String iconFallback = 'Icon',
+}) {
+  final label = formatButtonDisplayName(button.image).trim();
+  if (label.isNotEmpty) return label;
+
+  if (button.iconCodePoint != null) {
+    final iconName = iconPickerNameFor(
+      codePoint: button.iconCodePoint!,
+      fontFamily: button.iconFontFamily,
+    );
+    if (iconName != null && iconName.trim().isNotEmpty) return iconName;
+    return iconFallback;
+  }
+
+  return fallback;
+}
+
+String displayButtonRefLabel(
+  String? raw, {
+  String fallback = 'Unknown',
+}) {
+  final pretty = formatButtonDisplayName((raw ?? '').trim());
+  return pretty.isEmpty ? fallback : pretty;
+}

lib/utils/remote.dart

@@ -17,6 +17,7 @@ class IRButton {
   final Map<String, dynamic>? protocolParams;
   final int? iconCodePoint;
   final String? iconFontFamily;
+  final String? iconFontPackage;
   final int? buttonColor;
 
   const IRButton({
@@ -31,6 +32,7 @@ class IRButton {
     this.protocolParams,
     this.iconCodePoint,
     this.iconFontFamily,
+    this.iconFontPackage,
     this.buttonColor,
   });
 
@@ -46,6 +48,7 @@ class IRButton {
         'protocolParams': protocolParams,
         'iconCodePoint': iconCodePoint,
         'iconFontFamily': iconFontFamily,
+        'iconFontPackage': iconFontPackage,
         'buttonColor': buttonColor,
       };
 
@@ -64,6 +67,10 @@ class IRButton {
       protocolParams: (pp is Map) ? Map<String, dynamic>.from(pp) : null,
       iconCodePoint: json['iconCodePoint'] is int ? json['iconCodePoint'] as int? : int.tryParse('${json['iconCodePoint'] ?? ''}'),
       iconFontFamily: json['iconFontFamily'] as String?,
+      iconFontPackage: _resolveIconFontPackage(
+        json['iconFontPackage'] as String?,
+        json['iconFontFamily'] as String?,
+      ),
       buttonColor: json['buttonColor'] is int ? json['buttonColor'] as int? : int.tryParse('${json['buttonColor'] ?? ''}'),
     );
   }
@@ -80,6 +87,7 @@ class IRButton {
     Map<String, dynamic>? protocolParams,
     int? iconCodePoint,
     String? iconFontFamily,
+    String? iconFontPackage,
     int? buttonColor,
   }) {
     return IRButton(
@@ -94,11 +102,24 @@ class IRButton {
       protocolParams: protocolParams ?? this.protocolParams,
       iconCodePoint: iconCodePoint ?? this.iconCodePoint,
       iconFontFamily: iconFontFamily ?? this.iconFontFamily,
+      iconFontPackage: iconFontPackage ?? this.iconFontPackage,
       buttonColor: buttonColor ?? this.buttonColor,
     );
   }
 }
 
+String? _resolveIconFontPackage(String? explicitPackage, String? fontFamily) {
+  final pkg = explicitPackage?.trim();
+  if (pkg != null && pkg.isNotEmpty) return pkg;
+
+  final family = fontFamily?.trim();
+  if (family == null || family.isEmpty) return null;
+  if (family.toLowerCase().contains('fontawesome')) {
+    return 'font_awesome_flutter';
+  }
+  return null;
+}
+
 class Remote {
   int id;
   final List<IRButton> buttons;
@@ -177,6 +198,14 @@ Future<List<Remote>> readRemotes() async {
               bm['id'] = uuid.v4();
               mutated = true;
             }
+            final ff = (bm['iconFontFamily'] as String?)?.trim();
+            final fp = (bm['iconFontPackage'] as String?)?.trim();
+            if ((fp == null || fp.isEmpty) &&
+                ff != null &&
+                ff.toLowerCase().contains('fontawesome')) {
+              bm['iconFontPackage'] = 'font_awesome_flutter';
+              mutated = true;
+            }
           }
         }
       }

lib/utils/remotes_io.dart

@@ -1301,15 +1301,10 @@ String _lircHexFromAddrCmdExplicit(int addr16, int cmd16) {
   final int c1 = (cmd16 >> 8) & 0xFF;
   final int c2 = cmd16 & 0xFF;
 
-  final int l1 = _bitReverse(a1);
-  final int l2 = _bitReverse(a2);
-  final int l3 = _bitReverse(c1);
-  final int l4 = _bitReverse(c2);
-
-  return l1.toRadixString(16).padLeft(2, '0').toUpperCase() +
-      l2.toRadixString(16).padLeft(2, '0').toUpperCase() +
-      l3.toRadixString(16).padLeft(2, '0').toUpperCase() +
-      l4.toRadixString(16).padLeft(2, '0').toUpperCase();
+  return a1.toRadixString(16).padLeft(2, '0').toUpperCase() +
+      a2.toRadixString(16).padLeft(2, '0').toUpperCase() +
+      c1.toRadixString(16).padLeft(2, '0').toUpperCase() +
+      c2.toRadixString(16).padLeft(2, '0').toUpperCase();
 }
 
 int _bitReverse(int x) {

lib/widgets/create_button.dart

@@ -7,6 +7,7 @@ import 'package:irblaster_controller/ir/ir_protocol_registry.dart';
 import 'package:irblaster_controller/ir/ir_protocol_types.dart';
 import 'package:irblaster_controller/ir_finder/irblaster_db.dart';
 import 'package:irblaster_controller/ir_finder/ir_finder_models.dart';
+import 'package:irblaster_controller/utils/button_color_accessibility.dart';
 import 'package:irblaster_controller/utils/ir.dart';
 import 'package:irblaster_controller/utils/remote.dart';
 import 'package:irblaster_controller/widgets/code_test.dart';
@@ -111,6 +112,7 @@ class _CreateButtonState extends State<CreateButton> {
         _selectedIcon = IconData(
           b.iconCodePoint!,
           fontFamily: b.iconFontFamily,
+          fontPackage: b.iconFontPackage,
         );
       } else if (b.isImage) {
         _labelType = _LabelType.image;
@@ -126,7 +128,7 @@ class _CreateButtonState extends State<CreateButton> {
       }
 
       if (b.buttonColor != null) {
-        _selectedColor = Color(b.buttonColor!);
+        _selectedColor = normalizeAccessibleButtonColor(Color(b.buttonColor!));
       }
 
       if (b.protocol != null && b.protocol!.trim().isNotEmpty) {
@@ -786,18 +788,31 @@ class _CreateButtonState extends State<CreateButton> {
   }
 
   Widget _colorOption(Color? color, String label, ThemeData theme) {
-    final isSelected = _selectedColor == color;
-    final displayColor = color ?? theme.colorScheme.surfaceContainerHighest;
-
-    return InkWell(
+    final normalizedOption =
+        color == null ? null : normalizeAccessibleButtonColor(color);
+    final isSelected = normalizedOption == null
+        ? _selectedColor == null
+        : _selectedColor?.value == normalizedOption.value;
+    final displayColor =
+        normalizedOption ?? theme.colorScheme.surfaceContainerHighest;
+    final checkColor = normalizedOption == null
+        ? theme.colorScheme.onSurface
+        : resolveButtonForeground(normalizedOption, Colors.white);
+
+    return Semantics(
+      button: true,
+      label: isSelected
+          ? 'Button color $label, selected'
+          : 'Button color $label',
+      child: InkWell(
       onTap: () {
         setState(() {
-          _selectedColor = color;
+          _selectedColor = normalizedOption;
         });
       },
       borderRadius: BorderRadius.circular(8),
       child: Container(
-        width: 60,
+        constraints: const BoxConstraints(minWidth: 60, minHeight: 60),
         padding: const EdgeInsets.symmetric(vertical: 8),
         child: Column(
           mainAxisSize: MainAxisSize.min,
@@ -818,9 +833,7 @@ class _CreateButtonState extends State<CreateButton> {
               child: isSelected
                   ? Icon(
                       Icons.check,
-                      color: color == null
-                          ? theme.colorScheme.onSurface
-                          : Colors.white,
+                      color: checkColor,
                       size: 20,
                     )
                   : null,
@@ -830,15 +843,20 @@ class _CreateButtonState extends State<CreateButton> {
               label,
               style: theme.textTheme.bodySmall?.copyWith(fontSize: 10),
               textAlign: TextAlign.center,
-              maxLines: 1,
+              maxLines: 2,
               overflow: TextOverflow.ellipsis,
             ),
           ],
         ),
       ),
+      ),
     );
   }
 
+  int? get _selectedButtonColorValue => _selectedColor == null
+      ? null
+      : normalizeAccessibleButtonColor(_selectedColor!).value;
+
   List<Widget> _buildSignalSummaryChips() {
     final List<Widget> chips = [];
 
@@ -911,7 +929,8 @@ class _CreateButtonState extends State<CreateButton> {
         necBitOrder: bitOrder,
         iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
         iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-        buttonColor: _selectedColor?.value,
+        iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+        buttonColor: _selectedButtonColorValue,
       );
     }
 
@@ -926,7 +945,8 @@ class _CreateButtonState extends State<CreateButton> {
         isImage: _labelType == _LabelType.image,
         iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
         iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-        buttonColor: _selectedColor?.value,
+        iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+        buttonColor: _selectedButtonColorValue,
       );
     }
 
@@ -968,7 +988,8 @@ class _CreateButtonState extends State<CreateButton> {
       protocolParams: params,
       iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
       iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-      buttonColor: _selectedColor?.value,
+      iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+      buttonColor: _selectedButtonColorValue,
     );
   }
 
@@ -2589,7 +2610,8 @@ class _CreateButtonState extends State<CreateButton> {
         necBitOrder: bitOrder,
         iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
         iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-        buttonColor: _selectedColor?.value,
+        iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+        buttonColor: _selectedButtonColorValue,
       );
 
       Navigator.pop(context, button);
@@ -2613,7 +2635,8 @@ class _CreateButtonState extends State<CreateButton> {
         isImage: _labelType == _LabelType.image,
         iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
         iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-        buttonColor: _selectedColor?.value,
+        iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+        buttonColor: _selectedButtonColorValue,
       );
 
       Navigator.pop(context, button);
@@ -2667,7 +2690,8 @@ class _CreateButtonState extends State<CreateButton> {
         protocolParams: params,
         iconCodePoint: _labelType == _LabelType.icon ? _selectedIcon?.codePoint : null,
         iconFontFamily: _labelType == _LabelType.icon ? _selectedIcon?.fontFamily : null,
-        buttonColor: _selectedColor?.value,
+        iconFontPackage: _labelType == _LabelType.icon ? _selectedIcon?.fontPackage : null,
+        buttonColor: _selectedButtonColorValue,
       );
 
       Navigator.pop(context, button);