review names

conceptadev · Oct 18, 2024 · 92ccb1f · 92ccb1f
1 parent 78ffce4
commit 92ccb1f
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 80 deletions.
diff --git a/packages/remix/lib/src/components/menu_item/menu_item.dart b/packages/remix/lib/src/components/menu_item/menu_item.dart
@@ -15,9 +15,9 @@ part 'menu_item_widget.dart';
 @MixableSpec()
 class MenuItemSpec extends Spec<MenuItemSpec>
     with _$MenuItemSpec, Diagnosticable {
-  final BoxSpec container;
-  final FlexSpec mainFlex;
-  final FlexSpec textFlex;
+  final BoxSpec outerContainer;
+  final FlexSpec contentLayout;
+  final FlexSpec titleSubtitleLayout;
   final IconSpec icon;
   final TextSpec title;
   final TextSpec subtitle;
@@ -28,20 +28,20 @@ class MenuItemSpec extends Spec<MenuItemSpec>
   static const from = _$MenuItemSpec.from;
 
   const MenuItemSpec({
-    FlexSpec? mainFlex,
-    FlexSpec? textFlex,
+    BoxSpec? outerContainer,
+    FlexSpec? contentLayout,
+    FlexSpec? titleSubtitleLayout,
     IconSpec? icon,
     TextSpec? title,
     TextSpec? subtitle,
-    BoxSpec? container,
     super.modifiers,
     super.animated,
-  })  : mainFlex = mainFlex ?? const FlexSpec(),
-        textFlex = textFlex ?? const FlexSpec(),
+  })  : outerContainer = outerContainer ?? const BoxSpec(),
+        contentLayout = contentLayout ?? const FlexSpec(),
+        titleSubtitleLayout = titleSubtitleLayout ?? const FlexSpec(),
         icon = icon ?? const IconSpec(),
         title = title ?? const TextSpec(),
-        subtitle = subtitle ?? const TextSpec(),
-        container = container ?? const BoxSpec();
+        subtitle = subtitle ?? const TextSpec();
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {

diff --git a/packages/remix/lib/src/components/menu_item/menu_item.g.dart b/packages/remix/lib/src/components/menu_item/menu_item.g.dart
diff --git a/packages/remix/lib/src/components/menu_item/menu_item_style.dart b/packages/remix/lib/src/components/menu_item/menu_item_style.dart
@@ -7,14 +7,14 @@ class MenuItemStyle extends SpecStyle<MenuItemSpecUtility> {
   Style makeStyle(SpecConfiguration<MenuItemSpecUtility> spec) {
     final $ = spec.utilities;
 
-    final textFlex = $.textFlex.chain
+    final titleSubtitleLayout = $.titleSubtitleLayout.chain
       ..mainAxisAlignment.start()
       ..crossAxisAlignment.start()
       ..mainAxisSize.min()
       ..wrap.expanded()
       ..gap(4.0);
 
-    final mainFlex = $.mainFlex.chain..gap(12.0);
+    final contentLayout = $.contentLayout.gap(12.0);
 
     final title = $.title.style.fontSize(14.0);
 
@@ -23,7 +23,7 @@ class MenuItemStyle extends SpecStyle<MenuItemSpecUtility> {
       ..style.color.grey.shade600()
       ..maxLines(2);
 
-    final container = $.container.chain
+    final outerContainer = $.outerContainer.chain
       ..padding(12)
       ..borderRadius(12);
 
@@ -37,11 +37,11 @@ class MenuItemStyle extends SpecStyle<MenuItemSpecUtility> {
     );
 
     return Style.create([
-      textFlex,
-      mainFlex,
+      titleSubtitleLayout,
+      contentLayout,
       title,
       subtitle,
-      container,
+      outerContainer,
       icon,
       spec.on.disabled(disabled),
     ]);

diff --git a/packages/remix/lib/src/components/menu_item/menu_item_theme.dart b/packages/remix/lib/src/components/menu_item/menu_item_theme.dart
@@ -8,9 +8,9 @@ class FortalezaMenuItemStyle extends MenuItemStyle {
     final $ = spec.utilities;
 
     final baseStyle = super.makeStyle(spec);
-    final textFlex = $.textFlex.chain..gap.$space(1);
+    final titleSubtitleLayout = $.titleSubtitleLayout.chain..gap.$space(1);
 
-    final mainFlex = $.mainFlex.chain..gap.$space(3);
+    final contentLayout = $.contentLayout.chain..gap.$space(3);
     final title = $.title.chain
       ..style.$text(2)
       ..style.color.resetDirectives()
@@ -21,14 +21,14 @@ class FortalezaMenuItemStyle extends MenuItemStyle {
       ..style.color.resetDirectives()
       ..style.color.$neutral(9);
 
-    final container = $.container.chain
+    final outerContainer = $.outerContainer.chain
       ..padding.all.$space(3)
       ..padding.right.$space(4)
       ..borderRadius.all.$radius(2);
 
     final icon = $.icon.color.$neutral(11);
 
-    final hovered = $.container.color.$accent(2);
+    final hovered = $.outerContainer.color.$accent(2);
 
     final disabled = $.chain
       ..title.style.color.$neutral(9)
@@ -37,11 +37,11 @@ class FortalezaMenuItemStyle extends MenuItemStyle {
 
     return Style.create([
       baseStyle(),
-      textFlex,
-      mainFlex,
+      titleSubtitleLayout,
+      contentLayout,
       title,
       subtitle,
-      container,
+      outerContainer,
       icon,
       spec.on.hover(hovered),
       spec.on.disabled(disabled),