Merge branch 'main' into feature/radiobutton-overhaul

CHANGELOG.md

@@ -15,6 +15,7 @@ It is expected that you keep this format strictly, since we depend on it in our
   - `SBBCheckboxListItem`
   - `SBBRadioButtonListItem`
   - `SBBRadioListItem`
+- updated the SBB Icons version to 1.2.0
 
 ### Added
 
@@ -31,6 +32,7 @@ It is expected that you keep this format strictly, since we depend on it in our
   - `SBBRadioButtonListItem`
   - `SBBRadioListItem`
 - added animation to `SBBPagination`
+- added the `SBBIconsIndex` allowing String to IconData mapping
 
 ### Fixed
 

example/lib/pages/icon_page.dart

@@ -2,7 +2,6 @@ import 'package:sbb_design_system_mobile/sbb_design_system_mobile.dart';
 import 'package:flutter/material.dart';
 
 import '../native_app.dart';
-import '../sbb_icons_index.dart';
 
 class IconPage extends StatelessWidget {
   @override

lib/sbb_design_system_mobile.dart

@@ -48,6 +48,7 @@ export 'src/text/sbb_text_field.dart';
 export 'src/text/sbb_text_form_field.dart';
 export 'src/theme/sbb_colors.dart';
 export 'src/theme/sbb_icons/sbb_icons.dart';
+export 'src/theme/sbb_icons/sbb_icons_index.dart';
 export 'src/theme/sbb_theme.dart';
 export 'src/theme/sbb_typography.dart';
 export 'src/theme/styles/sbb_styles.dart';

lib/src/checkbox/sbb_checkbox_list_item.dart

@@ -252,29 +252,27 @@ class SBBCheckboxListItem extends StatelessWidget {
     return MergeSemantics(
       child: Material(
         color: resolvedBackgroundColor,
-        child: Column(children: [
-          Stack(
-            alignment: AlignmentDirectional.bottomStart,
-            children: [
-              ConstrainedBox(
-                constraints: const BoxConstraints(minHeight: _minListTileHeight),
-                child: InkWell(
-                  onTap: _isInteractive ? _handleTap : null,
-                  splashColor: style?.listItem?.backgroundColorHighlighted,
-                  focusColor: style?.listItem?.backgroundColorHighlighted,
-                  highlightColor: SBBColors.transparent,
-                  hoverColor: SBBColors.transparent,
-                  child: Semantics(
-                    enabled: _isInteractive,
-                    child: _checkboxBody(style),
-                  ),
+        child: Stack(
+          alignment: AlignmentDirectional.bottomStart,
+          children: [
+            ConstrainedBox(
+              constraints: const BoxConstraints(minHeight: _minListTileHeight),
+              child: InkWell(
+                onTap: _isInteractive ? _handleTap : null,
+                splashColor: style?.listItem?.backgroundColorHighlighted,
+                focusColor: style?.listItem?.backgroundColorHighlighted,
+                highlightColor: SBBColors.transparent,
+                hoverColor: SBBColors.transparent,
+                child: Semantics(
+                  enabled: _isInteractive,
+                  child: _checkboxBody(style),
                 ),
               ),
-              if (isLoading) BottomLoadingIndicator()
-            ],
-          ),
-          if (!isLastElement) const Divider(),
-        ]),
+            ),
+            if (!isLastElement) const Divider(),
+            if (isLoading) BottomLoadingIndicator()
+          ],
+        ),
       ),
     );
   }

tool/font_scripts/icons/.version

@@ -1 +1 @@
-1.0.3
+1.2.0

tool/font_scripts/lib/update_icon_fonts.dart

@@ -32,8 +32,7 @@ Future<void> main() async {
   final icons = responseJson['icons'] as List<dynamic>;
   final total = icons
       .cast<Map<String, dynamic>>()
-      .where((e) =>
-          (e['tags'] as List).cast<String>().any((t) => t.contains('Size=')))
+      .where((e) => (e['tags'] as List).cast<String>().any((t) => t.contains('Size=')))
       .length;
   progress = FillingBar(total: total + 4, width: 10, desc: 'Downloading icons');
 
@@ -76,20 +75,16 @@ Uri makeUrlUri(String path) {
 Future<void> prepareIcons(String type, List<dynamic> icons) async {
   final filter = icons.where((e) => e['tags'].contains('Size=$type'));
   final dir = await Directory('icons/$type-tmp').create(recursive: true);
-  final downloads = <Future<void>>[];
   for (final icon in filter) {
     final name = icon['name'];
     final fileName = '$name.svg';
     final svgUri = makeUrlUri(fileName);
-    final download = downloadSvg(
+    await downloadSvg(
       svgUri,
       fileName.replaceAll('-', '_'),
       dir.path,
     );
-    downloads.add(download);
   }
-
-  await Future.wait(downloads);
 }
 
 Future<void> downloadSvg(Uri uri, String fileName, String path) async {
@@ -104,8 +99,7 @@ Future<void> createFlutterFontMap() async {
   final small = await getMap('small');
   final medium = await getMap('medium');
   final large = await getMap('large');
-  mapFont(String name, String value) =>
-      sb.writeln('  static const $name = $value;');
+  mapFont(String name, String value) => sb.writeln('  static const $name = $value;');
 
   sb.writeln('library sbb_icons;');
   sb.writeln();
@@ -129,8 +123,7 @@ Future<void> createFlutterFontMap() async {
 
   await File('icons/sbb_icons.dart').writeAsString(sb.toString());
 
-  mapFont2(String name) =>
-      sb.writeln('    {\'icon\': SBBIcons.$name, \'name\': \'$name\'},');
+  mapFont2(String name) => sb.writeln('    {\'icon\': SBBIcons.$name, \'name\': \'$name\'},');
 
   sb.clear();
   sb.writeln('import \'package:sbb_design_system_mobile/sbb_design_system_mobile.dart\';');