diff --git a/packages/zeta_flutter/test/src/components/search_bar/search_bar_test.mocks.dart b/packages/zeta_flutter/test/src/components/search_bar/search_bar_test.mocks.dart index 97a0dc0c9..d7d2306a1 100644 --- a/packages/zeta_flutter/test/src/components/search_bar/search_bar_test.mocks.dart +++ b/packages/zeta_flutter/test/src/components/search_bar/search_bar_test.mocks.dart @@ -22,6 +22,7 @@ import 'search_bar_test.dart' as _i2; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member /// A class which mocks [ISearchBarEvents]. /// diff --git a/packages/zeta_flutter/test/src/components/tooltip/tooltip_test.mocks.dart b/packages/zeta_flutter/test/src/components/tooltip/tooltip_test.mocks.dart index 034d9c31a..340c86e25 100644 --- a/packages/zeta_flutter/test/src/components/tooltip/tooltip_test.mocks.dart +++ b/packages/zeta_flutter/test/src/components/tooltip/tooltip_test.mocks.dart @@ -24,9 +24,10 @@ import 'package:zeta_flutter_theme/zeta_flutter_theme.dart' as _i2; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member -class _FakeZetaTextStyle_0 extends _i1.SmartFake implements _i2.ZetaTextStyle { - _FakeZetaTextStyle_0( +class _FakeZetaPrimitives_0 extends _i1.SmartFake implements _i2.ZetaPrimitives { + _FakeZetaPrimitives_0( Object parent, Invocation parentInvocation, ) : super( @@ -35,8 +36,8 @@ class _FakeZetaTextStyle_0 extends _i1.SmartFake implements _i2.ZetaTextStyle { ); } -class _FakeZetaPrimitives_1 extends _i1.SmartFake implements _i2.ZetaPrimitives { - _FakeZetaPrimitives_1( +class _FakeZetaSemantics_1 extends _i1.SmartFake implements _i2.ZetaSemantics { + _FakeZetaSemantics_1( Object parent, Invocation parentInvocation, ) : super( @@ -45,8 +46,8 @@ class _FakeZetaPrimitives_1 extends _i1.SmartFake implements _i2.ZetaPrimitives ); } -class _FakeZetaSemantics_2 extends _i1.SmartFake implements _i2.ZetaSemantics { - _FakeZetaSemantics_2( +class _FakeZetaTextStyle_2 extends _i1.SmartFake implements _i2.ZetaTextStyle { + _FakeZetaTextStyle_2( Object parent, Invocation parentInvocation, ) : super( @@ -132,6 +133,32 @@ class _FakeDiagnosticsNode_8 extends _i1.SmartFake implements _i4.DiagnosticsNod /// /// See the documentation for Mockito's code generation for more information. class MockZeta extends _i1.Mock implements _i2.Zeta { + @override + _i2.ZetaPrimitives get primitives => (super.noSuchMethod( + Invocation.getter(#primitives), + returnValue: _FakeZetaPrimitives_0( + this, + Invocation.getter(#primitives), + ), + returnValueForMissingStub: _FakeZetaPrimitives_0( + this, + Invocation.getter(#primitives), + ), + ) as _i2.ZetaPrimitives); + + @override + _i2.ZetaSemantics get semantics => (super.noSuchMethod( + Invocation.getter(#semantics), + returnValue: _FakeZetaSemantics_1( + this, + Invocation.getter(#semantics), + ), + returnValueForMissingStub: _FakeZetaSemantics_1( + this, + Invocation.getter(#semantics), + ), + ) as _i2.ZetaSemantics); + @override bool get rounded => (super.noSuchMethod( Invocation.getter(#rounded), @@ -156,42 +183,16 @@ class MockZeta extends _i1.Mock implements _i2.Zeta { @override _i2.ZetaTextStyle get textStyles => (super.noSuchMethod( Invocation.getter(#textStyles), - returnValue: _FakeZetaTextStyle_0( + returnValue: _FakeZetaTextStyle_2( this, Invocation.getter(#textStyles), ), - returnValueForMissingStub: _FakeZetaTextStyle_0( + returnValueForMissingStub: _FakeZetaTextStyle_2( this, Invocation.getter(#textStyles), ), ) as _i2.ZetaTextStyle); - @override - _i2.ZetaPrimitives get primitives => (super.noSuchMethod( - Invocation.getter(#primitives), - returnValue: _FakeZetaPrimitives_1( - this, - Invocation.getter(#primitives), - ), - returnValueForMissingStub: _FakeZetaPrimitives_1( - this, - Invocation.getter(#primitives), - ), - ) as _i2.ZetaPrimitives); - - @override - _i2.ZetaSemantics get semantics => (super.noSuchMethod( - Invocation.getter(#semantics), - returnValue: _FakeZetaSemantics_2( - this, - Invocation.getter(#semantics), - ), - returnValueForMissingStub: _FakeZetaSemantics_2( - this, - Invocation.getter(#semantics), - ), - ) as _i2.ZetaSemantics); - @override _i2.ZetaColors get colors => (super.noSuchMethod( Invocation.getter(#colors), diff --git a/packages/zeta_flutter_theme/test/src/rounded_test.mocks.dart b/packages/zeta_flutter_theme/test/src/rounded_test.mocks.dart index 3e137aa54..a0fab510d 100644 --- a/packages/zeta_flutter_theme/test/src/rounded_test.mocks.dart +++ b/packages/zeta_flutter_theme/test/src/rounded_test.mocks.dart @@ -24,9 +24,10 @@ import 'package:zeta_flutter_theme/zeta_flutter_theme.dart' as _i2; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member -class _FakeZetaTextStyle_0 extends _i1.SmartFake implements _i2.ZetaTextStyle { - _FakeZetaTextStyle_0( +class _FakeZetaPrimitives_0 extends _i1.SmartFake implements _i2.ZetaPrimitives { + _FakeZetaPrimitives_0( Object parent, Invocation parentInvocation, ) : super( @@ -35,8 +36,8 @@ class _FakeZetaTextStyle_0 extends _i1.SmartFake implements _i2.ZetaTextStyle { ); } -class _FakeZetaPrimitives_1 extends _i1.SmartFake implements _i2.ZetaPrimitives { - _FakeZetaPrimitives_1( +class _FakeZetaSemantics_1 extends _i1.SmartFake implements _i2.ZetaSemantics { + _FakeZetaSemantics_1( Object parent, Invocation parentInvocation, ) : super( @@ -45,8 +46,8 @@ class _FakeZetaPrimitives_1 extends _i1.SmartFake implements _i2.ZetaPrimitives ); } -class _FakeZetaSemantics_2 extends _i1.SmartFake implements _i2.ZetaSemantics { - _FakeZetaSemantics_2( +class _FakeZetaTextStyle_2 extends _i1.SmartFake implements _i2.ZetaTextStyle { + _FakeZetaTextStyle_2( Object parent, Invocation parentInvocation, ) : super( @@ -132,6 +133,32 @@ class _FakeDiagnosticsNode_8 extends _i1.SmartFake implements _i4.DiagnosticsNod /// /// See the documentation for Mockito's code generation for more information. class MockZeta extends _i1.Mock implements _i2.Zeta { + @override + _i2.ZetaPrimitives get primitives => (super.noSuchMethod( + Invocation.getter(#primitives), + returnValue: _FakeZetaPrimitives_0( + this, + Invocation.getter(#primitives), + ), + returnValueForMissingStub: _FakeZetaPrimitives_0( + this, + Invocation.getter(#primitives), + ), + ) as _i2.ZetaPrimitives); + + @override + _i2.ZetaSemantics get semantics => (super.noSuchMethod( + Invocation.getter(#semantics), + returnValue: _FakeZetaSemantics_1( + this, + Invocation.getter(#semantics), + ), + returnValueForMissingStub: _FakeZetaSemantics_1( + this, + Invocation.getter(#semantics), + ), + ) as _i2.ZetaSemantics); + @override bool get rounded => (super.noSuchMethod( Invocation.getter(#rounded), @@ -156,42 +183,16 @@ class MockZeta extends _i1.Mock implements _i2.Zeta { @override _i2.ZetaTextStyle get textStyles => (super.noSuchMethod( Invocation.getter(#textStyles), - returnValue: _FakeZetaTextStyle_0( + returnValue: _FakeZetaTextStyle_2( this, Invocation.getter(#textStyles), ), - returnValueForMissingStub: _FakeZetaTextStyle_0( + returnValueForMissingStub: _FakeZetaTextStyle_2( this, Invocation.getter(#textStyles), ), ) as _i2.ZetaTextStyle); - @override - _i2.ZetaPrimitives get primitives => (super.noSuchMethod( - Invocation.getter(#primitives), - returnValue: _FakeZetaPrimitives_1( - this, - Invocation.getter(#primitives), - ), - returnValueForMissingStub: _FakeZetaPrimitives_1( - this, - Invocation.getter(#primitives), - ), - ) as _i2.ZetaPrimitives); - - @override - _i2.ZetaSemantics get semantics => (super.noSuchMethod( - Invocation.getter(#semantics), - returnValue: _FakeZetaSemantics_2( - this, - Invocation.getter(#semantics), - ), - returnValueForMissingStub: _FakeZetaSemantics_2( - this, - Invocation.getter(#semantics), - ), - ) as _i2.ZetaSemantics); - @override _i2.ZetaColors get colors => (super.noSuchMethod( Invocation.getter(#colors), diff --git a/packages/zeta_flutter_theme/test/src/zeta_provider_test.mocks.dart b/packages/zeta_flutter_theme/test/src/zeta_provider_test.mocks.dart index fc05ab5c5..ee26ac315 100644 --- a/packages/zeta_flutter_theme/test/src/zeta_provider_test.mocks.dart +++ b/packages/zeta_flutter_theme/test/src/zeta_provider_test.mocks.dart @@ -21,6 +21,7 @@ import 'package:zeta_flutter_theme/src/theme_service.dart' as _i2; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member class _FakeZetaThemeServiceData_0 extends _i1.SmartFake implements _i2.ZetaThemeServiceData { _FakeZetaThemeServiceData_0( diff --git a/packages/zeta_flutter_utils/test/src/extensions_test.mocks.dart b/packages/zeta_flutter_utils/test/src/extensions_test.mocks.dart index b5f359e59..111c271d0 100644 --- a/packages/zeta_flutter_utils/test/src/extensions_test.mocks.dart +++ b/packages/zeta_flutter_utils/test/src/extensions_test.mocks.dart @@ -25,6 +25,7 @@ import 'package:zeta_flutter_theme/zeta_flutter_theme.dart' as _i4; // ignore_for_file: unnecessary_parenthesis // ignore_for_file: camel_case_types // ignore_for_file: subtype_of_sealed_class +// ignore_for_file: invalid_use_of_internal_member class _FakeWidget_0 extends _i1.SmartFake implements _i2.Widget { _FakeWidget_0( @@ -89,8 +90,8 @@ class _FakeColor_4 extends _i1.SmartFake implements _i5.Color { ); } -class _FakeZetaTextStyle_5 extends _i1.SmartFake implements _i4.ZetaTextStyle { - _FakeZetaTextStyle_5( +class _FakeZetaSemantics_5 extends _i1.SmartFake implements _i4.ZetaSemantics { + _FakeZetaSemantics_5( Object parent, Invocation parentInvocation, ) : super( @@ -99,8 +100,8 @@ class _FakeZetaTextStyle_5 extends _i1.SmartFake implements _i4.ZetaTextStyle { ); } -class _FakeZetaSemantics_6 extends _i1.SmartFake implements _i4.ZetaSemantics { - _FakeZetaSemantics_6( +class _FakeZetaTextStyle_6 extends _i1.SmartFake implements _i4.ZetaTextStyle { + _FakeZetaTextStyle_6( Object parent, Invocation parentInvocation, ) : super( @@ -1601,6 +1602,32 @@ class MockZetaColors extends _i1.Mock implements _i4.ZetaColors { /// /// See the documentation for Mockito's code generation for more information. class MockZeta extends _i1.Mock implements _i4.Zeta { + @override + _i4.ZetaPrimitives get primitives => (super.noSuchMethod( + Invocation.getter(#primitives), + returnValue: _FakeZetaPrimitives_3( + this, + Invocation.getter(#primitives), + ), + returnValueForMissingStub: _FakeZetaPrimitives_3( + this, + Invocation.getter(#primitives), + ), + ) as _i4.ZetaPrimitives); + + @override + _i4.ZetaSemantics get semantics => (super.noSuchMethod( + Invocation.getter(#semantics), + returnValue: _FakeZetaSemantics_5( + this, + Invocation.getter(#semantics), + ), + returnValueForMissingStub: _FakeZetaSemantics_5( + this, + Invocation.getter(#semantics), + ), + ) as _i4.ZetaSemantics); + @override bool get rounded => (super.noSuchMethod( Invocation.getter(#rounded), @@ -1625,42 +1652,16 @@ class MockZeta extends _i1.Mock implements _i4.Zeta { @override _i4.ZetaTextStyle get textStyles => (super.noSuchMethod( Invocation.getter(#textStyles), - returnValue: _FakeZetaTextStyle_5( + returnValue: _FakeZetaTextStyle_6( this, Invocation.getter(#textStyles), ), - returnValueForMissingStub: _FakeZetaTextStyle_5( + returnValueForMissingStub: _FakeZetaTextStyle_6( this, Invocation.getter(#textStyles), ), ) as _i4.ZetaTextStyle); - @override - _i4.ZetaPrimitives get primitives => (super.noSuchMethod( - Invocation.getter(#primitives), - returnValue: _FakeZetaPrimitives_3( - this, - Invocation.getter(#primitives), - ), - returnValueForMissingStub: _FakeZetaPrimitives_3( - this, - Invocation.getter(#primitives), - ), - ) as _i4.ZetaPrimitives); - - @override - _i4.ZetaSemantics get semantics => (super.noSuchMethod( - Invocation.getter(#semantics), - returnValue: _FakeZetaSemantics_6( - this, - Invocation.getter(#semantics), - ), - returnValueForMissingStub: _FakeZetaSemantics_6( - this, - Invocation.getter(#semantics), - ), - ) as _i4.ZetaSemantics); - @override _i4.ZetaColors get colors => (super.noSuchMethod( Invocation.getter(#colors), diff --git a/widgetbook/assets/logo-dark.svg b/widgetbook/assets/logo-dark.svg new file mode 100644 index 000000000..b75da8a16 --- /dev/null +++ b/widgetbook/assets/logo-dark.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/widgetbook/assets/logo-light.svg b/widgetbook/assets/logo-light.svg new file mode 100644 index 000000000..0a562fde4 --- /dev/null +++ b/widgetbook/assets/logo-light.svg @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/widgetbook/lib/main.dart b/widgetbook/lib/main.dart index 068950c79..31cf12bfc 100644 --- a/widgetbook/lib/main.dart +++ b/widgetbook/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:http/http.dart' as http; import 'package:widgetbook/widgetbook.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @@ -34,13 +35,7 @@ class WidgetbookApp extends StatelessWidget { const semanticsLight = ZetaColorsAA(primitives: ZetaPrimitivesLight()); const semanticsDark = ZetaColorsAA(primitives: ZetaPrimitivesDark()); return Widgetbook( - directories: [ - WidgetbookUseCase( - name: 'Introduction', - builder: (BuildContext context) => IntroductionWidgetbook(readme: readme), - ), - ...directories, - ], + directories: directories, lightTheme: ThemeData( fontFamily: kZetaFontFamily, colorScheme: ColorScheme.fromSeed( @@ -56,8 +51,17 @@ class WidgetbookApp extends StatelessWidget { primary: semanticsDark.mainPrimary, ), ), - themeMode: ThemeMode.dark, - initialRoute: '?path=introduction', + home: IntroductionWidgetbook(readme: readme), + header: Builder( + builder: (context) { + return SvgPicture.asset( + Theme.of(context).brightness == Brightness.dark ? 'assets/logo-dark.svg' : 'assets/logo-light.svg', + semanticsLabel: 'Zeta Logo', + width: 150, + alignment: Alignment.centerLeft, + ); + }, + ), appBuilder: (context, child) => child, addons: [ ViewportAddon([ diff --git a/widgetbook/macos/Podfile.lock b/widgetbook/macos/Podfile.lock index 94203623b..15f5ba121 100644 --- a/widgetbook/macos/Podfile.lock +++ b/widgetbook/macos/Podfile.lock @@ -6,14 +6,11 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - record_macos (1.0.0): + - record_macos (1.1.0): - FlutterMacOS - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqflite_darwin (0.0.4): - - Flutter - - FlutterMacOS - url_launcher_macos (0.0.1): - FlutterMacOS @@ -23,7 +20,6 @@ DEPENDENCIES: - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - record_macos (from `Flutter/ephemeral/.symlinks/plugins/record_macos/macos`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - - sqflite_darwin (from `Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) EXTERNAL SOURCES: @@ -37,18 +33,15 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/record_macos/macos shared_preferences_foundation: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin - sqflite_darwin: - :path: Flutter/ephemeral/.symlinks/plugins/sqflite_darwin/darwin url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: audioplayers_darwin: 4027b33a8f471d996c13f71cb77f0b1583b5d923 - FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - record_macos: 3ead198d39fad25d10163780132a96b6fd162a1c + record_macos: 4440ca269ad3b870ebb1965297a365d558f0c520 shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3