settings leading fix, decorated icon cleanup
This commit is contained in:
parent
f2e6dc9448
commit
fd8083a90f
4 changed files with 9 additions and 10 deletions
|
@ -16,7 +16,6 @@ import 'package:aves/widgets/common/map/geo_map.dart';
|
|||
import 'package:aves/widgets/common/providers/map_theme_provider.dart';
|
||||
import 'package:aves/widgets/common/providers/media_query_data_provider.dart';
|
||||
import 'package:aves_map/aves_map.dart';
|
||||
import 'package:decorated_icon/decorated_icon.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/scheduler.dart';
|
||||
import 'package:latlong2/latlong.dart';
|
||||
|
@ -258,7 +257,7 @@ class _AddressRowState extends State<_AddressRow> {
|
|||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const SizedBox(width: _LocationInfo.iconPadding),
|
||||
const DecoratedIcon(AIcons.location, size: _LocationInfo.iconSize),
|
||||
const Icon(AIcons.location, size: _LocationInfo.iconSize),
|
||||
const SizedBox(width: _LocationInfo.iconPadding),
|
||||
Expanded(
|
||||
child: Container(
|
||||
|
@ -317,7 +316,7 @@ class _CoordinateRow extends StatelessWidget {
|
|||
return Row(
|
||||
children: [
|
||||
const SizedBox(width: _LocationInfo.iconPadding),
|
||||
const DecoratedIcon(AIcons.geoBounds, size: _LocationInfo.iconSize),
|
||||
const Icon(AIcons.geoBounds, size: _LocationInfo.iconSize),
|
||||
const SizedBox(width: _LocationInfo.iconPadding),
|
||||
Text(
|
||||
location != null ? settings.coordinateFormat.format(context.l10n, location!) : Constants.overlayUnknown,
|
||||
|
|
|
@ -8,7 +8,6 @@ import 'package:aves/theme/icons.dart';
|
|||
import 'package:aves/utils/constants.dart';
|
||||
import 'package:aves/widgets/common/extensions/build_context.dart';
|
||||
import 'package:aves_map/aves_map.dart';
|
||||
import 'package:decorated_icon/decorated_icon.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
|
@ -103,7 +102,7 @@ class _AddressRowState extends State<_AddressRow> {
|
|||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const SizedBox(width: MapInfoRow.iconPadding),
|
||||
const DecoratedIcon(AIcons.location, size: MapInfoRow.iconSize),
|
||||
const Icon(AIcons.location, size: MapInfoRow.iconSize),
|
||||
const SizedBox(width: MapInfoRow.iconPadding),
|
||||
Expanded(
|
||||
child: Container(
|
||||
|
@ -173,7 +172,7 @@ class _DateRow extends StatelessWidget {
|
|||
return Row(
|
||||
children: [
|
||||
const SizedBox(width: MapInfoRow.iconPadding),
|
||||
const DecoratedIcon(AIcons.date, size: MapInfoRow.iconSize),
|
||||
const Icon(AIcons.date, size: MapInfoRow.iconSize),
|
||||
const SizedBox(width: MapInfoRow.iconPadding),
|
||||
Text(
|
||||
dateText,
|
||||
|
|
|
@ -28,8 +28,9 @@ class SettingsTileLeading extends StatelessWidget {
|
|||
duration: Durations.themeColorModeAnimation,
|
||||
child: DecoratedIcon(
|
||||
icon,
|
||||
shadows: Theme.of(context).brightness == Brightness.dark ? Constants.embossShadows : null,
|
||||
size: 18,
|
||||
color: DefaultTextStyle.of(context).style.color,
|
||||
shadows: Theme.of(context).brightness == Brightness.dark ? Constants.embossShadows : null,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
|
|
@ -306,7 +306,7 @@ class _LocationRow extends AnimatedWidget {
|
|||
}
|
||||
return Row(
|
||||
children: [
|
||||
DecoratedIcon(AIcons.location, shadows: _shadows(context), size: _iconSize),
|
||||
DecoratedIcon(AIcons.location, size: _iconSize, shadows: _shadows(context)),
|
||||
const SizedBox(width: _iconPadding),
|
||||
Expanded(child: Text(location, strutStyle: Constants.overflowStrutStyle)),
|
||||
],
|
||||
|
@ -387,7 +387,7 @@ class _DateRow extends StatelessWidget {
|
|||
|
||||
return Row(
|
||||
children: [
|
||||
DecoratedIcon(AIcons.date, shadows: _shadows(context), size: _iconSize),
|
||||
DecoratedIcon(AIcons.date, size: _iconSize, shadows: _shadows(context)),
|
||||
const SizedBox(width: _iconPadding),
|
||||
Expanded(flex: 3, child: Text(dateText, strutStyle: Constants.overflowStrutStyle)),
|
||||
Expanded(flex: 2, child: Text(resolutionText, strutStyle: Constants.overflowStrutStyle)),
|
||||
|
@ -416,7 +416,7 @@ class _ShootingRow extends StatelessWidget {
|
|||
|
||||
return Row(
|
||||
children: [
|
||||
DecoratedIcon(AIcons.shooting, shadows: _shadows(context), size: _iconSize),
|
||||
DecoratedIcon(AIcons.shooting, size: _iconSize, shadows: _shadows(context)),
|
||||
const SizedBox(width: _iconPadding),
|
||||
Expanded(child: Text(apertureText, strutStyle: Constants.overflowStrutStyle)),
|
||||
Expanded(child: Text(details.exposureTime ?? Constants.overlayUnknown, strutStyle: Constants.overflowStrutStyle)),
|
||||
|
|
Loading…
Reference in a new issue