Skip to content
Snippets Groups Projects
Commit 0718f9ed authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '36-add-about-page' into 'master'

Resolve "Add about page"

Closes #36

See merge request !32
parents 6338fc09 4a53ecab
No related branches found
No related tags found
1 merge request!32Resolve "Add about page"
Pipeline #4500 passed
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=1.0.23 app.versionName=1.0.24
app.versionCode=24 app.versionCode=25
{ {
"app_name": "Random application", "app_name": "Random application",
"bottom_nav_sample": "Sample", "bottom_nav_sample": "Sample",
"bottom_nav_chart": "Graph", "bottom_nav_chart": "Graph",
"bottom_nav_about": "About",
"about_title": "About",
"about_content": "A random application, for testing purpose only.",
"TOP": "TOP", "TOP": "TOP",
"BOTTOM": "BOTTOM" "BOTTOM": "BOTTOM"
......
{ {
"app_name": "Random application", "app_name": "Random application",
"bottom_nav_sample": "Démo", "bottom_nav_sample": "Démo",
"bottom_nav_chart": "Graph", "bottom_nav_chart": "Graph",
"bottom_nav_about": "À propos",
"about_title": "À propos",
"about_content": "Application fourre-tout, à des fins de tests uniquement.",
"TOP": "HAUT", "TOP": "HAUT",
"BOTTOM": "BAS" "BOTTOM": "BAS"
......
...@@ -5,9 +5,9 @@ class BottomNavCubit extends HydratedCubit<int> { ...@@ -5,9 +5,9 @@ class BottomNavCubit extends HydratedCubit<int> {
void updateIndex(int index) => emit(index); void updateIndex(int index) => emit(index);
void getFirstScreen() => emit(0); void getDemoPage() => emit(0);
void getGraphPage() => emit(1);
void getSecondScreen() => emit(1); void getAboutPage() => emit(2);
@override @override
int? fromJson(Map<String, dynamic> json) { int? fromJson(Map<String, dynamic> json) {
......
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(),
],
);
}
}
...@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; ...@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:random/activities/ActivityDemoPage.dart'; import 'package:random/activities/ActivityDemoPage.dart';
import 'package:random/activities/ActivityGraphPage.dart'; import 'package:random/activities/ActivityGraphPage.dart';
import 'package:random/cubit/bottom_nav_cubit.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/custom_app_bar.dart';
import 'package:random/ui/widgets/bottom_nav_bar.dart'; import 'package:random/ui/widgets/bottom_nav_bar.dart';
...@@ -15,6 +16,7 @@ class SkeletonScreen extends StatelessWidget { ...@@ -15,6 +16,7 @@ class SkeletonScreen extends StatelessWidget {
const List<Widget> pageNavigation = <Widget>[ const List<Widget> pageNavigation = <Widget>[
ActivityDemoPage(), ActivityDemoPage(),
ActivityGraphPage(), ActivityGraphPage(),
AboutPage(),
]; ];
return BlocProvider<BottomNavCubit>( return BlocProvider<BottomNavCubit>(
......
...@@ -39,6 +39,10 @@ class BottomNavBar extends StatelessWidget { ...@@ -39,6 +39,10 @@ class BottomNavBar extends StatelessWidget {
icon: const Icon(Ionicons.pencil_outline), icon: const Icon(Ionicons.pencil_outline),
label: tr('bottom_nav_chart'), label: tr('bottom_nav_chart'),
), ),
BottomNavigationBarItem(
icon: const Icon(Ionicons.information_circle),
label: tr('bottom_nav_about'),
),
], ],
); );
}), }),
......
...@@ -3,7 +3,7 @@ description: A random application, for testing purpose only. ...@@ -3,7 +3,7 @@ description: A random application, for testing purpose only.
publish_to: 'none' publish_to: 'none'
version: 1.0.23+24 version: 1.0.24+25
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment