conceptadev · tilucasoli · Dec 5, 2024 · Nov 12, 2024 · Nov 13, 2024 · Nov 18, 2024
diff --git a/packages/mix/lib/src/theme/mix/mix_theme.dart b/packages/mix/lib/src/theme/mix/mix_theme.dart
@@ -11,7 +11,7 @@ import '../tokens/space_token.dart';
 import '../tokens/text_style_token.dart';
 
 class MixTheme extends InheritedWidget {
-  const MixTheme({required super.child, required this.data, super.key});
+  const MixTheme({required this.data, super.key, required super.child});
 
   static MixThemeData of(BuildContext context) {
     final themeData =

diff --git a/packages/mix_generator/lib/src/helpers/builder_utils.dart b/packages/mix_generator/lib/src/helpers/builder_utils.dart
@@ -131,19 +131,6 @@
   }
 }
 
-class TokenAnnotationContext extends AnnotationContext {
-  final Object? type;
-
-  TokenAnnotationContext({
-    required super.element,
-    required this.type,
-  });
-
-  String get name => element.name;
-
-  String get generatedName => element.generatedName;
-}
-
 extension ClassElementX on ClassElement {
   bool get isConst => unnamedConstructor?.isConst ?? false;
 
@@ -264,7 +251,7 @@
      return thisElement.name;
    }

    return getDisplayString(withNullability: false);
  }

  ClassElement? get classElement {

diff --git a/packages/remix/demo/lib/components/avatar_use_case.dart b/packages/remix/demo/lib/components/avatar_use_case.dart
@@ -1,6 +1,7 @@
 import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/badge_use_case.dart b/packages/remix/demo/lib/components/badge_use_case.dart
@@ -1,5 +1,7 @@
+import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 
@@ -15,8 +17,8 @@ Widget buildAvatarUseCase(BuildContext context) {
           label: 'Label',
           initialValue: 'New',
         ),
-        variants: const [
-          // context.knobs.variant(FortalezaBadgeStyle.variants),
+        variants: [
+          context.knobs.variant(FortalezaBadgeStyle.variants),
         ],
       ),
     ),

diff --git a/packages/remix/demo/lib/components/button_use_case.dart b/packages/remix/demo/lib/components/button_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/addons/icon_data_knob.dart';
 import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/callout_use_case.dart b/packages/remix/demo/lib/components/callout_use_case.dart
@@ -1,8 +1,8 @@
 import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/material.dart' as m;
 import 'package:flutter/widgets.dart';
