mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CircularProgressIndicator color and position show in notification

Browse Source
This commit is contained in:
llsajjad
2025-09-23 16:07:44 +03:30
parent 1f60954c53
commit 1901b84b2d
4 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/notification/pages/d_notification_page.dart
+20 -9
View File
@@ -92,16 +92,27 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
), ),
), ),
SizedBox(height: 12.0.h()), SizedBox(height: 12.0.h()),
Expanded( viewModel.isLoading
child: TabBarView( ? Container()
controller: controller, : Expanded(
children: const [ child: TabBarView(
NotificationAllTab(), controller: controller,
NotificationUnreadTab(), children: const [
NotificationImportantTab(), NotificationAllTab(),
], NotificationUnreadTab(),
NotificationImportantTab(),
],
),
),
if (viewModel.isLoading) ...[
const Spacer(),
const Center(
child: CircularProgressIndicator(
color: AppColors.secondary50,
),
), ),
), const Spacer(),
],
SizedBox(height: 10.0.h()), SizedBox(height: 10.0.h()),
Row( Row(
children: [ children: [
lib/views/notification/pages/m_notification_page.dart
+19 -13
View File
@@ -98,20 +98,26 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
), ),
), ),
SizedBox(height: 12.0.h()), SizedBox(height: 12.0.h()),
Expanded( viewModel.isLoading
child: TabBarView( ? Container()
controller: controller, : Expanded(
children: [ child: TabBarView(
NotificationAllTab(scrollController: _scrollController), controller: controller,
NotificationUnreadTab(scrollController: _scrollController), children: [
NotificationImportantTab(scrollController: _scrollController), NotificationAllTab(scrollController: _scrollController),
], NotificationUnreadTab(scrollController: _scrollController),
), NotificationImportantTab(
), scrollController: _scrollController,
),
],
),
),
if (viewModel.isLoading) ...[ if (viewModel.isLoading) ...[
SizedBox(height: 10.0.h()), const Spacer(),
const Center(child: CircularProgressIndicator()), const Center(
SizedBox(height: 10.0.h()), child: CircularProgressIndicator(color: AppColors.secondary50),
),
const Spacer(),
], ],
], ],
), ),
lib/views/notification/pages/t_notification_page.dart
+20 -9
View File
@@ -96,16 +96,27 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
), ),
), ),
SizedBox(height: 12.0.h()), SizedBox(height: 12.0.h()),
Expanded( viewModel.isLoading
child: TabBarView( ? Container()
controller: controller, : Expanded(
children: const [ child: TabBarView(
NotificationAllTab(), controller: controller,
NotificationUnreadTab(), children: const [
NotificationImportantTab(), NotificationAllTab(),
], NotificationUnreadTab(),
NotificationImportantTab(),
],
),
),
if (viewModel.isLoading) ...[
const Spacer(),
const Center(
child: CircularProgressIndicator(
color: AppColors.secondary50,
),
), ),
), const Spacer(),
],
SizedBox(height: 10.0.h()), SizedBox(height: 10.0.h()),
Row( Row(
children: [ children: [