From b018e7a4206afd43f03e07265fe68f175e30036d Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Mon, 21 Sep 2026 14:34:53 +0300 Subject: [PATCH] pagination added --- lib/modules/asset_tracking/asset_tracking_item_view.dart | 2 +- lib/modules/asset_tracking/asset_tracking_page.dart | 7 +------ lib/modules/asset_tracking/asset_tracking_provider.dart | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/modules/asset_tracking/asset_tracking_item_view.dart b/lib/modules/asset_tracking/asset_tracking_item_view.dart index 0b726413..8b278203 100644 --- a/lib/modules/asset_tracking/asset_tracking_item_view.dart +++ b/lib/modules/asset_tracking/asset_tracking_item_view.dart @@ -42,7 +42,7 @@ class AssetTrackingListItemView extends StatelessWidget { arrowMsg: isGridView ? "" : "View on map", ), if (isGridView) ...[ - 4.height, + 5.height, InfoTextWidget( label: "View on map", value: '', diff --git a/lib/modules/asset_tracking/asset_tracking_page.dart b/lib/modules/asset_tracking/asset_tracking_page.dart index a4c1a28e..9432584a 100644 --- a/lib/modules/asset_tracking/asset_tracking_page.dart +++ b/lib/modules/asset_tracking/asset_tracking_page.dart @@ -192,18 +192,13 @@ class _AssetTrackingPageState extends State with SingleTicker padding: const EdgeInsets.all(16), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 2, - childAspectRatio: 1.2, // need to fix this it's not flexiable with content.. + childAspectRatio: 1.1, // need to fix this it's not flexiable with content.. crossAxisSpacing: 12, mainAxisSpacing: 12, ), - itemCount: provider.isLoading ? 6 : provider.assetsList.length, - // separatorBuilder: (listContext, itemIndex) => 12.height, - itemBuilder: (listContext, itemIndex) { if (provider.isLoading) return const SizedBox().toAssetListShimmer(listContext, provider.isLoading); - - // Calculate staggered animation delay final delay = itemIndex * 0.08; final animation = Tween(begin: 0.0, end: 1.0).animate( CurvedAnimation( diff --git a/lib/modules/asset_tracking/asset_tracking_provider.dart b/lib/modules/asset_tracking/asset_tracking_provider.dart index ae21666c..9e148441 100644 --- a/lib/modules/asset_tracking/asset_tracking_provider.dart +++ b/lib/modules/asset_tracking/asset_tracking_provider.dart @@ -74,7 +74,7 @@ class AssetTrackingProvider extends ChangeNotifier { assetsList = responseAssetList; // assetInventoryResponse = newResponse; } - final int totalRows = (jsonData["totalRows"] as int?) ?? assetsList.length; + final int totalRows = (jsonData["totalRows"] as int?) ?? assetsList.length; nextPage = (assetsList.length) < totalRows; } else { if (loadMore) pageNo -= 1;