fix: Separate UniversalUI into a separate package.

mathrunet · Mar 13, 2023 · b7ffe81 · b7ffe81
1 parent a057c77
commit b7ffe81
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 3,528 deletions.
diff --git a/packages/masamune/example/pubspec.lock b/packages/masamune/example/pubspec.lock
@@ -401,18 +401,18 @@ packages:
     dependency: transitive
     description:
       name: katana_form
-      sha256: "33e7f18cafec0fc858f55eae81b460a5eee08b03d28490c4de676e14b7ccd98c"
+      sha256: "8be8f49d1fdf5edc9353d661385e5da1a5773f38c113aafbee07d443275731b7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.16"
+    version: "1.3.18"
   katana_functions:
     dependency: transitive
     description:
       name: katana_functions
-      sha256: "37a80e38df7babbcb6082f294334d54251d9c327d18ab09870c03e6715d56c7a"
+      sha256: "4ecc5b0321c3aa93d5a1dcebabc63c112d09a12d8c05f6e12e4eea3f0a0c9cf8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.14"
+    version: "1.1.15"
   katana_indicator:
     dependency: transitive
     description:
@@ -481,10 +481,10 @@ packages:
     dependency: transitive
     description:
       name: katana_model
-      sha256: "4f62900759b58c77bc8a8d33c65d6c9be35e97f7c9b152db016d55e0ebba9673"
+      sha256: f53f7e628729830f1bdf3761e2a439918dd4c797ac50c09cf7596bdf6b114254
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.14"
+    version: "1.5.15"
   katana_prefs:
     dependency: transitive
     description:
@@ -585,10 +585,10 @@ packages:
     dependency: transitive
     description:
       name: katana_ui
-      sha256: "367a09b85e4b495538fcf3c9397cfbe0580faa5483ceb9b5c2b3f15c2a4e4ba8"
+      sha256: a897c68f8205bc5a22d86fa4a5a5d4a28149f7257fd5dffce10a1b35e28aa0fa
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   lints:
     dependency: transitive
     description:
@@ -611,7 +611,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.10.5"
+    version: "1.11.0"
   masamune_annotation:
     dependency: transitive
     description:
@@ -687,26 +687,26 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "7623b7d4be0f0f7d9a8b5ee6879fc13e4522d4c875ab86801dee4af32b54b83e"
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.23"
+    version: "2.0.24"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: eec003594f19fe2456ea965ae36b3fc967bc5005f508890aafe31fa75e41d972
+      sha256: "026b97a6c29da75181a37aae2eba9227f5fe13cb2838c6b975ce209328b8ab4e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: "525ad5e07622d19447ad740b1ed5070031f7a5437f44355ae915ff56e986429a"
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.9"
+    version: "2.1.10"
   path_provider_platform_interface:
     dependency: transitive
     description:
@@ -719,10 +719,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "642ddf65fde5404f83267e8459ddb4556316d3ee6d511ed193357e25caa3632d"
+      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   platform:
     dependency: transitive
     description:
@@ -799,26 +799,26 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: a51a4f9375097f94df1c6e0a49c0374440d31ab026b59d58a7e7660675879db4
+      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.17"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "6b84fdf06b32bb336f972d373cd38b63734f3461ba56ac2ba01b56d052796259"
+      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: d7fb71e6e20cd3dfffcc823a28da3539b392e53ed5fc5c2b90b55fdaa8a7e8fa
+      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
@@ -831,18 +831,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "6737b757e49ba93de2a233df229d0b6a87728cea1684da828cbc718b65dcf9d7"
+      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.6"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: bd014168e8484837c39ef21065b78f305810ceabc1d4f90be6e3b392ce81b46d
+      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   shelf:
     dependency: transitive
     description:

diff --git a/packages/masamune/lib/masamune.dart b/packages/masamune/lib/masamune.dart
@@ -10,16 +10,11 @@ library masamune;
 
 // Dart imports:
 import 'dart:async';
-import 'dart:math';
 
 // Flutter imports:
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-// Package imports:
-import 'package:universal_platform/universal_platform.dart';
 
 // Project imports:
 import 'package:masamune/masamune.dart';
@@ -55,15 +50,3 @@ part 'src/masamune_controller.dart';
 part 'ui/grid_builder.dart';
 part 'ui/list_builder.dart';
 part 'ui/reorderable_list_builder.dart';
-
-part 'universal/universal_scaffold.dart';
-part 'universal/universal_app_bar.dart';
-part 'universal/universal_list_view.dart';
-part 'universal/universal_container.dart';
-part 'universal/universal_masamune_adapter.dart';
-part 'universal/universal_side_bar.dart';
-part 'universal/extensions.dart';
-part 'universal/universal_column.dart';
-part 'universal/breakpoint.dart';
-part 'universal/breakpoint_settings.dart';
-part 'universal/responsive.dart';
diff --git a/packages/masamune/lib/src/masamune_app.dart b/packages/masamune/lib/src/masamune_app.dart
@@ -176,7 +176,6 @@ class MasamuneApp extends StatelessWidget {
     this.onUnknownRoute,
     this.builder,
     this.onBuildAppFilters,
-    this.universalUIAdapter = const UniversalMasamuneAdapter(),
     this.masamuneAdapters = const <MasamuneAdapter>[],
   });
 
@@ -225,11 +224,6 @@ class MasamuneApp extends StatelessWidget {
   /// `katana_logger`で利用されるロギング用のアダプター。
   final List<LoggerAdapter> loggerAdapters;
 
-  /// Adapter for use with `Masamune Universal UI`.
-  ///
-  /// `Masamune Universal UI`で利用するアダプター。
-  final UniversalMasamuneAdapter universalUIAdapter;
-
   /// Config for router used by `katana_router`.
   ///
   /// `katana_router`で利用されるルーター用のコンフィグ。
@@ -415,7 +409,6 @@ class MasamuneApp extends StatelessWidget {
     );
     final filters = [
       ...masamuneAdapters.map((e) => e.onBuildApp),
-      universalUIAdapter.onBuildApp,
       if (onBuildAppFilters != null) ...onBuildAppFilters!,
     ];
     if (filters.isEmpty) {

diff --git a/packages/masamune/lib/universal/breakpoint.dart b/packages/masamune/lib/universal/breakpoint.dart