More fixes

lichess-org · Dec 17, 2024 · cb303f4 · cb303f4
1 parent 7a6e7cc
commit cb303f4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 36 deletions.
diff --git a/lib/src/model/settings/general_preferences.dart b/lib/src/model/settings/general_preferences.dart
@@ -49,14 +49,6 @@ class GeneralPreferences extends _$GeneralPreferences with PreferencesStorage<Ge
 
   Future<void> toggleCustomTheme() async {
     await save(state.copyWith(customThemeEnabled: !state.customThemeEnabled));
-    if (state.customThemeEnabled == false) {
-      final boardTheme = ref.read(boardPreferencesProvider).boardTheme;
-      if (boardTheme == BoardTheme.system) {
-        await ref.read(boardPreferencesProvider.notifier).setBoardTheme(BoardTheme.brown);
-      }
-    } else {
-      await ref.read(boardPreferencesProvider.notifier).setBoardTheme(BoardTheme.system);
-    }
   }
 
   Future<void> setCustomThemeSeed(Color? color) {
@@ -88,7 +80,7 @@ class GeneralPrefs with _$GeneralPrefs implements Serializable {
     isSoundEnabled: true,
     soundTheme: SoundTheme.standard,
     masterVolume: 0.8,
-    customThemeEnabled: true,
+    customThemeEnabled: false,
   );
 
   factory GeneralPrefs.fromJson(Map<String, dynamic> json) {

diff --git a/lib/src/view/settings/theme_screen.dart b/lib/src/view/settings/theme_screen.dart
@@ -65,6 +65,8 @@ class _BodyState extends ConsumerState<_Body> {
 
     const horizontalPadding = 16.0;
 
+    final bool hasAjustedColors = brightness != 0.0 || hue != 0.0;
+
     return ListView(
       children: [
         LayoutBuilder(
@@ -140,26 +142,27 @@ class _BodyState extends ConsumerState<_Body> {
                 },
               ),
             ),
-            AnimatedCrossFade(
-              duration: const Duration(milliseconds: 300),
-              crossFadeState:
-                  brightness != 0.0 || hue != 0.0
-                      ? CrossFadeState.showSecond
-                      : CrossFadeState.showFirst,
-              firstChild: const SizedBox.shrink(),
-              secondChild: PlatformListTile(
-                leading: const Icon(Icons.cancel),
-                title: Text(context.l10n.boardReset),
-                onTap: () {
-                  setState(() {
-                    brightness = 0.0;
-                    hue = 0.0;
-                  });
-                  ref
-                      .read(boardPreferencesProvider.notifier)
-                      .adjustColors(brightness: 0.0, hue: 0.0);
-                },
+            PlatformListTile(
+              leading: Opacity(
+                opacity: hasAjustedColors ? 1.0 : 0.5,
+                child: const Icon(Icons.cancel),
+              ),
+              title: Opacity(
+                opacity: hasAjustedColors ? 1.0 : 0.5,
+                child: Text(context.l10n.boardReset),
               ),
+              onTap:
+                  hasAjustedColors
+                      ? () {
+                        setState(() {
+                          brightness = 0.0;
+                          hue = 0.0;
+                        });
+                        ref
+                            .read(boardPreferencesProvider.notifier)
+                            .adjustColors(brightness: 0.0, hue: 0.0);
+                      }
+                      : null,
             ),
           ],
         ),

diff --git a/lib/src/widgets/board_carousel_item.dart b/lib/src/widgets/board_carousel_item.dart
@@ -53,8 +53,8 @@ class BoardCarouselItem extends ConsumerWidget {
       builder: (context, constraints) {
         final boardSize = constraints.biggest.shortestSide - _kBoardCarouselItemMargin.horizontal;
         final card = ChangeColors(
-          brightness: boardPrefs.brightness,
           hue: boardPrefs.hue,
+          brightness: boardPrefs.brightness,
           child: PlatformCard(
             color: backgroundColor,
             margin:
@@ -88,14 +88,14 @@ class BoardCarouselItem extends ConsumerWidget {
                         fen: fen,
                         orientation: orientation,
                         lastMove: lastMove,
-                        settings: boardPrefs.toBoardSettings().copyWith(
-                          brightness: 0.0,
-                          hue: 0.0,
+                        settings: ChessboardSettings(
                           enableCoordinates: false,
                           borderRadius: const BorderRadius.only(
                             topLeft: Radius.circular(10.0),
                             topRight: Radius.circular(10.0),
                           ),
+                          pieceAssets: boardPrefs.pieceSet.assets,
+                          colorScheme: boardPrefs.boardTheme.colors,
                         ),
                       ),
                     ),

diff --git a/lib/src/widgets/board_preview.dart b/lib/src/widgets/board_preview.dart
@@ -88,7 +88,11 @@ class _SmallBoardPreviewState extends ConsumerState<SmallBoardPreview> {
                       fen: widget.fen,
                       orientation: widget.orientation,
                       lastMove: widget.lastMove as NormalMove?,
-                      settings: boardPrefs.toBoardSettings().copyWith(
+                      settings: ChessboardSettings(
+                        pieceAssets: boardPrefs.pieceSet.assets,
+                        colorScheme: boardPrefs.boardTheme.colors,
+                        brightness: boardPrefs.brightness,
+                        hue: boardPrefs.hue,
                         enableCoordinates: false,
                         borderRadius: const BorderRadius.all(Radius.circular(4.0)),
                         boxShadow: boardShadows,

diff --git a/lib/src/widgets/board_thumbnail.dart b/lib/src/widgets/board_thumbnail.dart
@@ -76,11 +76,15 @@ class _BoardThumbnailState extends ConsumerState<BoardThumbnail> {
               fen: widget.fen,
               orientation: widget.orientation,
               lastMove: widget.lastMove as NormalMove?,
-              settings: boardPrefs.toBoardSettings().copyWith(
+              settings: ChessboardSettings(
                 enableCoordinates: false,
                 borderRadius: const BorderRadius.all(Radius.circular(4.0)),
                 boxShadow: boardShadows,
-                animationDuration: widget.animationDuration,
+                animationDuration: widget.animationDuration!,
+                pieceAssets: boardPrefs.pieceSet.assets,
+                colorScheme: boardPrefs.boardTheme.colors,
+                hue: boardPrefs.hue,
+                brightness: boardPrefs.brightness,
               ),
             )
             : StaticChessboard(
@@ -93,8 +97,8 @@ class _BoardThumbnailState extends ConsumerState<BoardThumbnail> {
               boxShadow: boardShadows,
               pieceAssets: boardPrefs.pieceSet.assets,
               colorScheme: boardPrefs.boardTheme.colors,
-              brightness: boardPrefs.brightness,
               hue: boardPrefs.hue,
+              brightness: boardPrefs.brightness,
             );
 
     final maybeTappableBoard =