diff --git a/assets/branding/app_icon_source.png b/assets/branding/app_icon_source.png index f34b688..4882c6d 100644 Binary files a/assets/branding/app_icon_source.png and b/assets/branding/app_icon_source.png differ diff --git a/assets/branding/icon.png b/assets/branding/icon.png index c7d0b4d..3023b14 100644 Binary files a/assets/branding/icon.png and b/assets/branding/icon.png differ diff --git a/assets/branding/icon_transparent.png b/assets/branding/icon_transparent.png index 93e7750..3023b14 100644 Binary files a/assets/branding/icon_transparent.png and b/assets/branding/icon_transparent.png differ diff --git a/flutter_native_splash.yaml b/flutter_native_splash.yaml index ff32fa0..6b72fa5 100644 --- a/flutter_native_splash.yaml +++ b/flutter_native_splash.yaml @@ -1,8 +1,8 @@ flutter_native_splash: color: "#F5F7F2" color_dark: "#111418" - image: assets/branding/splash_android.png - image_dark: assets/branding/splash_android.png + image: assets/branding/icon.png + image_dark: assets/branding/icon.png info_plist_files: - ios/YABus/Info.plist @@ -13,5 +13,5 @@ flutter_native_splash: android_12: color: "#F5F7F2" color_dark: "#111418" - image: assets/branding/splash_android.png - image_dark: assets/branding/splash_android.png + image: assets/branding/icon.png + image_dark: assets/branding/icon.png diff --git a/lib/screens/route_detail_screen.dart b/lib/screens/route_detail_screen.dart index eeb3ed1..ae6f105 100644 --- a/lib/screens/route_detail_screen.dart +++ b/lib/screens/route_detail_screen.dart @@ -459,7 +459,6 @@ class _RouteDetailScreenState extends State _isLoading = false; _status = _RouteDetailStatus.loadingRealtime; }); - _scheduleInitialStopsReveal(); _updateDesktopPresence(); if (_isRouteVisible) { unawaited(_loadSupplementaryNotices(topology)); diff --git a/pubspec.yaml b/pubspec.yaml index 0c9991a..8eedc2a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -104,7 +104,7 @@ flutter: assets: - assets/branding/YABus-black.svg - assets/branding/icon.svg - - assets/branding/splash_android.png + - assets/branding/icon.png - assets/branding/icon_transparent.png - assets/cat_cry.png - assets/cat_laugh.png diff --git a/test/route_detail_screen_loading_test.dart b/test/route_detail_screen_loading_test.dart index 963108d..604df69 100644 --- a/test/route_detail_screen_loading_test.dart +++ b/test/route_detail_screen_loading_test.dart @@ -429,7 +429,7 @@ void main() { expect(statusRect.right, closeTo(tileRect.right - 8, 0.1)); }); - _screenTest('fades in route stops immediately once data is ready', ( + _screenTest('waits for realtime ETA before fading in route stops', ( tester, repository, ) async { @@ -444,15 +444,18 @@ void main() { expect(stopsFade, findsOneWidget); expect(tester.widget(stopsFade).opacity.value, 0); + await tester.pump(const Duration(milliseconds: 110)); + expect(tester.widget(stopsFade).opacity.value, 0); + + repository.primaryRequests.single.complete(_detail(eta: 120)); + await tester.pump(); + await tester.pump(); await tester.pump(const Duration(milliseconds: 110)); expect( tester.widget(stopsFade).opacity.value, greaterThan(0), ); expect(tester.widget(stopsFade).opacity.value, lessThan(1)); - - repository.primaryRequests.single.complete(_detail(eta: 120)); - await tester.pump(); await tester.pump(const Duration(milliseconds: 250)); expect(tester.widget(stopsFade).opacity.value, 1); }, initialFrameCount: 1);