diff --git a/lib/main.dart b/lib/main.dart index 255a40ac..dcd6d3b2 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -210,6 +210,9 @@ class SpotubeState extends ConsumerState with WidgetsBindingObserver { WidgetsBinding.instance.addPostFrameCallback((timeStamp) { setState(() { appPlatform = Theme.of(context).platform; + if (appPlatform == TargetPlatform.macOS) { + appPlatform = TargetPlatform.android; + } }); }); } @@ -245,6 +248,9 @@ class SpotubeState extends ConsumerState with WidgetsBindingObserver { void changePlatform(TargetPlatform targetPlatform) { appPlatform = targetPlatform; + if (appPlatform == TargetPlatform.macOS) { + appPlatform = TargetPlatform.android; + } setState(() {}); } diff --git a/lib/services/queries/category.dart b/lib/services/queries/category.dart index 8028e70b..319a326a 100644 --- a/lib/services/queries/category.dart +++ b/lib/services/queries/category.dart @@ -2,8 +2,6 @@ import 'package:fl_query/fl_query.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:spotify/spotify.dart'; -import 'package:spotube/extensions/map.dart'; -import 'package:spotube/extensions/page.dart'; import 'package:spotube/hooks/use_spotify_infinite_query.dart'; class CategoryQueries { @@ -29,15 +27,6 @@ class CategoryQueries { } return lastPageData.nextOffset; }, - jsonConfig: JsonConfig>( - toJson: (page) => page.toJson(), - fromJson: (json) => PageJson.fromJson( - json, - (json) { - return Category.fromJson((json as Map).castKeyDeep()); - }, - ), - ), refreshConfig: RefreshConfig.withDefaults( context, staleDuration: const Duration(minutes: 30),