diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..b0b3e1fe2543143896ee06ae7b9984f8bd038f73
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.json]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
index 361df94f91db934b411ea13244ac8db6f41f3888..54ae0222de3e722adfb2b48c14d77c4d074dafda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
.buildlog/
.history
.svn/
+migrate_working_dir/
# IntelliJ related
*.iml
diff --git a/assets/fonts/Nunito-Bold.ttf b/assets/fonts/Nunito-Bold.ttf
deleted file mode 100644
index 6519feb781449ebe0015cbc74dfd9e13110fbba9..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Bold.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Light.ttf b/assets/fonts/Nunito-Light.ttf
deleted file mode 100644
index 8a0736c41cd6c2a1225d356bf274de1d0afc3497..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Light.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Medium.ttf b/assets/fonts/Nunito-Medium.ttf
deleted file mode 100644
index 88fccdc0638b6f5d6ac49d9d269dc3d518618ad1..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Medium.ttf and /dev/null differ
diff --git a/assets/fonts/Nunito-Regular.ttf b/assets/fonts/Nunito-Regular.ttf
deleted file mode 100644
index e7b8375a896ef0cd8e06730a78c84532b377e784..0000000000000000000000000000000000000000
Binary files a/assets/fonts/Nunito-Regular.ttf and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/changelogs/11.txt b/fastlane/metadata/android/en-US/changelogs/11.txt
new file mode 100644
index 0000000000000000000000000000000000000000..65ba5e83570223adc45ccea599a3487b24b8a7dd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/11.txt
@@ -0,0 +1 @@
+Use flutter_custom_toolbox for common features.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/11.txt b/fastlane/metadata/android/fr-FR/changelogs/11.txt
new file mode 100644
index 0000000000000000000000000000000000000000..258c624fb3898d91b6b70d7d99db2719c1bf0751
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/11.txt
@@ -0,0 +1 @@
+Utilisation de flutter_custom_toolbox pour les fonctionnalités communes.
diff --git a/lib/config/activity_page.dart b/lib/config/activity_page.dart
index 88dab9895d0b749c67c26880e2ff0e7cd07da657..b6d9644cb1ae692480bb3fe9fec9591aca941d00 100644
--- a/lib/config/activity_page.dart
+++ b/lib/config/activity_page.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:unicons/unicons.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/ui/pages/playlist.dart';
import 'package:spotifyplaylistgenerator/ui/pages/home.dart';
diff --git a/lib/config/default_global_settings.dart b/lib/config/default_global_settings.dart
index dd26e603a9073ae37e3ab68abf3ba48f4e6c483f..d92229c2e02064684ed4a2caeb272ff63325776a 100644
--- a/lib/config/default_global_settings.dart
+++ b/lib/config/default_global_settings.dart
@@ -1,4 +1,4 @@
-import 'package:spotifyplaylistgenerator/utils/tools.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class DefaultGlobalSettings {
// available global parameters codes
diff --git a/lib/config/screen.dart b/lib/config/screen.dart
index d712edf4eba4828f48a11a5bfdb61b7664a122b1..b80c4ce1816c26350dfbfeb93a35115937e0e663 100644
--- a/lib/config/screen.dart
+++ b/lib/config/screen.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:unicons/unicons.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/ui/screens/about.dart';
import 'package:spotifyplaylistgenerator/ui/screens/activity.dart';
diff --git a/lib/config/theme.dart b/lib/config/theme.dart
deleted file mode 100644
index 74f532fd5abf693979118609564d29167e902009..0000000000000000000000000000000000000000
--- a/lib/config/theme.dart
+++ /dev/null
@@ -1,190 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// Colors from Tailwind CSS (v3.0) - June 2022
-///
-/// https://tailwindcss.com/docs/customizing-colors
-
-const int _primaryColor = 0xFF6366F1;
-const MaterialColor primarySwatch = MaterialColor(_primaryColor, <int, Color>{
- 50: Color(0xFFEEF2FF), // indigo-50
- 100: Color(0xFFE0E7FF), // indigo-100
- 200: Color(0xFFC7D2FE), // indigo-200
- 300: Color(0xFFA5B4FC), // indigo-300
- 400: Color(0xFF818CF8), // indigo-400
- 500: Color(_primaryColor), // indigo-500
- 600: Color(0xFF4F46E5), // indigo-600
- 700: Color(0xFF4338CA), // indigo-700
- 800: Color(0xFF3730A3), // indigo-800
- 900: Color(0xFF312E81), // indigo-900
-});
-
-const int _textColor = 0xFF64748B;
-const MaterialColor textSwatch = MaterialColor(_textColor, <int, Color>{
- 50: Color(0xFFF8FAFC), // slate-50
- 100: Color(0xFFF1F5F9), // slate-100
- 200: Color(0xFFE2E8F0), // slate-200
- 300: Color(0xFFCBD5E1), // slate-300
- 400: Color(0xFF94A3B8), // slate-400
- 500: Color(_textColor), // slate-500
- 600: Color(0xFF475569), // slate-600
- 700: Color(0xFF334155), // slate-700
- 800: Color(0xFF1E293B), // slate-800
- 900: Color(0xFF0F172A), // slate-900
-});
-
-const Color errorColor = Color(0xFFDC2626); // red-600
-
-final ColorScheme lightColorScheme = ColorScheme.light(
- primary: primarySwatch.shade500,
- secondary: primarySwatch.shade500,
- onSecondary: Colors.white,
- error: errorColor,
- onSurface: textSwatch.shade500,
- surface: textSwatch.shade50,
- surfaceContainerHighest: Colors.white,
- shadow: textSwatch.shade900.withOpacity(.1),
-);
-
-final ColorScheme darkColorScheme = ColorScheme.dark(
- primary: primarySwatch.shade500,
- secondary: primarySwatch.shade500,
- onSecondary: Colors.white,
- error: errorColor,
- onSurface: textSwatch.shade300,
- surface: const Color(0xFF262630),
- surfaceContainerHighest: const Color(0xFF282832),
- shadow: textSwatch.shade900.withOpacity(.2),
-);
-
-final ThemeData lightTheme = ThemeData(
- colorScheme: lightColorScheme,
- fontFamily: 'Nunito',
- textTheme: TextTheme(
- displayLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- displayMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- displaySmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- headlineLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- headlineMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- headlineSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- titleLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- titleMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- titleSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- bodyLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- bodyMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- bodySmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- labelLarge: TextStyle(
- color: textSwatch.shade700,
- fontFamily: 'Nunito',
- ),
- labelMedium: TextStyle(
- color: textSwatch.shade600,
- fontFamily: 'Nunito',
- ),
- labelSmall: TextStyle(
- color: textSwatch.shade500,
- fontFamily: 'Nunito',
- ),
- ),
-);
-
-final ThemeData darkTheme = lightTheme.copyWith(
- colorScheme: darkColorScheme,
- textTheme: TextTheme(
- displayLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- displayMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- displaySmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- headlineLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- headlineMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- headlineSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- titleLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- titleMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- titleSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- bodyLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- bodyMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- bodySmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- labelLarge: TextStyle(
- color: textSwatch.shade200,
- fontFamily: 'Nunito',
- ),
- labelMedium: TextStyle(
- color: textSwatch.shade300,
- fontFamily: 'Nunito',
- ),
- labelSmall: TextStyle(
- color: textSwatch.shade400,
- fontFamily: 'Nunito',
- ),
- ),
-);
diff --git a/lib/cubit/activity_cubit.dart b/lib/cubit/activity_cubit.dart
index 02d692365b443705e2c6ffc33d18204c2da59e83..c4fb7572e9e398c303db8bfc0d7fca05f6e04af1 100644
--- a/lib/cubit/activity_cubit.dart
+++ b/lib/cubit/activity_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/models/activity/activity.dart';
import 'package:spotifyplaylistgenerator/models/settings/settings_global.dart';
diff --git a/lib/cubit/nav_cubit_pages.dart b/lib/cubit/nav_cubit_pages.dart
index d6f50044ab90f7c40a157bb86c631ca9962d4adf..cde152c8dbf384f5ede442367b755be74f21521b 100644
--- a/lib/cubit/nav_cubit_pages.dart
+++ b/lib/cubit/nav_cubit_pages.dart
@@ -1,4 +1,4 @@
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/activity_page.dart';
diff --git a/lib/cubit/nav_cubit_screens.dart b/lib/cubit/nav_cubit_screens.dart
index ff29d15b7853f6869006442d2c4d6f200d81423f..b782e7e9147a4a3abcb46344ac6248054691a350 100644
--- a/lib/cubit/nav_cubit_screens.dart
+++ b/lib/cubit/nav_cubit_screens.dart
@@ -1,4 +1,4 @@
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/screen.dart';
diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings_global_cubit.dart
index 7db262183898d5b87477a5208e1b3c7caf7d552f..0e3cd030ff5d935fe6223e4dca5722dfe0c0aafd 100644
--- a/lib/cubit/settings_global_cubit.dart
+++ b/lib/cubit/settings_global_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/default_global_settings.dart';
import 'package:spotifyplaylistgenerator/models/settings/settings_global.dart';
diff --git a/lib/cubit/theme_cubit.dart b/lib/cubit/theme_cubit.dart
index b793e895dbb0c672d451cd403e0036c3d9ac9b42..1ecab6014c67a0393eabbf704b8b85c9e988705e 100644
--- a/lib/cubit/theme_cubit.dart
+++ b/lib/cubit/theme_cubit.dart
@@ -1,6 +1,5 @@
-import 'package:equatable/equatable.dart';
import 'package:flutter/material.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
part 'theme_state.dart';
diff --git a/lib/main.dart b/lib/main.dart
index 1241841d7221e5728e084366c54ed83f4abd2287..0c45f7e89afd01f4e3d00697906463f36d1ba298 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,14 +1,9 @@
import 'dart:io';
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:hive/hive.dart';
-import 'package:hydrated_bloc/hydrated_bloc.dart';
-import 'package:path_provider/path_provider.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:spotifyplaylistgenerator/config/theme.dart';
import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_screens.dart';
diff --git a/lib/models/activity/activity.dart b/lib/models/activity/activity.dart
index 0fe889c5cfd6fdb02193b1fcf0b90e84527093a0..41d86b707e6b04a013c52a68aec8ef2d9dfe4901 100644
--- a/lib/models/activity/activity.dart
+++ b/lib/models/activity/activity.dart
@@ -1,5 +1,6 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:spotifyplaylistgenerator/models/settings/settings_global.dart';
-import 'package:spotifyplaylistgenerator/utils/tools.dart';
class Activity {
Activity({
diff --git a/lib/models/settings/settings_global.dart b/lib/models/settings/settings_global.dart
index 292d91d063a9e31506f3caa7905bb5e3a1651625..9a9be68d2d6a91f986b841190c191f0f8d439e9d 100644
--- a/lib/models/settings/settings_global.dart
+++ b/lib/models/settings/settings_global.dart
@@ -1,5 +1,6 @@
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
+
import 'package:spotifyplaylistgenerator/config/default_global_settings.dart';
-import 'package:spotifyplaylistgenerator/utils/tools.dart';
class GlobalSettings {
String skin;
diff --git a/lib/ui/helpers/app_titles.dart b/lib/ui/helpers/app_titles.dart
deleted file mode 100644
index b98107b12fabc3114ebfbec994166b588abcf1ad..0000000000000000000000000000000000000000
--- a/lib/ui/helpers/app_titles.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-
-class AppHeader extends StatelessWidget {
- const AppHeader({super.key, required this.text});
-
- final String text;
-
- @override
- Widget build(BuildContext context) {
- return Text(
- tr(text),
- textAlign: TextAlign.start,
- style: Theme.of(context).textTheme.headlineMedium!.apply(fontWeightDelta: 2),
- );
- }
-}
-
-class AppTitle extends StatelessWidget {
- const AppTitle({super.key, required this.text});
-
- final String text;
-
- @override
- Widget build(BuildContext context) {
- return Text(
- tr(text),
- textAlign: TextAlign.start,
- style: Theme.of(context).textTheme.titleLarge!.apply(fontWeightDelta: 2),
- );
- }
-}
diff --git a/lib/ui/nav/bottom_nav_bar.dart b/lib/ui/nav/bottom_nav_bar.dart
index f89af4babd5860c8277de07877450f1ab4bbb1a5..b47fb8d3c2e2938ff4c721e488990b63d13f4d3c 100644
--- a/lib/ui/nav/bottom_nav_bar.dart
+++ b/lib/ui/nav/bottom_nav_bar.dart
@@ -1,6 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/activity_page.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart';
@@ -35,7 +34,7 @@ class BottomNavBar extends StatelessWidget {
return BottomNavigationBar(
currentIndex: state,
- onTap: (int index) => context.read<NavCubitPage>().updateIndex(index),
+ onTap: (int index) => BlocProvider.of<NavCubitPage>(context).updateIndex(index),
type: BottomNavigationBarType.fixed,
elevation: 0,
backgroundColor: Colors.transparent,
diff --git a/lib/ui/nav/global_app_bar.dart b/lib/ui/nav/global_app_bar.dart
index 4c8c23356f7a5ea603cf9a57526c1a3d034141a5..f0305198447dd8b1e7ece737bc2d523449ecedbe 100644
--- a/lib/ui/nav/global_app_bar.dart
+++ b/lib/ui/nav/global_app_bar.dart
@@ -1,10 +1,9 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/screen.dart';
import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_screens.dart';
-import 'package:spotifyplaylistgenerator/ui/helpers/app_titles.dart';
class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
const GlobalAppBar({super.key});
@@ -21,7 +20,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// go to Settings page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubitScreen>().goToSettingsPage();
+ BlocProvider.of<NavCubitScreen>(context).goToSettingsPage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
@@ -32,7 +31,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// go to About page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubitScreen>().goToAboutPage();
+ BlocProvider.of<NavCubitScreen>(context).goToAboutPage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
@@ -43,7 +42,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
// back to Home page
menuActions.add(ElevatedButton(
onPressed: () {
- context.read<NavCubitScreen>().goToActivityPage();
+ BlocProvider.of<NavCubitScreen>(context).goToActivityPage();
},
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
diff --git a/lib/ui/pages/home.dart b/lib/ui/pages/home.dart
index 9d1283d7563b986f500cc0ce28ff7f61908d7b00..8d852d87a5cfd468cd7e9cc94a74eb567bb60a29 100644
--- a/lib/ui/pages/home.dart
+++ b/lib/ui/pages/home.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart';
import 'package:spotifyplaylistgenerator/models/activity/activity.dart';
diff --git a/lib/ui/pages/playlist.dart b/lib/ui/pages/playlist.dart
index 2ccb0ae304d5c5da4f6ef5c0781728ad5674b069..0b145b7f9d38a834f5d8c32f5926ed995f3a61e7 100644
--- a/lib/ui/pages/playlist.dart
+++ b/lib/ui/pages/playlist.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart';
import 'package:spotifyplaylistgenerator/models/activity/activity.dart';
diff --git a/lib/ui/screens/about.dart b/lib/ui/screens/about.dart
index 40b71d6234a06137ec50afd960aee17023240b1e..f7a14a9a7e574a7b6f9ed181f38d08ba8c2285fe 100644
--- a/lib/ui/screens/about.dart
+++ b/lib/ui/screens/about.dart
@@ -1,8 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-
-import 'package:spotifyplaylistgenerator/ui/helpers/app_titles.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
class ScreenAbout extends StatelessWidget {
const ScreenAbout({super.key});
diff --git a/lib/ui/screens/activity.dart b/lib/ui/screens/activity.dart
index fc76f32afc7c4ef1056bd9a71f33afcb7bdecea7..ced3df90d1a0aa8225dce3227b890b381458f540 100644
--- a/lib/ui/screens/activity.dart
+++ b/lib/ui/screens/activity.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/activity_page.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart';
diff --git a/lib/ui/screens/settings.dart b/lib/ui/screens/settings.dart
index ee9bc4899cf23b9b883b7ed9824474cef36d9059..c909c5818928f29d44608da0c48afadb6c80f0d4 100644
--- a/lib/ui/screens/settings.dart
+++ b/lib/ui/screens/settings.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:spotifyplaylistgenerator/ui/helpers/app_titles.dart';
import 'package:spotifyplaylistgenerator/ui/settings/settings_form.dart';
class ScreenSettings extends StatelessWidget {
diff --git a/lib/ui/settings/settings_form.dart b/lib/ui/settings/settings_form.dart
index efcb37ce6f61458d4eb3d5fbb8fe97a6dac8b27e..58dc63d7026618ab2b18df9fe83a9d7c68613478 100644
--- a/lib/ui/settings/settings_form.dart
+++ b/lib/ui/settings/settings_form.dart
@@ -1,6 +1,5 @@
-import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
-import 'package:unicons/unicons.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/ui/settings/theme_card.dart';
diff --git a/lib/ui/settings/theme_card.dart b/lib/ui/settings/theme_card.dart
index 37e2a15558bd122bfb875f3bf46eb8f5c2d9aed0..203e1478f49f9ad3997b17bcffd512b5f199c0a8 100644
--- a/lib/ui/settings/theme_card.dart
+++ b/lib/ui/settings/theme_card.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/cubit/theme_cubit.dart';
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 0ad936cad14cbeb514056339d6772acc767f89c4..1d929dda98562dba891df7a58a9e2c4dfe3319f4 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
import 'package:spotifyplaylistgenerator/config/screen.dart';
import 'package:spotifyplaylistgenerator/cubit/nav_cubit_screens.dart';
diff --git a/lib/utils/color_extensions.dart b/lib/utils/color_extensions.dart
deleted file mode 100644
index 4e55e338f0d3ed98b233d1ef887b7b3e17e29d97..0000000000000000000000000000000000000000
--- a/lib/utils/color_extensions.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'dart:ui';
-
-extension ColorExtension on Color {
- Color darken([int percent = 40]) {
- assert(1 <= percent && percent <= 100);
- final value = 1 - percent / 100;
- return Color.fromARGB(
- alpha,
- (red * value).round(),
- (green * value).round(),
- (blue * value).round(),
- );
- }
-
- Color lighten([int percent = 40]) {
- assert(1 <= percent && percent <= 100);
- final value = percent / 100;
- return Color.fromARGB(
- alpha,
- (red + ((255 - red) * value)).round(),
- (green + ((255 - green) * value)).round(),
- (blue + ((255 - blue) * value)).round(),
- );
- }
-
- Color avg(Color other) {
- final red = (this.red + other.red) ~/ 2;
- final green = (this.green + other.green) ~/ 2;
- final blue = (this.blue + other.blue) ~/ 2;
- final alpha = (this.alpha + other.alpha) ~/ 2;
- return Color.fromARGB(alpha, red, green, blue);
- }
-}
diff --git a/lib/utils/tools.dart b/lib/utils/tools.dart
deleted file mode 100644
index fd48b2b009b80b22248d6e7f08a63e96c4065bd7..0000000000000000000000000000000000000000
--- a/lib/utils/tools.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import 'package:flutter/foundation.dart';
-
-void printlog(String message) {
- if (!kReleaseMode) {
- debugPrint(message);
- }
-}
diff --git a/pubspec.lock b/pubspec.lock
index cdd192d88416d6289927f77cb2f3d35c4af6ac55..613b6b170e51779624177fae826f71164c5817a6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,20 +5,20 @@ packages:
dependency: transitive
description:
name: args
- sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
+ sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
url: "https://pub.dev"
source: hosted
- version: "2.5.0"
+ version: "2.6.0"
async:
dependency: transitive
description:
name: async
- sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+ sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
url: "https://pub.dev"
source: hosted
- version: "2.11.0"
+ version: "2.12.0"
auto_size_text:
- dependency: "direct main"
+ dependency: transitive
description:
name: auto_size_text
sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
@@ -61,12 +61,12 @@ packages:
dependency: transitive
description:
name: crypto
- sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+ sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
url: "https://pub.dev"
source: hosted
- version: "3.0.5"
+ version: "3.0.6"
easy_localization:
- dependency: "direct main"
+ dependency: transitive
description:
name: easy_localization
sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201
@@ -82,7 +82,7 @@ packages:
source: hosted
version: "0.0.2"
equatable:
- dependency: "direct main"
+ dependency: transitive
description:
name: equatable
sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
@@ -111,13 +111,22 @@ packages:
source: sdk
version: "0.0.0"
flutter_bloc:
- dependency: "direct main"
+ dependency: transitive
description:
name: flutter_bloc
sha256: b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a
url: "https://pub.dev"
source: hosted
version: "8.1.6"
+ flutter_custom_toolbox:
+ dependency: "direct main"
+ description:
+ path: "."
+ ref: "0.1.1"
+ resolved-ref: ba7137ca9edec7e503ed3dbfe7f6ede7e9cfbf4d
+ url: "https://git.harrault.fr/android/flutter-toolbox.git"
+ source: git
+ version: "0.1.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -137,7 +146,7 @@ packages:
source: sdk
version: "0.0.0"
hive:
- dependency: "direct main"
+ dependency: transitive
description:
name: hive
sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941"
@@ -161,7 +170,7 @@ packages:
source: hosted
version: "4.0.2"
hydrated_bloc:
- dependency: "direct main"
+ dependency: transitive
description:
name: hydrated_bloc
sha256: af35b357739fe41728df10bec03aad422cdc725a1e702e03af9d2a41ea05160c
@@ -209,13 +218,13 @@ packages:
source: hosted
version: "1.0.0"
package_info_plus:
- dependency: "direct main"
+ dependency: transitive
description:
name: package_info_plus
- sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef"
+ sha256: df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998
url: "https://pub.dev"
source: hosted
- version: "8.0.3"
+ version: "8.1.0"
package_info_plus_platform_interface:
dependency: transitive
description:
@@ -233,7 +242,7 @@ packages:
source: hosted
version: "1.9.0"
path_provider:
- dependency: "direct main"
+ dependency: transitive
description:
name: path_provider
sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
@@ -284,10 +293,10 @@ packages:
dependency: transitive
description:
name: platform
- sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+ sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
url: "https://pub.dev"
source: hosted
- version: "3.1.5"
+ version: "3.1.6"
plugin_platform_interface:
dependency: transitive
description:
@@ -377,10 +386,10 @@ packages:
dependency: transitive
description:
name: string_scanner
- sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+ sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.4.0"
synchronized:
dependency: transitive
description:
@@ -401,12 +410,12 @@ packages:
dependency: transitive
description:
name: typed_data
- sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+ sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
url: "https://pub.dev"
source: hosted
- version: "1.3.2"
+ version: "1.4.0"
unicons:
- dependency: "direct main"
+ dependency: transitive
description:
name: unicons
sha256: f3eab9d87c226415ef857cfd2167e1d12ad81ea1f5783b46cf644224fea4eab7
@@ -433,10 +442,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
+ sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a"
url: "https://pub.dev"
source: hosted
- version: "5.5.5"
+ version: "5.7.0"
xdg_directories:
dependency: transitive
description:
@@ -446,5 +455,5 @@ packages:
source: hosted
version: "1.1.0"
sdks:
- dart: ">=3.5.0 <4.0.0"
+ dart: ">=3.5.3 <4.0.0"
flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 4ce8bb55f76193e06ba4532c4ed3a9c6a444169f..b23d83db15e0c3b7c60440116835282e3ecb6724 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Create and manage Spotify playlists
publish_to: "none"
-version: 0.1.2+10
+version: 0.2.0+11
environment:
sdk: "^3.0.0"
@@ -13,15 +13,10 @@ dependencies:
sdk: flutter
# base
- auto_size_text: ^3.0.0
- easy_localization: ^3.0.1
- equatable: ^2.0.5
- flutter_bloc: ^8.1.1
- hive: ^2.2.3
- hydrated_bloc: ^9.0.0
- package_info_plus: ^8.0.0
- path_provider: ^2.0.11
- unicons: ^3.0.0
+ flutter_custom_toolbox:
+ git:
+ url: https://git.harrault.fr/android/flutter-toolbox.git
+ ref: 0.1.1
# specific
http: ^1.1.0
@@ -33,15 +28,3 @@ flutter:
uses-material-design: true
assets:
- assets/translations/
-
- fonts:
- - family: Nunito
- fonts:
- - asset: assets/fonts/Nunito-Bold.ttf
- weight: 700
- - asset: assets/fonts/Nunito-Medium.ttf
- weight: 500
- - asset: assets/fonts/Nunito-Regular.ttf
- weight: 400
- - asset: assets/fonts/Nunito-Light.ttf
- weight: 300