Refactor

natsuk4ze · Jan 21, 2024 · 8a12071 · 8a12071
1 parent a387dd2
commit 8a12071
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 13 deletions.
diff --git a/assets/app/owner.png b/assets/app/owner.png
diff --git a/lib/features/package_details/package_details_page.dart b/lib/features/package_details/package_details_page.dart
@@ -4,7 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:markdown_widget/markdown_widget.dart';
 import 'package:npm/features/package_details/package_details.dart';
 import 'package:npm/features/settings/language.dart';
-import 'package:npm/features/settings/theme.dart';
+import 'package:npm/features/settings/dark_mode.dart';
 import 'package:npm/widgets/link_text.dart';
 
 class PackageDetailsPage extends ConsumerWidget {

diff --git a/lib/features/packages/packages.dart b/lib/features/packages/packages.dart
@@ -45,10 +45,15 @@ class Package with _$Package {
       name: package['name'],
       description: package['description'],
       version: package['version'],
-      keywords: package['keywords'] != null
-          ? List<String>.from(package['keywords'])
-          : null,
+      keywords: ListX.fromOrNull<String>(package['keywords']),
       score: Score.fromJson(score),
     );
   }
 }
+
+extension ListX on List {
+  static List<T>? fromOrNull<T>(dynamic source) {
+    if (source == null) return null;
+    return List<T>.from(source as Iterable);
+  }
+}
diff --git a/lib/features/settings/theme.dart → lib/features/settings/dark_mode.dart b/lib/features/settings/theme.dart → lib/features/settings/dark_mode.dart
@@ -1,6 +1,6 @@
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
-part 'theme.g.dart';
+part 'dark_mode.g.dart';
 
 @riverpod
 class IsDarkMode extends _$IsDarkMode {

diff --git a/lib/features/settings/theme.g.dart → lib/features/settings/dark_mode.g.dart b/lib/features/settings/theme.g.dart → lib/features/settings/dark_mode.g.dart
diff --git a/lib/features/settings/settings_page.dart b/lib/features/settings/settings_page.dart
@@ -3,7 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:npm/features/settings/language.dart';
-import 'package:npm/features/settings/theme.dart';
+import 'package:npm/features/settings/dark_mode.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SettingsPage extends ConsumerWidget {

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:npm/features/settings/language.dart';
-import 'package:npm/features/settings/theme.dart';
+import 'package:npm/features/settings/dark_mode.dart';
 import 'package:npm/router.dart';
 import 'package:slang_flutter/slang_flutter.dart';
 

diff --git a/lib/router.dart b/lib/router.dart
@@ -51,7 +51,5 @@ class SettingsRoute extends GoRouteData {
   static const String path = 'settings';
 
   @override
-  NoTransitionPage<void> buildPage(context, state) => const NoTransitionPage(
-        child: SettingsPage(),
-      );
+  Widget build(context, state) => const SettingsPage();
 }
diff --git a/lib/widgets/link_text.dart b/lib/widgets/link_text.dart
@@ -14,7 +14,7 @@ class LinkText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () => launchUrl(Uri.parse(url)),
+      onTap: () async => launchUrl(Uri.parse(url)),
       child: Text(
         text ?? url,
         style: const TextStyle(

diff --git a/lib/widgets/logo.dart b/lib/widgets/logo.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:npm/features/settings/theme.dart';
+import 'package:npm/features/settings/dark_mode.dart';
 
 class Logo extends ConsumerWidget {
   const Logo({