gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-07 21:48:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Hide duplicate floating player in phone layout (#218)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-02-08 08:49:43 +01:00 • committed by GitHub
parent fe96c7e258
commit cf53f02d90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/screens/library_search/library_search_screen.dart
View file

@ -160,6 +160,8 @@ class _LibrarySearchScreenState extends ConsumerState<LibrarySearchScreen> {
child: Scaffold(
extendBody: true,
extendBodyBehindAppBar: true,
floatingActionButtonAnimator:
playerState == VideoPlayerState.minimized ? FloatingActionButtonAnimator.noAnimation : null,
floatingActionButtonLocation:
playerState == VideoPlayerState.minimized ? FloatingActionButtonLocation.centerFloat : null,
floatingActionButton: switch (playerState) {

2
lib/screens/shared/detail_scaffold.dart
View file

@ -78,6 +78,8 @@ class _DetailScaffoldState extends ConsumerState<DetailScaffold> {
},
refreshOnStart: true,
child: Scaffold(
floatingActionButtonAnimator:
playerState == VideoPlayerState.minimized ? FloatingActionButtonAnimator.noAnimation : null,
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: switch (playerState) {
VideoPlayerState.minimized => const Padding(

2
lib/screens/shared/nested_scaffold.dart
View file

@ -19,6 +19,8 @@ class NestedScaffold extends ConsumerWidget {
return Card(
child: Scaffold(
backgroundColor: Colors.transparent,
floatingActionButtonAnimator:
playerState == VideoPlayerState.minimized ? FloatingActionButtonAnimator.noAnimation : null,
floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
floatingActionButton: switch (AdaptiveLayout.layoutOf(context)) {
ViewSize.phone => null,

3
lib/widgets/navigation_scaffold/components/floating_player_bar.dart
View file

@ -75,7 +75,8 @@ class _CurrentlyPlayingBarState extends ConsumerState<FloatingPlayerBar> {
fladderSnackbar(context, title: "Swipe up/down to open/close the player");
},
child: Card(
elevation: 3,
elevation: 5,
color: Theme.of(context).colorScheme.primaryContainer,
child: ConstrainedBox(
constraints: const BoxConstraints(minHeight: 50, maxHeight: 85),
child: LayoutBuilder(builder: (context, constraints) {

9
lib/widgets/navigation_scaffold/navigation_scaffold.dart
View file

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:auto_route/auto_route.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:fladder/models/media_playback_model.dart';
@ -53,6 +54,8 @@ class _NavigationScaffoldState extends ConsumerState<NavigationScaffold> {
final playerState = ref.watch(mediaPlaybackProvider.select((value) => value.state));
final views = ref.watch(viewsProvider.select((value) => value.views));
final isHomeRoutes = homeRoutes.any((element) => element.name.contains(context.router.current.name));
return PopScope(
canPop: currentIndex == 0,
onPopInvokedWithResult: (didPop, result) {
@ -65,9 +68,13 @@ class _NavigationScaffoldState extends ConsumerState<NavigationScaffold> {
appBar: const FladderAppBar(),
extendBodyBehindAppBar: true,
extendBody: true,
floatingActionButtonAnimator:
playerState == VideoPlayerState.minimized ? FloatingActionButtonAnimator.noAnimation : null,
floatingActionButtonLocation:
playerState == VideoPlayerState.minimized ? FloatingActionButtonLocation.centerFloat : null,
floatingActionButton: AdaptiveLayout.layoutModeOf(context) == LayoutMode.single
floatingActionButton: AdaptiveLayout.layoutModeOf(context) == LayoutMode.single &&
AdaptiveLayout.viewSizeOf(context) == ViewSize.phone &&
isHomeRoutes
? switch (playerState) {
VideoPlayerState.minimized => const Padding(
padding: EdgeInsets.symmetric(horizontal: 8),