diff --git a/lib/screens/memory_map_screen.dart b/lib/screens/memory_map_screen.dart index c3cb1ee..28870bd 100644 --- a/lib/screens/memory_map_screen.dart +++ b/lib/screens/memory_map_screen.dart @@ -75,11 +75,11 @@ class _MemoryMapScreenState extends State with Loadable { background: isMaterial(context) ? MemoryMaterialMaps( location: widget.location, - initialZoom: 13, + initialZoom: 14, ) : MemoryCupertinoMaps( location: widget.location, - initialZoom: 13, + initialZoom: 14, ), persistentHeader: Container( width: double.infinity, diff --git a/lib/screens/timeline_screen/memory_sheet.dart b/lib/screens/timeline_screen/memory_sheet.dart index 78a0eab..81b65c7 100644 --- a/lib/screens/timeline_screen/memory_sheet.dart +++ b/lib/screens/timeline_screen/memory_sheet.dart @@ -142,6 +142,7 @@ class _MemorySheetState extends State with Loadable { isExpanded = true; }); }, + enableToggle: true, background: GestureDetector( onTap: () => Navigator.pop(context), ), @@ -234,11 +235,7 @@ class _MemorySheetState extends State with Loadable { children: [ Icon( context.platformIcons.time, - size: platformThemeData( - context, - material: (data) => data.textTheme.bodyLarge!.fontSize, - cupertino: (data) => data.textTheme.textStyle.fontSize, - ), + size: getIconSizeForBodyText(context), ), const SizedBox(width: TINY_SPACE), Text( @@ -258,6 +255,7 @@ class _MemorySheetState extends State with Loadable { isExpanded ? context.platformIcons.downArrow : context.platformIcons.upArrow, + size: getIconSizeForBodyText(context), ), const SizedBox(width: TINY_SPACE), Text( diff --git a/lib/screens/timeline_screen/timeline_overlay.dart b/lib/screens/timeline_screen/timeline_overlay.dart index fe03f19..5737cd5 100644 --- a/lib/screens/timeline_screen/timeline_overlay.dart +++ b/lib/screens/timeline_screen/timeline_overlay.dart @@ -4,6 +4,7 @@ import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:quid_faciam_hodie/constants/spacing.dart'; import 'package:quid_faciam_hodie/models/timeline.dart'; +import 'package:quid_faciam_hodie/utils/theme.dart'; class TimelineOverlay extends StatelessWidget { final DateTime date; @@ -88,13 +89,7 @@ class TimelineOverlay extends StatelessWidget { curve: Curves.linearToEaseOut, child: Icon( Icons.public, - size: platformThemeData( - context, - material: (data) => - data.textTheme.bodyLarge!.fontSize, - cupertino: (data) => - data.textTheme.textStyle.fontSize, - ), + size: getIconSizeForBodyText(context), color: Colors.white, ), ), diff --git a/lib/utils/theme.dart b/lib/utils/theme.dart index f496c8b..c9dc09b 100644 --- a/lib/utils/theme.dart +++ b/lib/utils/theme.dart @@ -37,3 +37,9 @@ Color getSheetColor(final BuildContext context) => platformThemeData( data.bottomSheetTheme.modalBackgroundColor ?? data.bottomAppBarColor, cupertino: (data) => data.barBackgroundColor, ); + +double getIconSizeForBodyText(final BuildContext context) => platformThemeData( + context, + material: (data) => data.textTheme.bodyText1!.fontSize ?? 16, + cupertino: (data) => data.textTheme.textStyle.fontSize ?? 16, + );