fix: Changed to apply to ChipTheme as well.

mathrunet · Mar 14, 2023 · 42ac2ca · 42ac2ca
1 parent fd1c44e
commit 42ac2ca
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/packages/katana_theme/example/pubspec.lock b/packages/katana_theme/example/pubspec.lock
@@ -345,7 +345,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.4.0"
+    version: "1.4.1"
   katana_theme_annotation:
     dependency: transitive
     description:
@@ -360,7 +360,7 @@ packages:
       path: "../../katana_theme_builder"
       relative: true
     source: path
-    version: "1.4.0"
+    version: "1.4.1"
   lints:
     dependency: transitive
     description:

diff --git a/packages/katana_theme/lib/src/app_theme_data.dart b/packages/katana_theme/lib/src/app_theme_data.dart
@@ -1240,6 +1240,20 @@ class AppThemeData {
             disabledColor: color.disabled,
             colorScheme: colorScheme,
           ),
+          chipTheme: theme.chipTheme.copyWith(
+            side: BorderSide.none,
+            backgroundColor: color.surface,
+            disabledColor: color.disabled,
+            labelStyle: theme.chipTheme.labelStyle?.copyWith(
+                  color: color.onSurface,
+                ) ??
+                TextStyle(color: color.onPrimary),
+            secondaryLabelStyle: theme.chipTheme.secondaryLabelStyle?.copyWith(
+                  color: color.onSurface,
+                ) ??
+                TextStyle(color: color.onSurface),
+            deleteIconColor: color.onSurface,
+          ),
           inputDecorationTheme: theme.inputDecorationTheme.copyWith(
             labelStyle: TextStyle(color: color.weak),
             helperStyle: TextStyle(color: color.weak),
@@ -1392,6 +1406,20 @@ class AppThemeData {
             disabledColor: color.disabled,
             colorScheme: colorScheme,
           ),
+          chipTheme: theme.chipTheme.copyWith(
+            side: BorderSide.none,
+            backgroundColor: color.surface,
+            disabledColor: color.disabled,
+            labelStyle: theme.chipTheme.labelStyle?.copyWith(
+                  color: color.onSurface,
+                ) ??
+                TextStyle(color: color.onPrimary),
+            secondaryLabelStyle: theme.chipTheme.secondaryLabelStyle?.copyWith(
+                  color: color.onSurface,
+                ) ??
+                TextStyle(color: color.onSurface),
+            deleteIconColor: color.onSurface,
+          ),
           inputDecorationTheme: theme.inputDecorationTheme.copyWith(
             labelStyle: TextStyle(color: color.weak),
             helperStyle: TextStyle(color: color.weak),

diff --git a/packages/katana_theme/pubspec.lock b/packages/katana_theme/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:

diff --git a/packages/katana_theme_annotation/pubspec.lock b/packages/katana_theme_annotation/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:

diff --git a/packages/katana_theme_builder/pubspec.lock b/packages/katana_theme_builder/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description: