Change quite a few cool things

Author: Calebh101

addons/banana/lib/banana.dart

@@ -25,8 +25,7 @@ class MakeRootSayBanana extends DictionariesAddon {
 
   @override
   FutureOr<void> onRegister(bool debug) {
-    DictionariesWidgetInjection(target: DictionariesWidgetInjectionTarget.rootNode, build: (context, widget) {
-      widget = widget as DictionariesRootNodeWidget;
+    DictionariesWidgetInjection<DictionariesRootNodeWidget>(target: DictionariesWidgetInjectionTarget.rootNode, build: (context, widget) {
       return widget..nameText = SelectableText("Banana!")..addWidget(DictionariesRootNodeSlot.beforeContextMenuButton, IconButton(onPressed: () {
         banana(context);
       }, icon: Text('🍌')));

lib/addons.dart

@@ -91,17 +91,30 @@ enum DictionariesWidgetInjectionTarget {
   rootNode,
 }
 
-final class DictionariesWidgetInjection extends DictionariesUIInjection {
+final class DictionariesWidgetInjection<T extends DictionariesWidget> extends DictionariesUIInjection {
   final DictionariesWidgetInjectionTarget target;
-  final DictionariesWidget Function(BuildContext context, DictionariesWidget widget) build;
+  final DictionariesWidget Function(BuildContext context, T widget) _build;
+
+  DictionariesWidget build(BuildContext context, DictionariesWidget widget) {
+    if (widget is T) {
+      return _build(context, widget);
+    } else {
+      Logger.warn("Detected type mismatch when building ${this.runtimeType}.");
+      return widget;
+    }
+  }
 
-  const DictionariesWidgetInjection({required this.target, required this.build});
+  const DictionariesWidgetInjection({required this.target, required DictionariesWidget Function(BuildContext context, T widget) build}) : _build = build;
 }
 
 final class DictionariesMaterialAppInjection extends DictionariesUIInjection {
   final MaterialApp Function(BuildContext context, MaterialApp widget) build;
 
   const DictionariesMaterialAppInjection({required this.build});
+
+  void inject(AddonContext context) {
+    injectedAddonUIs.add((this, context));
+  }
 }
 
 class DictionariesMenuBarInjection {

lib/src/editor.dart

@@ -363,7 +363,7 @@ class ObjectEditorState extends State<ObjectEditorDesktop> {
                   thickness: 1,
                   color: Colors.grey,
                 ),
-              ).apply(context, DictionariesWidgetInjectionTarget.rootNode);
+              ).apply<DictionariesRootNodeWidget>(context, DictionariesWidgetInjectionTarget.rootNode);
             },
           );
         }

lib/src/main.dart

@@ -5,6 +5,8 @@ import 'package:dictionaries/src/preview.dart';
 import 'package:dictionaries/tabview.dart';
 import 'package:flutter/material.dart';
 
+const bool showSettings = false;
+
 enum DataType {
   json,
   yaml,
@@ -69,7 +71,7 @@ class _ObjectEditorPageState extends State<ObjectEditorPage> with TickerProvider
   @override
   void initState() {
     root = widget.root;
-    tabs = [ObjectEditorTabType.base, ObjectEditorTabType.settings].map((x) => UserFocusedTab<ObjectEditorTabType>(attachment: x, child: objectEditorTabTypeContent(context, x, root), thumbnail: objectEditorTabTypeToWidget(x), reorderable: false)).toList();
+    tabs = [ObjectEditorTabType.base, ObjectEditorTabType.settings].where((x) => objectEditorTabTypeToWidget(x) != null).map((x) => UserFocusedTab<ObjectEditorTabType>(attachment: x, child: objectEditorTabTypeContent(context, x, root), thumbnail: objectEditorTabTypeToWidget(x)!, reorderable: false)).toList();
     controller = UserFocusedTabViewController(tabs);
     super.initState();
   }
@@ -112,7 +114,7 @@ class _ObjectEditorPageState extends State<ObjectEditorPage> with TickerProvider
                 }, onSelected: (value) {
                   if (value is DataType) {
                     var type = dataTypeToObjectEditorTabType(value);
-                    controller!.addTab(UserFocusedTab(child: objectEditorTabTypeContent(context, type, root), thumbnail: objectEditorTabTypeToWidget(type), attachment: type, showCloseButton: true));
+                    controller!.addTab(UserFocusedTab(child: objectEditorTabTypeContent(context, type, root), thumbnail: objectEditorTabTypeToWidget(type)!, attachment: type, showCloseButton: true));
                   }
                 }),
               ),
@@ -124,13 +126,13 @@ class _ObjectEditorPageState extends State<ObjectEditorPage> with TickerProvider
     );
   }
 
-  Widget objectEditorTabTypeToWidget(ObjectEditorTabType objectEditorTabType) {
+  Widget? objectEditorTabTypeToWidget(ObjectEditorTabType objectEditorTabType) {
     switch (objectEditorTabType) {
       case ObjectEditorTabType.base: return Icon(Icons.edit);
       case ObjectEditorTabType.json: return Text("JSON");
       case ObjectEditorTabType.yaml: return Text("YAML");
       case ObjectEditorTabType.plist: return Text("PList");
-      case ObjectEditorTabType.settings: return Icon(Icons.settings);
+      case ObjectEditorTabType.settings: return showSettings ? Icon(Icons.settings) : null;
     }
   }
 

lib/src/nodes.dart

@@ -478,6 +478,7 @@ class RootNode extends AllNodeData {
 
     XmlBuilder builder = XmlBuilder();
     builder.processing('xml', 'version="1.0" encoding="UTF-8"');
+    builder.doctype("plist", publicId: "-//Apple//DTD PLIST 1.0//EN", systemId: "http://www.apple.com/DTDs/PropertyList-1.0.dtd");
 
     builder.element('plist', nest: () {
       builder.attribute('version', '1.0');

lib/src/preview.dart

@@ -66,23 +66,29 @@ class _ObjectEditorPreviewState extends State<ObjectEditorPreview> {
         ],
       ),
       body: Scrollbar(
-        controller: horizontalScrollController,
-        notificationPredicate: (notif) => notif.metrics.axis == Axis.horizontal,
+        controller: verticalScrollController,
         child: SingleChildScrollView(
-          controller: horizontalScrollController,
-          scrollDirection: Axis.horizontal,
-          child: ConstrainedBox(
-            constraints: BoxConstraints(
-              minWidth: MediaQuery.of(context).size.width - 4,
-            ),
-            child: HighlightView(
-              text!,
-              language: dataTypeToLanguage(widget.type),
-              theme: isLight ? atomOneLightTheme : gruvboxDarkTheme,
-              padding: EdgeInsets.all(12),
-              textStyle: TextStyle(
-                fontFamily: 'monospace',
-                fontSize: 14,
+          controller: verticalScrollController,
+          child: Scrollbar(
+            controller: horizontalScrollController,
+            notificationPredicate: (notif) => notif.metrics.axis == Axis.horizontal,
+            child: SingleChildScrollView(
+              controller: horizontalScrollController,
+              scrollDirection: Axis.horizontal,
+              child: ConstrainedBox(
+                constraints: BoxConstraints(
+                  minWidth: MediaQuery.of(context).size.width - 4,
+                ),
+                child: HighlightView(
+                  text!,
+                  language: dataTypeToLanguage(widget.type),
+                  theme: isLight ? atomOneLightTheme : gruvboxDarkTheme,
+                  padding: EdgeInsets.all(12),
+                  textStyle: TextStyle(
+                    fontFamily: 'monospace',
+                    fontSize: 14,
+                  ),
+                ),
               ),
             ),
           ),