Skip to content

Commit

Permalink
chore: fix some notices
Browse files Browse the repository at this point in the history
  • Loading branch information
Yesterday17 committed Jul 7, 2024
1 parent bf98cdb commit a655e20
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 27 deletions.
2 changes: 2 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
analyzer:
errors:
body_might_complete_normally_catch_error: ignore
exclude:
- lib/native/**

include: package:flutter_lints/flutter.yaml

Expand Down
2 changes: 1 addition & 1 deletion lib/services/anniv/anniv.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class AnnivService extends ChangeNotifier {
info = SiteUserInfo(site: site, user: user);
await _saveInfo();
} catch (e) {
if (e is DioError && e.error is AnnivError) {
if (e is DioException && e.error is AnnivError) {
final error = e.error as AnnivError;
if (error.status == 902002) {
// unauthorized, logout
Expand Down
2 changes: 1 addition & 1 deletion lib/services/metadata/metadata_source_sqlite.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SqliteMetadataSource extends MetadataSource {
}

Future<Album?> _getAlbum(final String albumId) async {
final album = await database.getAlbum(albumId: UuidValue(albumId));
final album = await database.getAlbum(albumId: UuidValue.raw(albumId));
if (album == null) {
return null;
} else {
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/dialogs/annil.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/providers.dart';
import 'package:annix/utils/context_extension.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
Expand Down Expand Up @@ -74,15 +74,15 @@ class AnnilDialog extends HookConsumerWidget {
TextButton(
style: TextButton.styleFrom(textStyle: context.textTheme.labelLarge),
child: const Text('Cancel'),
onPressed: () => AnnixRouterDelegate.of(context).popRoute(),
onPressed: () => ref.read(routerProvider).popRoute(),
),
TextButton(
style: TextButton.styleFrom(textStyle: context.textTheme.labelLarge),
child: mode == AnnilDialogMode.add
? const Text('Add')
: const Text('Update'),
onPressed: () {
AnnixRouterDelegate.of(context).popRoute();
ref.read(routerProvider).popRoute();
onSubmit(
serverNameController.text,
serverUrlController.text,
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/page/anniv_login.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:annix/providers.dart';
import 'package:annix/ui/dialogs/loading.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:flutter/material.dart';
import 'package:annix/i18n/strings.g.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
Expand Down Expand Up @@ -32,7 +31,7 @@ class AnnivLoginPage extends HookConsumerWidget {
var url = serverUrlController.text;
var email = emailController.text;
final password = passwordController.text;
final delegate = AnnixRouterDelegate.of(context);
final delegate = ref.read(routerProvider);
if (url.isEmpty) {
_showSnackBar(context, 'Please enter a valid URL');
} else if (email.isEmpty || !email.contains('@')) {
Expand Down
7 changes: 3 additions & 4 deletions lib/ui/page/home/home_action_grid.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:annix/providers.dart';
import 'package:annix/ui/dialogs/loading.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/utils/context_extension.dart';
import 'package:flutter/material.dart';
import 'package:annix/i18n/strings.g.dart';
Expand All @@ -27,7 +26,7 @@ class HomeActionGrid extends ConsumerWidget {
icon: const Icon(Icons.favorite_outline),
title: t.my_favorite,
onPressed: () {
AnnixRouterDelegate.of(context).to(name: '/favorite');
ref.read(routerProvider).to(name: '/favorite');
},
),
HomeActionButton(
Expand All @@ -46,14 +45,14 @@ class HomeActionGrid extends ConsumerWidget {
icon: const Icon(Icons.history),
title: t.recent_played,
onPressed: () {
AnnixRouterDelegate.of(context).to(name: '/history');
ref.read(routerProvider).to(name: '/history');
},
),
HomeActionButton(
icon: const Icon(Icons.download),
title: t.download,
onPressed: () {
AnnixRouterDelegate.of(context).to(name: '/downloading');
ref.read(routerProvider).to(name: '/downloading');
},
),
],
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/page/home/home_appbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class HomeAppBar extends ConsumerWidget {
child: TextButton(
child: Text(t.server.login),
onPressed: () {
AnnixRouterDelegate.of(context).to(name: '/login');
ref.read(routerProvider).to(name: '/login');
},
),
);
Expand All @@ -36,7 +36,7 @@ class HomeAppBar extends ConsumerWidget {
child: Text(info!.user.nickname.substring(0, 1)),
),
onPressed: () {
AnnixRouterDelegate.of(context).to(name: '/server');
ref.read(routerProvider).to(name: '/server');
},
),
],
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/page/home/home_playlist.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:annix/providers.dart';
import 'package:annix/services/playback/playback.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/ui/widgets/cover.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
Expand Down Expand Up @@ -36,7 +35,7 @@ class PlaylistView extends ConsumerWidget {
overflow: TextOverflow.ellipsis,
),
onTap: () async {
final delegate = AnnixRouterDelegate.of(context);
final delegate = ref.read(routerProvider);
final list = await Playlist.load(
id: playlist.id,
db: ref.read(localDatabaseProvider),
Expand Down
7 changes: 2 additions & 5 deletions lib/ui/page/playing/playing_desktop.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:annix/providers.dart';
import 'package:annix/ui/dialogs/search_lyrics.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/ui/widgets/fade_indexed_stack.dart';
import 'package:annix/ui/widgets/lyric.dart';
import 'package:annix/ui/widgets/cover.dart';
Expand Down Expand Up @@ -94,8 +93,7 @@ class _PlayingDesktopScreenState extends State<PlayingDesktopScreen> {
),
onPressed: () {
// FIXME: dialog to show all available tags
final router =
AnnixRouterDelegate.of(context);
final router = ref.read(routerProvider);
router.to(
name: '/tag',
arguments: track.artist,
Expand All @@ -113,8 +111,7 @@ class _PlayingDesktopScreenState extends State<PlayingDesktopScreen> {
overflow: TextOverflow.ellipsis,
),
onPressed: () async {
final router =
AnnixRouterDelegate.of(context);
final router = ref.read(routerProvider);
router.to(
name: '/album',
arguments: track.id.albumId,
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/page/playing/playing_mobile_widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'package:animations/animations.dart';
import 'package:annix/providers.dart';
import 'package:annix/services/annil/cache.dart';
import 'package:annix/ui/dialogs/search_lyrics.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/ui/widgets/artist_text.dart';
import 'package:annix/ui/widgets/buttons/loop_mode_button.dart';
import 'package:annix/ui/widgets/buttons/play_pause_button.dart';
Expand Down Expand Up @@ -80,7 +79,7 @@ class PlayingScreenMobileBottomBar extends ConsumerWidget {
child: Text(t.playing.view_albums),
onPressed: () {
// hide playing page
AnnixRouterDelegate.of(context).slideController.hide();
ref.read(routerProvider).slideController.hide();
// jump to album page
delegate.to(
name: '/album',
Expand Down
3 changes: 1 addition & 2 deletions lib/ui/widgets/album/album_grid.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:annix/providers.dart';
import 'package:annix/services/metadata/metadata_model.dart';
import 'package:annix/ui/route/delegate.dart';
import 'package:annix/ui/widgets/artist_text.dart';
import 'package:annix/ui/widgets/cover.dart';
import 'package:annix/utils/context_extension.dart';
Expand Down Expand Up @@ -30,7 +29,7 @@ class AlbumGrid extends ConsumerWidget {
void toAlbum(final BuildContext context) {
metadataFuture.then((final album) {
if (album != null) {
AnnixRouterDelegate.of(context).to(name: '/album', arguments: album);
ref.read(routerProvider).to(name: '/album', arguments: album);
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions lib/utils/redirect_interceptor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ class RedirectInterceptor extends Interceptor {

@override
Future<dynamic> onError(
final DioError err,
final DioException err,
final ErrorInterceptorHandler handler,
) async {
if (err.type == DioErrorType.badResponse && err.response!.isRedirect) {
if (err.type == DioExceptionType.badResponse && err.response!.isRedirect) {
final url = err.requestOptions.extra['annil-dl-url'];
if (url != null) {
headers.putIfAbsent(url, () => err.response!.headers);
final opt = err.requestOptions;
opt.followRedirects = true;
try {
await client.fetch(opt).then((final value) => handler.resolve(value));
} on DioError catch (e) {
} on DioException catch (e) {
super.onError(e, handler);
}
}
Expand Down

0 comments on commit a655e20

Please sign in to comment.