Fix search input onChanged event

This commit is contained in:
Akshat Singh Kushwaha 2024-02-17 17:02:09 +05:30
parent 5d0b5e69a5
commit 1bd8fd7c2b
4 changed files with 56 additions and 66 deletions

View File

@ -1,3 +1,4 @@
import 'package:collection/collection.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart';
@ -7,6 +8,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotube/provider/authentication_provider.dart'; import 'package:spotube/provider/authentication_provider.dart';
import 'package:spotube/utils/platform.dart'; import 'package:spotube/utils/platform.dart';
const _userAgent =
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36";
class WebViewLogin extends HookConsumerWidget { class WebViewLogin extends HookConsumerWidget {
const WebViewLogin({Key? key}) : super(key: key); const WebViewLogin({Key? key}) : super(key: key);
@ -17,7 +21,7 @@ class WebViewLogin extends HookConsumerWidget {
ref.watch(AuthenticationNotifier.provider.notifier); ref.watch(AuthenticationNotifier.provider.notifier);
if (kIsDesktop) { if (kIsDesktop) {
const Scaffold( return const Scaffold(
body: Center( body: Center(
child: Text('This feature is not available on desktop'), child: Text('This feature is not available on desktop'),
), ),
@ -29,8 +33,7 @@ class WebViewLogin extends HookConsumerWidget {
child: InAppWebView( child: InAppWebView(
initialOptions: InAppWebViewGroupOptions( initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions( crossPlatform: InAppWebViewOptions(
userAgent: userAgent: _userAgent,
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 afari/537.36",
), ),
), ),
initialUrlRequest: URLRequest( initialUrlRequest: URLRequest(
@ -54,15 +57,18 @@ class WebViewLogin extends HookConsumerWidget {
if (exp.hasMatch(url)) { if (exp.hasMatch(url)) {
final cookies = final cookies =
await CookieManager.instance().getCookies(url: action); await CookieManager.instance().getCookies(url: action);
final cookieHeader = final spDcCookie = cookies.firstWhereOrNull((element) => element.name == "sp_dc");
"sp_dc=${cookies.firstWhere((element) => element.name == "sp_dc").value}";
authenticationNotifier.setCredentials( if (spDcCookie != null) {
await AuthenticationCredentials.fromCookie(cookieHeader), final cookieHeader = "sp_dc=${spDcCookie.value}";
);
if (mounted()) { authenticationNotifier.setCredentials(
// ignore: use_build_context_synchronously await AuthenticationCredentials.fromCookie(cookieHeader),
GoRouter.of(context).go("/"); );
if (mounted()) {
// ignore: use_build_context_synchronously
GoRouter.of(context).pushReplacementNamed("/");
}
} }
} }
}, },
@ -70,4 +76,4 @@ class WebViewLogin extends HookConsumerWidget {
), ),
); );
} }
} }

View File

@ -121,7 +121,7 @@ class SearchPage extends HookConsumerWidget {
prefixIcon: const Icon(SpotubeIcons.search), prefixIcon: const Icon(SpotubeIcons.search),
hintText: "${context.l10n.search}...", hintText: "${context.l10n.search}...",
), ),
onSubmitted: (value) async { onChanged: (value) async {
ref.read(searchTermStateProvider.notifier).state = ref.read(searchTermStateProvider.notifier).state =
value; value;
// Fl-Query is too fast, so we need to delay the search // Fl-Query is too fast, so we need to delay the search

View File

@ -8,6 +8,10 @@ ThemeData theme(Color seed, Brightness brightness, bool isAmoled) {
surface: isAmoled ? Colors.black : null, surface: isAmoled ? Colors.black : null,
brightness: brightness, brightness: brightness,
); );
const borderRadius = BorderRadius.all(Radius.circular(15));
const roundedRectangleBorder = RoundedRectangleBorder(borderRadius: borderRadius);
return ThemeData( return ThemeData(
useMaterial3: true, useMaterial3: true,
colorScheme: scheme, colorScheme: scheme,
@ -16,9 +20,9 @@ ThemeData theme(Color seed, Brightness brightness, bool isAmoled) {
iconColor: scheme.onSurface, iconColor: scheme.onSurface,
), ),
appBarTheme: const AppBarTheme(surfaceTintColor: Colors.transparent), appBarTheme: const AppBarTheme(surfaceTintColor: Colors.transparent),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: const InputDecorationTheme(
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular(15), borderRadius: borderRadius,
), ),
), ),
iconTheme: IconThemeData(size: 16, color: scheme.onSurface), iconTheme: IconThemeData(size: 16, color: scheme.onSurface),
@ -36,17 +40,17 @@ ThemeData theme(Color seed, Brightness brightness, bool isAmoled) {
dividerColor: Colors.transparent, dividerColor: Colors.transparent,
indicator: BoxDecoration( indicator: BoxDecoration(
color: scheme.secondaryContainer, color: scheme.secondaryContainer,
borderRadius: BorderRadius.circular(15), borderRadius: borderRadius,
), ),
), ),
popupMenuTheme: PopupMenuThemeData( popupMenuTheme: PopupMenuThemeData(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)), shape: roundedRectangleBorder,
color: scheme.surface, color: scheme.surface,
elevation: 4, elevation: 4,
), ),
snackBarTheme: SnackBarThemeData( snackBarTheme: SnackBarThemeData(
behavior: SnackBarBehavior.floating, behavior: SnackBarBehavior.floating,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)), shape: roundedRectangleBorder,
backgroundColor: scheme.onSurface, backgroundColor: scheme.onSurface,
contentTextStyle: TextStyle(color: scheme.surface), contentTextStyle: TextStyle(color: scheme.surface),
), ),
@ -63,11 +67,7 @@ ThemeData theme(Color seed, Brightness brightness, bool isAmoled) {
), ),
), ),
elevation: const MaterialStatePropertyAll(0), elevation: const MaterialStatePropertyAll(0),
shape: MaterialStatePropertyAll( shape: MaterialStatePropertyAll(roundedRectangleBorder),
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10),
),
),
), ),
scrollbarTheme: const ScrollbarThemeData( scrollbarTheme: const ScrollbarThemeData(
thickness: MaterialStatePropertyAll(14), thickness: MaterialStatePropertyAll(14),
@ -76,4 +76,4 @@ ThemeData theme(Color seed, Brightness brightness, bool isAmoled) {
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
), ),
); );
} }

View File

@ -543,10 +543,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: file name: file
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.0.0" version: "6.1.4"
file_picker: file_picker:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1255,30 +1255,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.4.2" version: "0.4.2"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@ -1323,18 +1299,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.16+1" version: "0.12.16"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.0" version: "0.5.0"
media_kit: media_kit:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1403,10 +1379,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.11.0" version: "1.10.0"
metadata_god: metadata_god:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1491,10 +1467,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: path name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.0" version: "1.8.3"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@ -1619,10 +1595,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.4" version: "3.1.2"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -1659,10 +1635,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: process name: process
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.0.2" version: "4.2.4"
provider: provider:
dependency: transitive dependency: transitive
description: description:
@ -2241,10 +2217,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "13.0.0" version: "11.10.0"
watcher: watcher:
dependency: transitive dependency: transitive
description: description:
@ -2253,6 +2229,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
web_socket_channel: web_socket_channel:
dependency: transitive dependency: transitive
description: description:
@ -2265,10 +2249,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: webdriver name: webdriver
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.3" version: "3.0.2"
wikipedia_api: wikipedia_api:
dependency: "direct main" dependency: "direct main"
description: description: