Migrate from AsyncValue.when to Dart 3's switch-case

See: rrousselGit/riverpod#2715
natsuk4ze · Jan 25, 2024 · 6fb7159 · 6fb7159
1 parent b7f030c
commit 6fb7159
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/lib/features/package_details/package_details_page.dart b/lib/features/package_details/package_details_page.dart
@@ -22,11 +22,11 @@ class PackageDetailsPage extends ConsumerWidget {
       appBar: TitleAppBar(title: l10n.packageDetailsPage.title),
       body: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 24),
-        child: package.when(
-          data: (package) => PackegeDetailsItem(package),
-          error: (e, _) => Text(e.toString()),
-          loading: () => const Center(child: CircularProgressIndicator()),
-        ),
+        child: switch (package) {
+          AsyncData(:final value) => PackegeDetailsItem(value),
+          AsyncError(:final error) => Text(error.toString()),
+          _ => const Center(child: CircularProgressIndicator()),
+        },
       ),
     );
   }

diff --git a/lib/features/packages/packages_page.dart b/lib/features/packages/packages_page.dart
@@ -17,7 +17,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'packages_page.g.dart';
 
 @visibleForTesting
-const initialSearchText = 'color';
+const initialSearchText = 'vue';
 
 @riverpod
 class Sort extends _$Sort {
@@ -111,32 +111,31 @@ class _PackageItems extends ConsumerWidget {
     final sort = ref.watch(sortProvider);
     final l10n = ref.watch(l10nProvider);
 
-    return packages.when(
-      data: (packages) {
-        final sortedPackages = sort == null
-            ? List.of(packages)
-            : packages.sortedByCompare(
-                (package) => sort.getValue(package.score),
-                (a, b) => b.compareTo(a));
+    return switch (packages) {
+      AsyncData(:final value) => Builder(builder: (context) {
+          final sortedPackages = sort == null
+              ? List.of(value)
+              : value.sortedByCompare((package) => sort.getValue(package.score),
+                  (a, b) => b.compareTo(a));
 
-        return sortedPackages.isEmpty
-            ? SingleChildScrollView(
-                child: EmptyImage(text: l10n.packagesPage.packageNotFound),
-              )
-            : RefreshIndicator(
-                onRefresh: () async => ref.refresh(packagesProvider(
-                  search: searchText,
-                  debounce: false,
-                ).future),
-                child: ListView.separated(
-                  separatorBuilder: (_, __) => const Divider(),
-                  itemCount: sortedPackages.length,
-                  itemBuilder: (_, int i) => PackageItem(sortedPackages[i]),
-                ),
-              );
-      },
-      error: (e, _) => Text(e.toString()),
-      loading: () => const Center(child: CircularProgressIndicator()),
-    );
+          return sortedPackages.isEmpty
+              ? SingleChildScrollView(
+                  child: EmptyImage(text: l10n.packagesPage.packageNotFound),
+                )
+              : RefreshIndicator(
+                  onRefresh: () async => ref.refresh(packagesProvider(
+                    search: searchText,
+                    debounce: false,
+                  ).future),
+                  child: ListView.separated(
+                    separatorBuilder: (_, __) => const Divider(),
+                    itemCount: sortedPackages.length,
+                    itemBuilder: (_, int i) => PackageItem(sortedPackages[i]),
+                  ),
+                );
+        }),
+      AsyncError(:final error) => Text(error.toString()),
+      _ => const Center(child: CircularProgressIndicator()),
+    };
   }
 }