Merge pull request #332 from DanXi-Dev/typeahead-fix

w568w · web-flow · commit bd5cc3b44acd · 2024-03-02T23:00:27.000+08:00
Fix: School bus feature
diff --git a/lib/model/celebration.dart b/lib/model/celebration.dart
@@ -45,7 +45,7 @@ class Celebration {
         return lunarDate.getMonth() == int.parse(splitTime[0]) &&
             lunarDate.getDay() == int.parse(splitTime[1]);
       case 3:
-        return VagueTime.onlymmdd(date).match(dateTime);
+        return VagueTime.onlyMMdd(date).match(dateTime);
     }
     return false;
   }
diff --git a/lib/repository/fdu/bus_repository.dart b/lib/repository/fdu/bus_repository.dart
@@ -95,7 +95,7 @@ class BusScheduleItem implements Comparable<BusScheduleItem> {
     if (time.isEmpty) {
       return null;
     }
-    return VagueTime.onlyMMSS(time.replaceAll(".", ":"));
+    return VagueTime.onlyHHmm(time.replaceAll(".", ":"));
   }
 
   @override
diff --git a/lib/util/vague_time.dart b/lib/util/vague_time.dart
@@ -32,13 +32,13 @@ class VagueTime implements Comparable<VagueTime> {
       this.millisecond,
       this.microsecond});
 
-  factory VagueTime.onlyMMSS(String mmss) {
-    var splitTime = mmss.split(":");
+  factory VagueTime.onlyHHmm(String hhmm) {
+    var splitTime = hhmm.split(":");
     return VagueTime(
         hour: int.parse(splitTime[0]), minute: int.parse(splitTime[1]));
   }
 
-  factory VagueTime.onlymmdd(String mmdd) {
+  factory VagueTime.onlyMMdd(String mmdd) {
     var splitTime = mmdd.split("-");
     return VagueTime(
         month: int.parse(splitTime[0]), day: int.parse(splitTime[1]));
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
@@ -16,38 +16,28 @@
 #include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-    g_autoptr(FlPluginRegistrar)
-    bitsdojo_window_linux_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
-    bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar);
-    g_autoptr(FlPluginRegistrar)
-    desktop_window_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWindowPlugin");
-    desktop_window_plugin_register_with_registrar(desktop_window_registrar);
-    g_autoptr(FlPluginRegistrar)
-    file_selector_linux_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
-    file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
-    g_autoptr(FlPluginRegistrar)
-    flutter_js_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin");
-    flutter_js_plugin_register_with_registrar(flutter_js_registrar);
-    g_autoptr(FlPluginRegistrar)
-    flutter_secure_storage_linux_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry,
-                                                        "FlutterSecureStorageLinuxPlugin");
-    flutter_secure_storage_linux_plugin_register_with_registrar(
-            flutter_secure_storage_linux_registrar);
-    g_autoptr(FlPluginRegistrar)
-    platform_device_id_linux_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin");
-    platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar);
-    g_autoptr(FlPluginRegistrar)
-    tray_manager_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
-    tray_manager_plugin_register_with_registrar(tray_manager_registrar);
-    g_autoptr(FlPluginRegistrar)
-    url_launcher_linux_registrar =
-            fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
-    url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+  g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
+  bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar);
+  g_autoptr(FlPluginRegistrar) desktop_window_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWindowPlugin");
+  desktop_window_plugin_register_with_registrar(desktop_window_registrar);
+  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
+  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_js_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin");
+  flutter_js_plugin_register_with_registrar(flutter_js_registrar);
+  g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
+  flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
+  g_autoptr(FlPluginRegistrar) platform_device_id_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin");
+  platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar);
+  g_autoptr(FlPluginRegistrar) tray_manager_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
+  tray_manager_plugin_register_with_registrar(tray_manager_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
@@ -3,15 +3,15 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-        bitsdojo_window_linux
-        desktop_window
-        file_selector_linux
-        flutter_js
-        flutter_secure_storage_linux
-        platform_device_id_linux
-        tray_manager
-        url_launcher_linux
-        )
+  bitsdojo_window_linux
+  desktop_window
+  file_selector_linux
+  flutter_js
+  flutter_secure_storage_linux
+  platform_device_id_linux
+  tray_manager
+  url_launcher_linux
+)
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
 )
diff --git a/pubspec.lock b/pubspec.lock
@@ -309,10 +309,10 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368"
+      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.4"
+    version: "2.3.6"
   desktop_window:
     dependency: "direct main"
     description:
@@ -1423,10 +1423,10 @@ packages:
     dependency: "direct main"
     description:
       name: provider
-      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   pub_semver:
     dependency: transitive
     description:
@@ -1885,10 +1885,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
+      sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.4"
+    version: "6.2.5"
   url_launcher_linux:
     dependency: transitive
     description:
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
@@ -20,28 +20,28 @@
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-    BitsdojoWindowPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("BitsdojoWindowPlugin"));
-    DesktopWindowPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("DesktopWindowPlugin"));
-    FileSelectorWindowsRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("FileSelectorWindows"));
-    FlutterJsPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("FlutterJsPlugin"));
-    FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
-    GalPluginCApiRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("GalPluginCApi"));
-    PermissionHandlerWindowsPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
-    PlatformDeviceIdWindowsPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("PlatformDeviceIdWindowsPlugin"));
-    ScreenBrightnessWindowsPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
-    SharePlusWindowsPluginCApiRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
-    TrayManagerPluginRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("TrayManagerPlugin"));
-    UrlLauncherWindowsRegisterWithRegistrar(
-            registry->GetRegistrarForPlugin("UrlLauncherWindows"));
+  BitsdojoWindowPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("BitsdojoWindowPlugin"));
+  DesktopWindowPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("DesktopWindowPlugin"));
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  FlutterJsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterJsPlugin"));
+  FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  GalPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("GalPluginCApi"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
+  PlatformDeviceIdWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PlatformDeviceIdWindowsPlugin"));
+  ScreenBrightnessWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("ScreenBrightnessWindowsPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
+  TrayManagerPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("TrayManagerPlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
@@ -3,19 +3,19 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-        bitsdojo_window_windows
-        desktop_window
-        file_selector_windows
-        flutter_js
-        flutter_secure_storage_windows
-        gal
-        permission_handler_windows
-        platform_device_id_windows
-        screen_brightness_windows
-        share_plus
-        tray_manager
-        url_launcher_windows
-        )
+  bitsdojo_window_windows
+  desktop_window
+  file_selector_windows
+  flutter_js
+  flutter_secure_storage_windows
+  gal
+  permission_handler_windows
+  platform_device_id_windows
+  screen_brightness_windows
+  share_plus
+  tray_manager
+  url_launcher_windows
+)
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
 )

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class Celebration {`
`45`	`45`	`return lunarDate.getMonth() == int.parse(splitTime[0]) &&`
`46`	`46`	`lunarDate.getDay() == int.parse(splitTime[1]);`
`47`	`47`	`case 3:`
`48`		`- return VagueTime.onlymmdd(date).match(dateTime);`
	`48`	`+ return VagueTime.onlyMMdd(date).match(dateTime);`
`49`	`49`	`}`
`50`	`50`	`return false;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class BusScheduleItem implements Comparable<BusScheduleItem> {`
`95`	`95`	`if (time.isEmpty) {`
`96`	`96`	`return null;`
`97`	`97`	`}`
`98`		`- return VagueTime.onlyMMSS(time.replaceAll(".", ":"));`
	`98`	`+ return VagueTime.onlyHHmm(time.replaceAll(".", ":"));`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@override`