Merge branch 'dev'

Author: Clon1998

lib/data/dto/machine/printer.dart

@@ -61,7 +61,6 @@ class PrinterBuilder {
 
   Printer build() {
     if (toolhead == null ||
-        heaterBed == null ||
         printFan == null ||
         gCodeMove == null ||
         motionReport == null ||
@@ -74,7 +73,7 @@ class PrinterBuilder {
     var printer = Printer(
         toolhead: toolhead!,
         extruders: extruders,
-        heaterBed: heaterBed!,
+        heaterBed: heaterBed,
         printFan: printFan!,
         gCodeMove: gCodeMove!,
         motionReport: motionReport!,
@@ -100,7 +99,7 @@ class Printer with _$Printer {
   const factory Printer({
     required Toolhead toolhead,
     required List<Extruder> extruders,
-    required HeaterBed heaterBed,
+    required HeaterBed? heaterBed,
     required PrintFan printFan,
     required GCodeMove gCodeMove,
     required MotionReport motionReport,

lib/service/moonraker/klippy_service.dart

@@ -35,10 +35,6 @@ KlippyService klipperServiceSelected(
 @riverpod
 Stream<KlipperInstance> klipperSelected(
     KlipperSelectedRef ref) async* {
-  ref.listenSelf((previous, next) {
-
-    logger.wtf('-- B: $previous -> $next');
-  });
   try {
     var machine = await ref.watchWhereNotNull(selectedMachineProvider);
     StreamController<KlipperInstance> sc = StreamController<KlipperInstance>();
@@ -79,7 +75,6 @@ class KlippyService {
 
     ref.listen(jrpcClientStateProvider(ownerUUID), (previous, next) {
       var data = next as AsyncValue<ClientState>;
-      logger.wtf('-- Is Refreshing $data');
       switch (data.valueOrFullNull) {
         case ClientState.connected:
           _onJrpcConnected();

lib/service/moonraker/printer_service.dart

@@ -212,8 +212,13 @@ class PrinterService {
       _printerStreamCtler.addError(MobilerakerException(
           'Could not fetch printer...',
           parentException: e,
-          parentStack: s));
+          parentStack: s), s);
+    } on Exception catch (e,s) {
+      logger.e('Unexpected exception thrown during refresh $ownerUUID...', e, s);
+      _showExceptionSnackbar(e, s);
+      _printerStreamCtler.addError(e,s);
     }
+
   }
 
   resumePrint() {

lib/ui/components/connection/connection_state_view.dart

@@ -95,7 +95,6 @@ class WebSocketState extends HookConsumerWidget {
       data: (ClientState clientState) {
         switch (clientState) {
           case ClientState.connected:
-            logger.w('--NIW: $clientType connectaed');
             return KlippyState(
               onConnected: onConnected,
             );
@@ -199,7 +198,6 @@ class KlippyState extends ConsumerWidget {
     }
 
     var watch = ref.watch(klipperSelectedProvider);
-    logger.wtf('--GOt ${watch.valueOrNull?.klippyState}, isReloading ${watch.isReloading},isRefreshing ${watch.isRefreshing}, isLoading ${watch.isLoading},');
     return AsyncValueWidget<KlipperInstance>(
       value: watch,
       data: (data) {

lib/ui/components/dialog/edit_form/num_edit_form_dialog.dart

@@ -103,7 +103,7 @@ class _FormEditDialog extends HookConsumerWidget {
                             .switchToOtherVariant
                         : null,
                     color: isValid.value
-                        ? themeData.textTheme.caption?.color
+                        ? themeData.textTheme.bodySmall?.color
                         : themeData.disabledColor,
                     iconSize: 18,
                     icon: AnimatedSwitcher(

lib/ui/components/dialog/exclude_object/exclude_object_dialog.dart

@@ -292,7 +292,7 @@ class ExcludeObjectPainter extends CustomPainter {
   void drawNoDataText(Canvas canvas, double maxX, double maxY) {
     TextSpan span = TextSpan(
       text: 'dialogs.exclude_object.no_visualization'.tr(),
-      style: Theme.of(context).textTheme.headline4,
+      style: Theme.of(context).textTheme.headlineMedium,
     );
     TextPainter tp = TextPainter(
         text: span,

lib/ui/components/drawer/nav_drawer_view.dart

@@ -206,7 +206,7 @@ class _NavHeader extends ConsumerWidget {
                                         machine.httpUrl),
                                 maxLines: 1,
                                 overflow: TextOverflow.ellipsis,
-                                style: themeData.textTheme.subtitle2
+                                style: themeData.textTheme.titleSmall
                                     ?.copyWith(color: onBackground),
                               ),
                             ],

lib/ui/components/power_api_panel.dart

@@ -82,7 +82,7 @@ class _PowerDeviceCard extends ConsumerWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(beautifyName(powerDevice.name),
-                  style: Theme.of(context).textTheme.caption),
+                  style: Theme.of(context).textTheme.bodySmall),
               Text(powerDevice.status.name.capitalize,
                   style: Theme.of(context).textTheme.headlineSmall),
             ],

lib/ui/screens/console/console_page.dart

@@ -80,7 +80,7 @@ class _ConsoleBody extends HookConsumerWidget {
               padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 3),
               child: Text(
                 'GCode Console',
-                style: theme.textTheme.subtitle1
+                style: theme.textTheme.titleMedium
                     ?.copyWith(color: theme.colorScheme.onPrimary),
               ),
             ),
@@ -238,7 +238,7 @@ class _Console extends ConsumerWidget {
         textStyle = theme.textTheme.bodyText1!;
         break;
       case ListTileStyle.list:
-        textStyle = theme.textTheme.subtitle1!;
+        textStyle = theme.textTheme.titleMedium!;
         break;
     }
 

lib/ui/screens/dashboard/tabs/control_tab.dart

@@ -268,7 +268,7 @@ class _FanCard extends StatelessWidget {
                   children: [
                     Text(
                       name,
-                      style: Theme.of(context).textTheme.caption,
+                      style: Theme.of(context).textTheme.bodySmall,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
@@ -693,7 +693,7 @@ class _PinTile extends ConsumerWidget {
                 children: [
                   Text(
                     beautifiedName,
-                    style: textTheme.caption,
+                    style: textTheme.bodySmall,
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
                   ),
@@ -722,7 +722,7 @@ class _PinTile extends ConsumerWidget {
               children: [
                 Text(
                   beautifiedName,
-                  style: textTheme.caption,
+                  style: textTheme.bodySmall,
                   maxLines: 1,
                   overflow: TextOverflow.ellipsis,
                 ),
@@ -859,7 +859,7 @@ class _Led extends ConsumerWidget {
                   children: [
                     Text(
                       beautifiedName,
-                      style: textTheme.caption,
+                      style: textTheme.bodySmall,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),