File detail view now works if parameters are missing

If no image or some gcode-meta attributes are missing the file detail view didnt work properly. Fixed that by centering the no image Icon and adding null value checks + defaults.

Author: Clon1998

lib/ui/views/files/details/file_details_view.dart

@@ -1,8 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:mobileraker/dto/files/gcode_file.dart';
 import 'package:mobileraker/ui/views/files/details/file_details_viewmodel.dart';
@@ -84,7 +82,8 @@ class FileDetailView extends ViewModelBuilderWidget<FileDetailsViewModel> {
                   placeholder: (context, url) => Icon(Icons.insert_drive_file),
                   errorWidget: (context, url, error) => Column(
                     children: [
-                      Icon(Icons.file_present),
+
+                      Expanded(child: Icon(Icons.file_present)),
                       Container(
                           width: double.infinity,
                           padding:
@@ -156,7 +155,7 @@ class FileDetailView extends ViewModelBuilderWidget<FileDetailsViewModel> {
                     ),
                     PropertyTile(
                       title: 'pages.files.details.meta_card.slicer'.tr(),
-                      subtitle: '${file.slicer} (v${file.slicerVersion})',
+                      subtitle: model.usedSlicerAndVersion,
                     ),
                     PropertyTile(
                       title: 'pages.files.details.meta_card.layer_higher'.tr(),

lib/ui/views/files/details/file_details_viewmodel.dart

@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:intl/intl.dart';
 import 'package:mobileraker/app/app_setup.locator.dart';
 import 'package:mobileraker/app/app_setup.logger.dart';
@@ -35,14 +36,13 @@ class FileDetailsViewModel extends MultipleStreamViewModel {
   FileDetailsViewModel(this._file);
 
   @override
-  Map<String, StreamData> get streamsMap =>
-      {
+  Map<String, StreamData> get streamsMap => {
         if (_printerService != null)
           _PrinterStreamKey:
-          StreamData<Printer>(_printerService!.printerStream),
+              StreamData<Printer>(_printerService!.printerStream),
         if (_klippyService != null)
           _ServerStreamKey:
-          StreamData<KlipperInstance>(_klippyService!.klipperStream),
+              StreamData<KlipperInstance>(_klippyService!.klipperStream),
       };
 
   bool get isServerAvailable => dataReady(_ServerStreamKey);
@@ -84,12 +84,20 @@ class FileDetailsViewModel extends MultipleStreamViewModel {
   }
 
   String get potentialEta {
+    if (_file.estimatedTime == null) return tr('general.unknown');
     var eta = DateTime.now()
         .add(Duration(seconds: _file.estimatedTime!.toInt()))
         .toLocal();
     return DateFormat.MMMEd().add_Hm().format(eta);
   }
 
+  String get usedSlicerAndVersion {
+    String ukwn = tr('general.unknown');
+    if (_file.slicerVersion == null) return _file.slicer ?? ukwn;
+
+    return '${_file.slicer ?? ukwn} (v${_file.slicerVersion})';
+  }
+
   bool get preHeatAvailable => _file.firstLayerTempBed != null;
 
   void preHeatPrinter() {
@@ -106,9 +114,10 @@ class FileDetailsViewModel extends MultipleStreamViewModel {
         _printerService?.setTemperature('extruder', 170);
         _printerService?.setTemperature(
             'heater_bed', (_file.firstLayerTempBed ?? 60.0).toInt());
-        _snackBarService.showSnackbar(title: 'Confirmed',
-            message: 'Preheating Extruder: 170°C, Bed: ${_file.firstLayerTempBed
-                ?.toStringAsFixed(0)}°C');
+        _snackBarService.showSnackbar(
+            title: 'Confirmed',
+            message:
+                'Preheating Extruder: 170°C, Bed: ${_file.firstLayerTempBed?.toStringAsFixed(0)}°C');
       }
     });
   }

lib/ui/views/files/files_view.dart

@@ -1,7 +1,6 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:mobileraker/app/app_setup.router.dart';
@@ -27,7 +26,7 @@ class FilesView extends ViewModelBuilderWidget<FilesViewModel> {
         appBar: buildAppBar(context, model),
         drawer: NavigationDrawerWidget(curPath: Routes.filesView),
         body: ConnectionStateView(
-          pChild: buildBody(context, model),
+          body: buildBody(context, model),
         ),
       ),
     );

lib/ui/views/files/files_viewmodel.dart

@@ -201,12 +201,14 @@ class FilesViewModel extends MultipleStreamViewModel {
     String queryTerm = searchEditingController.text.toLowerCase();
 
     if (queryTerm.isNotEmpty && isSearching) {
+      List<String> terms = queryTerm.split(RegExp('\\W+'));
+      RegExp regExp = RegExp(terms.where((element) => element.isNotEmpty).join("|"));
       folders = folders
-          .where((element) => element.name.toLowerCase().contains(queryTerm))
+          .where((element) => element.name.toLowerCase().contains(regExp))
           .toList(growable: false);
 
       files = files
-          .where((element) => element.name.toLowerCase().contains(queryTerm))
+          .where((element) => element.name.toLowerCase().contains(regExp))
           .toList(growable: false);
     }
     var folderComparator = folderComparators[selectedSorting];
@@ -234,6 +236,7 @@ class FilesViewModel extends MultipleStreamViewModel {
     if (_printerSetting != null) {
       return '${_printerSetting!.httpUrl}/server/files';
     }
+    return null;
   }
 
   @override