From fd8083a90f3f0bba83ecd15532122d5dead8012c Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Thu, 12 May 2022 22:16:03 +0900
Subject: [PATCH] settings leading fix, decorated icon cleanup

---
 lib/widgets/dialogs/location_pick_dialog.dart | 5 ++---
 lib/widgets/map/map_info_row.dart             | 5 ++---
 lib/widgets/settings/common/tile_leading.dart | 3 ++-
 lib/widgets/viewer/overlay/details.dart       | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/widgets/dialogs/location_pick_dialog.dart b/lib/widgets/dialogs/location_pick_dialog.dart
index d273487fe..b9b7d1b14 100644
--- a/lib/widgets/dialogs/location_pick_dialog.dart
+++ b/lib/widgets/dialogs/location_pick_dialog.dart
@@ -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,
diff --git a/lib/widgets/map/map_info_row.dart b/lib/widgets/map/map_info_row.dart
index d4826a962..2ae6b55ce 100644
--- a/lib/widgets/map/map_info_row.dart
+++ b/lib/widgets/map/map_info_row.dart
@@ -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,
diff --git a/lib/widgets/settings/common/tile_leading.dart b/lib/widgets/settings/common/tile_leading.dart
index 1cb7f3a06..55152617a 100644
--- a/lib/widgets/settings/common/tile_leading.dart
+++ b/lib/widgets/settings/common/tile_leading.dart
@@ -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,
       ),
     );
   }
diff --git a/lib/widgets/viewer/overlay/details.dart b/lib/widgets/viewer/overlay/details.dart
index 7205c4ec4..53a8adc74 100644
--- a/lib/widgets/viewer/overlay/details.dart
+++ b/lib/widgets/viewer/overlay/details.dart
@@ -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)),