From 18fe2f4b00be070d5b91577c6b530a16653022fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Fri, 29 Nov 2024 13:17:02 +0100
Subject: [PATCH] Use navigation tools from flutter_custom_toolbox
---
lib/common/config/activity_page.dart | 115 ------------------
lib/common/config/screen.dart | 55 ---------
lib/common/cubit/nav/nav_cubit_pages.dart | 33 -----
lib/common/cubit/nav/nav_cubit_screens.dart | 37 ------
lib/common/ui/nav/bottom_nav_bar.dart | 46 -------
lib/common/ui/nav/global_app_bar.dart | 81 ------------
lib/common/ui/screens/about.dart | 38 ------
lib/common/ui/screens/activity.dart | 18 ---
lib/common/ui/screens/settings.dart | 26 ----
lib/config/application_config.dart | 105 +++++++++++++++-
lib/main.dart | 5 +-
lib/{common => }/ui/pages/api.dart | 0
lib/{common => }/ui/pages/camera.dart | 0
lib/{common => }/ui/pages/demo.dart | 0
lib/{common => }/ui/pages/game.dart | 0
lib/{common => }/ui/pages/graph.dart | 0
.../ui/settings/settings_form.dart | 0
lib/ui/skeleton.dart | 66 ++++++----
pubspec.lock | 6 +-
pubspec.yaml | 4 +-
20 files changed, 150 insertions(+), 485 deletions(-)
delete mode 100644 lib/common/config/activity_page.dart
delete mode 100644 lib/common/config/screen.dart
delete mode 100644 lib/common/cubit/nav/nav_cubit_pages.dart
delete mode 100644 lib/common/cubit/nav/nav_cubit_screens.dart
delete mode 100644 lib/common/ui/nav/bottom_nav_bar.dart
delete mode 100644 lib/common/ui/nav/global_app_bar.dart
delete mode 100644 lib/common/ui/screens/about.dart
delete mode 100644 lib/common/ui/screens/activity.dart
delete mode 100644 lib/common/ui/screens/settings.dart
rename lib/{common => }/ui/pages/api.dart (100%)
rename lib/{common => }/ui/pages/camera.dart (100%)
rename lib/{common => }/ui/pages/demo.dart (100%)
rename lib/{common => }/ui/pages/game.dart (100%)
rename lib/{common => }/ui/pages/graph.dart (100%)
rename lib/{common => }/ui/settings/settings_form.dart (100%)
diff --git a/lib/common/config/activity_page.dart b/lib/common/config/activity_page.dart
deleted file mode 100644
index ddaecdf..0000000
--- a/lib/common/config/activity_page.dart
+++ /dev/null
@@ -1,115 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/ui/pages/api.dart';
-import 'package:random/common/ui/pages/camera.dart';
-import 'package:random/common/ui/pages/demo.dart';
-import 'package:random/common/ui/pages/game.dart';
-import 'package:random/common/ui/pages/graph.dart';
-
-import 'package:random/config/application_config.dart';
-
-import 'package:random/cubit/activity/activity_cubit.dart';
-import 'package:random/models/activity/activity.dart';
-
-class ActivityPageItem {
- final String code;
- final Icon icon;
- final Widget Function({required Activity currentActivity})? builder;
-
- const ActivityPageItem({
- required this.code,
- required this.icon,
- required this.builder,
- });
-}
-
-class ActivityPage {
- static const bool displayBottomNavBar = true;
-
- static const indexHome = 0;
- static final pageHome = ActivityPageItem(
- code: 'page_home',
- icon: Icon(UniconsLine.home),
- builder: ({required Activity currentActivity}) {
- return PageParameters(
- config: ApplicationConfig.config,
- canBeResumed: currentActivity.canBeResumed,
- );
- },
- );
-
- static const indexDemo = 1;
- static final pageDemo = ActivityPageItem(
- code: 'page_demo',
- icon: Icon(UniconsLine.eye),
- builder: ({required Activity currentActivity}) {
- return PageDemo();
- },
- );
-
- static const indexGame = 2;
- static final pageGame = ActivityPageItem(
- code: 'page_game',
- icon: Icon(UniconsLine.star),
- builder: ({required Activity currentActivity}) {
- return PageGame();
- },
- );
-
- static const indexCamera = 3;
- static final pageCamera = ActivityPageItem(
- code: 'page_camera',
- icon: Icon(UniconsLine.camera),
- builder: ({required Activity currentActivity}) {
- return PageCamera();
- },
- );
-
- static const indexGraph = 4;
- static final pageGraph = ActivityPageItem(
- code: 'page_graph',
- icon: Icon(UniconsLine.pen),
- builder: ({required Activity currentActivity}) {
- return PageGraph();
- },
- );
-
- static const indexApi = 5;
- static final pageApi = ActivityPageItem(
- code: 'page_api',
- icon: Icon(UniconsLine.link),
- builder: ({required Activity currentActivity}) {
- return PageApi();
- },
- );
-
- static final Map<int, ActivityPageItem> items = {
- indexHome: pageHome,
- indexDemo: pageDemo,
- indexGame: pageGame,
- indexCamera: pageCamera,
- indexGraph: pageGraph,
- indexApi: pageApi,
- };
-
- static int defaultPageIndex = indexDemo;
-
- static bool isIndexAllowed(int pageIndex) {
- return items.keys.contains(pageIndex);
- }
-
- static Widget getWidget(int pageIndex) {
- return BlocBuilder<ActivityCubit, ActivityState>(
- builder: (BuildContext context, ActivityState activityState) {
- final Activity currentActivity = activityState.currentActivity;
-
- if (items.keys.contains(pageIndex)) {
- return items[pageIndex]?.builder!(currentActivity: currentActivity) ?? Text('oups');
- } else {
- return getWidget(defaultPageIndex);
- }
- },
- );
- }
-}
diff --git a/lib/common/config/screen.dart b/lib/common/config/screen.dart
deleted file mode 100644
index 2a828ee..0000000
--- a/lib/common/config/screen.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/ui/screens/about.dart';
-import 'package:random/common/ui/screens/activity.dart';
-import 'package:random/common/ui/screens/settings.dart';
-
-class ScreenItem {
- final String code;
- final Icon icon;
- final Widget screen;
-
- const ScreenItem({
- required this.code,
- required this.icon,
- required this.screen,
- });
-}
-
-class Screen {
- static const indexActivity = 0;
- static const screenActivity = ScreenItem(
- code: 'screen_activity',
- icon: Icon(UniconsLine.home),
- screen: ScreenActivity(),
- );
-
- static const indexSettings = 1;
- static const screenSettings = ScreenItem(
- code: 'screen_settings',
- icon: Icon(UniconsLine.setting),
- screen: ScreenSettings(),
- );
-
- static const indexAbout = 2;
- static const screenAbout = ScreenItem(
- code: 'screen_about',
- icon: Icon(UniconsLine.info_circle),
- screen: ScreenAbout(),
- );
-
- static Map<int, ScreenItem> items = {
- indexActivity: screenActivity,
- indexSettings: screenSettings,
- indexAbout: screenAbout,
- };
-
- static bool isIndexAllowed(int screenIndex) {
- return items.keys.contains(screenIndex);
- }
-
- static Widget getWidget(int screenIndex) {
- return items[screenIndex]?.screen ?? screenActivity.screen;
- }
-}
diff --git a/lib/common/cubit/nav/nav_cubit_pages.dart b/lib/common/cubit/nav/nav_cubit_pages.dart
deleted file mode 100644
index b2dc71b..0000000
--- a/lib/common/cubit/nav/nav_cubit_pages.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/config/activity_page.dart';
-
-class NavCubitPage extends HydratedCubit<int> {
- NavCubitPage() : super(0);
-
- void updateIndex(int index) {
- if (ActivityPage.isIndexAllowed(index)) {
- emit(index);
- } else {
- emit(ActivityPage.indexHome);
- }
- }
-
- void goToPageHome() {
- updateIndex(ActivityPage.indexHome);
- }
-
- void goToPageGame() {
- updateIndex(ActivityPage.indexGame);
- }
-
- @override
- int fromJson(Map<String, dynamic> json) {
- return ActivityPage.indexHome;
- }
-
- @override
- Map<String, dynamic>? toJson(int state) {
- return <String, int>{'index': state};
- }
-}
diff --git a/lib/common/cubit/nav/nav_cubit_screens.dart b/lib/common/cubit/nav/nav_cubit_screens.dart
deleted file mode 100644
index e0ccaa6..0000000
--- a/lib/common/cubit/nav/nav_cubit_screens.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/config/screen.dart';
-
-class NavCubitScreen extends HydratedCubit<int> {
- NavCubitScreen() : super(0);
-
- void updateIndex(int index) {
- if (Screen.isIndexAllowed(index)) {
- emit(index);
- } else {
- goToScreenActivity();
- }
- }
-
- void goToScreenActivity() {
- emit(Screen.indexActivity);
- }
-
- void goToScreenSettings() {
- emit(Screen.indexSettings);
- }
-
- void goToScreenAbout() {
- emit(Screen.indexAbout);
- }
-
- @override
- int fromJson(Map<String, dynamic> json) {
- return Screen.indexActivity;
- }
-
- @override
- Map<String, dynamic>? toJson(int state) {
- return <String, int>{'index': state};
- }
-}
diff --git a/lib/common/ui/nav/bottom_nav_bar.dart b/lib/common/ui/nav/bottom_nav_bar.dart
deleted file mode 100644
index 613cb7f..0000000
--- a/lib/common/ui/nav/bottom_nav_bar.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/config/activity_page.dart';
-import 'package:random/common/cubit/nav/nav_cubit_pages.dart';
-
-class BottomNavBar extends StatelessWidget {
- const BottomNavBar({super.key});
-
- @override
- Widget build(BuildContext context) {
- return Card(
- margin: const EdgeInsets.only(top: 1, right: 4, left: 4),
- elevation: 4,
- shadowColor: Theme.of(context).colorScheme.shadow,
- color: Theme.of(context).colorScheme.surfaceContainerHighest,
- shape: const RoundedRectangleBorder(
- borderRadius: BorderRadius.only(
- topLeft: Radius.circular(16),
- topRight: Radius.circular(16),
- ),
- ),
- child: BlocBuilder<NavCubitPage, int>(builder: (BuildContext context, int state) {
- final List<BottomNavigationBarItem> items = [];
-
- ActivityPage.items.forEach((int pageIndex, ActivityPageItem item) {
- items.add(BottomNavigationBarItem(
- icon: item.icon,
- label: tr(item.code),
- ));
- });
-
- return BottomNavigationBar(
- currentIndex: state,
- onTap: (int index) => BlocProvider.of<NavCubitPage>(context).updateIndex(index),
- type: BottomNavigationBarType.fixed,
- elevation: 0,
- backgroundColor: Colors.transparent,
- selectedItemColor: Theme.of(context).colorScheme.primary,
- unselectedItemColor: Theme.of(context).textTheme.bodySmall!.color,
- items: items,
- );
- }),
- );
- }
-}
diff --git a/lib/common/ui/nav/global_app_bar.dart b/lib/common/ui/nav/global_app_bar.dart
deleted file mode 100644
index 0c940f7..0000000
--- a/lib/common/ui/nav/global_app_bar.dart
+++ /dev/null
@@ -1,81 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/config/screen.dart';
-import 'package:random/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:random/common/cubit/nav/nav_cubit_screens.dart';
-
-import 'package:random/cubit/activity/activity_cubit.dart';
-import 'package:random/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.isRunning && !currentActivity.isFinished) {
- menuActions.add(ActivityButtonQuit(
- onPressed: () {},
- onLongPress: () {
- BlocProvider.of<ActivityCubit>(context).quitActivity();
- BlocProvider.of<NavCubitPage>(context).goToPageHome();
- },
- ));
- } 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/common/ui/screens/about.dart b/lib/common/ui/screens/about.dart
deleted file mode 100644
index f7a14a9..0000000
--- a/lib/common/ui/screens/about.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-class ScreenAbout extends StatelessWidget {
- const ScreenAbout({super.key});
-
- @override
- Widget build(BuildContext context) {
- return Padding(
- padding: const EdgeInsets.symmetric(horizontal: 8),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: <Widget>[
- const SizedBox(height: 8),
- const AppTitle(text: 'about_title'),
- const Text('about_content').tr(),
- FutureBuilder<PackageInfo>(
- future: PackageInfo.fromPlatform(),
- builder: (context, snapshot) {
- switch (snapshot.connectionState) {
- case ConnectionState.done:
- return const Text('about_version').tr(
- namedArgs: {
- 'version': snapshot.data!.version,
- },
- );
- default:
- return const SizedBox();
- }
- },
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/common/ui/screens/activity.dart b/lib/common/ui/screens/activity.dart
deleted file mode 100644
index 239e1ee..0000000
--- a/lib/common/ui/screens/activity.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/config/activity_page.dart';
-import 'package:random/common/cubit/nav/nav_cubit_pages.dart';
-
-class ScreenActivity extends StatelessWidget {
- const ScreenActivity({super.key});
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder<NavCubitPage, int>(
- builder: (BuildContext context, int pageIndex) {
- return ActivityPage.getWidget(pageIndex);
- },
- );
- }
-}
diff --git a/lib/common/ui/screens/settings.dart b/lib/common/ui/screens/settings.dart
deleted file mode 100644
index 8dc117a..0000000
--- a/lib/common/ui/screens/settings.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/ui/settings/settings_form.dart';
-
-class ScreenSettings extends StatelessWidget {
- const ScreenSettings({super.key});
-
- @override
- Widget build(BuildContext context) {
- return const Padding(
- padding: EdgeInsets.symmetric(horizontal: 8),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.start,
- crossAxisAlignment: CrossAxisAlignment.start,
- mainAxisSize: MainAxisSize.max,
- children: <Widget>[
- SizedBox(height: 8),
- AppTitle(text: 'settings_title'),
- SizedBox(height: 8),
- SettingsForm(),
- ],
- ),
- );
- }
-}
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
index 191d5f2..03d0f48 100644
--- a/lib/config/application_config.dart
+++ b/lib/config/application_config.dart
@@ -1,26 +1,38 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
-import 'package:random/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:random/ui/pages/api.dart';
+import 'package:random/ui/pages/camera.dart';
+import 'package:random/ui/pages/demo.dart';
+import 'package:random/ui/pages/game.dart';
+import 'package:random/ui/pages/graph.dart';
import 'package:random/cubit/activity/activity_cubit.dart';
import 'package:random/ui/parameters/parameter_painter_board_size.dart';
import 'package:random/ui/parameters/parameter_painter_colors_count.dart';
class ApplicationConfig {
+ // activity parameter: board size
static const String parameterCodeBoardSize = 'boardSize';
- static const String parameterCodeColorsCount = 'colorsCount';
-
static const String boardSizeValueSmall = '6';
static const String boardSizeValueMedium = '10';
static const String boardSizeValueLarge = '16';
static const String boardSizeValueExtraLarge = '24';
+ // activity parameter: colors count
+ static const String parameterCodeColorsCount = 'colorsCount';
static const String colorsCountVeryLow = '4';
static const String colorsCountLow = '5';
static const String colorsCountMedium = '6';
static const String colorsCountHigh = '7';
+ // activity pages
+ static const int activityPageIndexHome = 0;
+ static const int activityPageIndexDemo = 1;
+ static const int activityPageIndexGame = 2;
+ static const int activityPageIndexCamera = 3;
+ static const int activityPageIndexGraph = 4;
+ static const int activityPageIndexApi = 5;
+
static final ApplicationConfigDefinition config = ApplicationConfigDefinition(
appTitle: 'Random application',
activitySettings: [
@@ -82,14 +94,95 @@ class ApplicationConfig {
],
startNewActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).startNewActivity(context);
- BlocProvider.of<NavCubitPage>(context).goToPageGame();
+ BlocProvider.of<NavCubitPage>(context)
+ .updateIndex(ApplicationConfig.activityPageIndexGame);
+ },
+ quitCurrentActivity: (BuildContext context) {
+ BlocProvider.of<ActivityCubit>(context).quitActivity();
+ BlocProvider.of<NavCubitPage>(context)
+ .updateIndex(ApplicationConfig.activityPageIndexHome);
},
deleteCurrentActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).deleteSavedActivity();
},
resumeActivity: (BuildContext context) {
BlocProvider.of<ActivityCubit>(context).resumeSavedActivity();
- BlocProvider.of<NavCubitPage>(context).goToPageGame();
+ BlocProvider.of<NavCubitPage>(context)
+ .updateIndex(ApplicationConfig.activityPageIndexGame);
},
+ navigation: ApplicationNavigation(
+ screenActivity: ScreenItem(
+ code: 'screen_activity',
+ icon: Icon(UniconsLine.home),
+ screen: ({required ApplicationConfigDefinition appConfig}) =>
+ ScreenActivity(appConfig: appConfig),
+ ),
+ screenSettings: ScreenItem(
+ code: 'screen_settings',
+ icon: Icon(UniconsLine.setting),
+ screen: ({required ApplicationConfigDefinition appConfig}) => ScreenSettings(),
+ ),
+ screenAbout: ScreenItem(
+ code: 'screen_about',
+ icon: Icon(UniconsLine.info_circle),
+ screen: ({required ApplicationConfigDefinition appConfig}) => ScreenAbout(),
+ ),
+ displayBottomNavBar: true,
+ activityPages: {
+ activityPageIndexHome: ActivityPageItem(
+ code: 'page_home',
+ icon: Icon(UniconsLine.home),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ return PageParameters(
+ appConfig: appConfig,
+ canBeResumed: activityState.currentActivity.canBeResumed,
+ );
+ },
+ );
+ },
+ ),
+ activityPageIndexDemo: ActivityPageItem(
+ code: 'page_demo',
+ icon: Icon(UniconsLine.eye),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return PageDemo();
+ },
+ ),
+ activityPageIndexGame: ActivityPageItem(
+ code: 'page_game',
+ icon: Icon(UniconsLine.star),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ return PageGame();
+ },
+ );
+ },
+ ),
+ activityPageIndexCamera: ActivityPageItem(
+ code: 'page_camera',
+ icon: Icon(UniconsLine.camera),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return PageCamera();
+ },
+ ),
+ activityPageIndexGraph: ActivityPageItem(
+ code: 'page_graph',
+ icon: Icon(UniconsLine.pen),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return PageGraph();
+ },
+ ),
+ activityPageIndexApi: ActivityPageItem(
+ code: 'page_api',
+ icon: Icon(UniconsLine.link),
+ builder: ({required ApplicationConfigDefinition appConfig}) {
+ return PageApi();
+ },
+ ),
+ },
+ ),
);
}
diff --git a/lib/main.dart b/lib/main.dart
index dceb87d..27e2e47 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,9 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:random/common/cubit/nav/nav_cubit_pages.dart';
-import 'package:random/common/cubit/nav/nav_cubit_screens.dart';
-
import 'package:random/config/application_config.dart';
import 'package:random/cubit/settings/settings_cubit.dart';
@@ -50,7 +47,7 @@ class MyApp extends StatelessWidget {
providers: [
// default providers
BlocProvider<NavCubitPage>(
- create: (context) => NavCubitPage(),
+ create: (context) => NavCubitPage(appConfig: ApplicationConfig.config),
),
BlocProvider<NavCubitScreen>(
create: (context) => NavCubitScreen(),
diff --git a/lib/common/ui/pages/api.dart b/lib/ui/pages/api.dart
similarity index 100%
rename from lib/common/ui/pages/api.dart
rename to lib/ui/pages/api.dart
diff --git a/lib/common/ui/pages/camera.dart b/lib/ui/pages/camera.dart
similarity index 100%
rename from lib/common/ui/pages/camera.dart
rename to lib/ui/pages/camera.dart
diff --git a/lib/common/ui/pages/demo.dart b/lib/ui/pages/demo.dart
similarity index 100%
rename from lib/common/ui/pages/demo.dart
rename to lib/ui/pages/demo.dart
diff --git a/lib/common/ui/pages/game.dart b/lib/ui/pages/game.dart
similarity index 100%
rename from lib/common/ui/pages/game.dart
rename to lib/ui/pages/game.dart
diff --git a/lib/common/ui/pages/graph.dart b/lib/ui/pages/graph.dart
similarity index 100%
rename from lib/common/ui/pages/graph.dart
rename to lib/ui/pages/graph.dart
diff --git a/lib/common/ui/settings/settings_form.dart b/lib/ui/settings/settings_form.dart
similarity index 100%
rename from lib/common/ui/settings/settings_form.dart
rename to lib/ui/settings/settings_form.dart
diff --git a/lib/ui/skeleton.dart b/lib/ui/skeleton.dart
index 7649abe..f71424f 100644
--- a/lib/ui/skeleton.dart
+++ b/lib/ui/skeleton.dart
@@ -1,11 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:random/common/config/activity_page.dart';
-import 'package:random/common/config/screen.dart';
-import 'package:random/common/cubit/nav/nav_cubit_screens.dart';
-import 'package:random/common/ui/nav/global_app_bar.dart';
-import 'package:random/common/ui/nav/bottom_nav_bar.dart';
+import 'package:random/config/application_config.dart';
+import 'package:random/cubit/activity/activity_cubit.dart';
+import 'package:random/models/activity/activity.dart';
class SkeletonScreen extends StatelessWidget {
const SkeletonScreen({super.key});
@@ -14,22 +12,48 @@ class SkeletonScreen extends StatelessWidget {
Widget build(BuildContext context) {
return BlocBuilder<NavCubitScreen, int>(
builder: (BuildContext context, int screenIndex) {
- return Scaffold(
- appBar: const GlobalAppBar(),
- extendBodyBehindAppBar: false,
- body: Material(
- color: Theme.of(context).colorScheme.surface,
- child: Padding(
- padding: const EdgeInsets.only(
- top: 8,
- left: 2,
- right: 2,
- ),
- child: Screen.getWidget(screenIndex),
- ),
- ),
- backgroundColor: Theme.of(context).colorScheme.surface,
- bottomNavigationBar: ActivityPage.displayBottomNavBar ? const BottomNavBar() : null,
+ return BlocBuilder<ActivityCubit, ActivityState>(
+ builder: (BuildContext context, ActivityState activityState) {
+ return BlocBuilder<NavCubitPage, int>(
+ builder: (BuildContext context, int pageIndex) {
+ final Activity currentActivity = activityState.currentActivity;
+
+ // autostart activity
+ if (ApplicationConfig.config.autoStartActivity &&
+ (!currentActivity.isRunning)) {
+ ApplicationConfig.config.startNewActivity(context);
+ }
+
+ return Scaffold(
+ appBar: GlobalAppBar(
+ appConfig: ApplicationConfig.config,
+ pageIndex: pageIndex,
+ isActivityRunning:
+ currentActivity.isRunning && !currentActivity.isFinished,
+ ),
+ extendBodyBehindAppBar: false,
+ body: Material(
+ color: Theme.of(context).colorScheme.surface,
+ child: Padding(
+ padding: const EdgeInsets.only(
+ top: 8,
+ left: 2,
+ right: 2,
+ ),
+ child: ApplicationConfig.config.navigation.getScreenWidget(
+ appConfig: ApplicationConfig.config,
+ screenIndex: screenIndex,
+ ),
+ ),
+ ),
+ backgroundColor: Theme.of(context).colorScheme.surface,
+ bottomNavigationBar: ApplicationConfig.config.navigation.displayBottomNavBar
+ ? BottomNavBar(appConfig: ApplicationConfig.config)
+ : null,
+ );
+ },
+ );
+ },
);
},
);
diff --git a/pubspec.lock b/pubspec.lock
index e4df4c7..41af682 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -186,11 +186,11 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: "0.5.0"
- resolved-ref: b8164a50489ba981ea57d9f02e2334f09cb8c6a7
+ ref: "0.6.0"
+ resolved-ref: dfe0f6b7b49f9aa32f085e4a5d3ea320b3611eed
url: "https://git.harrault.fr/android/flutter-toolbox.git"
source: git
- version: "0.5.0"
+ version: "0.6.0"
flutter_lints:
dependency: "direct dev"
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index db5f1e8..4da2484 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A random application, for testing purpose only.
publish_to: "none"
-version: 1.4.0+74
+version: 1.5.0+75
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.5.0
+ ref: 0.6.0
# specific
camera: ^0.11.0+2
--
GitLab