diff --git a/bake b/bake index f1c9247e..cb207fcf 100755 --- a/bake +++ b/bake @@ -139,13 +139,13 @@ root.run() { _run root "$@"; bake.run() { _run bake "$@"; } bake.test() { _run bake ./test.bash test; } -_you_dart.run() { _run _you_dart "$@"; } -_you_dart.install() { _run _you_dart flutter pub get; } -_you_dart.clean() { _run _you_dart flutter clean; rm -rf build; } -_you_dart.upgrade() { _run _you_dart flutter pub outdated ; - _run _you_dart flutter pub upgrade ; } -_you_dart.test() { _run _you_dart flutter test; } -_you_dart.publish() { _run _you_dart flutter pub publish; } +_you_dart_internal.run() { _run _you_dart_internal "$@"; } +_you_dart_internal.install() { _run _you_dart_internal flutter pub get; } +_you_dart_internal.clean() { _run _you_dart_internal flutter clean; rm -rf build; } +_you_dart_internal.upgrade() { _run _you_dart_internal flutter pub outdated ; + _run _you_dart_internal flutter pub upgrade ; } +_you_dart_internal.test() { _run _you_dart_internal flutter test; } +_you_dart_internal.publish() { _run _you_dart_internal flutter pub publish; } you_dart.run() { _run you_dart "$@"; } you_dart.install() { _run you_dart flutter pub get; } @@ -163,16 +163,6 @@ you_flutter.upgrade() { _run you_flutter flutter pub outdated ; you_flutter.test() { _run you_flutter flutter test; } you_flutter.publish() { _run you_flutter flutter pub publish; } - -_you_flutter.run() { _run _you_flutter "$@"; } -_you_flutter.install() { _run _you_flutter flutter pub get; } -_you_flutter.clean() { _run _you_flutter flutter clean; rm -rf build; } -_you_flutter.upgrade() { _run _you_flutter flutter pub outdated ; - _run _you_flutter flutter pub upgrade ; } -_you_flutter.test() { _run _you_flutter flutter test; } -_you_flutter.publish() { _run _you_flutter flutter pub publish; } - - you_cli.run() { _run you_cli "$@"; } you_cli.test() { _run you_cli dart test; } you_cli.install() { _run you_cli flutter pub get; } diff --git a/notes/flutter_web/lib/app.dart b/notes/flutter_web/lib/app.dart index 88d3de9e..bd0c0795 100644 --- a/notes/flutter_web/lib/app.dart +++ b/notes/flutter_web/lib/app.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_web/routes.g.dart'; -import 'package:_you_flutter/better_ui.dart'; +import 'package:you_flutter/better_ui.dart'; import 'package:you_flutter/router.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:you_flutter/state.dart'; diff --git a/notes/flutter_web/lib/routes/layout.dart b/notes/flutter_web/lib/routes/layout.dart index fc19381b..fc32740c 100644 --- a/notes/flutter_web/lib/routes/layout.dart +++ b/notes/flutter_web/lib/routes/layout.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_web/app.dart'; -import 'package:_you_flutter/better_ui.dart'; +import 'package:you_flutter/better_ui.dart'; import 'package:you_flutter/note.dart'; import 'package:you_flutter/router.dart'; import 'package:you_flutter/state.dart'; diff --git a/notes/flutter_web/lib/routes/notes/style&theming/colors/page.dart b/notes/flutter_web/lib/routes/notes/style&theming/colors/page.dart index 7292a8a5..e3c13133 100644 --- a/notes/flutter_web/lib/routes/notes/style&theming/colors/page.dart +++ b/notes/flutter_web/lib/routes/notes/style&theming/colors/page.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:you_flutter/note.dart'; -import 'package:_you_flutter/visualization.dart'; @NoteAnnotation(label: "Color roles", publish: true) void build(BuildContext context, Cell print) { diff --git a/notes/flutter_web/pubspec.yaml b/notes/flutter_web/pubspec.yaml index 26817fe9..1eda5bd4 100644 --- a/notes/flutter_web/pubspec.yaml +++ b/notes/flutter_web/pubspec.yaml @@ -37,9 +37,9 @@ dependencies: source_maps: ^0.10.12 # you_* + _you_dart_internal: ^0.0.6-dev.2 you_dart: ^0.0.4 you_flutter: ^0.0.4 - _you_flutter: ^0.0.6-dev.2 dev_dependencies: @@ -81,9 +81,9 @@ dependency_overrides: # - dart pub publish will no longer warn about dependency_overrides. # Dependency overrides only take effect in the root package of a resolution. # - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md + _you_dart_internal: + path: ../../packages/_you_dart_internal you_dart: path: ../../packages/you_dart you_flutter: path: ../../packages/you_flutter - _you_flutter: - path: ../../packages/_you_flutter diff --git a/packages/_you_dart/lib/_you_dart.dart b/packages/_you_dart/lib/_you_dart.dart deleted file mode 100644 index db5fdbe4..00000000 --- a/packages/_you_dart/lib/_you_dart.dart +++ /dev/null @@ -1,6 +0,0 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library; - -export 'src/_you_dart_base.dart'; diff --git a/packages/_you_dart/lib/src/_you_dart_base.dart b/packages/_you_dart/lib/src/_you_dart_base.dart deleted file mode 100644 index e8a6f159..00000000 --- a/packages/_you_dart/lib/src/_you_dart_base.dart +++ /dev/null @@ -1,6 +0,0 @@ -// TODO: Put public facing types in this file. - -/// Checks if you are awesome. Spoiler: you are. -class Awesome { - bool get isAwesome => true; -} diff --git a/packages/_you_dart/test/_you_dart_test.dart b/packages/_you_dart/test/_you_dart_test.dart deleted file mode 100644 index be18a80e..00000000 --- a/packages/_you_dart/test/_you_dart_test.dart +++ /dev/null @@ -1,16 +0,0 @@ -import 'package:_you_dart/_you_dart.dart'; -import 'package:test/test.dart'; - -void main() { - group('A group of tests', () { - final awesome = Awesome(); - - setUp(() { - // Additional setup goes here. - }); - - test('First Test', () { - expect(awesome.isAwesome, isTrue); - }); - }); -} diff --git a/packages/_you_dart/.gitignore b/packages/_you_dart_internal/.gitignore similarity index 100% rename from packages/_you_dart/.gitignore rename to packages/_you_dart_internal/.gitignore diff --git a/packages/_you_dart/CHANGELOG.md b/packages/_you_dart_internal/CHANGELOG.md similarity index 100% rename from packages/_you_dart/CHANGELOG.md rename to packages/_you_dart_internal/CHANGELOG.md diff --git a/packages/_you_dart/LICENSE b/packages/_you_dart_internal/LICENSE similarity index 100% rename from packages/_you_dart/LICENSE rename to packages/_you_dart_internal/LICENSE diff --git a/packages/_you_dart/README.md b/packages/_you_dart_internal/README.md similarity index 76% rename from packages/_you_dart/README.md rename to packages/_you_dart_internal/README.md index e446a292..adf73904 100644 --- a/packages/_you_dart/README.md +++ b/packages/_you_dart_internal/README.md @@ -1,4 +1,4 @@ -# _you_dart +# _you_dart_internal A dart package internal use. diff --git a/packages/_you_dart/analysis_options.yaml b/packages/_you_dart_internal/analysis_options.yaml similarity index 100% rename from packages/_you_dart/analysis_options.yaml rename to packages/_you_dart_internal/analysis_options.yaml diff --git a/packages/you_dart/lib/src/core.dart b/packages/_you_dart_internal/lib/core.dart similarity index 100% rename from packages/you_dart/lib/src/core.dart rename to packages/_you_dart_internal/lib/core.dart diff --git a/packages/_you_dart/pubspec.yaml b/packages/_you_dart_internal/pubspec.yaml similarity index 77% rename from packages/_you_dart/pubspec.yaml rename to packages/_you_dart_internal/pubspec.yaml index 7306d525..b519eaca 100644 --- a/packages/_you_dart/pubspec.yaml +++ b/packages/_you_dart_internal/pubspec.yaml @@ -1,4 +1,4 @@ -name: _you_dart +name: _you_dart_internal description: "internal dart lib." version: 0.0.6-dev.2 homepage: https://github.com/chen56/you @@ -9,8 +9,9 @@ environment: # Add regular dependencies here. dependencies: - # path: ^1.8.0 + meta: ^1.12.0 dev_dependencies: - lints: ^3.0.0 + lints: ^4.0.0 test: ^1.24.0 + checks: ^0.3.0 diff --git a/packages/_you_dart_internal/test/_you_dart_test.dart b/packages/_you_dart_internal/test/_you_dart_test.dart new file mode 100644 index 00000000..7de0162a --- /dev/null +++ b/packages/_you_dart_internal/test/_you_dart_test.dart @@ -0,0 +1,11 @@ +import 'package:test/test.dart'; + +void main() { + group('A group of tests', () { + setUp(() { + // Additional setup goes here. + }); + + test('First Test', () {}); + }); +} diff --git a/packages/you_dart/test/core_types_test.dart b/packages/_you_dart_internal/test/core_types_test.dart similarity index 96% rename from packages/you_dart/test/core_types_test.dart rename to packages/_you_dart_internal/test/core_types_test.dart index 4f38a39b..6a8a2472 100644 --- a/packages/you_dart/test/core_types_test.dart +++ b/packages/_you_dart_internal/test/core_types_test.dart @@ -1,6 +1,6 @@ +import 'package:_you_dart_internal/core.dart'; import 'package:checks/checks.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:you_dart/src/core.dart'; +import 'package:test/test.dart'; void main() { group("types.isType", () { diff --git a/packages/_you_flutter/.gitignore b/packages/_you_flutter/.gitignore deleted file mode 100644 index ac5aa989..00000000 --- a/packages/_you_flutter/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -.dart_tool/ -build/ diff --git a/packages/_you_flutter/.metadata b/packages/_you_flutter/.metadata deleted file mode 100644 index 8e3dacfd..00000000 --- a/packages/_you_flutter/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: "1dfb46e9c08761303b963d155a8d5090d44250c1" - channel: "master" - -project_type: package diff --git a/packages/_you_flutter/CHANGELOG.md b/packages/_you_flutter/CHANGELOG.md deleted file mode 100644 index 41cc7d81..00000000 --- a/packages/_you_flutter/CHANGELOG.md +++ /dev/null @@ -1,3 +0,0 @@ -## 0.0.1 - -* TODO: Describe initial release. diff --git a/packages/_you_flutter/LICENSE b/packages/_you_flutter/LICENSE deleted file mode 100644 index 1f340deb..00000000 --- a/packages/_you_flutter/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 Chen Peng - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/packages/_you_flutter/README.md b/packages/_you_flutter/README.md deleted file mode 100644 index 94aa03e9..00000000 --- a/packages/_you_flutter/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# _you_flutter - -A package that facilitates for dart/flutter applications. - -## Features - -- you_* 相关app内部的一些公共lib -- 也是you_flutter的孵化器 diff --git a/packages/_you_flutter/analysis_options.yaml b/packages/_you_flutter/analysis_options.yaml deleted file mode 100644 index a5744c1c..00000000 --- a/packages/_you_flutter/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: package:flutter_lints/flutter.yaml - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/packages/_you_flutter/lib/better_ui.dart b/packages/_you_flutter/lib/better_ui.dart deleted file mode 100644 index 5cc4eba2..00000000 --- a/packages/_you_flutter/lib/better_ui.dart +++ /dev/null @@ -1,6 +0,0 @@ -@experimental -library you_better_ui; - -import 'package:meta/meta.dart'; - -export 'package:_you_flutter/src/better_ui.dart' ; \ No newline at end of file diff --git a/packages/_you_flutter/lib/visualization.dart b/packages/_you_flutter/lib/visualization.dart deleted file mode 100644 index 23c0726e..00000000 --- a/packages/_you_flutter/lib/visualization.dart +++ /dev/null @@ -1,3 +0,0 @@ -library _you_flutter; - -export 'src/visualization/material_colors.dart' show MaterialColorRoles; diff --git a/packages/_you_flutter/pubspec.yaml b/packages/_you_flutter/pubspec.yaml deleted file mode 100644 index 8d887b97..00000000 --- a/packages/_you_flutter/pubspec.yaml +++ /dev/null @@ -1,68 +0,0 @@ -name: _you_flutter -description: "you_* internal package." -version: 0.0.6-dev.2 -homepage: https://github.com/chen56/you -repository: https://github.com/chen56/you - -environment: - sdk: '>=3.4.0 <4.0.0' - flutter: '>=3.22.0' - -dependencies: - checks: ^0.3.0 - flutter: - sdk: flutter - meta: ^1.12.0 - you_flutter: ^0.0.6-dev.2 - -dev_dependencies: - flutter_test: - sdk: flutter - flutter_lints: ^4.0.0 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. -flutter: - - # To add assets to your package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware - - # To add custom fonts to your package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages - -dependency_overrides: - # dart CHANGELOG 3.0.0 2023-05-10 - # - dart pub publish will no longer warn about dependency_overrides. - # Dependency overrides only take effect in the root package of a resolution. - # - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md - you_dart: - path: ../you_dart - you_flutter: - path: ../you_flutter diff --git a/packages/_you_flutter/test/you_flutter_internal_test.dart b/packages/_you_flutter/test/you_flutter_internal_test.dart deleted file mode 100644 index efd7773e..00000000 --- a/packages/_you_flutter/test/you_flutter_internal_test.dart +++ /dev/null @@ -1,6 +0,0 @@ -import 'package:flutter_test/flutter_test.dart'; - - -void main() { - test('adds one to input values', () {}); -} diff --git a/packages/you_cli/pubspec.yaml b/packages/you_cli/pubspec.yaml index 371096d5..13022dcd 100644 --- a/packages/you_cli/pubspec.yaml +++ b/packages/you_cli/pubspec.yaml @@ -25,7 +25,7 @@ dependencies: checks: ^0.3.0 # you_* - you_dart: ^0.0.4 + you_dart: ^0.0.6-dev.2 dev_dependencies: lints: ^3.0.0 @@ -37,4 +37,6 @@ dependency_overrides: # Dependency overrides only take effect in the root package of a resolution. # - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md you_dart: - path: ../you_dart \ No newline at end of file + path: ../you_dart + _you_dart_internal: + path: ../_you_dart_internal \ No newline at end of file diff --git a/packages/you_dart/lib/src/state.dart b/packages/you_dart/lib/src/state.dart index 51d71078..85ae638c 100644 --- a/packages/you_dart/lib/src/state.dart +++ b/packages/you_dart/lib/src/state.dart @@ -6,7 +6,7 @@ import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; import 'package:meta/meta.dart'; -import 'package:you_dart/src/core.dart'; +import 'package:_you_dart_internal/core.dart'; _defaultOnSignalDoNothing(Signal signal) {} diff --git a/packages/you_dart/lib/src/state_json.dart b/packages/you_dart/lib/src/state_json.dart index 91d60385..a651f9b5 100644 --- a/packages/you_dart/lib/src/state_json.dart +++ b/packages/you_dart/lib/src/state_json.dart @@ -2,7 +2,7 @@ import 'dart:collection'; import 'dart:convert'; import 'package:meta/meta.dart'; -import 'package:you_dart/src/core.dart'; +import 'package:_you_dart_internal/core.dart'; import 'package:you_dart/src/state.dart'; /// [Store] 的编解码器，为[Store]对象赋予json等的能力, 目前支持 diff --git a/packages/you_dart/pubspec.yaml b/packages/you_dart/pubspec.yaml index 890cac15..850de9b6 100644 --- a/packages/you_dart/pubspec.yaml +++ b/packages/you_dart/pubspec.yaml @@ -14,10 +14,19 @@ dependencies: sdk: flutter meta: ^1.12.0 collection: ^1.18.0 + _you_dart_internal: ^0.0.6-dev.2 dev_dependencies: test: ^1.24.0 flutter_test: sdk: flutter - checks: ^0.3.0 \ No newline at end of file + checks: ^0.3.0 + +dependency_overrides: + # dart CHANGELOG 3.0.0 2023-05-10 + # - dart pub publish will no longer warn about dependency_overrides. + # Dependency overrides only take effect in the root package of a resolution. + # - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md + _you_dart_internal: + path: ../_you_dart_internal diff --git a/packages/you_flutter/lib/better_ui.dart b/packages/you_flutter/lib/better_ui.dart new file mode 100644 index 00000000..43994472 --- /dev/null +++ b/packages/you_flutter/lib/better_ui.dart @@ -0,0 +1,5 @@ +@experimental + +import 'package:meta/meta.dart'; + +export 'package:you_flutter/src/better_ui.dart' ; \ No newline at end of file diff --git a/packages/you_flutter/lib/note.dart b/packages/you_flutter/lib/note.dart index 9d257d9e..72de8ace 100644 --- a/packages/you_flutter/lib/note.dart +++ b/packages/you_flutter/lib/note.dart @@ -8,3 +8,5 @@ export 'src/note/note.dart' show ToNote, NoteAnnotation, NoteBuilder, NoteLayout export 'src/note/contents/contents.dart' show contents, Contents; export 'src/note/contents/mockup.dart' show MockupWindow; export 'src/note/contents/markdown_content.dart' show MD; + +export 'src/note/visualization/material_colors.dart' show MaterialColorRoles; diff --git a/packages/_you_flutter/lib/src/better_ui.dart b/packages/you_flutter/lib/src/better_ui.dart similarity index 100% rename from packages/_you_flutter/lib/src/better_ui.dart rename to packages/you_flutter/lib/src/better_ui.dart diff --git a/packages/you_flutter/lib/src/note/contents/params.dart b/packages/you_flutter/lib/src/note/contents/params.dart index b498573a..a16a229e 100644 --- a/packages/you_flutter/lib/src/note/contents/params.dart +++ b/packages/you_flutter/lib/src/note/contents/params.dart @@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:you_flutter/src/note/contents/params_editors.dart'; // ignore: implementation_imports, FIXME internal import /src of the same project. -import 'package:you_dart/src/core.dart'; +import 'package:_you_dart_internal/core.dart'; final defaultEmitter = code.DartEmitter(allocator: code.Allocator(), useNullSafetySyntax: true); diff --git a/packages/you_flutter/lib/src/note/contents/source_code.dart b/packages/you_flutter/lib/src/note/contents/source_code.dart index e9077321..393e099f 100644 --- a/packages/you_flutter/lib/src/note/contents/source_code.dart +++ b/packages/you_flutter/lib/src/note/contents/source_code.dart @@ -11,7 +11,7 @@ import 'package:meta/meta.dart'; import 'package:path/path.dart' as path_; import 'package:you_flutter/src/utils_core.dart'; // ignore: implementation_imports, internal import /src of the same project -import 'package:you_dart/src/core.dart'; +import 'package:_you_dart_internal/core.dart'; typedef _AddCell = ({Block belongTo, MethodInvocation invocation}); diff --git a/packages/_you_flutter/lib/src/visualization/material_colors.dart b/packages/you_flutter/lib/src/note/visualization/material_colors.dart similarity index 70% rename from packages/_you_flutter/lib/src/visualization/material_colors.dart rename to packages/you_flutter/lib/src/note/visualization/material_colors.dart index 87b63c0d..c3fc9450 100644 --- a/packages/_you_flutter/lib/src/visualization/material_colors.dart +++ b/packages/you_flutter/lib/src/note/visualization/material_colors.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:meta/meta.dart'; -import 'package:_you_flutter/better_ui.dart'; +import 'package:you_flutter/better_ui.dart'; import 'package:you_flutter/state.dart'; @experimental @@ -245,181 +245,6 @@ class MaterialColorRoles extends StatelessWidget { } } -@experimental -class MaterialColorRoles2 extends StatelessWidget { - const MaterialColorRoles2({super.key}); - - //可视性 - @override - Widget build(BuildContext context) { - final colorScheme = Theme.of(context).colorScheme; - final colors = _Colors(colorScheme: colorScheme); - - Size maxSize = Size.zero; - for (var c in colors.onSurfaces) { - final Size size = measureWidget(Directionality( - textDirection: TextDirection.ltr, - child: _OnBlock(color: c), - )); - if (size.width > maxSize.width) { - maxSize = size; - } - } - Size maxSizeOfbackgroundColor = Size.zero; - for (var c in colors.backgroundColors) { - final Size size = measureWidget(Directionality( - textDirection: TextDirection.ltr, - child: _OnBlock(color: c), - )); - if (size.width > maxSizeOfbackgroundColor.width) { - maxSizeOfbackgroundColor = size; - } - } - - _BackgroundBlock _backgroundBlock({required Color color, required String label, List<_ColorData> onColors = const []}) { - return _BackgroundBlock(label: label, color: color, backgroundColorLabelWidth: maxSizeOfbackgroundColor.width, onColorWidth: maxSize.width, onColors: onColors); - } - - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _backgroundBlock(label: "primary", color: colorScheme.primary, onColors: [ - _ColorData(label: "onPrimary", color: colorScheme.onPrimary), - ]), - _backgroundBlock(label: "secondary", color: colorScheme.secondary, onColors: [ - _ColorData(label: "onSecondary", color: colorScheme.onSecondary), - ]), - _backgroundBlock(label: "tertiary", color: colorScheme.tertiary, onColors: [ - _ColorData(label: "onTertiary", color: colorScheme.onTertiary), - ]), - Wrap( - children: [ - _backgroundBlock(label: "primary", color: colorScheme.primary, onColors: [ - _ColorData(label: "onPrimary", color: colorScheme.onPrimary), - ]), - _backgroundBlock(label: "secondary", color: colorScheme.secondary, onColors: [ - _ColorData(label: "onSecondary", color: colorScheme.onSecondary), - ]), - _backgroundBlock(label: "tertiary", color: colorScheme.tertiary, onColors: [ - _ColorData(label: "onTertiary", color: colorScheme.onTertiary), - ]), - ], - ), - Wrap( - children: [ - _backgroundBlock(label: "primaryContainer", color: colorScheme.primaryContainer, onColors: [ - _ColorData(label: "onPrimaryContainer", color: colorScheme.onPrimaryContainer), - ]), - _backgroundBlock(label: "secondaryContainer", color: colorScheme.secondaryContainer, onColors: [ - _ColorData(label: "onSecondaryContainer", color: colorScheme.onSecondaryContainer), - ]), - _backgroundBlock(label: "tertiaryContainer", color: colorScheme.tertiaryContainer, onColors: [ - _ColorData(label: "onTertiaryContainer", color: colorScheme.onTertiaryContainer), - ]), - ], - ), - Wrap( - children: [ - _backgroundBlock(label: "primaryFixed", color: colorScheme.primaryFixed, onColors: [ - _ColorData(label: "onPrimaryFixed", color: colorScheme.onPrimaryFixed), - ]), - _backgroundBlock(label: "secondaryFixed", color: colorScheme.secondaryFixed, onColors: [ - _ColorData(label: "onSecondaryFixed", color: colorScheme.onSecondaryFixed), - ]), - _backgroundBlock(label: "tertiaryFixed", color: colorScheme.tertiaryFixed, onColors: [ - _ColorData(label: "onTertiaryFixed", color: colorScheme.onTertiaryFixed), - ]), - ], - ), - Wrap( - children: [ - _backgroundBlock(label: "primaryFixedDim", color: colorScheme.primaryFixedDim, onColors: [ - _ColorData(label: "onPrimaryFixed", color: colorScheme.onPrimaryFixed), - _ColorData(label: "onPrimaryFixedVariant", color: colorScheme.onPrimaryFixedVariant), - ]), - _backgroundBlock(label: "secondaryFixedDim", color: colorScheme.secondaryFixedDim, onColors: [ - _ColorData(label: "onSecondaryFixed", color: colorScheme.onSecondaryFixed), - _ColorData(label: "onSecondaryFixedVariant", color: colorScheme.onSecondaryFixedVariant), - ]), - _backgroundBlock(label: "tertiaryFixedDim", color: colorScheme.tertiaryFixedDim, onColors: [ - _ColorData(label: "onTertiaryFixed", color: colorScheme.onTertiaryFixed), - _ColorData(label: "onTertiaryFixedVariant", color: colorScheme.onTertiaryFixedVariant), - ]), - ], - ), - const Divider(), - Wrap( - children: [ - _backgroundBlock(label: "error", color: colorScheme.error, onColors: [ - _ColorData(label: "onError", color: colorScheme.onError), - ]), - _backgroundBlock(label: "errorContainer", color: colorScheme.errorContainer, onColors: [ - _ColorData(label: "onError", color: colorScheme.onErrorContainer), - ]), - ], - ), - const Divider(), - Wrap( - children: [ - _backgroundBlock(label: "surface", color: colorScheme.surface, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceBright", color: colorScheme.surfaceBright, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceDim", color: colorScheme.surfaceDim, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - ], - ), - Wrap( - children: [ - _backgroundBlock(label: "surfaceContainerHighest", color: colorScheme.surfaceContainerHighest, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceContainerHigh", color: colorScheme.surfaceContainerHigh, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceContainer", color: colorScheme.surfaceContainer, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceContainerLow", color: colorScheme.surfaceContainerLow, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - _backgroundBlock(label: "surfaceContainerLowest", color: colorScheme.surfaceContainerLowest, onColors: [ - _ColorData(label: "onSurface", color: colorScheme.onSurface), - _ColorData(label: "onSurfaceVariant", color: colorScheme.onSurfaceVariant), - ]), - ], - ), - const Divider(), - Wrap( - children: [ - _backgroundBlock(label: "inverseSurface", color: colorScheme.inverseSurface, onColors: [ - _ColorData(label: "onInverseSurface", color: colorScheme.onInverseSurface), - _ColorData(label: "inversePrimary", color: colorScheme.inversePrimary), - ]), - _backgroundBlock(label: "surface", color: colorScheme.surface, onColors: [ - _ColorData(label: "outline", color: colorScheme.outline), - _ColorData(label: "outlineVariant", color: colorScheme.outlineVariant), - _ColorData(label: "scrim", color: colorScheme.scrim), - _ColorData(label: "shadow", color: colorScheme.shadow), - _ColorData(label: "surfaceTint", color: colorScheme.surfaceTint), - ]), - ], - ), - ], - ); - } -} - class _Colors { _Colors({required ColorScheme colorScheme}) { all = { diff --git a/packages/you_flutter/pubspec.yaml b/packages/you_flutter/pubspec.yaml index be2c5136..37120195 100644 --- a/packages/you_flutter/pubspec.yaml +++ b/packages/you_flutter/pubspec.yaml @@ -9,12 +9,12 @@ environment: flutter: '>=3.22.0' dependencies: + flutter: + sdk: flutter analyzer: ^6.4.1 code_builder: ^4.10.0 dart_style: ^2.3.6 file: ^7.0.0 - flutter: - sdk: flutter flutter_highlight: ^0.7.0 flutter_markdown: ^0.7.1 highlight: ^0.7.0 @@ -29,7 +29,8 @@ dependencies: # you_* - you_dart: ^0.0.5 + you_dart: ^0.0.6-dev.2 + _you_dart_internal: ^0.0.6-dev.2 dev_dependencies: flutter_test: @@ -43,6 +44,8 @@ dependency_overrides: # - dart pub publish will no longer warn about dependency_overrides. # Dependency overrides only take effect in the root package of a resolution. # - ref: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md + _you_dart_internal: + path: ../_you_dart_internal you_dart: path: ../you_dart diff --git a/packages/_you_flutter/test/better_ui_test.dart b/packages/you_flutter/test/better_ui_test.dart similarity index 97% rename from packages/_you_flutter/test/better_ui_test.dart rename to packages/you_flutter/test/better_ui_test.dart index c8f8948f..0c081af5 100644 --- a/packages/_you_flutter/test/better_ui_test.dart +++ b/packages/you_flutter/test/better_ui_test.dart @@ -1,6 +1,6 @@ import 'package:checks/checks.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:_you_flutter/better_ui.dart'; +import 'package:you_flutter/src/better_ui.dart'; void main() { group("YouRouter.parse ok", () {