Merge branch 'main' into pannable_field_widget

Author: EmeraldWither

lib/services/nt_widget_registry.dart

@@ -398,13 +398,32 @@ class NTWidgetRegistry {
       defaultHeight: 2,
     );
 
-    _widgetNameBuildMap.addAll({
-      LargeTextDisplay.widgetType: LargeTextDisplay.new,
-      ToggleButton.widgetType: ToggleButton.new,
-      ToggleSwitch.widgetType: ToggleSwitch.new,
-      SingleColorView.widgetType: SingleColorView.new,
-      MultiColorView.widgetType: MultiColorView.new,
-    });
+    registerWithoutModel(
+      name: LargeTextDisplay.widgetType,
+      widget: LargeTextDisplay.new,
+      minHeight: _normalSize * 0.8,
+    );
+
+    registerWithoutModel(
+      name: ToggleButton.widgetType,
+      widget: ToggleButton.new,
+      minHeight: _normalSize * 0.8,
+    );
+
+    registerWithoutModel(
+      name: ToggleSwitch.widgetType,
+      widget: ToggleSwitch.new,
+    );
+
+    registerWithoutModel(
+      name: SingleColorView.widgetType,
+      widget: SingleColorView.new,
+    );
+
+    registerWithoutModel(
+      name: MultiColorView.widgetType,
+      widget: MultiColorView.new,
+    );
 
     _initialized = true;
   }
@@ -616,6 +635,48 @@ class NTWidgetRegistry {
     defaultHeight: defaultHeight,
   );
 
+  static void registerWithoutModel<WidgetType extends NTWidget>({
+    required String name,
+    Set<String>? aliases,
+    required NTWidgetProvider<WidgetType> widget,
+    double? minWidth,
+    double? minHeight,
+    double? defaultWidth,
+    double? defaultHeight,
+  }) => registerWithAlias(
+    names: {name, ...?aliases},
+    model:
+        ({
+          required NTConnection ntConnection,
+          required SharedPreferences preferences,
+          required String topic,
+          double? period,
+          NT4Type? dataType,
+          NT4StructMeta? ntStructMeta,
+        }) => SingleTopicNTWidgetModel.createDefault(
+          ntConnection: ntConnection,
+          preferences: preferences,
+          topic: topic,
+          period: period,
+          type: name,
+          dataType: dataType,
+          ntStructMeta: ntStructMeta,
+        ),
+    widget: widget,
+    fromJson:
+        ({required jsonData, required ntConnection, required preferences}) =>
+            SingleTopicNTWidgetModel.createDefaultFromJson(
+              ntConnection: ntConnection,
+              preferences: preferences,
+              jsonData: jsonData,
+              type: name,
+            ),
+    minWidth: minWidth,
+    minHeight: minHeight,
+    defaultWidth: defaultWidth,
+    defaultHeight: defaultHeight,
+  );
+
   static void
   register<ModelType extends NTWidgetModel, WidgetType extends NTWidget>({
     required String name,

lib/services/update_checker.dart

@@ -3,6 +3,21 @@ import 'package:version/version.dart';
 
 import 'package:elastic_dashboard/services/log.dart';
 
+extension on Release {
+  Version? getVersion() {
+    if (tagName == null) return null;
+
+    if (!tagName!.startsWith('v')) return null;
+
+    String versionName = tagName!.substring(1);
+    try {
+      return Version.parse(versionName);
+    } catch (_) {
+      return null;
+    }
+  }
+}
+
 class UpdateChecker {
   final GitHub _github;
   final String currentVersion;
@@ -13,9 +28,30 @@ class UpdateChecker {
     logger.info('Checking for updates');
 
     try {
-      Release latestRelease = await _github.repositories.getLatestRelease(
-        RepositorySlug('Gold872', 'elastic_dashboard'),
-      );
+      Version current = Version.parse(currentVersion);
+
+      final List<Release> releases = await _github.repositories
+          .listReleases(
+            RepositorySlug('Gold872', 'elastic_dashboard'),
+          )
+          .toList();
+
+      final Iterable<Release> yearReleases = releases.where((release) {
+        Version? latest = release.getVersion();
+
+        if (latest == null) return false;
+        if (latest.major != current.major) return false;
+
+        return true;
+      });
+
+      Release? latestRelease = yearReleases.firstOrNull;
+      if (latestRelease == null) {
+        return UpdateCheckerResponse(
+          updateAvailable: false,
+          error: false,
+        );
+      }
 
       String? tagName = latestRelease.tagName;
 
@@ -27,7 +63,9 @@ class UpdateChecker {
           errorMessage: 'Release tag not found',
         );
       }
-      if (!tagName.startsWith('v')) {
+      Version? latest = latestRelease.getVersion();
+
+      if (latest == null) {
         logger.error('Invalid version name: $tagName');
         return UpdateCheckerResponse(
           updateAvailable: false,
@@ -36,11 +74,6 @@ class UpdateChecker {
         );
       }
 
-      String versionName = tagName.substring(1);
-
-      Version current = Version.parse(currentVersion);
-      Version latest = Version.parse(versionName);
-
       bool updateAvailable = current < latest;
 
       return UpdateCheckerResponse(

lib/widgets/nt_widgets/nt_widget.dart

@@ -121,6 +121,23 @@ class SingleTopicNTWidgetModel extends NTWidgetModel {
     init();
   }
 
+  SingleTopicNTWidgetModel.createDefaultFromJson({
+    required super.ntConnection,
+    required super.preferences,
+    required Map<String, dynamic> jsonData,
+    required String type,
+  }) : _typeOverride = type,
+       super.fromJson(jsonData: jsonData) {
+    dataType = NT4Type.parseNullable(tryCast(jsonData['data_type']));
+
+    Map<String, dynamic>? structMetaJson = jsonData['struct_meta'];
+    if (structMetaJson != null) {
+      ntStructMeta = NT4StructMeta.fromJson(structMetaJson);
+    }
+
+    init();
+  }
+
   SingleTopicNTWidgetModel.fromJson({
     required super.ntConnection,
     required super.preferences,