From bae9c3a1e17677c172d020971328e7c1ca65db63 Mon Sep 17 00:00:00 2001 From: Simon Ding Date: Wed, 17 Jul 2024 19:02:32 +0800 Subject: [PATCH] dart fix --- ui/lib/activity.dart | 2 +- ui/lib/login_page.dart | 1 + ui/lib/main.dart | 8 ++++---- ui/lib/movie_watchlist.dart | 2 +- ui/lib/providers/settings.dart | 32 ++++++++++++++++---------------- ui/lib/search.dart | 22 +++++++++++----------- ui/lib/system_settings.dart | 34 +++++++++++++++++----------------- ui/lib/tv_details.dart | 2 +- 8 files changed, 52 insertions(+), 51 deletions(-) diff --git a/ui/lib/activity.dart b/ui/lib/activity.dart index 51daab0..f5cba7b 100644 --- a/ui/lib/activity.dart +++ b/ui/lib/activity.dart @@ -72,6 +72,6 @@ class ActivityPage extends ConsumerWidget { ); }, error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()); + loading: () => const MyProgressIndicator()); } } diff --git a/ui/lib/login_page.dart b/ui/lib/login_page.dart index 33e2118..d3b9b90 100644 --- a/ui/lib/login_page.dart +++ b/ui/lib/login_page.dart @@ -28,6 +28,7 @@ class LoginScreen extends ConsumerWidget { title: 'Polaris', onLogin: (data) { ref.read(authSettingProvider.notifier).login(data.name, data.password); + return null; }, onSubmitAnimationCompleted: () { context.go(WelcomePage.routeTv); diff --git a/ui/lib/main.dart b/ui/lib/main.dart index f097f1f..6e7e64f 100644 --- a/ui/lib/main.dart +++ b/ui/lib/main.dart @@ -23,7 +23,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { // GoRouter configuration - final _shellRoute = ShellRoute( + final shellRoute = ShellRoute( builder: (BuildContext context, GoRouterState state, Widget child) { return SelectionArea( child: Scaffold( @@ -139,10 +139,10 @@ class MyApp extends StatelessWidget { ], ); - final _router = GoRouter( + final router = GoRouter( navigatorKey: APIs.navigatorKey, routes: [ - _shellRoute, + shellRoute, GoRoute( path: LoginScreen.route, builder: (context, state) => const LoginScreen(), @@ -172,7 +172,7 @@ class MyApp extends StatelessWidget { seedColor: Colors.blue, brightness: Brightness.dark), useMaterial3: true, ), - routerConfig: _router, + routerConfig: router, ), ); } diff --git a/ui/lib/movie_watchlist.dart b/ui/lib/movie_watchlist.dart index 3eef3d0..5f4575d 100644 --- a/ui/lib/movie_watchlist.dart +++ b/ui/lib/movie_watchlist.dart @@ -142,7 +142,7 @@ class _MovieDetailsPageState extends ConsumerState { icon: const Icon(Icons.download), onPressed: () async { await ref - .read(movieTorrentsDataProvider(this.id) + .read(movieTorrentsDataProvider(id) .notifier) .download(torrent.link!); }, diff --git a/ui/lib/providers/settings.dart b/ui/lib/providers/settings.dart index 9f26cd8..3466f77 100644 --- a/ui/lib/providers/settings.dart +++ b/ui/lib/providers/settings.dart @@ -7,18 +7,18 @@ import 'package:ui/providers/APIs.dart'; import 'package:ui/providers/server_response.dart'; var settingProvider = - AsyncNotifierProvider.family( + AsyncNotifierProvider.autoDispose.family( EditSettingData.new); var indexersProvider = - AsyncNotifierProvider>(IndexerSetting.new); + AsyncNotifierProvider.autoDispose>(IndexerSetting.new); var dwonloadClientsProvider = - AsyncNotifierProvider>( + AsyncNotifierProvider.autoDispose>( DownloadClientSetting.new); var storageSettingProvider = - AsyncNotifierProvider>( + AsyncNotifierProvider.autoDispose>( StorageSettingData.new); class EditSettingData extends FamilyAsyncNotifier { @@ -113,10 +113,10 @@ class Indexer { id = json["id"]; } Map toJson() { - final Map data = new Map(); - data['name'] = this.name; - data['url'] = this.url; - data['api_key'] = this.apiKey; + final Map data = {}; + data['name'] = name; + data['url'] = url; + data['api_key'] = apiKey; return data; } } @@ -196,14 +196,14 @@ class DownloadClient { } Map toJson() { - final Map data = new Map(); - data['id'] = this.id; - data['enable'] = this.enable; - data['name'] = this.name; - data['implementation'] = this.implementation; - data['url'] = this.url; - data['remove_completed_downloads'] = this.removeCompletedDownloads; - data['remove_failed_downloads'] = this.removeFailedDownloads; + final Map data = {}; + data['id'] = id; + data['enable'] = enable; + data['name'] = name; + data['implementation'] = implementation; + data['url'] = url; + data['remove_completed_downloads'] = removeCompletedDownloads; + data['remove_failed_downloads'] = removeFailedDownloads; return data; } } diff --git a/ui/lib/search.dart b/ui/lib/search.dart index 64d83f1..a34895b 100644 --- a/ui/lib/search.dart +++ b/ui/lib/search.dart @@ -85,7 +85,7 @@ class _SearchPageState extends ConsumerState { return cards; }, error: (err, trace) => [Text("$err")], - loading: () => [MyProgressIndicator()]); + loading: () => [const MyProgressIndicator()]); var f = FutureBuilder( // We listen to the pending operation, to update the UI accordingly. @@ -93,7 +93,7 @@ class _SearchPageState extends ConsumerState { builder: (context, snapshot) { if (snapshot.connectionState != ConnectionState.done && snapshot.connectionState != ConnectionState.none) { - return MyProgressIndicator(); + return const MyProgressIndicator(); } return ListView( children: res, @@ -126,8 +126,8 @@ class _SearchPageState extends ConsumerState { builder: (BuildContext context) { return Consumer( builder: (context, ref, _) { - String _resSelected = "1080p"; - int _storageSelected = 0; + String resSelected = "1080p"; + int storageSelected = 0; var storage = ref.watch(storageSettingProvider); return AlertDialog( @@ -137,7 +137,7 @@ class _SearchPageState extends ConsumerState { children: [ DropdownMenu( label: const Text("清晰度"), - initialSelection: _resSelected, + initialSelection: resSelected, dropdownMenuEntries: const [ DropdownMenuEntry(value: "720p", label: "720p"), DropdownMenuEntry(value: "1080p", label: "1080p"), @@ -145,7 +145,7 @@ class _SearchPageState extends ConsumerState { ], onSelected: (value) { setState(() { - _resSelected = value!; + resSelected = value!; }); }, ), @@ -153,14 +153,14 @@ class _SearchPageState extends ConsumerState { data: (v) { return DropdownMenu( label: const Text("存储位置"), - initialSelection: _storageSelected, + initialSelection: storageSelected, dropdownMenuEntries: v .map((s) => DropdownMenuEntry( label: s.name!, value: s.id)) .toList(), onSelected: (value) { setState(() { - _storageSelected = value!; + storageSelected = value!; }); }, ); @@ -185,11 +185,11 @@ class _SearchPageState extends ConsumerState { ), child: const Text('确定'), onPressed: () { - print(_storageSelected); + print(storageSelected); ref .read(searchPageDataProvider.notifier) - .submit2Watchlist(item.id!, _storageSelected, - _resSelected, item.mediaType!); + .submit2Watchlist(item.id!, storageSelected, + resSelected, item.mediaType!); Navigator.of(context).pop(); }, ), diff --git a/ui/lib/system_settings.dart b/ui/lib/system_settings.dart index 95ee59e..178753a 100644 --- a/ui/lib/system_settings.dart +++ b/ui/lib/system_settings.dart @@ -61,7 +61,7 @@ class _SystemSettingsPageState extends ConsumerState { ); }, error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()), + loading: () => const MyProgressIndicator()), dirKey.when( data: (data) { _downloadDirController.text = data; @@ -80,7 +80,7 @@ class _SystemSettingsPageState extends ConsumerState { ); }, error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()), + loading: () => const MyProgressIndicator()), Center( child: Padding( padding: const EdgeInsets.only(top: 28.0), @@ -154,7 +154,7 @@ class _SystemSettingsPageState extends ConsumerState { ))); }), error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()); + loading: () => const MyProgressIndicator()); }); var downloadClients = ref.watch(dwonloadClientsProvider); @@ -197,7 +197,7 @@ class _SystemSettingsPageState extends ConsumerState { ))); }), error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()); + loading: () => const MyProgressIndicator()); }); var storageSettingData = ref.watch(storageSettingProvider); @@ -238,12 +238,12 @@ class _SystemSettingsPageState extends ConsumerState { ))); }), error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()); + loading: () => const MyProgressIndicator()); }); var authData = ref.watch(authSettingProvider); - TextEditingController _userController = TextEditingController(); - TextEditingController _passController = TextEditingController(); + TextEditingController userController = TextEditingController(); + TextEditingController passController = TextEditingController(); var authSetting = authData.when( data: (data) { if (_enableAuth == null) { @@ -251,7 +251,7 @@ class _SystemSettingsPageState extends ConsumerState { _enableAuth = data.enable; }); } - _userController.text = data.user; + userController.text = data.user; return Column( children: [ SwitchListTile( @@ -266,13 +266,13 @@ class _SystemSettingsPageState extends ConsumerState { ? Column( children: [ TextFormField( - controller: _userController, + controller: userController, decoration: const InputDecoration( labelText: "用户名", icon: Icon(Icons.verified_user), )), TextFormField( - controller: _passController, + controller: passController, decoration: const InputDecoration( labelText: "密码", icon: Icon(Icons.verified_user), @@ -287,13 +287,13 @@ class _SystemSettingsPageState extends ConsumerState { ref .read(authSettingProvider.notifier) .updateAuthSetting(_enableAuth!, - _userController.text, _passController.text); + userController.text, passController.text); })) ], ); }, error: (err, trace) => Text("$err"), - loading: () => MyProgressIndicator()); + loading: () => const MyProgressIndicator()); return ListView( children: [ @@ -490,7 +490,7 @@ class _SystemSettingsPageState extends ConsumerState { passController.text = s.settings!["password"] ?? ""; } - String _selectImpl = + String selectImpl = s.implementation == null ? "local" : s.implementation!; return StatefulBuilder(builder: (context, setState) { return AlertDialog( @@ -502,10 +502,10 @@ class _SystemSettingsPageState extends ConsumerState { label: const Text("实现"), onSelected: (value) { setState(() { - _selectImpl = value!; + selectImpl = value!; }); }, - initialSelection: _selectImpl, + initialSelection: selectImpl, dropdownMenuEntries: const [ DropdownMenuEntry(value: "local", label: "本地存储"), DropdownMenuEntry(value: "webdav", label: "webdav") @@ -515,7 +515,7 @@ class _SystemSettingsPageState extends ConsumerState { decoration: const InputDecoration(labelText: "名称"), controller: nameController, ), - _selectImpl != "local" + selectImpl != "local" ? Column( children: [ @@ -573,7 +573,7 @@ class _SystemSettingsPageState extends ConsumerState { .read(storageSettingProvider.notifier) .addStorage(Storage( name: nameController.text, - implementation: _selectImpl, + implementation: selectImpl, settings: { "tv_path": tvPathController.text, "movie_path": moviePathController.text, diff --git a/ui/lib/tv_details.dart b/ui/lib/tv_details.dart index 5057eba..289785f 100644 --- a/ui/lib/tv_details.dart +++ b/ui/lib/tv_details.dart @@ -46,7 +46,7 @@ class _TvDetailsPageState extends ConsumerState { builder: (context, snapshot) { return seriesDetails.when( data: (details) { - Map> m = Map(); + Map> m = {}; for (final ep in details.episodes!) { var row = DataRow(cells: [ DataCell(Text("${ep.episodeNumber}")),