bug fixes --no-bump

bw8686 · bw8686 · commit 86130d048635 · 2026-01-28T02:16:26.000Z
diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1,5 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
+  - hive_ce: true
+  - get_it: true
diff --git a/lib/features/api/repositories/fpapi.dart b/lib/features/api/repositories/fpapi.dart
@@ -679,7 +679,7 @@ class FPApiRequests {
     }
 
     final decodedres = jsonDecode(response);
-    if (decodedres != null && decodedres.toString().contains('dislike')) {
+    if (decodedres != null && decodedres.toString().contains('like')) {
       return 'success';
     }
 
@@ -696,7 +696,7 @@ class FPApiRequests {
     }
 
     final decodedres = jsonDecode(response);
-    if (decodedres != null && decodedres.toString().contains('like')) {
+    if (decodedres != null && decodedres.toString().contains('dislike')) {
       return 'success';
     }
 
diff --git a/lib/features/download/components/fp_download_dialog.dart b/lib/features/download/components/fp_download_dialog.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:go_router/go_router.dart';
 
 import 'package:floaty/features/api/models/definitions.dart';
 import 'package:floaty/features/download/repositories/fp_download_provider.dart';
diff --git a/lib/features/download/controllers/fp_download_service.dart b/lib/features/download/controllers/fp_download_service.dart
@@ -119,12 +119,21 @@ class FPDownloadService {
       const linuxSettings = LinuxInitializationSettings(
         defaultActionName: 'Open notification',
       );
+      // Provide Windows initialization settings when running on Windows
+      final windowsSettings = Platform.isWindows
+          ? WindowsInitializationSettings(
+              appName: 'Floaty',
+              appUserModelId: 'uk.bw86.floaty',
+              guid: 'd2f7b3e5-1c7a-4b0a-8c2f-3e8b9d1a2b3c',
+            )
+          : null;
 
       final initSettings = InitializationSettings(
         android: androidSettings,
         iOS: iosSettings,
         macOS: macosSettings,
         linux: linuxSettings,
+        windows: windowsSettings,
       );
 
       await _notificationsPlugin.initialize(initSettings);
diff --git a/lib/features/home/views/home_screen.dart b/lib/features/home/views/home_screen.dart
diff --git a/lib/features/player/components/custom_player/custom_player.dart b/lib/features/player/components/custom_player/custom_player.dart
@@ -6,6 +6,7 @@ import 'package:floaty/features/player/components/custom_player/fullscreen_playe
 import 'package:floaty/features/player/components/custom_player/pip_overlay.dart';
 import 'package:floaty/features/player/controllers/media_player_service.dart';
 import 'package:floaty/features/player/models/video_quality.dart';
+import 'package:floaty/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -156,6 +157,7 @@ class _CustomPlayerState extends ConsumerState<CustomPlayer>
   bool _volumeDragging = false;
   bool _buffering = false;
   double _playbackSpeed = 1.0;
+  bool _incrementPlaybackSpeed = false;
   late final AnimationController _animationController;
   Timer? _hideControlsTimer;
   late final MediaPlayerService mediaService;
@@ -256,7 +258,15 @@ class _CustomPlayerState extends ConsumerState<CustomPlayer>
     _buffering = mediaService.buffering;
 
     _setupPlayerListeners();
-    _initBrightnessAndVolume();
+
+    // Perform async initialization without making initState async.
+    _asyncInit();
+  }
+
+  Future<void> _asyncInit() async {
+    _incrementPlaybackSpeed =
+        await settings.getBool('increment_playback_speed');
+    await _initBrightnessAndVolume();
   }
 
   Future<void> _initBrightnessAndVolume() async {
@@ -1535,9 +1545,9 @@ class _CustomPlayerState extends ConsumerState<CustomPlayer>
             child: Center(
               child: Slider(
                 value: _playbackSpeed,
-                min: 0.25,
+                min: _incrementPlaybackSpeed ? 0.3 : 0.25,
                 max: 4.0,
-                divisions: 15,
+                divisions: _incrementPlaybackSpeed ? 37 : 15,
                 label: '${_playbackSpeed.toStringAsFixed(2)}x',
                 onChanged: (value) {
                   setState(() => _playbackSpeed = value);
@@ -1570,9 +1580,9 @@ class _CustomPlayerState extends ConsumerState<CustomPlayer>
             child: Center(
               child: Slider(
                 value: _playbackSpeed,
-                min: 0.25,
+                min: _incrementPlaybackSpeed ? 0.3 : 0.25,
                 max: 4.0,
-                divisions: 15,
+                divisions: _incrementPlaybackSpeed ? 37 : 15,
                 label: '${_playbackSpeed.toStringAsFixed(2)}x',
                 onChanged: (value) {
                   if (setModalState != null) {
diff --git a/lib/features/post/views/post_screen.dart b/lib/features/post/views/post_screen.dart
@@ -1120,9 +1120,9 @@ class _VideoDetailPageState extends ConsumerState<VideoDetailPage> {
         GestureDetector(
           onTap: () {
             if (post.creator?.urlname == post.channel?.urlname) {
-              context.go('/channel/${post.creator?.urlname}');
+              context.push('/channel/${post.creator?.urlname}');
             } else {
-              context.go(
+              context.push(
                   '/channel/${post.creator?.urlname}/${post.channel?.urlname}');
             }
           },
@@ -1478,10 +1478,11 @@ class _VideoDetailPageState extends ConsumerState<VideoDetailPage> {
                                 splashFactory: InkRipple.splashFactory,
                                 overlayColor: Colors.grey[800],
                               ),
-                              child: const Text(
+                              child: Text(
                                 'CANCEL',
                                 style: TextStyle(
                                   fontWeight: FontWeight.bold,
+                                  color: theme.textTheme.bodyMedium?.color,
                                 ),
                               ),
                             ),
@@ -1515,7 +1516,7 @@ class _VideoDetailPageState extends ConsumerState<VideoDetailPage> {
                                 style: TextStyle(
                                   color: _currentLength >= 3 &&
                                           _currentLength <= 4500
-                                      ? Colors.white
+                                      ? colorScheme.primary
                                       : Colors.grey[600],
                                   fontWeight: FontWeight.bold,
                                 ),
diff --git a/lib/features/router/controllers/router.dart b/lib/features/router/controllers/router.dart
@@ -298,7 +298,7 @@ final GoRouter routerController = GoRouter(
         return null;
       } else {
         // User has never authenticated and is offline - they can only access offline routes
-        final isOfflineRoute = currentPath == '/offline-library' ||
+        final isOfflineRoute = currentPath == '/offline' ||
             (currentPath.startsWith('/post/') &&
                 state.extra is Map &&
                 (state.extra as Map)['isOffline'] == true);
@@ -308,7 +308,7 @@ final GoRouter routerController = GoRouter(
         }
 
         // Redirect to offline library since they can't login anyway
-        return '/offline-library';
+        return '/offline';
       }
     }
 
@@ -331,7 +331,7 @@ final GoRouter routerController = GoRouter(
       // Allow them to stay in the app but redirect to offline library
       // unless they're already on a safe route
 
-      final isOfflineRoute = currentPath == '/offline-library' ||
+      final isOfflineRoute = currentPath == '/offline' ||
           (currentPath.startsWith('/post/') &&
               state.extra is Map &&
               (state.extra as Map)['isOffline'] == true);
@@ -346,15 +346,15 @@ final GoRouter routerController = GoRouter(
         // This way they can still watch their downloaded videos
         debugPrint(
             'Session expired but user has offline access - redirecting to offline library');
-        return '/offline-library';
+        return '/offline';
       }
 
       // Already on a safe route, let them stay
       return null;
     }
 
     // Allow access to offline content routes even without any authentication
-    final isOfflineRoute = currentPath == '/offline-library' ||
+    final isOfflineRoute = currentPath == '/offline' ||
         (currentPath.startsWith('/post/') &&
             state.extra is Map &&
             (state.extra as Map)['isOffline'] == true);
diff --git a/lib/features/router/views/root_layout.dart b/lib/features/router/views/root_layout.dart
@@ -8,11 +8,13 @@ import 'package:floaty/shared/components/switcher.dart';
 import 'package:floaty/whitelabels.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
 
 import 'package:floaty/features/api/models/definitions.dart';
 import 'package:floaty/shared/controllers/root_provider.dart';
 import 'package:floaty/features/player/components/custom_player/mini_player_overlay.dart';
 import 'package:floaty/features/player/controllers/media_player_service.dart';
+import 'package:hive_ce_flutter/hive_flutter.dart';
 // No router import here — RootLayout is a plain shell widget.
 
 // RootLayout is a plain shell widget. A single global key is used so
@@ -36,6 +38,7 @@ class RootLayoutState extends ConsumerState<RootLayout>
   bool? _lastSidebarCollapsed;
   bool _textGuardInitialized = false;
   bool updateReady = updatercontroller.updateReady;
+  int _selectedIndex = 0;
   @override
   void initState() {
     super.initState();
@@ -81,6 +84,12 @@ class RootLayoutState extends ConsumerState<RootLayout>
     final screenWidth = MediaQuery.of(context).size.width;
     isSmallScreen = screenWidth < 600;
     bool subed = false;
+    final settingsBox = Hive.box('settings');
+    //TODO: put back
+    final bottomNavEnabled = false;
+    // final bottomNavEnabled =
+    //     settingsBox.get('bottom_navigation', defaultValue: true) as bool;
+    final useBottomNav = isSmallScreen && bottomNavEnabled;
 
     final isSidebarCollapsed = isSmallScreen ? false : rootState.isCollapsed;
 
@@ -288,24 +297,54 @@ class RootLayoutState extends ConsumerState<RootLayout>
         surfaceTintColor: colorScheme.surfaceContainer,
         title: rootState.appBarTitle,
         actions: rootState.appBarActions,
-        leading: rootState.appBarLeading ??
-            (isSmallScreen
-                ? IconButton(
-                    icon: const Icon(Icons.menu),
-                    onPressed: () {
-                      scaffoldKey.currentState?.openDrawer();
-                    },
-                  )
-                : (Navigator.of(context).canPop()
-                    ? IconButton(
-                        icon: const Icon(Icons.arrow_back),
-                        onPressed: () {
-                          Navigator.of(context).pop();
-                        },
-                      )
-                    : null)),
+        leading: (() {
+          if (rootState.appBarLeading != null) return rootState.appBarLeading;
+          if (isSmallScreen) {
+            // On small screens:
+            // - If bottom nav is NOT enabled, show the menu button.
+            // - If bottom nav IS enabled, show a back button except on root routes.
+            if (!useBottomNav) {
+              return IconButton(
+                icon: const Icon(Icons.menu),
+                onPressed: () {
+                  scaffoldKey.currentState?.openDrawer();
+                },
+              );
+            }
+
+            final currentPath = GoRouter.of(context).state.uri.path;
+            const rootRoutes = [
+              '/home',
+              '/browse',
+              '/history',
+              '/offline',
+              '/more'
+            ];
+            final isRootRoute =
+                rootRoutes.any((r) => currentPath.startsWith(r));
+            if (isRootRoute) return null;
+            return IconButton(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () {
+                if (GoRouter.of(context).canPop()) {
+                  context.pop();
+                } else {
+                  context.go('/home');
+                }
+              },
+            );
+          }
+          return Navigator.of(context).canPop()
+              ? IconButton(
+                  icon: const Icon(Icons.arrow_back),
+                  onPressed: () {
+                    Navigator.of(context).pop();
+                  },
+                )
+              : null;
+        }()),
       ),
-      drawer: isSmallScreen ? sidebar : null,
+      drawer: (isSmallScreen && !useBottomNav) ? sidebar : null,
       body: SafeArea(
         child: Row(
           children: [
@@ -330,6 +369,41 @@ class RootLayoutState extends ConsumerState<RootLayout>
           ],
         ),
       ),
+      bottomNavigationBar: useBottomNav
+          ? NavigationBar(
+              selectedIndex: _selectedIndex,
+              onDestinationSelected: (idx) {
+                String route = '/home';
+                switch (idx) {
+                  case 0:
+                    route = '/home';
+                    break;
+                  case 1:
+                    route = '/history';
+                    break;
+                  case 2:
+                    route = '/browse';
+                    break;
+                  case 3:
+                    route = '/more';
+                    break;
+                }
+                setState(() {
+                  _selectedIndex = idx;
+                });
+                context.go(route);
+              },
+              destinations: const [
+                NavigationDestination(icon: Icon(Icons.home), label: 'Home'),
+                NavigationDestination(
+                    icon: Icon(Icons.history), label: 'History'),
+                NavigationDestination(
+                    icon: Icon(Icons.view_carousel), label: 'Browse'),
+                NavigationDestination(
+                    icon: Icon(Icons.more_horiz), label: 'More'),
+              ],
+            )
+          : null,
     );
   }
 }
diff --git a/lib/features/settings/views/settings_screen.dart b/lib/features/settings/views/settings_screen.dart
@@ -1159,6 +1159,10 @@ class _PlayerSettingsScreenState extends State<PlayerSettingsScreen> {
                 title: 'Pause upon entering background',
                 settingkey: 'pause_on_background',
               ),
+              const ToggleSetting(
+                title: 'Increment playback speed by 0.1x',
+                settingkey: 'increment_playback_speed',
+              ),
               if (!Platform.isAndroid && !Platform.isIOS)
                 const ToggleSetting(
                   title: 'Discord RPC',
@@ -1345,6 +1349,12 @@ class _AppearanceSettingsScreenState extends State<AppearanceSettingsScreen> {
                     title: 'Old UI components from old Floatplane design.',
                     settingkey: 'legacy_ui',
                   ),
+                  //TODO: put back
+                  // const ToggleSetting(
+                  //   title: 'Bottom Navigation on small screens.',
+                  //   settingkey: 'bottom_navigation',
+                  //   defaultvalue: true,
+                  // ),
                 ],
               );
             },
diff --git a/lib/features/updater/respositories/updater_controllers.dart b/lib/features/updater/respositories/updater_controllers.dart
@@ -38,7 +38,6 @@ class UpdaterController {
   }
 
   Future<void> initialCheck() async {
-    print('$flavor');
     final response =
         await dio.get('https://floaty.fyi/api/latest-update?flavor=$flavor');
     final packageInfo = await PackageInfo.fromPlatform();
diff --git a/lib/features/whenplane/repositories/whenplaneintergration.dart b/lib/features/whenplane/repositories/whenplaneintergration.dart
diff --git a/lib/features/whenplane/views/whenplane.dart b/lib/features/whenplane/views/whenplane.dart
diff --git a/lib/main.dart b/lib/main.dart
diff --git a/linux/packaging/appimage/AppRun b/linux/packaging/appimage/AppRun

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ class FPApiRequests {`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`final decodedres = jsonDecode(response);`
`682`		`- if (decodedres != null && decodedres.toString().contains('dislike')) {`
	`682`	`+ if (decodedres != null && decodedres.toString().contains('like')) {`
`683`	`683`	`return 'success';`
`684`	`684`	`}`
`685`	`685`
`@@ -696,7 +696,7 @@ class FPApiRequests {`
`696`	`696`	`}`
`697`	`697`
`698`	`698`	`final decodedres = jsonDecode(response);`
`699`		`- if (decodedres != null && decodedres.toString().contains('like')) {`
	`699`	`+ if (decodedres != null && decodedres.toString().contains('dislike')) {`
`700`	`700`	`return 'success';`
`701`	`701`	`}`
`702`	`702`