Merge branch 'ui/map-page' of github.com:NIAEFEUP/project-schrodinger…

… into ui/map-page
NIAEFEUP · Feb 6, 2025 · d596ceb · d596ceb
2 parents 27cccb4 + 19c8a9b
commit d596ceb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/packages/uni_app/lib/model/entities/locations/special_room_location.dart b/packages/uni_app/lib/model/entities/locations/special_room_location.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:uni/model/entities/location.dart';
 import 'package:uni_ui/icons.dart';
 

diff --git a/packages/uni_app/lib/view/common_widgets/pages_layouts/general/general.dart b/packages/uni_app/lib/view/common_widgets/pages_layouts/general/general.dart
@@ -108,18 +108,20 @@ abstract class GeneralPageViewState<T extends StatefulWidget> extends State<T> {
   }
 
   Widget getScaffold(BuildContext context, Widget body) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      appBar: getTopNavbar(context),
-      extendBody: true,
-      floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
-      floatingActionButton: const AppBottomNavbar(),
-      floatingActionButtonAnimator: FloatingActionButtonAnimator.noAnimation,
-      body: RefreshState(
-        onRefresh: onRefresh,
-        header: getHeader(context),
-        body: body,
+    return MediaQuery.removePadding(
+      // Prevent misalignment of navbar icons
+      context: context,
+      removeBottom: true,
+      child: Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        appBar: getTopNavbar(context),
+        extendBody: true, // Allow body to appear behind the bottom navbar
+        bottomNavigationBar: const AppBottomNavbar(),
+        body: RefreshState(
+          onRefresh: onRefresh,
+          header: getHeader(context),
+          body: body,
+        ),
       ),
     );
   }

diff --git a/packages/uni_app/lib/view/map/widgets/marker.dart b/packages/uni_app/lib/view/map/widgets/marker.dart
@@ -41,11 +41,19 @@ class MarkerIcon extends StatelessWidget {
 
     final fontColor = _getFontColor(context);
     if (location?.icon is IconData) {
-      return UniIcon(location?.icon as IconData,
-          color: fontColor, size: 12, solid: true);
+      return UniIcon(
+        location?.icon as IconData,
+        color: fontColor,
+        size: 12,
+        solid: true,
+      );
     } else {
-      return UniIcon(Icons.device_unknown,
-          color: fontColor, size: 12, solid: true);
+      return UniIcon(
+        Icons.device_unknown,
+        color: fontColor,
+        size: 12,
+        solid: true,
+      );
     }
   }
 

diff --git a/packages/uni_ui/lib/navbar/bottom_navbar_item.dart b/packages/uni_ui/lib/navbar/bottom_navbar_item.dart
@@ -24,6 +24,7 @@ class BottomNavbarItem {
             : null,
         child: UniIcon(
           icon,
+          size: 32,
           color: Theme.of(context).colorScheme.secondary,
         ),
       ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ class BottomNavbarItem { @@
                 : null,
             child: UniIcon(
               icon,
+              size: 32,
               color: Theme.of(context).colorScheme.secondary,
             ),
           ),
@@ Expand Down @@