fix(ui): Fix some ui bugs

This commit is contained in:
anhtunz
2025-03-14 22:36:25 +07:00
parent c21667606a
commit ba9a3d95f6
10 changed files with 174 additions and 120 deletions

View File

@@ -9,6 +9,7 @@ import 'package:go_router/go_router.dart';
import 'package:badges/badges.dart' as badges;
import 'package:persistent_bottom_nav_bar/persistent_bottom_nav_bar.dart';
import 'package:sfm_app/feature/sound_notification_test/notification_screen.dart';
import 'package:sfm_app/product/permission/notification_permission.dart';
import '../settings/profile/profile_model.dart';
import '../../product/extention/context_extention.dart';
import '../../bloc/home_bloc.dart';
@@ -72,6 +73,7 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
mainBloc.sinkIsVNIcon.add(isVN);
mainBloc.sinkThemeMode.add(isLight);
LocationPermissionRequest.instance.checkLocationPermission(context);
NotificationPermission.instance.checkNotificationPermission(context);
}
@override
@@ -148,15 +150,15 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
inactiveIcon:
IconConstants.instance.getMaterialIcon(Icons.group_outlined),
),
PersistentBottomNavBarItem(
icon: IconConstants.instance
.getMaterialIcon(Icons.notifications_outlined),
title: appLocalization(context).notification,
activeColorPrimary: Colors.blue,
inactiveColorPrimary: Colors.grey,
inactiveIcon: IconConstants.instance
.getMaterialIcon(Icons.notifications_outlined),
),
// PersistentBottomNavBarItem(
// icon: IconConstants.instance
// .getMaterialIcon(Icons.notifications_outlined),
// title: appLocalization(context).notification,
// activeColorPrimary: Colors.blue,
// inactiveColorPrimary: Colors.grey,
// inactiveIcon: IconConstants.instance
// .getMaterialIcon(Icons.notifications_outlined),
// ),
];
}
@@ -181,10 +183,10 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
child: const InterFamilyScreen(),
blocBuilder: () => InterFamilyBloc(),
),
BlocProvider(
/*BlocProvider(
child: const NotificationScreen(),
blocBuilder: () => NotificationBloc(),
),
),*/
];
}
@@ -221,8 +223,8 @@ class _MainScreenState extends State<MainScreen> with WidgetsBindingObserver {
},
icon: Icon(
themeModeSnapshot.data ?? isLight
? Icons.dark_mode_outlined
: Icons.light_mode_outlined,
? Icons.light_mode_outlined
: Icons.dark_mode_outlined,
),
),
StreamBuilder<bool>(