chore: resolve conflict

pactus-project · Dec 27, 2024 · 612c995 · 612c995
1 parent 6994f68
commit 612c995
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/src/features/main/theme/bloc/theme_bloc.dart b/lib/src/features/main/theme/bloc/theme_bloc.dart
@@ -1,7 +1,7 @@
 // lib/src/features/main/theme/bloc/theme_bloc.dart
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
+import 'package:fluent_ui/fluent_ui.dart';
 import 'package:gui/src/features/main/theme/bloc/theme_state.dart';
 import '../../../../core/services/shared_preferences_service.dart';
 

diff --git a/lib/src/features/main/theme/bloc/theme_event.dart b/lib/src/features/main/theme/bloc/theme_event.dart
@@ -12,7 +12,7 @@ class InitializeThemeEvent extends ThemeEvent {}
 
 class ChangeTheme extends ThemeEvent {
   const ChangeTheme(this.themeData);
-  final ThemeData themeData;
+  final FluentThemeData themeData;
 
   @override
   List<Object> get props => [themeData];

diff --git a/lib/src/features/main/theme/bloc/theme_state.dart b/lib/src/features/main/theme/bloc/theme_state.dart
@@ -1,19 +1,19 @@
 // lib/src/features/main/theme/bloc/theme_state.dart
 import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
+import 'package:fluent_ui/fluent_ui.dart';
 
 class ThemeState extends Equatable {
   const ThemeState({
     required this.themeData,
   });
-  final ThemeData themeData;
+  final FluentThemeData themeData;
 
-  static ThemeData lightTheme = ThemeData(
+  static FluentThemeData lightTheme = FluentThemeData(
     brightness: Brightness.light,
   );
-  static ThemeData darkTheme = ThemeData.dark();
+  static FluentThemeData darkTheme = FluentThemeData.dark();
 
-  ThemeState copyWith({ThemeData? themeData}) {
+  ThemeState copyWith({FluentThemeData? themeData}) {
     return ThemeState(
       themeData: themeData ?? this.themeData,
     );