-
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/card_use_case.dart b/packages/remix/demo/lib/components/card_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:mix/mix.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 
@@ -32,12 +33,12 @@ Widget buildCard(BuildContext context) {
               children: [
                 StyledText(
                   'Leo Farias',
-                  style: Style($text.style.ref($rx.text.text3)),
+                  style: Style($text.style.$text3()),
                 ),
                 StyledText(
                   'Flutter Engineer',
                   style: Style(
-                    $text.style.ref($rx.text.text2),
+                    $text.style.$text2(),
                     $text.style.color.$neutral(10),
                   ),
                 ),

diff --git a/packages/remix/demo/lib/components/checkbox_use_case.dart b/packages/remix/demo/lib/components/checkbox_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:demo/helpers/use_case_state.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/chip_use_case.dart b/packages/remix/demo/lib/components/chip_use_case.dart
@@ -3,6 +3,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:demo/helpers/use_case_state.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/icon_button_use_case.dart b/packages/remix/demo/lib/components/icon_button_use_case.dart
@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart' as m;
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/progress_use_case.dart b/packages/remix/demo/lib/components/progress_use_case.dart
@@ -1,6 +1,7 @@
 import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/radio_use_case.dart b/packages/remix/demo/lib/components/radio_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:demo/helpers/string.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/select_use_case.dart b/packages/remix/demo/lib/components/select_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/material.dart' as m;
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/spinner_use_case.dart b/packages/remix/demo/lib/components/spinner_use_case.dart
@@ -1,6 +1,7 @@
 import 'package:demo/helpers/knob_builder.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/switch_use_case.dart b/packages/remix/demo/lib/components/switch_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/helpers/knob_builder.dart';
 import 'package:demo/helpers/use_case_state.dart';
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/components/textfield_use_case.dart b/packages/remix/demo/lib/components/textfield_use_case.dart
@@ -2,6 +2,7 @@ import 'package:demo/addons/icon_data_knob.dart';
 import 'package:flutter/material.dart' as m;
 import 'package:flutter/widgets.dart';
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 

diff --git a/packages/remix/demo/lib/helpers/theme_addon.dart b/packages/remix/demo/lib/helpers/theme_addon.dart
@@ -1,10 +1,7 @@
 import 'package:remix/remix.dart';
 import 'package:widgetbook/widgetbook.dart';
 
-typedef ThemeMultiBrightness = ({
-  RemixComponentTheme light,
-  RemixComponentTheme dark
-});
+typedef ThemeMultiBrightness = ({RemixThemeData light, RemixThemeData dark});
 
 class RemixComponentThemeAddon extends ThemeAddon<ThemeMultiBrightness> {
   @override
@@ -17,14 +14,8 @@ class RemixComponentThemeAddon extends ThemeAddon<ThemeMultiBrightness> {
           themeBuilder: (context, themes, child) {
             return RemixApp(
               debugShowCheckedModeBanner: false,
-              darkTheme: RemixThemeData(
-                tokens: dark,
-                components: themes.dark,
-              ),
-              theme: RemixThemeData(
-                components: themes.light,
-                tokens: light,
-              ),
+              darkTheme: themes.dark,
+              theme: themes.light,
               home: child,
             );
           },

diff --git a/packages/remix/demo/lib/main.dart b/packages/remix/demo/lib/main.dart
@@ -1,6 +1,7 @@
 import 'package:demo/helpers/theme_addon.dart';
 import 'package:flutter/material.dart' hide Scaffold, ThemeMode;
 import 'package:remix/remix.dart';
+import 'package:remix/themes/fortaleza.dart';
 import 'package:widgetbook/widgetbook.dart';
 import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook;
 
@@ -47,15 +48,15 @@ class HotReload extends StatelessWidget {
             WidgetbookTheme(
               name: 'Fortaleza',
               data: (
-                dark: RemixComponentTheme.fortalezaDark(),
-                light: RemixComponentTheme.fortalezaLight()
+                light: FortalezaThemeData.light(),
+                dark: FortalezaThemeData.dark(),
               ),
             ),
             WidgetbookTheme(
               name: 'Base',
               data: (
-                dark: RemixComponentTheme.baseDark(),
-                light: RemixComponentTheme.baseLight(),
+                light: RemixThemeData.baseLight(),
+                dark: RemixThemeData.baseDark(),
               ),
             ),
           ],

diff --git a/packages/remix/demo/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/packages/remix/demo/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -1,12 +1,12 @@
 // This is a generated file; do not edit or check into version control.
 FLUTTER_ROOT=/Users/lucasoliveira/fvm/versions/stable
-FLUTTER_APPLICATION_PATH=/Users/lucasoliveira/Developer/Mix/mix/packages/remix/demo
+FLUTTER_APPLICATION_PATH=/Users/lucasoliveira/Developer/Projects/hairday/packages/mix/packages/remix/demo
 COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=/Users/lucasoliveira/Developer/Mix/mix/packages/remix/demo/lib/main.dart
+FLUTTER_TARGET=/Users/lucasoliveira/Developer/Projects/hairday/packages/mix/packages/remix/demo/lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
 FLUTTER_BUILD_NUMBER=1
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=/Users/lucasoliveira/Developer/Mix/mix/packages/remix/demo/.dart_tool/package_config.json
+PACKAGE_CONFIG=/Users/lucasoliveira/Developer/Projects/hairday/packages/mix/packages/remix/demo/.dart_tool/package_config.json