number format

lib/widgets/filter_grids/common/covered_filter_chip.dart

@@ -13,9 +13,11 @@ import 'package:aves/model/source/tag.dart';
 import 'package:aves/theme/durations.dart';
 import 'package:aves/theme/icons.dart';
 import 'package:aves/utils/android_file_utils.dart';
+import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:aves/widgets/common/thumbnail/image.dart';
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 
 class CoveredFilterChip<T extends CollectionFilter> extends StatelessWidget {
@@ -171,6 +173,9 @@ class CoveredFilterChip<T extends CollectionFilter> extends StatelessWidget {
   Color _detailColor(BuildContext context) => Theme.of(context).textTheme.caption!.color!;
 
   Widget _buildDetails(BuildContext context, CollectionSource source, T filter) {
+    final locale = context.l10n.localeName;
+    final numberFormat = NumberFormat.decimalPattern(locale);
+
     final padding = min<double>(8.0, extent / 16);
     final iconSize = detailIconSize(extent);
     final fontSize = detailFontSize(extent);
@@ -198,7 +203,7 @@ class CoveredFilterChip<T extends CollectionFilter> extends StatelessWidget {
             ),
           ),
         Text(
-          '${source.count(filter)}',
+          numberFormat.format(source.count(filter)),
           style: TextStyle(
             color: _detailColor(context),
             fontSize: fontSize,

lib/widgets/stats/filter_table.dart

@@ -5,7 +5,7 @@ import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/common/extensions/build_context.dart';
 import 'package:aves/widgets/common/identity/aves_filter_chip.dart';
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart' as intl;
+import 'package:intl/intl.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 
 class FilterTable<T extends Comparable> extends StatelessWidget {
@@ -32,6 +32,10 @@ class FilterTable<T extends Comparable> extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final locale = context.l10n.localeName;
+    final numberFormat = NumberFormat.decimalPattern(locale);
+    final percentFormat = NumberFormat.percentPattern();
+
     final sortedEntries = entryCountMap.entries.toList();
     if (sortByCount) {
       sortedEntries.sort((kv1, kv2) {
@@ -85,7 +89,7 @@ class FilterTable<T extends Comparable> extends StatelessWidget {
                           isRTL: isRtl,
                           barRadius: barRadius,
                           center: Text(
-                            intl.NumberFormat.percentPattern().format(percent),
+                            percentFormat.format(percent),
                             style: TextStyle(
                               shadows: theme.brightness == Brightness.dark ? Constants.embossShadows : null,
                             ),
@@ -95,7 +99,7 @@ class FilterTable<T extends Comparable> extends StatelessWidget {
                       },
                     ),
                   Text(
-                    '$count',
+                    numberFormat.format(count),
                     style: TextStyle(
                       color: theme.textTheme.caption!.color,
                     ),

lib/widgets/stats/histogram.dart

@@ -89,6 +89,7 @@ class _HistogramState extends State<Histogram> {
     ];
 
     final locale = context.l10n.localeName;
+    final numberFormat = NumberFormat.decimalPattern(locale);
     final timeAxisSpec = _firstDate != null && _lastDate != null
         ? TimeAxisSpec.forLevel(
             locale: locale,
@@ -158,7 +159,7 @@ class _HistogramState extends State<Histogram> {
                     ),
                     const Spacer(),
                     Text(
-                      '$count',
+                      numberFormat.format(count),
                       style: TextStyle(
                         color: theme.textTheme.caption!.color,
                       ),

lib/widgets/stats/stats_page.dart

@@ -25,7 +25,7 @@ import 'package:charts_flutter/flutter.dart' as charts;
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart' as intl;
+import 'package:intl/intl.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 import 'package:provider/provider.dart';
 
@@ -71,11 +71,16 @@ class StatsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l10n = context.l10n;
+    final locale = l10n.localeName;
+    final numberFormat = NumberFormat.decimalPattern(locale);
+    final percentFormat = NumberFormat.percentPattern();
+
     Widget child;
     if (entries.isEmpty) {
       child = EmptyContent(
         icon: AIcons.image,
-        text: context.l10n.collectionEmptyImages,
+        text: l10n.collectionEmptyImages,
       );
     } else {
       final theme = Theme.of(context);
@@ -92,8 +97,8 @@ class StatsPage extends StatelessWidget {
               alignment: WrapAlignment.center,
               crossAxisAlignment: WrapCrossAlignment.center,
               children: [
-                _buildMimeDonut(context, AIcons.image, imagesByMimeTypes, animate),
-                _buildMimeDonut(context, AIcons.video, videoByMimeTypes, animate),
+                _buildMimeDonut(context, AIcons.image, imagesByMimeTypes, animate, numberFormat),
+                _buildMimeDonut(context, AIcons.video, videoByMimeTypes, animate, numberFormat),
               ],
             );
           },
@@ -125,7 +130,7 @@ class StatsPage extends StatelessWidget {
                     isRTL: context.isRtl,
                     barRadius: barRadius,
                     center: Text(
-                      intl.NumberFormat.percentPattern().format(withGpsPercent),
+                      percentFormat.format(withGpsPercent),
                       style: TextStyle(
                         shadows: isDark ? Constants.embossShadows : null,
                       ),
@@ -139,7 +144,7 @@ class StatsPage extends StatelessWidget {
             ),
             const SizedBox(height: 8),
             Text(
-              context.l10n.statsWithGps(withGpsCount),
+              l10n.statsWithGps(withGpsCount),
               textAlign: TextAlign.center,
             ),
           ],
@@ -154,17 +159,17 @@ class StatsPage extends StatelessWidget {
             onFilterSelection: (filter) => _onFilterSelection(context, filter),
           ),
           locationIndicator,
-          ..._buildFilterSection<String>(context, context.l10n.statsTopCountries, entryCountPerCountry, (v) => LocationFilter(LocationLevel.country, v)),
-          ..._buildFilterSection<String>(context, context.l10n.statsTopPlaces, entryCountPerPlace, (v) => LocationFilter(LocationLevel.place, v)),
-          ..._buildFilterSection<String>(context, context.l10n.statsTopTags, entryCountPerTag, TagFilter.new),
-          if (showRatings) ..._buildFilterSection<int>(context, context.l10n.searchSectionRating, entryCountPerRating, RatingFilter.new, sortByCount: false, maxRowCount: null),
+          ..._buildFilterSection<String>(context, l10n.statsTopCountries, entryCountPerCountry, (v) => LocationFilter(LocationLevel.country, v)),
+          ..._buildFilterSection<String>(context, l10n.statsTopPlaces, entryCountPerPlace, (v) => LocationFilter(LocationLevel.place, v)),
+          ..._buildFilterSection<String>(context, l10n.statsTopTags, entryCountPerTag, TagFilter.new),
+          if (showRatings) ..._buildFilterSection<int>(context, l10n.searchSectionRating, entryCountPerRating, RatingFilter.new, sortByCount: false, maxRowCount: null),
         ],
       );
     }
     return MediaQueryDataProvider(
       child: Scaffold(
         appBar: AppBar(
-          title: Text(context.l10n.statsPageTitle),
+          title: Text(l10n.statsPageTitle),
         ),
         body: GestureAreaProtectorStack(
           child: SafeArea(
@@ -181,6 +186,7 @@ class StatsPage extends StatelessWidget {
     IconData icon,
     Map<String, int> byMimeTypes,
     bool animate,
+    NumberFormat numberFormat,
   ) {
     if (byMimeTypes.isEmpty) return const SizedBox.shrink();
 
@@ -237,7 +243,7 @@ class StatsPage extends StatelessWidget {
                 children: [
                   Icon(icon),
                   Text(
-                    '$sum',
+                    numberFormat.format(sum),
                     textAlign: TextAlign.center,
                   ),
                 ],
@@ -269,7 +275,7 @@ class StatsPage extends StatelessWidget {
                         ),
                         const SizedBox(width: 8),
                         Text(
-                          '${d.entryCount}',
+                          numberFormat.format(d.entryCount),
                           style: TextStyle(
                             color: Theme.of(context).textTheme.caption!.color,
                           ),