improvements & bugfixes

This commit is contained in:
Myzel394 2022-08-22 17:13:21 +02:00
parent 82fe501d1d
commit 4170ec99ea
4 changed files with 13 additions and 14 deletions

View File

@ -75,11 +75,11 @@ class _MemoryMapScreenState extends State<MemoryMapScreen> with Loadable {
background: isMaterial(context) background: isMaterial(context)
? MemoryMaterialMaps( ? MemoryMaterialMaps(
location: widget.location, location: widget.location,
initialZoom: 13, initialZoom: 14,
) )
: MemoryCupertinoMaps( : MemoryCupertinoMaps(
location: widget.location, location: widget.location,
initialZoom: 13, initialZoom: 14,
), ),
persistentHeader: Container( persistentHeader: Container(
width: double.infinity, width: double.infinity,

View File

@ -142,6 +142,7 @@ class _MemorySheetState extends State<MemorySheet> with Loadable {
isExpanded = true; isExpanded = true;
}); });
}, },
enableToggle: true,
background: GestureDetector( background: GestureDetector(
onTap: () => Navigator.pop(context), onTap: () => Navigator.pop(context),
), ),
@ -234,11 +235,7 @@ class _MemorySheetState extends State<MemorySheet> with Loadable {
children: [ children: [
Icon( Icon(
context.platformIcons.time, context.platformIcons.time,
size: platformThemeData( size: getIconSizeForBodyText(context),
context,
material: (data) => data.textTheme.bodyLarge!.fontSize,
cupertino: (data) => data.textTheme.textStyle.fontSize,
),
), ),
const SizedBox(width: TINY_SPACE), const SizedBox(width: TINY_SPACE),
Text( Text(
@ -258,6 +255,7 @@ class _MemorySheetState extends State<MemorySheet> with Loadable {
isExpanded isExpanded
? context.platformIcons.downArrow ? context.platformIcons.downArrow
: context.platformIcons.upArrow, : context.platformIcons.upArrow,
size: getIconSizeForBodyText(context),
), ),
const SizedBox(width: TINY_SPACE), const SizedBox(width: TINY_SPACE),
Text( Text(

View File

@ -4,6 +4,7 @@ import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:quid_faciam_hodie/constants/spacing.dart'; import 'package:quid_faciam_hodie/constants/spacing.dart';
import 'package:quid_faciam_hodie/models/timeline.dart'; import 'package:quid_faciam_hodie/models/timeline.dart';
import 'package:quid_faciam_hodie/utils/theme.dart';
class TimelineOverlay extends StatelessWidget { class TimelineOverlay extends StatelessWidget {
final DateTime date; final DateTime date;
@ -88,13 +89,7 @@ class TimelineOverlay extends StatelessWidget {
curve: Curves.linearToEaseOut, curve: Curves.linearToEaseOut,
child: Icon( child: Icon(
Icons.public, Icons.public,
size: platformThemeData( size: getIconSizeForBodyText(context),
context,
material: (data) =>
data.textTheme.bodyLarge!.fontSize,
cupertino: (data) =>
data.textTheme.textStyle.fontSize,
),
color: Colors.white, color: Colors.white,
), ),
), ),

View File

@ -37,3 +37,9 @@ Color getSheetColor(final BuildContext context) => platformThemeData(
data.bottomSheetTheme.modalBackgroundColor ?? data.bottomAppBarColor, data.bottomSheetTheme.modalBackgroundColor ?? data.bottomAppBarColor,
cupertino: (data) => data.barBackgroundColor, 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,
);