Use ApplicationSettings widgets from flutter_custom_toolbox

fastlane/metadata/android/en-US/changelogs/22.txt

+Use ApplicationSettings widgets from flutter_custom_toolbox.

fastlane/metadata/android/fr-FR/changelogs/22.txt

+Utilisation des widgets ApplicationSettings depuis flutter_custom_toolbox.

lib/cubit/theme_cubit.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-part 'theme_state.dart';
-
-class ThemeCubit extends HydratedCubit<ThemeModeState> {
-  ThemeCubit() : super(const ThemeModeState());
-
-  void getTheme(ThemeModeState state) {
-    emit(state);
-  }
-
-  @override
-  ThemeModeState? fromJson(Map<String, dynamic> json) {
-    switch (json['themeMode']) {
-      case 'ThemeMode.dark':
-        return const ThemeModeState(themeMode: ThemeMode.dark);
-      case 'ThemeMode.light':
-        return const ThemeModeState(themeMode: ThemeMode.light);
-      case 'ThemeMode.system':
-      default:
-        return const ThemeModeState(themeMode: ThemeMode.system);
-    }
-  }
-
-  @override
-  Map<String, String>? toJson(ThemeModeState state) {
-    return <String, String>{'themeMode': state.themeMode.toString()};
-  }
-}

lib/cubit/theme_state.dart

-part of 'theme_cubit.dart';
-
-@immutable
-class ThemeModeState extends Equatable {
-  const ThemeModeState({
-    this.themeMode,
-  });
-
-  final ThemeMode? themeMode;
-
-  @override
-  List<Object?> get props => <Object?>[
-        themeMode,
-      ];
-}

lib/main.dart

@@ -9,7 +9,6 @@ import 'package:reversi/cubit/game_cubit.dart';
 import 'package:reversi/cubit/nav_cubit.dart';
 import 'package:reversi/cubit/settings_game_cubit.dart';
 import 'package:reversi/cubit/settings_global_cubit.dart';
-import 'package:reversi/cubit/theme_cubit.dart';
 import 'package:reversi/ui/skeleton.dart';
 
 void main() async {
@@ -48,13 +47,14 @@ class MyApp extends StatelessWidget {
     return MultiBlocProvider(
       providers: [
         BlocProvider<NavCubit>(create: (context) => NavCubit()),
-        BlocProvider<ThemeCubit>(create: (context) => ThemeCubit()),
+        BlocProvider<ApplicationThemeModeCubit>(
+            create: (context) => ApplicationThemeModeCubit()),
         BlocProvider<GameCubit>(create: (context) => GameCubit()),
         BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()),
         BlocProvider<GameSettingsCubit>(create: (context) => GameSettingsCubit()),
       ],
-      child: BlocBuilder<ThemeCubit, ThemeModeState>(
-        builder: (BuildContext context, ThemeModeState state) {
+      child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>(
+        builder: (BuildContext context, ApplicationThemeModeState state) {
           return MaterialApp(
             title: 'Reversi',
             home: const SkeletonScreen(),

lib/ui/screens/page_settings.dart

 import 'package:flutter/material.dart';
 import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
 
-import 'package:reversi/ui/settings/settings_form.dart';
-
 class PageSettings extends StatelessWidget {
   const PageSettings({super.key});
 
@@ -18,7 +16,7 @@ class PageSettings extends StatelessWidget {
           SizedBox(height: 8),
           AppTitle(text: 'settings_title'),
           SizedBox(height: 8),
-          SettingsForm(),
+          ApplicationSettingsForm(),
         ],
       ),
     );

lib/ui/settings/settings_form.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:reversi/ui/settings/theme_card.dart';
-
-class SettingsForm extends StatefulWidget {
-  const SettingsForm({super.key});
-
-  @override
-  State<SettingsForm> createState() => _SettingsFormState();
-}
-
-class _SettingsFormState extends State<SettingsForm> {
-  @override
-  void dispose() {
-    super.dispose();
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.start,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      mainAxisSize: MainAxisSize.max,
-      children: <Widget>[
-        // Light/dark theme
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: <Widget>[
-            const Text('settings_label_theme').tr(),
-            const Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                ThemeCard(
-                  mode: ThemeMode.system,
-                  icon: UniconsLine.cog,
-                ),
-                ThemeCard(
-                  mode: ThemeMode.light,
-                  icon: UniconsLine.sun,
-                ),
-                ThemeCard(
-                  mode: ThemeMode.dark,
-                  icon: UniconsLine.moon,
-                )
-              ],
-            ),
-          ],
-        ),
-
-        const SizedBox(height: 16),
-      ],
-    );
-  }
-}

lib/ui/settings/theme_card.dart

-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:reversi/cubit/theme_cubit.dart';
-
-class ThemeCard extends StatelessWidget {
-  const ThemeCard({
-    super.key,
-    required this.mode,
-    required this.icon,
-  });
-
-  final IconData icon;
-  final ThemeMode mode;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<ThemeCubit, ThemeModeState>(
-      builder: (BuildContext context, ThemeModeState state) {
-        return Card(
-          elevation: 2,
-          shadowColor: Theme.of(context).colorScheme.shadow,
-          color: state.themeMode == mode
-              ? Theme.of(context).colorScheme.primary
-              : Theme.of(context).colorScheme.surface,
-          shape: const RoundedRectangleBorder(
-            borderRadius: BorderRadius.all(Radius.circular(12)),
-          ),
-          margin: const EdgeInsets.all(5),
-          child: InkWell(
-            onTap: () => BlocProvider.of<ThemeCubit>(context).getTheme(
-              ThemeModeState(themeMode: mode),
-            ),
-            borderRadius: const BorderRadius.all(Radius.circular(12)),
-            child: Icon(
-              icon,
-              size: 32,
-              color: state.themeMode != mode
-                  ? Theme.of(context).colorScheme.primary
-                  : Colors.white,
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

pubspec.lock

@@ -122,11 +122,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0.1.1"
-      resolved-ref: ba7137ca9edec7e503ed3dbfe7f6ede7e9cfbf4d
+      ref: "0.2.0"
+      resolved-ref: bbf0abd5457d42678882384216af9e83c38549bc
       url: "https://git.harrault.fr/android/flutter-toolbox.git"
     source: git
-    version: "0.1.1"
+    version: "0.2.0"
   flutter_lints:
     dependency: "direct dev"
     description:

pubspec.yaml

@@ -3,7 +3,7 @@ description: A reversi game application.
 
 publish_to: "none"
 
-version: 0.2.0+21
+version: 0.2.1+22
 
 environment:
   sdk: "^3.0.0"
@@ -16,7 +16,7 @@ dependencies:
   flutter_custom_toolbox:
     git:
       url: https://git.harrault.fr/android/flutter-toolbox.git
-      ref: 0.1.1
+      ref: 0.2.0
 
   # specific
   async: ^2.11.0