Fixed theme (#6)

* fixed warnings

* decreased min dart version

* Update pubspec.yaml

* fixed theme and filter

* fixed theme

Co-authored-by: Volodymyr Oliinyk <[email protected]>

Author: Oliinyk-Volodymyr

CHANGELOG.md

@@ -1,3 +1,5 @@
+## 1.0.3
+- fixed theme
 ## 1.0.2
 - fixed a bug with filter logs
 ## 1.0.1

lib/logger_flutter_plus.dart

@@ -5,6 +5,7 @@ export 'package:logger/logger.dart';
 
 export 'src/shake/default_shake_detector.dart';
 export 'src/shake/shake_detector.dart';
+export 'src/theme/log_console_theme.dart';
 export 'src/utils/log_console_manager.dart';
 export 'src/widgets/log_console_widget.dart';
 export 'src/widgets/shake_detector_widget.dart';

lib/src/theme/log_color_schema.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+class LogColorSchema {
+  static const Color bottomAppBarColor = Colors.black87;
+  static Color scaffoldBackgroundColor = Colors.black26;
+
+  static const Color logTextColor = Colors.white;
+}

lib/src/theme/log_console_theme.dart

@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:logger_flutter_plus/src/theme/log_color_schema.dart';
+
+class LogConsoleTheme {
+  const LogConsoleTheme._({
+    required this.bottomAppBarColor,
+    required this.scaffoldBackgroundColor,
+    required this.bodyLarge,
+  });
+
+  factory LogConsoleTheme.byTheme(
+    ThemeData theme,
+  ) =>
+      LogConsoleTheme._(
+        bottomAppBarColor: theme.bottomAppBarTheme.color ?? theme.bottomAppBarColor,
+        scaffoldBackgroundColor: theme.scaffoldBackgroundColor,
+        bodyLarge: theme.textTheme.bodyLarge,
+      );
+
+  factory LogConsoleTheme.dark() => LogConsoleTheme._(
+        bottomAppBarColor: LogColorSchema.bottomAppBarColor,
+        scaffoldBackgroundColor: LogColorSchema.scaffoldBackgroundColor,
+        bodyLarge: TextStyle(
+          color: LogColorSchema.logTextColor,
+        ),
+      );
+
+  final Color bottomAppBarColor;
+  final Color scaffoldBackgroundColor;
+
+  final TextStyle? bodyLarge;
+}

lib/src/widgets/log_console_app_bar.dart

@@ -1,26 +1,27 @@
 import 'package:flutter/material.dart';
+import 'package:logger_flutter_plus/src/theme/log_console_theme.dart';
 
 class LogConsoleAppBar extends StatelessWidget {
   const LogConsoleAppBar({
     super.key,
     this.showCloseButton = true,
     required this.onIncreaseFontSize,
     required this.onDecreaseFontSize,
+    required this.theme,
   });
 
   final bool showCloseButton;
 
   final VoidCallback onDecreaseFontSize;
   final VoidCallback onIncreaseFontSize;
+  final LogConsoleTheme theme;
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
     return Container(
       height: 60,
       padding: EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-      color: theme.bottomAppBarTheme.color ?? theme.bottomAppBarColor,
+      color: theme.bottomAppBarColor,
       child: Row(
         mainAxisSize: MainAxisSize.max,
         children: <Widget>[

lib/src/widgets/log_console_bottom_bar.dart

@@ -1,26 +1,27 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
+import 'package:logger_flutter_plus/src/theme/log_console_theme.dart';
 
 class LogConsoleBottomBar extends StatelessWidget {
   const LogConsoleBottomBar({
     super.key,
     this.filterLevel,
     this.onChangedFilterLevel,
     this.onChangedFilterText,
+    required this.theme,
   });
 
   final ValueChanged<Level?>? onChangedFilterLevel;
   final ValueChanged<String>? onChangedFilterText;
   final Level? filterLevel;
+  final LogConsoleTheme theme;
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
     return Container(
       height: 60,
       padding: EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-      color: theme.bottomAppBarTheme.color ?? theme.bottomAppBarColor,
+      color: theme.bottomAppBarColor,
       child: Row(
         children: [
           Expanded(

lib/src/widgets/log_console_content.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
+import 'package:logger_flutter_plus/src/theme/log_console_theme.dart';
 import 'package:logger_flutter_plus/src/utils/log_console_manager.dart';
 
 class LogConsoleContent extends StatefulWidget {
@@ -10,6 +11,7 @@ class LogConsoleContent extends StatefulWidget {
     required this.filterText,
     required this.scrollController,
     required this.logConsoleManager,
+    required this.theme,
   });
 
   final double logFontSize;
@@ -18,6 +20,7 @@ class LogConsoleContent extends StatefulWidget {
 
   final ScrollController scrollController;
   final LogConsoleManager logConsoleManager;
+  final LogConsoleTheme theme;
 
   @override
   State<LogConsoleContent> createState() => _LogConsoleContentState();
@@ -54,7 +57,7 @@ class _LogConsoleContentState extends State<LogConsoleContent> {
           itemBuilder: (context, index) => Text.rich(
             widget.logConsoleManager.logs[index].span,
             key: ValueKey(widget.logConsoleManager.logs[index].id),
-            style: theme.textTheme.bodyText1?.copyWith(fontSize: widget.logFontSize),
+            style: widget.theme.bodyLarge?.copyWith(fontSize: widget.logFontSize),
           ),
           itemCount: widget.logConsoleManager.logs.length,
         ),

lib/src/widgets/log_console_widget.dart

@@ -1,19 +1,22 @@
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
+import 'package:logger_flutter_plus/src/theme/log_console_theme.dart';
 import 'package:logger_flutter_plus/src/utils/log_console_manager.dart';
 import 'package:logger_flutter_plus/src/widgets/log_console_app_bar.dart';
 import 'package:logger_flutter_plus/src/widgets/log_console_bottom_bar.dart';
 import 'package:logger_flutter_plus/src/widgets/log_console_content.dart';
 
 class LogConsoleWidget extends StatefulWidget {
-  const LogConsoleWidget({
+  LogConsoleWidget({
     super.key,
     required this.logConsoleManager,
     this.showCloseButton = false,
-  });
+    LogConsoleTheme? theme,
+  }) : theme = theme ?? LogConsoleTheme.dark();
 
   final bool showCloseButton;
   final LogConsoleManager logConsoleManager;
+  late final LogConsoleTheme theme;
 
   @override
   State<LogConsoleWidget> createState() => _LogConsoleWidgetState();
@@ -61,11 +64,13 @@ class _LogConsoleWidgetState extends State<LogConsoleWidget> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: widget.theme.scaffoldBackgroundColor,
       body: SafeArea(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: <Widget>[
             LogConsoleAppBar(
+              theme: widget.theme,
               showCloseButton: widget.showCloseButton,
               onDecreaseFontSize: () {
                 setState(() {
@@ -80,6 +85,7 @@ class _LogConsoleWidgetState extends State<LogConsoleWidget> {
             ),
             Expanded(
               child: LogConsoleContent(
+                theme: widget.theme,
                 logFontSize: _logFontSize,
                 filterLevel: _filterLevel,
                 filterText: _filterText,
@@ -88,6 +94,7 @@ class _LogConsoleWidgetState extends State<LogConsoleWidget> {
               ),
             ),
             LogConsoleBottomBar(
+              theme: widget.theme,
               filterLevel: _filterLevel,
               onChangedFilterLevel: (filterLevel) {
                 widget.logConsoleManager.setFilterLevel(filterLevel);

pubspec.yaml

@@ -1,8 +1,8 @@
 name: logger_flutter_plus
 description: Flutter extension for logger. Please go there for documentation.
-version: 1.0.2
+version: 1.0.3
 
-homepage: https://github.com/Oliinyk-Volodymyr/logger_flutter
+homepage: https://github.com/Oliinyk-Volodymyr/logger_flutter_plus
 
 environment:
   sdk: ">=2.17.0 <3.0.0"