diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt new file mode 100644 index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/13.txt @@ -0,0 +1 @@ +Normalize Activity application architecture. diff --git a/fastlane/metadata/android/fr-FR/changelogs/13.txt b/fastlane/metadata/android/fr-FR/changelogs/13.txt new file mode 100644 index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/13.txt @@ -0,0 +1 @@ +Harmonisation des applications en Activity. diff --git a/lib/config/activity_page.dart b/lib/common/config/activity_page.dart similarity index 70% rename from lib/config/activity_page.dart rename to lib/common/config/activity_page.dart index b6d9644cb1ae692480bb3fe9fec9591aca941d00..d5bf44cfc6aeb8a84355bc1514ef55c7e866a653 100644 --- a/lib/config/activity_page.dart +++ b/lib/common/config/activity_page.dart @@ -1,52 +1,50 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/ui/pages/playlist.dart'; -import 'package:spotifyplaylistgenerator/ui/pages/home.dart'; +import 'package:spotifyplaylistgenerator/common/ui/pages/playlist.dart'; +import 'package:spotifyplaylistgenerator/common/ui/pages/home.dart'; class ActivityPageItem { + final String code; final Icon icon; final Widget page; - final String code; const ActivityPageItem({ + required this.code, required this.icon, required this.page, - required this.code, }); } class ActivityPage { + static const bool displayBottomNavBar = true; + static const indexHome = 0; static const pageHome = ActivityPageItem( + code: 'page_home', icon: Icon(UniconsLine.home), page: PageHome(), - code: 'page_home', ); static const indexPlaylist = 1; static const pagePlaylist = ActivityPageItem( + code: 'page_playlist', icon: Icon(UniconsLine.list_ul), page: PagePlaylist(), - code: 'page_playlist', ); - static Map<int, ActivityPageItem> items = { + static const Map<int, ActivityPageItem> items = { indexHome: pageHome, indexPlaylist: pagePlaylist, }; + static int defaultPageIndex = indexHome; + static bool isIndexAllowed(int pageIndex) { return items.keys.contains(pageIndex); } - static ActivityPageItem getPageItem(int pageIndex) { - return items[pageIndex] ?? pageHome; - } - - static Widget getPageWidget(int pageIndex) { + static Widget getWidget(int pageIndex) { return items[pageIndex]?.page ?? pageHome.page; } - - static int itemsCount = ActivityPage.items.length; } diff --git a/lib/config/screen.dart b/lib/common/config/screen.dart similarity index 68% rename from lib/config/screen.dart rename to lib/common/config/screen.dart index b80c4ce1816c26350dfbfeb93a35115937e0e663..bfa6ba4acf6718a7ae7b6804c3fa4ff9dd1c63a8 100644 --- a/lib/config/screen.dart +++ b/lib/common/config/screen.dart @@ -1,42 +1,42 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/ui/screens/about.dart'; -import 'package:spotifyplaylistgenerator/ui/screens/activity.dart'; -import 'package:spotifyplaylistgenerator/ui/screens/settings.dart'; +import 'package:spotifyplaylistgenerator/common/ui/screens/about.dart'; +import 'package:spotifyplaylistgenerator/common/ui/screens/activity.dart'; +import 'package:spotifyplaylistgenerator/common/ui/screens/settings.dart'; class ScreenItem { + final String code; final Icon icon; final Widget screen; - final bool displayBottomNavBar; const ScreenItem({ + required this.code, required this.icon, required this.screen, - required this.displayBottomNavBar, }); } class Screen { static const indexActivity = 0; static const screenActivity = ScreenItem( + code: 'screen_activity', icon: Icon(UniconsLine.home), screen: ScreenActivity(), - displayBottomNavBar: true, ); static const indexSettings = 1; static const screenSettings = ScreenItem( + code: 'screen_settings', icon: Icon(UniconsLine.setting), screen: ScreenSettings(), - displayBottomNavBar: false, ); static const indexAbout = 2; static const screenAbout = ScreenItem( + code: 'screen_about', icon: Icon(UniconsLine.info_circle), screen: ScreenAbout(), - displayBottomNavBar: false, ); static Map<int, ScreenItem> items = { @@ -53,9 +53,5 @@ class Screen { return items[screenIndex]?.screen ?? screenActivity.screen; } - static bool displayBottomNavBar(int screenIndex) { - return items[screenIndex]?.displayBottomNavBar ?? screenActivity.displayBottomNavBar; - } - static int itemsCount = Screen.items.length; } diff --git a/lib/cubit/nav_cubit_pages.dart b/lib/common/cubit/nav/nav_cubit_pages.dart similarity index 70% rename from lib/cubit/nav_cubit_pages.dart rename to lib/common/cubit/nav/nav_cubit_pages.dart index cde152c8dbf384f5ede442367b755be74f21521b..62b8b19e23528e415e1ddc4ec371cb7cf989b41e 100644 --- a/lib/cubit/nav_cubit_pages.dart +++ b/lib/common/cubit/nav/nav_cubit_pages.dart @@ -1,6 +1,6 @@ import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/config/activity_page.dart'; +import 'package:spotifyplaylistgenerator/common/config/activity_page.dart'; class NavCubitPage extends HydratedCubit<int> { NavCubitPage() : super(0); @@ -13,6 +13,10 @@ class NavCubitPage extends HydratedCubit<int> { } } + void goToPageHome() { + updateIndex(ActivityPage.indexHome); + } + @override int fromJson(Map<String, dynamic> json) { return ActivityPage.indexHome; @@ -20,6 +24,6 @@ class NavCubitPage extends HydratedCubit<int> { @override Map<String, dynamic>? toJson(int state) { - return <String, int>{'pageIndex': state}; + return <String, int>{'index': state}; } } diff --git a/lib/cubit/nav_cubit_screens.dart b/lib/common/cubit/nav/nav_cubit_screens.dart similarity index 69% rename from lib/cubit/nav_cubit_screens.dart rename to lib/common/cubit/nav/nav_cubit_screens.dart index b782e7e9147a4a3abcb46344ac6248054691a350..3187b4b419d59e8d8e7909abdf646e109f630606 100644 --- a/lib/cubit/nav_cubit_screens.dart +++ b/lib/common/cubit/nav/nav_cubit_screens.dart @@ -1,6 +1,6 @@ import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/config/screen.dart'; +import 'package:spotifyplaylistgenerator/common/config/screen.dart'; class NavCubitScreen extends HydratedCubit<int> { NavCubitScreen() : super(0); @@ -9,19 +9,19 @@ class NavCubitScreen extends HydratedCubit<int> { if (Screen.isIndexAllowed(index)) { emit(index); } else { - goToActivityPage(); + goToScreenActivity(); } } - void goToActivityPage() { + void goToScreenActivity() { emit(Screen.indexActivity); } - void goToSettingsPage() { + void goToScreenSettings() { emit(Screen.indexSettings); } - void goToAboutPage() { + void goToScreenAbout() { emit(Screen.indexAbout); } @@ -32,6 +32,6 @@ class NavCubitScreen extends HydratedCubit<int> { @override Map<String, dynamic>? toJson(int state) { - return <String, int>{'screenIndex': state}; + return <String, int>{'index': state}; } } diff --git a/lib/ui/nav/bottom_nav_bar.dart b/lib/common/ui/nav/bottom_nav_bar.dart similarity index 74% rename from lib/ui/nav/bottom_nav_bar.dart rename to lib/common/ui/nav/bottom_nav_bar.dart index b47fb8d3c2e2938ff4c721e488990b63d13f4d3c..da294e115d85f6f897498fd876fb660be91449b1 100644 --- a/lib/ui/nav/bottom_nav_bar.dart +++ b/lib/common/ui/nav/bottom_nav_bar.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/config/activity_page.dart'; -import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart'; +import 'package:spotifyplaylistgenerator/common/config/activity_page.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_pages.dart'; class BottomNavBar extends StatelessWidget { const BottomNavBar({super.key}); @@ -21,16 +21,14 @@ class BottomNavBar extends StatelessWidget { ), ), child: BlocBuilder<NavCubitPage, int>(builder: (BuildContext context, int state) { - final List<ActivityPageItem> pageItems = [ - ActivityPage.pageHome, - ActivityPage.pagePlaylist, - ]; - final List<BottomNavigationBarItem> items = pageItems.map((ActivityPageItem item) { - return BottomNavigationBarItem( + final List<BottomNavigationBarItem> items = []; + + ActivityPage.items.forEach((int pageIndex, ActivityPageItem item) { + items.add(BottomNavigationBarItem( icon: item.icon, label: tr(item.code), - ); - }).toList(); + )); + }); return BottomNavigationBar( currentIndex: state, diff --git a/lib/common/ui/nav/global_app_bar.dart b/lib/common/ui/nav/global_app_bar.dart new file mode 100644 index 0000000000000000000000000000000000000000..eba9f5bddb23b6a5560fd24130943f56cd0f9d27 --- /dev/null +++ b/lib/common/ui/nav/global_app_bar.dart @@ -0,0 +1,83 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + +import 'package:spotifyplaylistgenerator/common/config/screen.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_pages.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_screens.dart'; + +import 'package:spotifyplaylistgenerator/cubit/activity/activity_cubit.dart'; +import 'package:spotifyplaylistgenerator/models/activity/activity.dart'; + +class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget { + const GlobalAppBar({super.key}); + + @override + Widget build(BuildContext context) { + return BlocBuilder<ActivityCubit, ActivityState>( + builder: (BuildContext context, ActivityState activityState) { + return BlocBuilder<NavCubitScreen, int>( + builder: (BuildContext context, int pageIndex) { + final Activity currentActivity = activityState.currentActivity; + + final List<Widget> menuActions = []; + + if (currentActivity.isConnected) { + menuActions.add(StyledButton( + color: Colors.red, + onPressed: () {}, + onLongPress: () { + BlocProvider.of<ActivityCubit>(context).quitActivity(); + BlocProvider.of<NavCubitPage>(context).goToPageHome(); + }, + child: Screen.screenSettings.icon, + )); + } else { + if (pageIndex == Screen.indexActivity) { + // go to Settings page + menuActions.add(ElevatedButton( + onPressed: () { + BlocProvider.of<NavCubitScreen>(context).goToScreenSettings(); + }, + style: ElevatedButton.styleFrom( + shape: const CircleBorder(), + ), + child: Screen.screenSettings.icon, + )); + + // go to About page + menuActions.add(ElevatedButton( + onPressed: () { + BlocProvider.of<NavCubitScreen>(context).goToScreenAbout(); + }, + style: ElevatedButton.styleFrom( + shape: const CircleBorder(), + ), + child: Screen.screenAbout.icon, + )); + } else { + // back to Home page + menuActions.add(ElevatedButton( + onPressed: () { + BlocProvider.of<NavCubitScreen>(context).goToScreenActivity(); + }, + style: ElevatedButton.styleFrom( + shape: const CircleBorder(), + ), + child: Screen.screenActivity.icon, + )); + } + } + + return AppBar( + title: const AppHeader(text: 'app_name'), + actions: menuActions, + ); + }, + ); + }, + ); + } + + @override + Size get preferredSize => const Size.fromHeight(50); +} diff --git a/lib/ui/pages/home.dart b/lib/common/ui/pages/home.dart similarity index 91% rename from lib/ui/pages/home.dart rename to lib/common/ui/pages/home.dart index 8d852d87a5cfd468cd7e9cc94a74eb567bb60a29..42152f9e2e8e0248b4a2a802421460dafd10c35c 100644 --- a/lib/ui/pages/home.dart +++ b/lib/common/ui/pages/home.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart'; +import 'package:spotifyplaylistgenerator/cubit/activity/activity_cubit.dart'; import 'package:spotifyplaylistgenerator/models/activity/activity.dart'; class PageHome extends StatelessWidget { diff --git a/lib/ui/pages/playlist.dart b/lib/common/ui/pages/playlist.dart similarity index 91% rename from lib/ui/pages/playlist.dart rename to lib/common/ui/pages/playlist.dart index 0b145b7f9d38a834f5d8c32f5926ed995f3a61e7..aca9296d2df66ede7b8cc7331d4347dd2c00ac50 100644 --- a/lib/ui/pages/playlist.dart +++ b/lib/common/ui/pages/playlist.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart'; +import 'package:spotifyplaylistgenerator/cubit/activity/activity_cubit.dart'; import 'package:spotifyplaylistgenerator/models/activity/activity.dart'; class PagePlaylist extends StatelessWidget { diff --git a/lib/ui/screens/about.dart b/lib/common/ui/screens/about.dart similarity index 100% rename from lib/ui/screens/about.dart rename to lib/common/ui/screens/about.dart diff --git a/lib/ui/screens/activity.dart b/lib/common/ui/screens/activity.dart similarity index 63% rename from lib/ui/screens/activity.dart rename to lib/common/ui/screens/activity.dart index ced3df90d1a0aa8225dce3227b890b381458f540..436f5c2cd194a2c18f453ce950667cccb25426c7 100644 --- a/lib/ui/screens/activity.dart +++ b/lib/common/ui/screens/activity.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/config/activity_page.dart'; -import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart'; +import 'package:spotifyplaylistgenerator/common/config/activity_page.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_pages.dart'; class ScreenActivity extends StatelessWidget { const ScreenActivity({super.key}); @@ -11,7 +11,7 @@ class ScreenActivity extends StatelessWidget { Widget build(BuildContext context) { return BlocBuilder<NavCubitPage, int>( builder: (BuildContext context, int pageIndex) { - return ActivityPage.getPageWidget(pageIndex); + return ActivityPage.getWidget(pageIndex); }, ); } diff --git a/lib/ui/screens/settings.dart b/lib/common/ui/screens/settings.dart similarity index 100% rename from lib/ui/screens/settings.dart rename to lib/common/ui/screens/settings.dart diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart new file mode 100644 index 0000000000000000000000000000000000000000..a81fea3a050678786eca57fb86c3582a2fc080c2 --- /dev/null +++ b/lib/config/application_config.dart @@ -0,0 +1,3 @@ +class ApplicationConfig { + static const String appTitle = 'Spotify playlist generator'; +} diff --git a/lib/config/default_activity_settings.dart b/lib/config/default_activity_settings.dart new file mode 100644 index 0000000000000000000000000000000000000000..b58425a81947d26fc305105fb077cd057aec9314 --- /dev/null +++ b/lib/config/default_activity_settings.dart @@ -0,0 +1,28 @@ +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + +class DefaultActivitySettings { + // available game parameters codes + static const String parameterCodeLayout = 'layout'; + static const List<String> availableParameters = [ + parameterCodeLayout, + ]; + + // layout: available values + static const String layoutValueFrench = 'default'; + static const List<String> allowedLayoutValues = [ + layoutValueFrench, + ]; + // layout: default value + static const String defaultLayoutValue = layoutValueFrench; + + // available values from parameter code + static List<String> getAvailableValues(String parameterCode) { + switch (parameterCode) { + case parameterCodeLayout: + return DefaultActivitySettings.allowedLayoutValues; + } + + printlog('Did not find any available value for game parameter "$parameterCode".'); + return []; + } +} diff --git a/lib/cubit/activity_cubit.dart b/lib/cubit/activity/activity_cubit.dart similarity index 100% rename from lib/cubit/activity_cubit.dart rename to lib/cubit/activity/activity_cubit.dart diff --git a/lib/cubit/activity_state.dart b/lib/cubit/activity/activity_state.dart similarity index 100% rename from lib/cubit/activity_state.dart rename to lib/cubit/activity/activity_state.dart diff --git a/lib/cubit/settings/settings_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart new file mode 100644 index 0000000000000000000000000000000000000000..0cd0d9456c026273cb42c4726e12bfe217a63825 --- /dev/null +++ b/lib/cubit/settings/settings_activity_cubit.dart @@ -0,0 +1,61 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + +import 'package:spotifyplaylistgenerator/config/default_activity_settings.dart'; +import 'package:spotifyplaylistgenerator/models/settings/settings_activity.dart'; + +part 'settings_activity_state.dart'; + +class ActivitySettingsCubit extends HydratedCubit<ActivitySettingsState> { + ActivitySettingsCubit() + : super(ActivitySettingsState(settings: ActivitySettings.createDefault())); + + void setValues({ + String? layout, + }) { + emit( + ActivitySettingsState( + settings: ActivitySettings( + layout: layout ?? state.settings.layout, + ), + ), + ); + } + + String getParameterValue(String code) { + switch (code) { + case DefaultActivitySettings.parameterCodeLayout: + return ActivitySettings.getLayoutValueFromUnsafe(state.settings.layout); + } + + return ''; + } + + void setParameterValue(String code, String value) { + final String layout = code == DefaultActivitySettings.parameterCodeLayout + ? value + : getParameterValue(DefaultActivitySettings.parameterCodeLayout); + + setValues( + layout: layout, + ); + } + + @override + ActivitySettingsState? fromJson(Map<String, dynamic> json) { + final String layout = json[DefaultActivitySettings.parameterCodeLayout] as String; + + return ActivitySettingsState( + settings: ActivitySettings( + layout: layout, + ), + ); + } + + @override + Map<String, dynamic>? toJson(ActivitySettingsState state) { + return <String, dynamic>{ + DefaultActivitySettings.parameterCodeLayout: state.settings.layout, + }; + } +} diff --git a/lib/cubit/settings/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart new file mode 100644 index 0000000000000000000000000000000000000000..2b2de42011634e81ae9e6f8bcaa1577f239c778b --- /dev/null +++ b/lib/cubit/settings/settings_activity_state.dart @@ -0,0 +1,15 @@ +part of 'settings_activity_cubit.dart'; + +@immutable +class ActivitySettingsState extends Equatable { + const ActivitySettingsState({ + required this.settings, + }); + + final ActivitySettings settings; + + @override + List<dynamic> get props => <dynamic>[ + settings, + ]; +} diff --git a/lib/cubit/settings_global_cubit.dart b/lib/cubit/settings/settings_global_cubit.dart similarity index 100% rename from lib/cubit/settings_global_cubit.dart rename to lib/cubit/settings/settings_global_cubit.dart diff --git a/lib/cubit/settings_global_state.dart b/lib/cubit/settings/settings_global_state.dart similarity index 100% rename from lib/cubit/settings_global_state.dart rename to lib/cubit/settings/settings_global_state.dart diff --git a/lib/main.dart b/lib/main.dart index eafd6fc80c07a4ecb2b686271599efdb089b0d7b..bb76542d5a7957dd5f6d3bd47f1d57ec77747052 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,10 +4,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/cubit/activity_cubit.dart'; -import 'package:spotifyplaylistgenerator/cubit/nav_cubit_pages.dart'; -import 'package:spotifyplaylistgenerator/cubit/nav_cubit_screens.dart'; -import 'package:spotifyplaylistgenerator/cubit/settings_global_cubit.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_pages.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_screens.dart'; + +import 'package:spotifyplaylistgenerator/config/application_config.dart'; +import 'package:spotifyplaylistgenerator/cubit/activity/activity_cubit.dart'; +import 'package:spotifyplaylistgenerator/cubit/settings/settings_activity_cubit.dart'; +import 'package:spotifyplaylistgenerator/cubit/settings/settings_global_cubit.dart'; import 'package:spotifyplaylistgenerator/ui/skeleton.dart'; void main() async { @@ -40,17 +43,30 @@ class MyApp extends StatelessWidget { Widget build(BuildContext context) { return MultiBlocProvider( providers: [ - BlocProvider<NavCubitPage>(create: (context) => NavCubitPage()), - BlocProvider<NavCubitScreen>(create: (context) => NavCubitScreen()), + // default providers + BlocProvider<NavCubitPage>( + create: (context) => NavCubitPage(), + ), + BlocProvider<NavCubitScreen>( + create: (context) => NavCubitScreen(), + ), BlocProvider<ApplicationThemeModeCubit>( - create: (context) => ApplicationThemeModeCubit()), - BlocProvider<ActivityCubit>(create: (context) => ActivityCubit()), - BlocProvider<GlobalSettingsCubit>(create: (context) => GlobalSettingsCubit()), + create: (context) => ApplicationThemeModeCubit(), + ), + BlocProvider<ActivityCubit>( + create: (context) => ActivityCubit(), + ), + BlocProvider<GlobalSettingsCubit>( + create: (context) => GlobalSettingsCubit(), + ), + BlocProvider<ActivitySettingsCubit>( + create: (context) => ActivitySettingsCubit(), + ), ], child: BlocBuilder<ApplicationThemeModeCubit, ApplicationThemeModeState>( builder: (BuildContext context, ApplicationThemeModeState state) { return MaterialApp( - title: 'Spotify playlist generator', + title: ApplicationConfig.appTitle, home: const SkeletonScreen(), // Theme stuff diff --git a/lib/models/settings/settings_activity.dart b/lib/models/settings/settings_activity.dart new file mode 100644 index 0000000000000000000000000000000000000000..33ad6d9d2b73307e154b093743ccf3129d383cea --- /dev/null +++ b/lib/models/settings/settings_activity.dart @@ -0,0 +1,42 @@ +import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; + +import 'package:spotifyplaylistgenerator/config/default_activity_settings.dart'; + +class ActivitySettings { + final String layout; + + ActivitySettings({ + required this.layout, + }); + + static String getLayoutValueFromUnsafe(String layout) { + if (DefaultActivitySettings.allowedLayoutValues.contains(layout)) { + return layout; + } + + return DefaultActivitySettings.defaultLayoutValue; + } + + factory ActivitySettings.createDefault() { + return ActivitySettings( + layout: DefaultActivitySettings.defaultLayoutValue, + ); + } + + void dump() { + printlog('$ActivitySettings:'); + printlog(' ${DefaultActivitySettings.parameterCodeLayout}: $layout'); + printlog(''); + } + + @override + String toString() { + return '$ActivitySettings(${toJson()})'; + } + + Map<String, dynamic>? toJson() { + return <String, dynamic>{ + DefaultActivitySettings.parameterCodeLayout: layout, + }; + } +} diff --git a/lib/ui/nav/global_app_bar.dart b/lib/ui/nav/global_app_bar.dart deleted file mode 100644 index f0305198447dd8b1e7ece737bc2d523449ecedbe..0000000000000000000000000000000000000000 --- a/lib/ui/nav/global_app_bar.dart +++ /dev/null @@ -1,66 +0,0 @@ -import 'package:flutter/material.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'; - -class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget { - const GlobalAppBar({super.key}); - - @override - Widget build(BuildContext context) { - return BlocBuilder<ActivityCubit, ActivityState>( - builder: (BuildContext context, ActivityState activityState) { - return BlocBuilder<NavCubitScreen, int>( - builder: (BuildContext context, int screenIndex) { - final List<Widget> menuActions = []; - - if (screenIndex == Screen.indexActivity) { - // go to Settings page - menuActions.add(ElevatedButton( - onPressed: () { - BlocProvider.of<NavCubitScreen>(context).goToSettingsPage(); - }, - style: ElevatedButton.styleFrom( - shape: const CircleBorder(), - ), - child: Screen.screenSettings.icon, - )); - - // go to About page - menuActions.add(ElevatedButton( - onPressed: () { - BlocProvider.of<NavCubitScreen>(context).goToAboutPage(); - }, - style: ElevatedButton.styleFrom( - shape: const CircleBorder(), - ), - child: Screen.screenAbout.icon, - )); - } else { - // back to Home page - menuActions.add(ElevatedButton( - onPressed: () { - BlocProvider.of<NavCubitScreen>(context).goToActivityPage(); - }, - style: ElevatedButton.styleFrom( - shape: const CircleBorder(), - ), - child: Screen.screenActivity.icon, - )); - } - - return AppBar( - title: const AppHeader(text: 'app_name'), - actions: menuActions, - ); - }, - ); - }, - ); - } - - @override - Size get preferredSize => const Size.fromHeight(50); -} diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart index 1d929dda98562dba891df7a58a9e2c4dfe3319f4..9b5056c4057449347f6613d3f18522c15ea8dfa1 100644 --- a/lib/ui/skeleton.dart +++ b/lib/ui/skeleton.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_custom_toolbox/flutter_toolbox.dart'; -import 'package:spotifyplaylistgenerator/config/screen.dart'; -import 'package:spotifyplaylistgenerator/cubit/nav_cubit_screens.dart'; -import 'package:spotifyplaylistgenerator/ui/nav/bottom_nav_bar.dart'; -import 'package:spotifyplaylistgenerator/ui/nav/global_app_bar.dart'; +import 'package:spotifyplaylistgenerator/common/config/activity_page.dart'; +import 'package:spotifyplaylistgenerator/common/config/screen.dart'; +import 'package:spotifyplaylistgenerator/common/cubit/nav/nav_cubit_screens.dart'; +import 'package:spotifyplaylistgenerator/common/ui/nav/global_app_bar.dart'; +import 'package:spotifyplaylistgenerator/common/ui/nav/bottom_nav_bar.dart'; class SkeletonScreen extends StatelessWidget { const SkeletonScreen({super.key}); @@ -28,8 +29,7 @@ class SkeletonScreen extends StatelessWidget { ), ), backgroundColor: Theme.of(context).colorScheme.surface, - bottomNavigationBar: - Screen.displayBottomNavBar(screenIndex) ? const BottomNavBar() : null, + bottomNavigationBar: ActivityPage.displayBottomNavBar ? const BottomNavBar() : null, ); }, ); diff --git a/pubspec.lock b/pubspec.lock index 1ec777c6e784a3a794efde27a31bf135ef379ab6..8ca95092bb289f0969f8344f49bc92e4e8dc4df6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -245,10 +245,10 @@ packages: dependency: transitive description: name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.1.5" path_provider_android: dependency: transitive description: @@ -442,10 +442,10 @@ packages: dependency: transitive description: name: win32 - sha256: "2735daae5150e8b1dfeb3eb0544b4d3af0061e9e82cef063adcd583bdae4306a" + sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454" url: "https://pub.dev" source: hosted - version: "5.7.0" + version: "5.7.2" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b29864291dd9992b0dc1d0895ad18fe5965a16fb..147c3788c8f267d6bcb231561f04d0126d66d8b4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Create and manage Spotify playlists publish_to: "none" -version: 0.2.1+12 +version: 0.3.0+13 environment: sdk: "^3.0.0"