From 02e5fc582cd96d5ddded1eec5c4364d0c7dde36c Mon Sep 17 00:00:00 2001 From: Vadim <44135514+vodemn@users.noreply.github.com> Date: Fri, 20 Jan 2023 23:39:01 +0300 Subject: [PATCH] Removed source-swap button --- .../components/widget_button_secondary.dart | 18 ++++++++++-------- .../widget_bottom_controls.dart | 15 ++++++--------- lib/screens/metering/screen_metering.dart | 1 - 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lib/screens/metering/components/bottom_controls/components/widget_button_secondary.dart b/lib/screens/metering/components/bottom_controls/components/widget_button_secondary.dart index 070d2de..e161bb6 100644 --- a/lib/screens/metering/components/bottom_controls/components/widget_button_secondary.dart +++ b/lib/screens/metering/components/bottom_controls/components/widget_button_secondary.dart @@ -14,14 +14,16 @@ class MeteringSecondaryButton extends StatelessWidget { @override Widget build(BuildContext context) { - return FilledCircle( - color: Theme.of(context).colorScheme.surfaceVariant, - size: 48, - child: Center( - child: IconButton( - onPressed: onPressed, - color: Theme.of(context).colorScheme.onSurface, - icon: Icon(icon), + return Center( + child: FilledCircle( + color: Theme.of(context).colorScheme.surfaceVariant, + size: 48, + child: Center( + child: IconButton( + onPressed: onPressed, + color: Theme.of(context).colorScheme.onSurface, + icon: Icon(icon), + ), ), ), ); 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 1eeb1c7..3bf00e3 100644 --- a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart +++ b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart @@ -5,12 +5,10 @@ import 'components/widget_button_measure.dart'; import 'components/widget_button_secondary.dart'; class MeteringBottomControls extends StatelessWidget { - final VoidCallback onSourceChanged; final VoidCallback onMeasure; final VoidCallback onSettings; const MeteringBottomControls({ - required this.onSourceChanged, required this.onMeasure, required this.onSettings, super.key, @@ -32,16 +30,15 @@ class MeteringBottomControls extends StatelessWidget { child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - MeteringSecondaryButton( - onPressed: onSourceChanged, - icon: Icons.flip_camera_android, - ), + const Spacer(), MeteringMeasureButton( onTap: onMeasure, ), - MeteringSecondaryButton( - onPressed: onSettings, - icon: Icons.settings, + Expanded( + child: MeteringSecondaryButton( + onPressed: onSettings, + icon: Icons.settings, + ), ), ], ), diff --git a/lib/screens/metering/screen_metering.dart b/lib/screens/metering/screen_metering.dart index 477878a..d50cb6d 100644 --- a/lib/screens/metering/screen_metering.dart +++ b/lib/screens/metering/screen_metering.dart @@ -86,7 +86,6 @@ class _MeteringScreenState extends State { ), ), MeteringBottomControls( - onSourceChanged: () {}, onMeasure: () => context.read().add(const MeasureEvent()), onSettings: () { Navigator.push(context, MaterialPageRoute(builder: (context) => const SettingsScreen()));