fix: Add selected tab pill text color (#181)

coingaming · May 26, 2023 · 1ce39cf · 1ce39cf
1 parent 129b0a7
commit 1ce39cf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/src/theme/tab_bar/tab_bar_colors.dart b/lib/src/theme/tab_bar/tab_bar_colors.dart
@@ -11,13 +11,15 @@ class MoonTabBarColors extends ThemeExtension<MoonTabBarColors> with Diagnostica
     indicatorColor: MoonColors.light.piccolo,
     textColor: MoonTypography.light.colors.bodyPrimary,
     selectedTextColor: MoonColors.light.piccolo,
+    selectedPillTextColor: MoonTypography.light.colors.bodyPrimary,
     selectedPillTabColor: MoonColors.light.gohan,
   );
 
   static final dark = MoonTabBarColors(
     indicatorColor: MoonColors.dark.piccolo,
     textColor: MoonTypography.dark.colors.bodyPrimary,
     selectedTextColor: MoonColors.dark.piccolo,
+    selectedPillTextColor: MoonTypography.dark.colors.bodyPrimary,
     selectedPillTabColor: MoonColors.dark.gohan,
   );
 
@@ -30,13 +32,17 @@ class MoonTabBarColors extends ThemeExtension<MoonTabBarColors> with Diagnostica
   /// TabBar selected tab text color.
   final Color selectedTextColor;
 
+  /// TabBar selected pill tab text color.
+  final Color selectedPillTextColor;
+
   /// TabBar selected pill tab color.
   final Color selectedPillTabColor;
 
   const MoonTabBarColors({
     required this.indicatorColor,
     required this.textColor,
     required this.selectedTextColor,
+    required this.selectedPillTextColor,
     required this.selectedPillTabColor,
   });
 
@@ -45,12 +51,14 @@ class MoonTabBarColors extends ThemeExtension<MoonTabBarColors> with Diagnostica
     Color? indicatorColor,
     Color? textColor,
     Color? selectedTextColor,
+    Color? selectedPillTextColor,
     Color? selectedPillTabColor,
   }) {
     return MoonTabBarColors(
       indicatorColor: indicatorColor ?? this.indicatorColor,
       textColor: textColor ?? this.textColor,
       selectedTextColor: selectedTextColor ?? this.selectedTextColor,
+      selectedPillTextColor: selectedPillTextColor ?? this.selectedPillTextColor,
       selectedPillTabColor: selectedPillTabColor ?? this.selectedPillTabColor,
     );
   }
@@ -63,6 +71,7 @@ class MoonTabBarColors extends ThemeExtension<MoonTabBarColors> with Diagnostica
       indicatorColor: colorPremulLerp(indicatorColor, other.indicatorColor, t)!,
       textColor: colorPremulLerp(textColor, other.textColor, t)!,
       selectedTextColor: colorPremulLerp(selectedTextColor, other.selectedTextColor, t)!,
+      selectedPillTextColor: colorPremulLerp(selectedPillTextColor, other.selectedPillTextColor, t)!,
       selectedPillTabColor: colorPremulLerp(selectedPillTabColor, other.selectedPillTabColor, t)!,
     );
   }
@@ -75,6 +84,7 @@ class MoonTabBarColors extends ThemeExtension<MoonTabBarColors> with Diagnostica
       ..add(ColorProperty("indicatorColor", indicatorColor))
       ..add(ColorProperty("textColor", textColor))
       ..add(ColorProperty("selectedTextColor", selectedTextColor))
+      ..add(ColorProperty("selectedPillTextColor", selectedPillTextColor))
       ..add(ColorProperty("selectedPillTabColor", selectedPillTabColor));
   }
 }
diff --git a/lib/src/widgets/tab_bar/tab_bar.dart b/lib/src/widgets/tab_bar/tab_bar.dart
@@ -449,8 +449,8 @@ class _PillTabBuilder extends StatelessWidget {
         MoonTypography.light.colors.bodyPrimary;
 
     final Color effectiveSelectedTextColor = tabStyle?.selectedTextColor ??
-        context.moonTheme?.tabBarTheme.colors.selectedTextColor ??
-        MoonColors.light.piccolo;
+        context.moonTheme?.tabBarTheme.colors.selectedPillTextColor ??
+        MoonTypography.light.colors.bodyPrimary;
 
     final TextStyle effectiveTextStyle = moonTabBarSizeProperties.textStyle.merge(tabStyle?.textStyle);