feat(#704): adapt bottom navigation bar

hpi-dhc · Apr 9, 2024 · 3aec14d · 3aec14d
1 parent 920d3ed
commit 3aec14d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/app/integration_test/main_page_test.dart b/app/integration_test/main_page_test.dart
@@ -1,6 +1,7 @@
 import 'package:app/common/module.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:provider/provider.dart';
 
@@ -41,8 +42,8 @@ void main() {
 
       await tester.pumpAndSettle();
 
-      expect(find.byIcon(Icons.summarize_rounded), findsOneWidget);
-      expect(find.byIcon(Icons.medication_rounded), findsOneWidget);
+      expect(find.byIcon(FontAwesomeIcons.pills), findsOneWidget);
+      expect(find.byIcon(FontAwesomeIcons.dna), findsOneWidget);
       expect(find.byIcon(Icons.lightbulb_rounded), findsOneWidget);
       expect(find.byIcon(Icons.more_horiz_rounded), findsOneWidget);
 

diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -338,10 +338,10 @@
     }
   },
 
-  "nav_report": "Report",
+  "nav_report": "Genes",
   "tab_report": "Gene report",
   "nav_drugs": "Medications",
-  "tab_drugs": "Medications",
+  "tab_drugs": "Medication overview",
   "nav_faq": "FAQ",
   "tab_faq": "Common questions",
   "nav_more": "More",

diff --git a/app/lib/main/pages/main.dart b/app/lib/main/pages/main.dart
@@ -1,3 +1,5 @@
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+
 import '../../common/module.dart';
 
 class TabRouteDefinition {
@@ -8,30 +10,30 @@ class TabRouteDefinition {
   });
   PageRouteInfo<void> pageRouteInfo;
   String label;
-  Icon icon;
+  IconData icon;
 }
 
 List<TabRouteDefinition> getTabRoutesDefinition(BuildContext context) {
   return [
-    TabRouteDefinition(
-      pageRouteInfo: ReportRoute(),
-      label: context.l10n.nav_report,
-      icon: Icon(Icons.summarize_rounded),
-    ),
     TabRouteDefinition(
       pageRouteInfo: SearchRoute(),
       label: context.l10n.nav_drugs,
-      icon: Icon(Icons.medication_rounded),
+      icon: FontAwesomeIcons.pills,
+    ),
+    TabRouteDefinition(
+      pageRouteInfo: ReportRoute(),
+      label: context.l10n.nav_report,
+      icon: FontAwesomeIcons.dna,
     ),
     TabRouteDefinition(
       pageRouteInfo: FaqRoute(),
       label: context.l10n.nav_faq,
-      icon: Icon(Icons.lightbulb_rounded),
+      icon: Icons.lightbulb_rounded,
     ),
     TabRouteDefinition(
       pageRouteInfo: MoreRoute(),
       label: context.l10n.nav_more,
-      icon: Icon(Icons.more_horiz_rounded),
+      icon: Icons.more_horiz_rounded,
     ),
   ];
 }
@@ -78,7 +80,7 @@ class MainPage extends StatelessWidget {
   ) {
     return getTabRoutesDefinition(context).map(
       (routeDefinition) => BottomNavigationBarItem(
-        icon: routeDefinition.icon,
+        icon: Icon(routeDefinition.icon),
         label: routeDefinition.label,  
       )
     ).toList();

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -498,6 +498,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  font_awesome_flutter:
+    dependency: "direct main"
+    description:
+      name: font_awesome_flutter
+      sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.7.0"
   freezed:
     dependency: "direct dev"
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -29,6 +29,7 @@ dependencies:
   flutter_sliding_up_panel: ^2.0.1
   flutter_svg: ^2.0.9
   flutter_web_auth: ^0.5.0
+  font_awesome_flutter: ^10.7.0
   freezed_annotation: ^2.0.3
   google_fonts: ^6.1.0
   hive: ^2.2.2