From 26f852a5141d6b8ba82ffce9bf43396fd3678ccd Mon Sep 17 00:00:00 2001 From: ice-hector <96414297+ice-hector@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:07:33 +0300 Subject: [PATCH] chore: clean up --- .../features/dapps/views/categories/apps/apps.dart | 2 -- .../categories_collection/categories_collection.dart | 3 --- .../featured_collection/featured_collection.dart | 12 +++--------- lib/app/features/dapps/views/pages/dapps.dart | 4 ---- .../dapps/views/pages/dapps_list/dapps_list.dart | 3 ++- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/lib/app/features/dapps/views/categories/apps/apps.dart b/lib/app/features/dapps/views/categories/apps/apps.dart index 5a7a7c5e83..293ca1ec0d 100644 --- a/lib/app/features/dapps/views/categories/apps/apps.dart +++ b/lib/app/features/dapps/views/categories/apps/apps.dart @@ -7,12 +7,10 @@ import 'package:ice/app/features/dapps/views/components/apps_collection/apps_col class AppsRouteData { AppsRouteData({ required this.title, - this.items = const [], this.isSearchVisible = true, }); final String title; - final List? items; final bool? isSearchVisible; } diff --git a/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart b/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart index 91dba5d547..ac9a97bfc4 100644 --- a/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart +++ b/lib/app/features/dapps/views/components/categories_collection/categories_collection.dart @@ -6,7 +6,6 @@ import 'package:ice/app/extensions/asset_gen_image.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/dapps/providers/dapps_provider.dart'; import 'package:ice/app/features/dapps/views/categories/apps/apps.dart'; import 'package:ice/app/router/app_routes.dart'; import 'package:ice/generated/assets.gen.dart'; @@ -55,7 +54,6 @@ class CategoriesCollection extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final apps = ref.watch(dappsDataProvider); return Padding( padding: EdgeInsets.only(bottom: 8.0.s, top: 3.0.s), child: SizedBox( @@ -76,7 +74,6 @@ class CategoriesCollection extends ConsumerWidget { DAppsListRoute( $extra: AppsRouteData( title: DAppsCategory.values[index].title(context), - items: apps, ), ).push(context); }, diff --git a/lib/app/features/dapps/views/components/featured_collection/featured_collection.dart b/lib/app/features/dapps/views/components/featured_collection/featured_collection.dart index 409ff758c5..aedf2246cc 100644 --- a/lib/app/features/dapps/views/components/featured_collection/featured_collection.dart +++ b/lib/app/features/dapps/views/components/featured_collection/featured_collection.dart @@ -46,15 +46,9 @@ class FeaturedCollection extends ConsumerWidget { left: 12.0.s, child: Row( children: [ - DecoratedBox( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8.0.s), - ), - child: Image.asset( - items[index].iconImage, - width: 30.0.s, - ), + Image.asset( + items[index].iconImage, + width: 30.0.s, ), SizedBox(width: 8.0.s), Column( diff --git a/lib/app/features/dapps/views/pages/dapps.dart b/lib/app/features/dapps/views/pages/dapps.dart index 6e242a3771..f0db1575cf 100644 --- a/lib/app/features/dapps/views/pages/dapps.dart +++ b/lib/app/features/dapps/views/pages/dapps.dart @@ -4,7 +4,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/extensions/theme_data.dart'; -import 'package:ice/app/features/dapps/model/dapp_data.dart'; import 'package:ice/app/features/dapps/providers/dapps_provider.dart'; import 'package:ice/app/features/dapps/views/categories/apps/apps.dart'; import 'package:ice/app/features/dapps/views/categories/featured.dart'; @@ -52,7 +51,6 @@ class DAppsPage extends HookConsumerWidget { DAppsListRoute( $extra: AppsRouteData( title: context.i18n.dapps_section_title_highest_ranked, - items: apps, ), ).push(context); }, @@ -65,7 +63,6 @@ class DAppsPage extends HookConsumerWidget { DAppsListRoute( $extra: AppsRouteData( title: context.i18n.dapps_section_title_recently_added, - items: apps, ), ).push(context); }, @@ -75,7 +72,6 @@ class DAppsPage extends HookConsumerWidget { DAppsListRoute( $extra: AppsRouteData( title: context.i18n.dapps_section_title_favourites, - items: [], ), ).push(context); }, diff --git a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart index 13b765ba65..af7cb55c3d 100644 --- a/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart +++ b/lib/app/features/dapps/views/pages/dapps_list/dapps_list.dart @@ -7,6 +7,7 @@ import 'package:ice/app/components/screen_offset/screen_side_offset.dart'; import 'package:ice/app/extensions/build_context.dart'; import 'package:ice/app/extensions/num.dart'; import 'package:ice/app/features/dapps/model/dapp_data.dart'; +import 'package:ice/app/features/dapps/providers/dapps_provider.dart'; import 'package:ice/app/features/dapps/views/categories/apps/apps.dart'; import 'package:ice/app/features/dapps/views/components/grid_item/grid_item.dart'; import 'package:ice/app/router/components/navigation_app_bar/navigation_app_bar.dart'; @@ -20,7 +21,7 @@ class DAppsList extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final searchText = useState(''); - final items = payload.items ?? []; + final items = ref.watch(dappsDataProvider); final filteredApps = searchText.value.isEmpty ? items