fix: multimeter layout fixes

Author: AsCress

lib/l10n/app_localizations_en.dart

@@ -1058,6 +1058,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get temperatureSensorUnavailableMessage =>
       'Ambient temperature sensor is not available on this device';
 
+  @override
   String get sharingMessage => 'Sharing PSLab Data';
 
   @override

lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:provider/provider.dart';
 import 'package:pslab/l10n/app_localizations.dart';
 import 'package:pslab/providers/board_state_provider.dart';
@@ -46,39 +47,44 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     _preCacheImages(context);
-    return MaterialApp(
-      debugShowCheckedModeBanner: false,
+    return ScreenUtilInit(
+      designSize: const Size(360, 690),
       builder: (context, child) {
-        registerAppLocalizations(AppLocalizations.of(context)!);
-        getIt<BoardStateProvider>().initialize();
-        return child!;
-      },
-      theme: AppTheme.lightTheme,
-      darkTheme: AppTheme.darkTheme,
-      themeMode: ThemeMode.system,
-      localizationsDelegates: AppLocalizations.localizationsDelegates,
-      supportedLocales: AppLocalizations.supportedLocales,
-      initialRoute: '/',
-      routes: {
-        '/': (context) => const InstrumentsScreen(),
-        '/oscilloscope': (context) => const OscilloscopeScreen(),
-        '/multimeter': (context) => const MultimeterScreen(),
-        '/waveGenerator': (context) => const WaveGeneratorScreen(),
-        '/logicAnalyzer': (context) => const LogicAnalyzerScreen(),
-        '/powerSource': (context) => const PowerSourceScreen(),
-        '/connectDevice': (context) => const ConnectDeviceScreen(),
-        '/faq': (context) => FAQScreen(),
-        '/settings': (context) => const SettingsScreen(),
-        '/aboutUs': (context) => const AboutUsScreen(),
-        '/softwareLicenses': (context) => SoftwareLicensesScreen(),
-        '/accelerometer': (context) => const AccelerometerScreen(),
-        '/gyroscope': (context) => const GyroscopeScreen(),
-        '/roboticArm': (context) => const RoboticArmScreen(),
-        '/luxmeter': (context) => const LuxMeterScreen(),
-        '/barometer': (context) => const BarometerScreen(),
-        '/soundmeter': (context) => const SoundMeterScreen(),
-        '/thermometer': (context) => const ThermometerScreen(),
-        '/sensors': (context) => const SensorsScreen()
+        return MaterialApp(
+          debugShowCheckedModeBanner: false,
+          builder: (context, child) {
+            registerAppLocalizations(AppLocalizations.of(context)!);
+            getIt<BoardStateProvider>().initialize();
+            return child!;
+          },
+          theme: AppTheme.lightTheme,
+          darkTheme: AppTheme.darkTheme,
+          themeMode: ThemeMode.system,
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          initialRoute: '/',
+          routes: {
+            '/': (context) => const InstrumentsScreen(),
+            '/oscilloscope': (context) => const OscilloscopeScreen(),
+            '/multimeter': (context) => const MultimeterScreen(),
+            '/waveGenerator': (context) => const WaveGeneratorScreen(),
+            '/logicAnalyzer': (context) => const LogicAnalyzerScreen(),
+            '/powerSource': (context) => const PowerSourceScreen(),
+            '/connectDevice': (context) => const ConnectDeviceScreen(),
+            '/faq': (context) => FAQScreen(),
+            '/settings': (context) => const SettingsScreen(),
+            '/aboutUs': (context) => const AboutUsScreen(),
+            '/softwareLicenses': (context) => SoftwareLicensesScreen(),
+            '/accelerometer': (context) => const AccelerometerScreen(),
+            '/gyroscope': (context) => const GyroscopeScreen(),
+            '/roboticArm': (context) => const RoboticArmScreen(),
+            '/luxmeter': (context) => const LuxMeterScreen(),
+            '/barometer': (context) => const BarometerScreen(),
+            '/soundmeter': (context) => const SoundMeterScreen(),
+            '/thermometer': (context) => const ThermometerScreen(),
+            '/sensors': (context) => const SensorsScreen()
+          },
+        );
       },
     );
   }

lib/view/multimeter_screen.dart

@@ -194,7 +194,16 @@ class _MultimeterScreenState extends State<MultimeterScreen> {
                             ),
                           ],
                         ),
-                        MultimeterKnob(),
+                        Positioned(
+                          left: 0,
+                          top: 0,
+                          right: 0,
+                          bottom: 0,
+                          child: Align(
+                            alignment: Alignment.center,
+                            child: MultimeterKnob(),
+                          ),
+                        ),
                       ],
                     ),
                   ),

lib/view/widgets/multimeter_knob.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:provider/provider.dart';
 import 'package:pslab/l10n/app_localizations.dart';
 import 'package:pslab/providers/locator.dart';
@@ -247,8 +248,9 @@ class _MultimeterKnobState extends State<MultimeterKnob> {
       children: [
         CustomPaint(
           painter: InnerDialFillPainter(),
-          child: Container(
-            width: 300,
+          child: SizedBox(
+            width: 300.w,
+            height: 300.h,
           ),
         ),
         GestureDetector(
@@ -267,17 +269,18 @@ class _MultimeterKnobState extends State<MultimeterKnob> {
               color: pointerColor,
             ),
             child: SizedBox(
-              width: 430,
-              height: 450,
+              width: 360.w,
+              height: 360.h,
             ),
           ),
         ),
         IgnorePointer(
           ignoring: true,
           child: CustomPaint(
             painter: InnerDialPainter(),
-            child: Container(
-              width: 300,
+            child: SizedBox(
+              height: 300.h,
+              width: 300.w,
             ),
           ),
         ),
@@ -287,11 +290,7 @@ class _MultimeterKnobState extends State<MultimeterKnob> {
             painter: RadialLabelPainter(
               labels: knobMarker,
               labelColors: knobLabelColors,
-              radius: 112,
-            ),
-            child: SizedBox(
-              width: 430,
-              height: 450,
+              radius: 112.r,
             ),
           ),
         )

pubspec.yaml

@@ -68,6 +68,7 @@ dependencies:
   share_plus: ^11.0.0
   path_provider: ^2.1.5
   file_picker: ^10.2.4
+  flutter_screenutil: ^5.9.3
 
 
 dev_dependencies: