From 8b9cd0dd19d7f4d4d4d6ea2fbdc1baee769a99bc Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Tue, 7 May 2024 20:39:40 +0200 Subject: [PATCH] migrated to outlined icons --- .../widget_bottom_controls.dart | 6 ++-- .../widget_slider_exposure_offset.dart | 2 +- .../zoom_slider/widget_slider_zoom.dart | 2 +- .../widget_placeholder_camera_controls.dart | 7 ++--- .../widget_placeholder_camera_view.dart | 2 +- .../widget_list_exposure_pairs.dart | 2 +- .../widget_picker_equipment_profiles.dart | 2 +- .../film_picker/widget_picker_film.dart | 9 ++---- .../iso_picker/widget_picker_iso.dart | 7 ++--- .../nd_picker/widget_picker_nd.dart | 2 +- .../widget_container_reading_value.dart | 2 +- .../widget_list_tile_report_issue.dart | 2 +- .../widget_list_tile_restore_purchases.dart | 2 +- .../widget_list_tile_source_code.dart | 2 +- .../widget_list_tile_write_email.dart | 2 +- .../caffeine/widget_list_tile_caffeine.dart | 2 +- .../haptics/widget_list_tile_haptics.dart | 2 +- .../language/widget_list_tile_language.dart | 4 +-- .../widget_list_tile_volume_actions.dart | 2 +- .../buy_pro/widget_list_tile_buy_pro.dart | 2 +- .../widget_dialog_calibration.dart | 31 ++++++------------- .../widget_list_tile_calibration.dart | 2 +- .../widget_list_tile_camera_features.dart | 4 +-- .../widget_container_equipment_profile.dart | 18 +++++------ .../widget_dialog_equipment_profile_name.dart | 2 +- .../screen_equipment_profile.dart | 4 +-- .../widget_list_tile_equipment_profiles.dart | 2 +- .../films/widget_list_tile_films.dart | 4 +-- .../widget_list_tile_fractional_stops.dart | 4 +-- .../widget_list_tile_show_ev_100.dart | 2 +- .../dialog_filter/widget_dialog_filter.dart | 2 +- .../widget_list_tile_dynamic_color.dart | 2 +- .../widget_dialog_picker_primary_color.dart | 4 +-- .../widget_list_tile_primary_color.dart | 4 +-- .../widget_list_tile_theme_type.dart | 4 +-- .../widget_dialog_pro_features.dart | 2 +- .../ruler_slider/widget_slider_ruler.dart | 2 +- .../shared/sliver_screen/screen_sliver.dart | 2 +- 38 files changed, 70 insertions(+), 88 deletions(-) diff --git a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart index af0a488..24179ba 100644 --- a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart +++ b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart @@ -32,8 +32,8 @@ class MeteringBottomControls extends StatelessWidget { onPressed: onSwitchEvSourceType, icon: Icon( UserPreferencesProvider.evSourceTypeOf(context) != EvSourceType.camera - ? Icons.camera_rear - : Icons.wb_incandescent, + ? Icons.camera_rear_outlined + : Icons.wb_incandescent_outlined, ), tooltip: UserPreferencesProvider.evSourceTypeOf(context) != EvSourceType.camera ? S.of(context).tooltipUseCamera @@ -48,7 +48,7 @@ class MeteringBottomControls extends StatelessWidget { ), right: IconButton.filledTonal( onPressed: onSettings, - icon: const Icon(Icons.settings), + icon: const Icon(Icons.settings_outlined), tooltip: S.of(context).tooltipOpenSettings, ), ); diff --git a/lib/screens/metering/components/camera_container/components/camera_controls/components/exposure_offset_slider/widget_slider_exposure_offset.dart b/lib/screens/metering/components/camera_container/components/camera_controls/components/exposure_offset_slider/widget_slider_exposure_offset.dart index bd1e71c..0730b53 100644 --- a/lib/screens/metering/components/camera_container/components/camera_controls/components/exposure_offset_slider/widget_slider_exposure_offset.dart +++ b/lib/screens/metering/components/camera_container/components/camera_controls/components/exposure_offset_slider/widget_slider_exposure_offset.dart @@ -21,7 +21,7 @@ class ExposureOffsetSlider extends StatelessWidget { range: range, value: value, onChanged: onChanged, - icon: Icons.light_mode, + icon: Icons.light_mode_outlined, defaultValue: 0, rulerValueAdapter: (value) => value.toStringSignedAsFixed(0), valueAdapter: (value) => S.of(context).evValue(value.toStringSignedAsFixed(1)), diff --git a/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart b/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart index 80cd4bd..316d547 100644 --- a/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart +++ b/lib/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart @@ -32,7 +32,7 @@ class _ZoomSliderState extends State { range: widget.range, value: widget.value, onChanged: widget.onChanged, - icon: Icons.search, + icon: Icons.search_outlined, defaultValue: EquipmentProfiles.selectedOf(context).lensZoom, rulerValueAdapter: (value) => value.toStringAsFixed(0), valueAdapter: (value) => value.toZoom(), diff --git a/lib/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart b/lib/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart index cb4d76b..467a0b1 100644 --- a/lib/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart +++ b/lib/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart @@ -20,15 +20,12 @@ class CameraControlsPlaceholder extends StatelessWidget { children: [ IconButton( onPressed: onReset, - icon: Icon(error == CameraErrorType.permissionNotGranted ? Icons.settings : Icons.sync), + icon: Icon(error == CameraErrorType.permissionNotGranted ? Icons.settings_outlined : Icons.sync_outlined), ), const SizedBox(height: Dimens.grid8), Text( error.toStringLocalized(context), - style: Theme.of(context) - .textTheme - .bodyMedium - ?.copyWith(color: Theme.of(context).colorScheme.onBackground), + style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.onBackground), textAlign: TextAlign.center, ), ], diff --git a/lib/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart b/lib/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart index a2914d2..4da8417 100644 --- a/lib/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart +++ b/lib/screens/metering/components/camera_container/components/camera_preview/components/camera_view_placeholder/widget_placeholder_camera_view.dart @@ -12,7 +12,7 @@ class CameraViewPlaceholder extends StatelessWidget { return Card( color: error != null ? null : Colors.black, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(Dimens.borderRadiusM)), - child: Center(child: error != null ? const Icon(Icons.no_photography) : null), + child: Center(child: error != null ? const Icon(Icons.no_photography_outlined) : null), ); } } diff --git a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart index 2f2188d..415892d 100644 --- a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart +++ b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart @@ -19,7 +19,7 @@ class ExposurePairsList extends StatelessWidget { duration: Dimens.switchDuration, child: exposurePairs.isEmpty ? IconPlaceholder( - icon: Icons.not_interested, + icon: Icons.not_interested_outlined, text: S.of(context).noExposurePairs, ) : Stack( diff --git a/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart b/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart index adbe1d2..d82cdf4 100644 --- a/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart +++ b/lib/screens/metering/components/shared/readings_container/components/equipment_profile_picker/widget_picker_equipment_profiles.dart @@ -11,7 +11,7 @@ class EquipmentProfilePicker extends StatelessWidget { @override Widget build(BuildContext context) { return AnimatedDialogPicker( - icon: Icons.camera, + icon: Icons.camera_outlined, title: S.of(context).equipmentProfile, selectedValue: EquipmentProfiles.selectedOf(context), values: EquipmentProfiles.of(context), diff --git a/lib/screens/metering/components/shared/readings_container/components/film_picker/widget_picker_film.dart b/lib/screens/metering/components/shared/readings_container/components/film_picker/widget_picker_film.dart index 13a9366..6c6ccf1 100644 --- a/lib/screens/metering/components/shared/readings_container/components/film_picker/widget_picker_film.dart +++ b/lib/screens/metering/components/shared/readings_container/components/film_picker/widget_picker_film.dart @@ -13,7 +13,7 @@ class FilmPicker extends StatelessWidget { @override Widget build(BuildContext context) { return AnimatedDialogPicker( - icon: Icons.camera_roll, + icon: Icons.camera_roll_outlined, title: S.of(context).film, subtitle: S.of(context).filmReciprocityHint, selectedValue: Films.selectedOf(context), @@ -23,17 +23,14 @@ class FilmPicker extends StatelessWidget { closedChild: ReadingValueContainer.singleValue( value: ReadingValue( label: _label(context), - value: Films.selectedOf(context).name.isEmpty - ? S.of(context).none - : Films.selectedOf(context).name, + value: Films.selectedOf(context).name.isEmpty ? S.of(context).none : Films.selectedOf(context).name, ), ), ); } String _label(BuildContext context) { - if (Films.selectedOf(context) == const Film.other() || - Films.selectedOf(context).iso == selectedIso.value) { + if (Films.selectedOf(context) == const Film.other() || Films.selectedOf(context).iso == selectedIso.value) { return S.of(context).film; } diff --git a/lib/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart b/lib/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart index a85b30c..4eba200 100644 --- a/lib/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart +++ b/lib/screens/metering/components/shared/readings_container/components/iso_picker/widget_picker_iso.dart @@ -18,16 +18,15 @@ class IsoValuePicker extends StatelessWidget { @override Widget build(BuildContext context) { return AnimatedDialogPicker( - icon: Icons.iso, + icon: Icons.iso_outlined, title: S.of(context).iso, subtitle: S.of(context).filmSpeed, selectedValue: selectedValue, values: values, itemTitleBuilder: (_, value) => Text(value.value.toString()), // using ascending order, because increase in film speed rises EV - itemTrailingBuilder: (selected, value) => value.value != selected.value - ? Text(S.of(context).evValue(selected.toStringDifference(value))) - : null, + itemTrailingBuilder: (selected, value) => + value.value != selected.value ? Text(S.of(context).evValue(selected.toStringDifference(value))) : null, onChanged: onChanged, closedChild: ReadingValueContainer.singleValue( value: ReadingValue( diff --git a/lib/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart b/lib/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart index fdd8f0a..fa28bd4 100644 --- a/lib/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart +++ b/lib/screens/metering/components/shared/readings_container/components/nd_picker/widget_picker_nd.dart @@ -18,7 +18,7 @@ class NdValuePicker extends StatelessWidget { @override Widget build(BuildContext context) { return AnimatedDialogPicker( - icon: Icons.filter_b_and_w, + icon: Icons.filter_b_and_w_outlined, title: S.of(context).nd, subtitle: S.of(context).ndFilterFactor, selectedValue: selectedValue, diff --git a/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart b/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart index c35d5d6..771dc76 100644 --- a/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart +++ b/lib/screens/metering/components/shared/readings_container/components/shared/reading_value_container/widget_container_reading_value.dart @@ -60,7 +60,7 @@ class ReadingValueContainer extends StatelessWidget implements AnimatedDialogClo top: 0, right: 0, child: Icon( - Icons.lock, + Icons.lock_outlined, size: Theme.of(context).textTheme.labelMedium!.fontSize, color: Theme.of(context).colorScheme.onPrimaryContainer, ), diff --git a/lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart b/lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart index b737791..f7e4d44 100644 --- a/lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart +++ b/lib/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart @@ -9,7 +9,7 @@ class ReportIssueListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.bug_report), + leading: const Icon(Icons.bug_report_outlined), title: Text(S.of(context).reportIssue), onTap: () { launchUrl( diff --git a/lib/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart b/lib/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart index 8bbbdea..b07257e 100644 --- a/lib/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart +++ b/lib/screens/settings/components/about/components/restore_purchases/widget_list_tile_restore_purchases.dart @@ -8,7 +8,7 @@ class RestorePurchasesListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.restore), + leading: const Icon(Icons.restore_outlined), title: Text(S.of(context).restorePurchases), onTap: IAPProductsProvider.of(context).restorePurchases, ); diff --git a/lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart b/lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart index ad40ce5..cc63336 100644 --- a/lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart +++ b/lib/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart @@ -9,7 +9,7 @@ class SourceCodeListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.code), + leading: const Icon(Icons.code_outlined), title: Text(S.of(context).sourceCode), onTap: () { launchUrl( diff --git a/lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart b/lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart index 4d2ee30..aab959f 100644 --- a/lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart +++ b/lib/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart @@ -10,7 +10,7 @@ class WriteEmailListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.email), + leading: const Icon(Icons.email_outlined), title: Text(S.of(context).writeEmail), onTap: () { final mailToUrl = Uri.parse('mailto:$contactEmail?subject=M3 Lightmeter'); diff --git a/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart b/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart index ee0483d..502df78 100644 --- a/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart +++ b/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart @@ -12,7 +12,7 @@ class CaffeineListTile extends StatelessWidget { Widget build(BuildContext context) { return BlocBuilder( builder: (context, state) => SwitchListTile( - secondary: const Icon(Icons.screen_lock_portrait), + secondary: const Icon(Icons.screen_lock_portrait_outlined), title: Text(S.of(context).keepScreenOn), value: state, onChanged: context.read().onCaffeineChanged, diff --git a/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart b/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart index ec7ec60..e16d749 100644 --- a/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart +++ b/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart @@ -12,7 +12,7 @@ class HapticsListTile extends StatelessWidget { Widget build(BuildContext context) { return BlocBuilder( builder: (context, state) => SwitchListTile( - secondary: const Icon(Icons.vibration), + secondary: const Icon(Icons.vibration_outlined), title: Text(S.of(context).haptics), value: state, onChanged: context.read().onHapticsChanged, diff --git a/lib/screens/settings/components/general/components/language/widget_list_tile_language.dart b/lib/screens/settings/components/general/components/language/widget_list_tile_language.dart index eeaaf4c..14d8971 100644 --- a/lib/screens/settings/components/general/components/language/widget_list_tile_language.dart +++ b/lib/screens/settings/components/general/components/language/widget_list_tile_language.dart @@ -10,14 +10,14 @@ class LanguageListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.language), + leading: const Icon(Icons.language_outlined), title: Text(S.of(context).language), trailing: Text(UserPreferencesProvider.localeOf(context).localizedName), onTap: () { showDialog( context: context, builder: (_) => DialogPicker( - icon: Icons.language, + icon: Icons.language_outlined, title: S.of(context).chooseLanguage, selectedValue: UserPreferencesProvider.localeOf(context), values: SupportedLocale.values, diff --git a/lib/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart b/lib/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart index 0502b60..1bea42e 100644 --- a/lib/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart +++ b/lib/screens/settings/components/general/components/volume_actions/widget_list_tile_volume_actions.dart @@ -11,7 +11,7 @@ class VolumeActionsListTile extends StatelessWidget { Widget build(BuildContext context) { return BlocBuilder( builder: (context, state) => SwitchListTile( - secondary: const Icon(Icons.volume_up), + secondary: const Icon(Icons.volume_up_outlined), title: Text(S.of(context).volumeKeysAction), value: state, onChanged: context.read().onVolumeActionChanged, diff --git a/lib/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart b/lib/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart index 4bb401d..cc026a9 100644 --- a/lib/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart +++ b/lib/screens/settings/components/lightmeter_pro/components/buy_pro/widget_list_tile_buy_pro.dart @@ -12,7 +12,7 @@ class BuyProListTile extends StatelessWidget { final status = IAPProducts.productOf(context, IAPProductType.paidFeatures)?.status; final isPending = status == IAPProductStatus.purchased || status == null; return ListTile( - leading: const Icon(Icons.star), + leading: const Icon(Icons.star_outlined), title: Text(S.of(context).unlockProFeatures), onTap: !isPending ? () { diff --git a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart index 57b1316..639b79c 100644 --- a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart @@ -16,7 +16,7 @@ class CalibrationDialog extends StatelessWidget { Widget build(BuildContext context) { final bool hasLightSensor = ServicesProvider.of(context).environment.hasLightSensor; return AlertDialog( - icon: const Icon(Icons.settings_brightness), + icon: const Icon(Icons.settings_brightness_outlined), titlePadding: Dimens.dialogIconTitlePadding, title: Text(S.of(context).calibration), contentPadding: const EdgeInsets.symmetric(horizontal: Dimens.paddingL), @@ -25,38 +25,27 @@ class CalibrationDialog extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - hasLightSensor - ? S.of(context).calibrationMessage - : S.of(context).calibrationMessageCameraOnly, + hasLightSensor ? S.of(context).calibrationMessage : S.of(context).calibrationMessageCameraOnly, ), const SizedBox(height: Dimens.grid16), BlocBuilder( - buildWhen: (previous, current) => - previous.cameraEvCalibration != current.cameraEvCalibration, + buildWhen: (previous, current) => previous.cameraEvCalibration != current.cameraEvCalibration, builder: (context, state) => _CalibrationUnit( title: S.of(context).camera, value: state.cameraEvCalibration, - onChanged: (value) => context - .read() - .add(CameraEvCalibrationChangedEvent(value)), - onReset: () => context - .read() - .add(const CameraEvCalibrationResetEvent()), + onChanged: (value) => context.read().add(CameraEvCalibrationChangedEvent(value)), + onReset: () => context.read().add(const CameraEvCalibrationResetEvent()), ), ), if (hasLightSensor) BlocBuilder( - buildWhen: (previous, current) => - previous.lightSensorEvCalibration != current.lightSensorEvCalibration, + buildWhen: (previous, current) => previous.lightSensorEvCalibration != current.lightSensorEvCalibration, builder: (context, state) => _CalibrationUnit( title: S.of(context).lightSensor, value: state.lightSensorEvCalibration, - onChanged: (value) => context - .read() - .add(LightSensorEvCalibrationChangedEvent(value)), - onReset: () => context - .read() - .add(const LightSensorEvCalibrationResetEvent()), + onChanged: (value) => + context.read().add(LightSensorEvCalibrationChangedEvent(value)), + onReset: () => context.read().add(const LightSensorEvCalibrationResetEvent()), ), ), ], @@ -116,7 +105,7 @@ class _CalibrationUnit extends StatelessWidget { ), IconButton( onPressed: onReset, - icon: const Icon(Icons.sync), + icon: const Icon(Icons.sync_outlined), tooltip: S.of(context).tooltipResetToZero, ), ], diff --git a/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart b/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart index 61690c4..617d2e5 100644 --- a/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart @@ -9,7 +9,7 @@ class CalibrationListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.settings_brightness), + leading: const Icon(Icons.settings_brightness_outlined), title: Text(S.of(context).calibration), onTap: () { showDialog( diff --git a/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart b/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart index 1446be3..c779912 100644 --- a/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart +++ b/lib/screens/settings/components/metering/components/camera_features/widget_list_tile_camera_features.dart @@ -11,13 +11,13 @@ class CameraFeaturesListTile extends StatelessWidget { @override Widget build(BuildContext context) { return IAPListTile( - leading: const Icon(Icons.camera_alt), + leading: const Icon(Icons.camera_alt_outlined), title: Text(S.of(context).cameraFeatures), onTap: () { showDialog( context: context, builder: (_) => DialogSwitch( - icon: Icons.layers_outlined, + icon: Icons.camera_alt_outlined, title: S.of(context).cameraFeatures, values: UserPreferencesProvider.cameraConfigOf(context), titleAdapter: (context, feature) { diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart index 8504c67..72ba238 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart @@ -171,7 +171,7 @@ class _AnimatedNameLeading extends AnimatedWidget { return Padding( padding: EdgeInsets.only(right: _progress.value * Dimens.grid8), child: Icon( - Icons.edit, + Icons.edit_outlined, size: _progress.value * Dimens.grid24, ), ); @@ -194,7 +194,7 @@ class _AnimatedArrowButton extends AnimatedWidget { onPressed: onPressed, icon: Transform.rotate( angle: _progress.value * pi, - child: const Icon(Icons.keyboard_arrow_down), + child: const Icon(Icons.keyboard_arrow_down_outlined), ), tooltip: _progress.value == 0 ? S.of(context).tooltipExpand : S.of(context).tooltipCollapse, ); @@ -239,7 +239,7 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { child: Column( children: [ FilterListTile( - icon: Icons.iso, + icon: Icons.iso_outlined, title: S.of(context).isoValues, description: S.of(context).isoValuesFilterDescription, values: IsoValue.values, @@ -247,7 +247,7 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { onChanged: onIsoValuesSelecred, ), FilterListTile( - icon: Icons.filter_b_and_w, + icon: Icons.filter_b_and_w_outlined, title: S.of(context).ndFilters, description: S.of(context).ndFiltersFilterDescription, values: NdValue.values, @@ -255,7 +255,7 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { onChanged: onNdValuesSelected, ), RangePickerListTile( - icon: Icons.camera, + icon: Icons.camera_outlined, title: S.of(context).apertureValues, description: S.of(context).apertureValuesFilterDescription, values: ApertureValue.values, @@ -263,7 +263,7 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { onChanged: onApertureValuesSelected, ), RangePickerListTile( - icon: Icons.shutter_speed, + icon: Icons.shutter_speed_outlined, title: S.of(context).shutterSpeedValues, description: S.of(context).shutterSpeedValuesFilterDescription, values: ShutterSpeedValue.values, @@ -275,7 +275,7 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { value.value == 1 ? S.of(context).shutterSpeedManual : value.toString(), ), SliderPickerListTile( - icon: Icons.zoom_in, + icon: Icons.zoom_in_outlined, title: S.of(context).lensZoom, description: S.of(context).lensZoomDescription, value: equipmentData.lensZoom, @@ -291,12 +291,12 @@ class _AnimatedEquipmentListTiles extends AnimatedWidget { children: [ IconButton( onPressed: onCopy, - icon: const Icon(Icons.copy), + icon: const Icon(Icons.copy_outlined), tooltip: S.of(context).tooltipCopy, ), IconButton( onPressed: onDelete, - icon: const Icon(Icons.delete), + icon: const Icon(Icons.delete_outlined), tooltip: S.of(context).tooltipDelete, ), ], diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart index e3014ac..fa6556b 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart @@ -23,7 +23,7 @@ class _EquipmentProfileNameDialogState extends State @override Widget build(BuildContext context) { return AlertDialog( - icon: const Icon(Icons.edit), + icon: const Icon(Icons.edit_outlined), titlePadding: Dimens.dialogIconTitlePadding, title: Text(S.of(context).equipmentProfileName), content: TextField( diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart index 9f3cf5a..b07b767 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart @@ -32,7 +32,7 @@ class _EquipmentProfilesScreenState extends State { appBarActions: [ IconButton( onPressed: _addProfile, - icon: const Icon(Icons.add), + icon: const Icon(Icons.add_outlined), tooltip: S.of(context).tooltipAdd, ), ], @@ -150,7 +150,7 @@ class _EquipmentProfilesListPlaceholder extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(Dimens.paddingL), child: IconPlaceholder( - icon: Icons.add, + icon: Icons.add_outlined, text: S.of(context).tapToAdd, ), ), diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart index 740918f..610dd59 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart @@ -10,7 +10,7 @@ class EquipmentProfilesListTile extends StatelessWidget { @override Widget build(BuildContext context) { return IAPListTile( - leading: const Icon(Icons.camera), + leading: const Icon(Icons.camera_outlined), title: Text(S.of(context).equipmentProfiles), onTap: () { Navigator.of(context).push( diff --git a/lib/screens/settings/components/metering/components/films/widget_list_tile_films.dart b/lib/screens/settings/components/metering/components/films/widget_list_tile_films.dart index 72ff433..4eaf017 100644 --- a/lib/screens/settings/components/metering/components/films/widget_list_tile_films.dart +++ b/lib/screens/settings/components/metering/components/films/widget_list_tile_films.dart @@ -11,13 +11,13 @@ class FilmsListTile extends StatelessWidget { @override Widget build(BuildContext context) { return IAPListTile( - leading: const Icon(Icons.camera_roll), + leading: const Icon(Icons.camera_roll_outlined), title: Text(S.of(context).filmsInUse), onTap: () { showDialog>( context: context, builder: (_) => DialogFilter( - icon: const Icon(Icons.camera_roll), + icon: const Icon(Icons.camera_roll_outlined), title: S.of(context).filmsInUse, description: S.of(context).filmsInUseDescription, values: Films.of(context).sublist(1), diff --git a/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart b/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart index e8b99d1..90ab875 100644 --- a/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart +++ b/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart @@ -10,14 +10,14 @@ class StopTypeListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.straighten), + leading: const Icon(Icons.straighten_outlined), title: Text(S.of(context).fractionalStops), trailing: Text(_typeToString(context, UserPreferencesProvider.stopTypeOf(context))), onTap: () { showDialog( context: context, builder: (_) => DialogPicker( - icon: Icons.straighten, + icon: Icons.straighten_outlined, title: S.of(context).showFractionalStops, selectedValue: UserPreferencesProvider.stopTypeOf(context), values: StopType.values, diff --git a/lib/screens/settings/components/metering/components/show_ev_100/widget_list_tile_show_ev_100.dart b/lib/screens/settings/components/metering/components/show_ev_100/widget_list_tile_show_ev_100.dart index a92623e..e0701f4 100644 --- a/lib/screens/settings/components/metering/components/show_ev_100/widget_list_tile_show_ev_100.dart +++ b/lib/screens/settings/components/metering/components/show_ev_100/widget_list_tile_show_ev_100.dart @@ -13,7 +13,7 @@ class ShowEv100ListTile extends StatelessWidget { return Disable( disable: !context.isPro, child: SwitchListTile( - secondary: const Icon(Icons.adjust), + secondary: const Icon(Icons.adjust_outlined), title: Text(S.of(context).showEv100), value: context.isPro && UserPreferencesProvider.showEv100Of(context), onChanged: (_) => UserPreferencesProvider.of(context).toggleShowEv100(), diff --git a/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart b/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart index 374c8d7..7294505 100644 --- a/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart +++ b/lib/screens/settings/components/shared/dialog_filter/widget_dialog_filter.dart @@ -109,7 +109,7 @@ class _DialogFilterState extends State> { width: 40, child: IconButton( padding: EdgeInsets.zero, - icon: Icon(_hasAnyUnselected ? Icons.select_all : Icons.deselect), + icon: Icon(_hasAnyUnselected ? Icons.select_all_outlined : Icons.deselect_outlined), onPressed: _toggleAll, tooltip: _hasAnyUnselected ? S.of(context).tooltipSelectAll : S.of(context).tooltipDesecelectAll, ), diff --git a/lib/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart b/lib/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart index 6fc5a6c..3b6ab72 100644 --- a/lib/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart +++ b/lib/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart @@ -10,7 +10,7 @@ class DynamicColorListTile extends StatelessWidget { @override Widget build(BuildContext context) { return SwitchListTile( - secondary: const Icon(Icons.colorize), + secondary: const Icon(Icons.colorize_outlined), title: Text(S.of(context).dynamicColor), value: UserPreferencesProvider.dynamicColorStateOf(context) == DynamicColorState.enabled, onChanged: UserPreferencesProvider.of(context).enableDynamicColor, diff --git a/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart b/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart index 380faa1..be9e8ad 100644 --- a/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart +++ b/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart @@ -24,7 +24,7 @@ class _PrimaryColorDialogPickerState extends State { @override Widget build(BuildContext context) { return AlertDialog( - icon: const Icon(Icons.palette), + icon: const Icon(Icons.palette_outlined), titlePadding: Dimens.dialogIconTitlePadding, title: Text(S.of(context).choosePrimaryColor), content: SizedBox( @@ -124,7 +124,7 @@ class _SelectableColorItemState extends State<_SelectableColorItem> { duration: Dimens.durationS, child: widget.selected ? Icon( - Icons.check, + Icons.check_outlined, color: ThemeData.estimateBrightnessForColor(widget.color) == Brightness.light ? Colors.black : Colors.white, diff --git a/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart b/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart index 1cf8762..6560d4c 100644 --- a/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart +++ b/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart @@ -13,13 +13,13 @@ class PrimaryColorListTile extends StatelessWidget { if (UserPreferencesProvider.dynamicColorStateOf(context) == DynamicColorState.enabled) { return Disable( child: ListTile( - leading: const Icon(Icons.palette), + leading: const Icon(Icons.palette_outlined), title: Text(S.of(context).primaryColor), ), ); } return ListTile( - leading: const Icon(Icons.palette), + leading: const Icon(Icons.palette_outlined), title: Text(S.of(context).primaryColor), onTap: () { showDialog( diff --git a/lib/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart b/lib/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart index cfcd694..a74464c 100644 --- a/lib/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart +++ b/lib/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart @@ -10,14 +10,14 @@ class ThemeTypeListTile extends StatelessWidget { @override Widget build(BuildContext context) { return ListTile( - leading: const Icon(Icons.brightness_6), + leading: const Icon(Icons.brightness_6_outlined), title: Text(S.of(context).theme), trailing: Text(_typeToString(context, UserPreferencesProvider.themeTypeOf(context))), onTap: () { showDialog( context: context, builder: (_) => DialogPicker( - icon: Icons.brightness_6, + icon: Icons.brightness_6_outlined, title: S.of(context).chooseTheme, selectedValue: UserPreferencesProvider.themeTypeOf(context), values: ThemeType.values, diff --git a/lib/screens/shared/pro_features_dialog/widget_dialog_pro_features.dart b/lib/screens/shared/pro_features_dialog/widget_dialog_pro_features.dart index 3b8d4f2..cdf76b0 100644 --- a/lib/screens/shared/pro_features_dialog/widget_dialog_pro_features.dart +++ b/lib/screens/shared/pro_features_dialog/widget_dialog_pro_features.dart @@ -24,7 +24,7 @@ class ProFeaturesDialog extends StatelessWidget { @override Widget build(BuildContext context) { return TransparentDialog( - icon: Icons.star, + icon: Icons.star_outlined, title: S.of(context).proFeatures, scrollableContent: false, content: Flexible( diff --git a/lib/screens/shared/ruler_slider/widget_slider_ruler.dart b/lib/screens/shared/ruler_slider/widget_slider_ruler.dart index 422d4c9..77b4dce 100644 --- a/lib/screens/shared/ruler_slider/widget_slider_ruler.dart +++ b/lib/screens/shared/ruler_slider/widget_slider_ruler.dart @@ -53,7 +53,7 @@ class RulerSlider extends StatelessWidget { ), ), IconButton( - icon: const Icon(Icons.sync), + icon: const Icon(Icons.sync_outlined), onPressed: value != defaultValue ? () => onChanged(defaultValue) : null, tooltip: S.of(context).tooltipResetToZero, ), diff --git a/lib/screens/shared/sliver_screen/screen_sliver.dart b/lib/screens/shared/sliver_screen/screen_sliver.dart index 97ed830..4c69457 100644 --- a/lib/screens/shared/sliver_screen/screen_sliver.dart +++ b/lib/screens/shared/sliver_screen/screen_sliver.dart @@ -42,7 +42,7 @@ class SliverScreen extends StatelessWidget { if (Navigator.of(context).canPop()) IconButton( onPressed: Navigator.of(context).pop, - icon: const Icon(Icons.close), + icon: const Icon(Icons.close_outlined), tooltip: S.of(context).tooltipClose, ), ],