Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

number format

Browse source
This commit is contained in:
Thibault Deckers 2022-08-26 21:59:02 +02:00
parent 507835f0af
commit 2ba54ef13d
4 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/widgets/filter_grids/common/covered_filter_chip.dart
View file

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

10
lib/widgets/stats/filter_table.dart
View file

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

3
lib/widgets/stats/histogram.dart
View file

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

32
lib/widgets/stats/stats_page.dart
View file

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