diff --git a/fastlane/metadata/android/en-US/changelogs/14.txt b/fastlane/metadata/android/en-US/changelogs/14.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac2c90e221caf3cf01ebba168fb16a8f31c0253a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/14.txt
@@ -0,0 +1 @@
+Normalize Activity application architecture.
diff --git a/fastlane/metadata/android/fr-FR/changelogs/14.txt b/fastlane/metadata/android/fr-FR/changelogs/14.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1d6843d89ba84ea4147528bc3d62d9ecf1a4a762
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/14.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 73%
rename from lib/config/activity_page.dart
rename to lib/common/config/activity_page.dart
index 5de51cb1670fb041a0acc48d81c91bff7d4679f2..18354dd8d619f776b872073430f3f21d2c4f3799 100644
--- a/lib/config/activity_page.dart
+++ b/lib/common/config/activity_page.dart
@@ -1,61 +1,59 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:stopmotion/ui/pages/editor.dart';
-import 'package:stopmotion/ui/pages/home.dart';
-import 'package:stopmotion/ui/pages/player.dart';
+import 'package:stopmotion/common/ui/pages/editor.dart';
+import 'package:stopmotion/common/ui/pages/home.dart';
+import 'package:stopmotion/common/ui/pages/player.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 indexEditor = 1;
static const pageEditor = ActivityPageItem(
+ code: 'page_editor',
icon: Icon(UniconsLine.setting),
page: PageEditor(),
- code: 'page_editor',
);
static const indexPlayer = 2;
static const pagePlayer = ActivityPageItem(
+ code: 'page_player',
icon: Icon(UniconsLine.info_circle),
page: PagePlayer(),
- code: 'page_player',
);
- static Map<int, ActivityPageItem> items = {
+ static const Map<int, ActivityPageItem> items = {
indexHome: pageHome,
indexEditor: pageEditor,
indexPlayer: pagePlayer,
};
+ 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 67%
rename from lib/config/screen.dart
rename to lib/common/config/screen.dart
index 41d67622a0f38f872def535a62a67219585fdaa4..8f8b000d9df6abd332c818662a000f23a4a8d7bf 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:stopmotion/ui/screens/about.dart';
-import 'package:stopmotion/ui/screens/activity.dart';
-import 'package:stopmotion/ui/screens/settings.dart';
+import 'package:stopmotion/common/ui/screens/about.dart';
+import 'package:stopmotion/common/ui/screens/activity.dart';
+import 'package:stopmotion/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 = {
@@ -52,10 +52,4 @@ class Screen {
static Widget getWidget(int screenIndex) {
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 72%
rename from lib/cubit/nav_cubit_pages.dart
rename to lib/common/cubit/nav/nav_cubit_pages.dart
index 9099e788484ff04e76ec983f221109bc32ca1555..ca5c49cda4877a3c94aafb50c4ebe06bbeea9c8e 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:stopmotion/config/activity_page.dart';
+import 'package:stopmotion/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 71%
rename from lib/cubit/nav_cubit_screens.dart
rename to lib/common/cubit/nav/nav_cubit_screens.dart
index 616206d9b9c3d34b87398a7b5aa384d391a7e1ae..d8e1b7f302016bcfa1a96e73b535107bb96dabb6 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:stopmotion/config/screen.dart';
+import 'package:stopmotion/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 edd86d4c344abb3560d73e94bcca0a4b80f59a2c..a02ae2cbb31acec1c53d6ae57f8d6978357a969c 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:stopmotion/config/activity_page.dart';
-import 'package:stopmotion/cubit/nav_cubit_pages.dart';
+import 'package:stopmotion/common/config/activity_page.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_pages.dart';
class BottomNavBar extends StatelessWidget {
const BottomNavBar({super.key});
@@ -21,17 +21,14 @@ class BottomNavBar extends StatelessWidget {
),
),
child: BlocBuilder<NavCubitPage, int>(builder: (BuildContext context, int state) {
- final List<ActivityPageItem> pageItems = [
- ActivityPage.pageHome,
- ActivityPage.pageEditor,
- ActivityPage.pagePlayer,
- ];
- 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..c0727bb8a9025c5c80bd64ce25a054e192cb0b9b
--- /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:stopmotion/common/config/screen.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:stopmotion/cubit/activity/activity_cubit.dart';
+import 'package:stopmotion/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(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/editor.dart b/lib/common/ui/pages/editor.dart
similarity index 91%
rename from lib/ui/pages/editor.dart
rename to lib/common/ui/pages/editor.dart
index 4ed4be14d9f7b4f1bf0315ddd51b4f3cc542da2c..099801687ae6db7d010b9457d74123e5e6d76bee 100644
--- a/lib/ui/pages/editor.dart
+++ b/lib/common/ui/pages/editor.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:stopmotion/cubit/activity_cubit.dart';
+import 'package:stopmotion/cubit/activity/activity_cubit.dart';
import 'package:stopmotion/ui/widgets/take_picture_widget.dart';
class PageEditor extends StatelessWidget {
diff --git a/lib/ui/pages/home.dart b/lib/common/ui/pages/home.dart
similarity index 93%
rename from lib/ui/pages/home.dart
rename to lib/common/ui/pages/home.dart
index 5c1e5482332414cdd6d9fc89b826e09eeff73ec4..a7720fabed9cab5531bba0d4e9286fbb473208d4 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:stopmotion/cubit/activity_cubit.dart';
+import 'package:stopmotion/cubit/activity/activity_cubit.dart';
import 'package:stopmotion/models/activity/activity.dart';
class PageHome extends StatelessWidget {
diff --git a/lib/ui/pages/player.dart b/lib/common/ui/pages/player.dart
similarity index 93%
rename from lib/ui/pages/player.dart
rename to lib/common/ui/pages/player.dart
index fc1302ec7ec8fcbc84a9cc801d953b7b5ff30f02..f55c9818b0db6cc9789311e75c137eb6c7356a68 100644
--- a/lib/ui/pages/player.dart
+++ b/lib/common/ui/pages/player.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:stopmotion/cubit/activity_cubit.dart';
+import 'package:stopmotion/cubit/activity/activity_cubit.dart';
import 'package:stopmotion/models/activity/activity.dart';
class PagePlayer 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 66%
rename from lib/ui/screens/activity.dart
rename to lib/common/ui/screens/activity.dart
index dcf72de9ef243e1c368cc49da379409fb95913fa..9f5a48649d5aa0eefb277c60cf5e0487ae2b7d3a 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:stopmotion/config/activity_page.dart';
-import 'package:stopmotion/cubit/nav_cubit_pages.dart';
+import 'package:stopmotion/common/config/activity_page.dart';
+import 'package:stopmotion/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 99%
rename from lib/ui/screens/settings.dart
rename to lib/common/ui/screens/settings.dart
index 19ab068c447eadddb87b90c14a50c007799a0344..7981b1c6becc4f5b925c3058b05423750d80f62e 100644
--- a/lib/ui/screens/settings.dart
+++ b/lib/common/ui/screens/settings.dart
@@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-
class ScreenSettings extends StatelessWidget {
const ScreenSettings({super.key});
diff --git a/lib/config/application_config.dart b/lib/config/application_config.dart
new file mode 100644
index 0000000000000000000000000000000000000000..563f237cf928977b2ac3e27cd389e9d8a7d7ec7f
--- /dev/null
+++ b/lib/config/application_config.dart
@@ -0,0 +1,3 @@
+class ApplicationConfig {
+ static const String appTitle = 'Stop Motion';
+}
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_activity_cubit.dart b/lib/cubit/settings/settings_activity_cubit.dart
similarity index 100%
rename from lib/cubit/settings_activity_cubit.dart
rename to lib/cubit/settings/settings_activity_cubit.dart
diff --git a/lib/cubit/settings_activity_state.dart b/lib/cubit/settings/settings_activity_state.dart
similarity index 100%
rename from lib/cubit/settings_activity_state.dart
rename to lib/cubit/settings/settings_activity_state.dart
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 65fa661ae5ebcd8c5410791efd8d0dffcd2da599..142d8a0e2bcfb890cd791bb960831f5915ca2b1d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,11 +4,13 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_custom_toolbox/flutter_toolbox.dart';
-import 'package:stopmotion/cubit/activity_cubit.dart';
-import 'package:stopmotion/cubit/nav_cubit_pages.dart';
-import 'package:stopmotion/cubit/nav_cubit_screens.dart';
-import 'package:stopmotion/cubit/settings_global_cubit.dart';
-import 'package:stopmotion/cubit/settings_activity_cubit.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_pages.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_screens.dart';
+
+import 'package:stopmotion/config/application_config.dart';
+import 'package:stopmotion/cubit/activity/activity_cubit.dart';
+import 'package:stopmotion/cubit/settings/settings_activity_cubit.dart';
+import 'package:stopmotion/cubit/settings/settings_global_cubit.dart';
import 'package:stopmotion/ui/skeleton.dart';
void main() async {
@@ -41,18 +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()),
- BlocProvider<ActivitySettingsCubit>(create: (context) => ActivitySettingsCubit()),
+ 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: 'Stop Motion',
+ title: ApplicationConfig.appTitle,
home: const SkeletonScreen(),
// Theme stuff
diff --git a/lib/ui/nav/global_app_bar.dart b/lib/ui/nav/global_app_bar.dart
deleted file mode 100644
index 92320466ea3c534bba515cb811503eb531470db0..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:stopmotion/config/screen.dart';
-import 'package:stopmotion/cubit/activity_cubit.dart';
-import 'package:stopmotion/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 6f8f62666805f09446eca8c8008cd8f4bbba7f2b..e8bc0bbb488f4d3d4dc380e6c3ab4538adedd5a8 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:stopmotion/config/screen.dart';
-import 'package:stopmotion/cubit/nav_cubit_screens.dart';
-import 'package:stopmotion/ui/nav/global_app_bar.dart';
-import 'package:stopmotion/ui/nav/bottom_nav_bar.dart';
+import 'package:stopmotion/common/config/activity_page.dart';
+import 'package:stopmotion/common/config/screen.dart';
+import 'package:stopmotion/common/cubit/nav/nav_cubit_screens.dart';
+import 'package:stopmotion/common/ui/nav/global_app_bar.dart';
+import 'package:stopmotion/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 4285c0c588b1f2300411e858fee26392785fbc07..c7e121f5837cba8db968eca302859ebb424ba1f1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -301,10 +301,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:
@@ -506,10 +506,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 07b129f3ceaa1d57420dbbf09d3ba23be4872b95..91f98728c6c8d34223c60718ab40ab5a2d1d95d2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: stop motion assistant
publish_to: "none"
-version: 0.2.1+13
+version: 0.3.0+14
environment:
sdk: "^3.0.0"