Merge pull request #13 from mkobuolys/fix/split-slide-text-color

fix: override text colors for Material text styles
mkobuolys · Sep 17, 2023 · 83a83d1 · 83a83d1
2 parents d74fb6d + eda9d1f
commit 83a83d1
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.4.1
+
+fix: override text colors for Material text styles
+
 # 0.4.0
 
 - **BREAKING**: refactor: rework the way how a new slide is created

diff --git a/lib/src/flutter_deck_slide.dart b/lib/src/flutter_deck_slide.dart
@@ -252,17 +252,29 @@ class FlutterDeckSlide extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final materialTheme = Theme.of(context);
     final theme = FlutterDeckTheme.of(context).merge(_theme);
+
     final slideTheme = theme.slideTheme;
-    final textTheme = theme.textTheme;
+    final backgroundColor = slideTheme.backgroundColor;
+    final color = slideTheme.color;
 
-    return FlutterDeckTheme(
-      data: theme.copyWith(textTheme: textTheme.apply(color: slideTheme.color)),
-      child: Builder(
-        builder: (context) => Scaffold(
-          backgroundColor: slideTheme.backgroundColor,
-          drawer: const FlutterDeckDrawer(),
-          body: _SlideBody(child: _builder(context)),
+    return Theme(
+      data: materialTheme.copyWith(
+        textTheme: materialTheme.textTheme.apply(
+          bodyColor: color,
+          displayColor: color,
+          decorationColor: color,
+        ),
+      ),
+      child: FlutterDeckTheme(
+        data: theme.copyWith(textTheme: theme.textTheme.apply(color: color)),
+        child: Builder(
+          builder: (context) => Scaffold(
+            backgroundColor: backgroundColor,
+            drawer: const FlutterDeckDrawer(),
+            body: _SlideBody(child: _builder(context)),
+          ),
         ),
       ),
     );

diff --git a/lib/src/templates/split_slide.dart b/lib/src/templates/split_slide.dart
@@ -172,16 +172,26 @@ class _ContentSection extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final materialTheme = Theme.of(context);
     final theme = FlutterDeckTheme.of(context);
 
-    return FlutterDeckTheme(
-      data: theme.copyWith(textTheme: theme.textTheme.apply(color: color)),
-      child: Builder(
-        builder: (context) => Expanded(
-          flex: flex,
-          child: Padding(
-            padding: FlutterDeckLayout.slidePadding,
-            child: builder(context),
+    return Theme(
+      data: materialTheme.copyWith(
+        textTheme: materialTheme.textTheme.apply(
+          bodyColor: color,
+          displayColor: color,
+          decorationColor: color,
+        ),
+      ),
+      child: FlutterDeckTheme(
+        data: theme.copyWith(textTheme: theme.textTheme.apply(color: color)),
+        child: Builder(
+          builder: (context) => Expanded(
+            flex: flex,
+            child: Padding(
+              padding: FlutterDeckLayout.slidePadding,
+              child: builder(context),
+            ),
           ),
         ),
       ),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_deck
 description: A lightweight, customizable, and easy-to-use framework to create presentations in Flutter.
-version: 0.4.0
+version: 0.4.1
 homepage: https://github.com/mkobuolys/flutter_deck
 repository: https://github.com/mkobuolys/flutter_deck
 issue_tracker: https://github.com/mkobuolys/flutter_deck/issues