diff --git a/fastlane/metadata/android/en-US/changelogs/67.txt b/fastlane/metadata/android/en-US/changelogs/67.txt
new file mode 100644
index 0000000000000000000000000000000000000000..32ed6eeabc096d0bf9648887a8525fd6364bb098
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/67.txt
@@ -0,0 +1 @@
+Use ApplicationSettings widgets from flutter_custom_toolbox.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/67.txt b/fastlane/metadata/android/fr-FR/changelogs/67.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6d5f7c8162c433e10549ee49e010d90c58ffdbc3
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/67.txt
@@ -0,0 +1 @@
+Utilisation des widgets ApplicationSettings depuis flutter_custom_toolbox.
diff --git a/lib/cubit/theme_cubit.dart b/lib/cubit/theme_cubit.dart
deleted file mode 100644
index 1ecab6014c67a0393eabbf704b8b85c9e988705e..0000000000000000000000000000000000000000
--- a/lib/cubit/theme_cubit.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-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()};
- }
-}
diff --git a/lib/cubit/theme_state.dart b/lib/cubit/theme_state.dart
deleted file mode 100644
index e479a50f12fe72a35a1fd1722ff72afbb692a136..0000000000000000000000000000000000000000
--- a/lib/cubit/theme_state.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'theme_cubit.dart';
-
-@immutable
-class ThemeModeState extends Equatable {
- const ThemeModeState({
- this.themeMode,
- });
-
- final ThemeMode? themeMode;
-
- @override
- List<Object?> get props => <Object?>[
- themeMode,
- ];
-}
diff --git a/lib/main.dart b/lib/main.dart
index 4ffe9093631b71940b0496fd1f44da80fe5c7f9d..21f19aa75d2ada9fdb032a468f3bd8eda6e18252 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,7 +8,6 @@ import 'package:puzzlegame/cubit/game_cubit.dart';
import 'package:puzzlegame/cubit/nav_cubit.dart';
import 'package:puzzlegame/cubit/settings_game_cubit.dart';
import 'package:puzzlegame/cubit/settings_global_cubit.dart';
-import 'package:puzzlegame/cubit/theme_cubit.dart';
import 'package:puzzlegame/ui/skeleton.dart';
void main() async {
@@ -47,15 +46,16 @@ 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: 'Template app',
+ title: 'Puzzle',
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/ui/screens/page_settings.dart b/lib/ui/screens/page_settings.dart
index 14160564e1ede7acd63d7aa2e8827140509f1e43..50964ef462b6e3e411347cab4e966afb0f505008 100644
--- a/lib/ui/screens/page_settings.dart
+++ b/lib/ui/screens/page_settings.dart
@@ -1,8 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:puzzlegame/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(),
],
),
);
diff --git a/lib/ui/settings/settings_form.dart b/lib/ui/settings/settings_form.dart
deleted file mode 100644
index 38fbe91b8c7e23afca02a43bc7c8a0a244a4e377..0000000000000000000000000000000000000000
--- a/lib/ui/settings/settings_form.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/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),
- ],
- );
- }
-}
diff --git a/lib/ui/settings/theme_card.dart b/lib/ui/settings/theme_card.dart
deleted file mode 100644
index 6e96a15883985017e391383a17079d5d8120f292..0000000000000000000000000000000000000000
--- a/lib/ui/settings/theme_card.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:puzzlegame/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,
- ),
- ),
- );
- },
- );
- }
-}
diff --git a/pubspec.lock b/pubspec.lock
index c5006ee6b8271559448e362d35660a41a518927b..45f98bd9476c3a5a3858b2a933f1089097692e0f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -130,11 +130,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:
diff --git a/pubspec.yaml b/pubspec.yaml
index e6b60b81fea31278fc088b69bb1b7ac162eb96f4..46e87c4230f3c5e847b3e6ad09d57984809e56ae 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A puzzle game application.
publish_to: "none"
-version: 0.3.0+66
+version: 0.3.1+67
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
image: ^4.1.3