diff --git a/lib/data/repositories/dashboard_repository.dart b/lib/data/repositories/dashboard_repository.dart index 1ba8029ed..afd44537d 100644 --- a/lib/data/repositories/dashboard_repository.dart +++ b/lib/data/repositories/dashboard_repository.dart @@ -23,7 +23,6 @@ class DashboardRepositoryFlutter implements BaseRepository { /// error, it attempts to load the Dashboard from a Web Client. @override Future loadItem(AuthState auth) async { - print('DashboardRepo: loadDashboard...'); final data = await webClient.fetchItem( auth.url + '/dashboard', auth.token); diff --git a/lib/keys.dart b/lib/keys.dart index 0d3ad5951..90bb9c875 100644 --- a/lib/keys.dart +++ b/lib/keys.dart @@ -11,7 +11,6 @@ class NinjaKeys { static final productHome = const Key('__product_home__'); static final productList = const Key('__product_list__'); - static final productsLoading = const Key('__productsLoading__'); static final productItem = (int id) => Key('ProductItem__${id}'); static final productItemCheckbox = (int id) => Key('ProductItem__${id}__Checkbox'); static final productItemProductKey = (int id) => Key('ProductItem__${id}__ProductKey'); diff --git a/lib/ui/dashboard/dashboard_panels.dart b/lib/ui/dashboard/dashboard_panels.dart index 8e596d7b0..366a94e09 100644 --- a/lib/ui/dashboard/dashboard_panels.dart +++ b/lib/ui/dashboard/dashboard_panels.dart @@ -15,6 +15,14 @@ class DashboardPanels extends StatelessWidget { @override Widget build(BuildContext context) { + return AppLoading(builder: (context, loading) { + return loading + ? LoadingIndicator() + : _buildPanels(); + }); + } + + ListView _buildPanels() { return ListView( padding: EdgeInsets.only(left: 12.0, right: 12.0, top: 20.0), children: [ diff --git a/lib/ui/product/product_list.dart b/lib/ui/product/product_list.dart index 617f7530c..d048b3324 100644 --- a/lib/ui/product/product_list.dart +++ b/lib/ui/product/product_list.dart @@ -21,7 +21,7 @@ class ProductList extends StatelessWidget { Widget build(BuildContext context) { return AppLoading(builder: (context, loading) { return loading - ? LoadingIndicator(key: NinjaKeys.productsLoading) + ? LoadingIndicator() : _buildListView(); }); }