From a8ee72c11b7f0fbbec8da2b6e2604c69a6fe074c Mon Sep 17 00:00:00 2001 From: Thomas Fransolet Date: Thu, 8 Aug 2024 08:46:59 +0200 Subject: [PATCH] Fix some issues (map search + video) --- lib/Screens/Map/geo_point_filter.dart | 7 ++++++- lib/Screens/Video/video_view.dart | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Screens/Map/geo_point_filter.dart b/lib/Screens/Map/geo_point_filter.dart index 12c6d1a..147775d 100644 --- a/lib/Screens/Map/geo_point_filter.dart +++ b/lib/Screens/Map/geo_point_filter.dart @@ -16,6 +16,7 @@ import 'package:tablet_app/Screens/Map/tree_node.dart'; import 'package:tablet_app/app_context.dart'; import 'package:tablet_app/constants.dart'; import 'package:html/parser.dart' show parse; +import 'package:diacritic/diacritic.dart'; import 'map_context.dart'; @@ -190,7 +191,11 @@ class _GeoPointFilterState extends State { } bool _nodeOrChildrenContainsText(TreeNode node, String searchText) { - if (node.title.toLowerCase().contains(searchText)) { + // Remove accent and other special characters + String normalizedSearchText = removeDiacritics(searchText.toLowerCase()); + String normalizedTitle = removeDiacritics(node.title.toLowerCase()); + + if (normalizedTitle.contains(normalizedSearchText)) { return true; } for (var childNode in node.children) { diff --git a/lib/Screens/Video/video_view.dart b/lib/Screens/Video/video_view.dart index 35befea..6f17d45 100644 --- a/lib/Screens/Video/video_view.dart +++ b/lib/Screens/Video/video_view.dart @@ -31,7 +31,7 @@ class _VideoView extends State { if (videoDTO!.source_ != null && videoDTO!.source_!.length > 0 ) { videoId = YoutubePlayer.convertUrlToId(videoDTO!.source_!); - if (kIsWeb) { + if (true) { final _controllerWeb = iframe.YoutubePlayerController( params: iframe.YoutubePlayerParams( mute: false, @@ -94,6 +94,6 @@ class _VideoView extends State { @override Widget build(BuildContext context) => videoDTO!.source_ != null && videoDTO!.source_!.length > 0 ? - (kIsWeb ? _videoViewWeb! : _videoView!): + (true ? _videoViewWeb! : _videoView!): Center(child: Text("La vidéo ne peut pas être affichée, l'url est incorrecte", style: new TextStyle(fontSize: kNoneInfoOrIncorrect))); } \ No newline at end of file