diff --git a/android/gradle.properties b/android/gradle.properties index 33c43775a7db70e59256cad64931ad4fc01c2c7c..5a36ab8c92338284725018aa8f109700499c74fd 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,5 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -app.versionName=1.0.23 -app.versionCode=24 +app.versionName=1.0.24 +app.versionCode=25 diff --git a/assets/translations/en.json b/assets/translations/en.json index ca94af1202f50913ca29861c168ca3a6813f3578..5159cadefc7c57a7695a4fab93ebd84beb1b7edb 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -1,7 +1,12 @@ { "app_name": "Random application", + "bottom_nav_sample": "Sample", "bottom_nav_chart": "Graph", + "bottom_nav_about": "About", + + "about_title": "About", + "about_content": "A random application, for testing purpose only.", "TOP": "TOP", "BOTTOM": "BOTTOM" diff --git a/assets/translations/fr.json b/assets/translations/fr.json index 6016e93819e90cfbf849b98f265175c97ba97433..9f395345b7abc7a81f441f08ad5f1287d03e556b 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -1,7 +1,12 @@ { "app_name": "Random application", + "bottom_nav_sample": "Démo", "bottom_nav_chart": "Graph", + "bottom_nav_about": "À propos", + + "about_title": "À propos", + "about_content": "Application fourre-tout, à des fins de tests uniquement.", "TOP": "HAUT", "BOTTOM": "BAS" diff --git a/lib/cubit/bottom_nav_cubit.dart b/lib/cubit/bottom_nav_cubit.dart index 7a39813bfd5dd444a4b0ff8f4763acd0f1a5a47a..eb54062a9da27c975b07df38df69f1cdf1d9b776 100644 --- a/lib/cubit/bottom_nav_cubit.dart +++ b/lib/cubit/bottom_nav_cubit.dart @@ -5,9 +5,9 @@ class BottomNavCubit extends HydratedCubit<int> { void updateIndex(int index) => emit(index); - void getFirstScreen() => emit(0); - - void getSecondScreen() => emit(1); + void getDemoPage() => emit(0); + void getGraphPage() => emit(1); + void getAboutPage() => emit(2); @override int? fromJson(Map<String, dynamic> json) { diff --git a/lib/ui/screens/about_page.dart b/lib/ui/screens/about_page.dart new file mode 100644 index 0000000000000000000000000000000000000000..5c6a6477efb6e7484649a8cb8b226773d87d1a38 --- /dev/null +++ b/lib/ui/screens/about_page.dart @@ -0,0 +1,23 @@ +import 'package:easy_localization/easy_localization.dart'; +import 'package:flutter/material.dart'; + +class AboutPage extends StatelessWidget { + const AboutPage({super.key}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: <Widget>[ + Text( + 'about_title', + textAlign: TextAlign.start, + style: Theme.of(context).textTheme.headlineMedium!.apply(fontWeightDelta: 2), + ).tr(), + Text('about_content').tr(), + ], + ); + } +} diff --git a/lib/ui/screens/skeleton_screen.dart b/lib/ui/screens/skeleton_screen.dart index 6d6e9faac7f6a8b3f50c41ff596fbc461560f559..4c43b9b17d9a55c530deaa4a85c921fc00fdd7c0 100644 --- a/lib/ui/screens/skeleton_screen.dart +++ b/lib/ui/screens/skeleton_screen.dart @@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:random/activities/ActivityDemoPage.dart'; import 'package:random/activities/ActivityGraphPage.dart'; import 'package:random/cubit/bottom_nav_cubit.dart'; +import 'package:random/ui/screens/about_page.dart'; import 'package:random/ui/widgets/custom_app_bar.dart'; import 'package:random/ui/widgets/bottom_nav_bar.dart'; @@ -15,6 +16,7 @@ class SkeletonScreen extends StatelessWidget { const List<Widget> pageNavigation = <Widget>[ ActivityDemoPage(), ActivityGraphPage(), + AboutPage(), ]; return BlocProvider<BottomNavCubit>( diff --git a/lib/ui/widgets/bottom_nav_bar.dart b/lib/ui/widgets/bottom_nav_bar.dart index d656854e1934bd014c1a053286b45bbf0a4ec723..5e6f7106eaa7c68a2b9b85440ae307b3abd8c855 100644 --- a/lib/ui/widgets/bottom_nav_bar.dart +++ b/lib/ui/widgets/bottom_nav_bar.dart @@ -39,6 +39,10 @@ class BottomNavBar extends StatelessWidget { icon: const Icon(Ionicons.pencil_outline), label: tr('bottom_nav_chart'), ), + BottomNavigationBarItem( + icon: const Icon(Ionicons.information_circle), + label: tr('bottom_nav_about'), + ), ], ); }), diff --git a/pubspec.yaml b/pubspec.yaml index 46f75c51a02b5b0f3bf67c68d9fe644eaca0ed5e..f779334e1c421c1ae576fca2565b2a4585802584 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: A random application, for testing purpose only. publish_to: 'none' -version: 1.0.23+24 +version: 1.0.24+25 environment: sdk: '^3.0.0'