Merge remote-tracking branch 'upstream/develop' into develop

jhqwqmc · Sep 16, 2024 · 5427695 · 5427695
2 parents 0625ce8 + 2ba5f0b
commit 5427695
Show file tree

Hide file tree

Showing 566 changed files with 3,073 additions and 842 deletions.
diff --git a/.github/workflows/build-development-jars-and-publish.yml b/.github/workflows/build-development-jars-and-publish.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Test Extensions
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: test --scan
+          arguments: test clean --scan
           build-root-directory: ./extensions
 #  ----------------------------------------------------------------------------------------------------
       - name: Publish Engine to Beta Maven Repository
@@ -86,6 +86,7 @@ jobs:
           build-root-directory: ./engine
       - name: Add Tag
         uses: mathieudutour/[email protected]
+        continue-on-error: true
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           default_bump: false

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/app/lib/app_router.dart b/app/lib/app_router.dart
@@ -21,7 +21,7 @@ final appRouter = Provider<AppRouter>((ref) => AppRouter(ref: ref.passing));
 @AutoRouterConfig(
   replaceInRouteName: "Page,Route",
 )
-class AppRouter extends _$AppRouter {
+class AppRouter extends RootStackRouter {
   AppRouter({
     required this.ref,
   });

diff --git a/app/lib/app_router.gr.dart b/app/lib/app_router.gr.dart
diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -64,10 +64,10 @@ class TypeWriterApp extends HookConsumerWidget {
           borderSide: BorderSide.none,
         ),
         fillColor: brightness == Brightness.light
-            ? Colors.black.withOpacity(0.05)
-            : Colors.black.withOpacity(0.2),
+            ? Colors.black.withValues(alpha: 0.05)
+            : Colors.black.withValues(alpha: 0.2),
         filled: true,
-        hoverColor: Colors.black.withOpacity(0.1),
+        hoverColor: Colors.black.withValues(alpha: 0.1),
         errorStyle: const TextStyle(
           color: Colors.redAccent,
           fontSize: 12,
@@ -88,7 +88,7 @@ class TypeWriterApp extends HookConsumerWidget {
           borderSide: const BorderSide(color: Colors.red, width: 2),
         ),
       ),
-      hoverColor: Colors.black.withOpacity(0.1),
+      hoverColor: Colors.black.withValues(alpha: 0.1),
       colorScheme: baseTheme.colorScheme.copyWith(
         primary: Colors.blueAccent,
         brightness: brightness,

diff --git a/app/lib/models/communicator.dart b/app/lib/models/communicator.dart
@@ -100,7 +100,7 @@ class SocketNotifier extends StateNotifier<Socket?> {
         state == ConnectionState.connected;
   }
 
-  void init(String hostname, int port, [String? token]) {
+  void init(String hostname, int? port, [String? token]) {
     if (state != null) return;
     if (_connectionState != ConnectionState.none) return;
     _connectionState = ConnectionState.connecting;
@@ -112,7 +112,8 @@ class SocketNotifier extends StateNotifier<Socket?> {
       return;
     }
 
-    var url = "//$hostname:$port";
+    var url = "//$hostname";
+    if (port != null) url += ":$port";
     if (token != null) url += "?token=$token";
 
     debugPrint("初始化套接字");

diff --git a/app/lib/models/entry_blueprint.dart b/app/lib/models/entry_blueprint.dart
@@ -260,7 +260,7 @@ final _customEditorCustomLayout = [
   "item",
   "skin",
   "color",
-  "floatRange",
+  "closedRange",
 ];
 
 /// Since freezed does not support methods on data models, we have to create a separate extension class.
@@ -270,7 +270,7 @@ extension DataBlueprintExtension on DataBlueprint {
         (_) => null,
         primitive: (data) {
           if (data.type.validate(data.internalDefaultValue)) {
-            return data.defaultValue;
+            return data.internalDefaultValue;
           }
           return _defaultPrimitiveValue(data.type);
         },

diff --git a/app/lib/pages/book_page.dart b/app/lib/pages/book_page.dart
@@ -177,7 +177,7 @@ class _RailButton extends HookConsumerWidget {
     final tabRouter = context.tabsRouter;
     final isSelected = tabRouter.activeIndex == index;
     return Material(
-      color: isSelected ? Colors.white.withOpacity(0.15) : Colors.transparent,
+      color: isSelected ? Colors.white.withValues(alpha:0.15) : Colors.transparent,
       borderRadius: BorderRadius.circular(8),
       child: InkWell(
         onTap: () => tabRouter.setActiveIndex(index),

diff --git a/app/lib/pages/connect_page.dart b/app/lib/pages/connect_page.dart
@@ -15,13 +15,13 @@ import "package:typewriter/widgets/components/general/text_scroller.dart";
 class ConnectPage extends HookConsumerWidget {
   const ConnectPage({
     @QueryParam("host") this.hostname = "",
-    @QueryParam() this.port = 9092,
+    @QueryParam() this.port,
     @QueryParam() this.token = "",
     super.key,
   });
 
   final String hostname;
-  final int port;
+  final int? port;
   final String token;
 
   @override

diff --git a/app/lib/pages/page_editor.dart b/app/lib/pages/page_editor.dart
@@ -31,7 +31,7 @@ String? currentPageId(CurrentPageIdRef ref) {
 
 @riverpod
 String currentPageLabel(CurrentPageLabelRef ref) {
-  return ref.watch(currentPageIdProvider)?.formatted ?? "";
+  return ref.watch(currentPageProvider)?.pageName.formatted ?? "";
 }
 
 @riverpod

diff --git a/app/lib/pages/page_editor.g.dart b/app/lib/pages/page_editor.g.dart