Skip to content

Add per-profile landscape orbit layouts and an animated mini player dock #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ultraelectronica merged 11 commits into from
Nov 6, 2026
Merged

Add per-profile landscape orbit layouts and an animated mini player dock #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c8338cc
Cache card face and key Stack children to preserve artwork state
ultraelectronica Nov 6, 2026
f904d3b
Add independent portrait and landscape orbit layout preferences
ultraelectronica Nov 6, 2026
21b4631
Add separate landscape orbit layout preferences
ultraelectronica Nov 6, 2026
5392894
Add landscape orbit layout widget tests
ultraelectronica Nov 6, 2026
3ccad92
Wire landscape orbit preferences into songs view
ultraelectronica Nov 6, 2026
351ff17
Add per-profile orbit settings localization strings
ultraelectronica Nov 6, 2026
ffb8d4b
Restyle song card with padded glass border layout
ultraelectronica Nov 6, 2026
67c176d
Let orbit ribbon paint under shell overlays
ultraelectronica Nov 6, 2026
36f3798
Add orbit viewport edge-to-edge regression tests
ultraelectronica Nov 6, 2026
4e08905
Add compact landscape mini player dock
ultraelectronica Nov 6, 2026
bf072f2
Add animated landscape mini player dock
ultraelectronica Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 109 additions & 89 deletions lib/app/app.dart
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions lib/features/settings/data/settings_search_catalog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,10 @@ List<SettingsSearchPage> buildSettingsSearchCatalog() {
LucideIcons.orbit,
(id) => OrbitSettingsScreen(initialSection: id),
sections: [
_section('orbitLayoutProfile', l10n.orbitLayoutProfile, [
('portrait', l10n.portrait),
('landscape', l10n.landscape),
]),
_section('geometry', l10n.geometry, [
('curvature', l10n.curvature),
('verticalPosition', l10n.verticalPosition),
Expand Down
224 changes: 168 additions & 56 deletions lib/features/settings/screens/orbit_settings_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,143 +3,246 @@ import 'package:flick/widgets/common/flick_snackbar.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:lucide_icons_flutter/lucide_icons.dart';
import 'package:flick/core/constants/app_constants.dart';
import 'package:flick/core/utils/adaptive_layout.dart';
import 'package:flick/providers/app_preferences_provider.dart';
import 'package:flick/features/settings/widgets/settings_widgets.dart';
import 'package:flick/l10n/settings_l10n.dart';

class OrbitSettingsScreen extends ConsumerWidget {
enum _OrbitLayoutProfile { portrait, landscape }

class OrbitSettingsScreen extends ConsumerStatefulWidget {
const OrbitSettingsScreen({super.key, this.initialSection});

final String? initialSection;

@override
Widget build(BuildContext context, WidgetRef ref) {
ConsumerState<OrbitSettingsScreen> createState() =>
_OrbitSettingsScreenState();
}

class _OrbitSettingsScreenState extends ConsumerState<OrbitSettingsScreen> {
_OrbitLayoutProfile _profile = _OrbitLayoutProfile.portrait;
bool _profileInitialized = false;

bool get _landscape => _profile == _OrbitLayoutProfile.landscape;

@override
void didChangeDependencies() {
super.didChangeDependencies();
if (_profileInitialized) return;
_profileInitialized = true;
_profile = AdaptiveLayout.isWide(MediaQuery.sizeOf(context))
? _OrbitLayoutProfile.landscape
: _OrbitLayoutProfile.portrait;
}

@override
Widget build(BuildContext context) {
final prefs = ref.watch(appPreferencesProvider);
final notifier = ref.read(appPreferencesProvider.notifier);

final radiusRatio = _landscape
? prefs.orbitLandscapeRadiusRatio
: prefs.orbitRadiusRatio;
final centerYRatio = _landscape
? prefs.orbitLandscapeCenterYRatio
: prefs.orbitCenterYRatio;
final itemSpacing = _landscape
? prefs.orbitLandscapeItemSpacing
: prefs.orbitItemSpacing;
final selectedScale = _landscape
? prefs.orbitLandscapeSelectedScale
: prefs.orbitSelectedScale;
final depth = _landscape ? prefs.orbitLandscapeDepth : prefs.orbitDepth;
final visibleItems = _landscape
? prefs.orbitLandscapeVisibleItems
: prefs.orbitVisibleItems;
final cardWidthRatio = _landscape
? prefs.orbitLandscapeCardWidthRatio
: prefs.orbitCardWidthRatio;

return SettingsScaffold(
title: l10n.englishForFilipino.customizeOrbital,
initialSection: initialSection,
initialSection: widget.initialSection,
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SettingsSectionHeader(l10n.englishForFilipino.geometry, sectionId: 'geometry'),
SettingsSectionHeader(
l10n.englishForFilipino.orbitLayoutProfile,
sectionId: 'orbitLayoutProfile',
),
SettingsCard(
children: [
SelectionSetting(
icon: LucideIcons.rectangleVertical,
title: l10n.englishForFilipino.portrait,
subtitle: l10n.orbitPortraitHint,
selected: !_landscape,
onTap: () {
setState(() => _profile = _OrbitLayoutProfile.portrait);
},
),
const SettingsDivider(),
SelectionSetting(
icon: LucideIcons.rectangleHorizontal,
title: l10n.englishForFilipino.landscape,
subtitle: l10n.orbitLandscapeHint,
selected: _landscape,
onTap: () {
setState(() => _profile = _OrbitLayoutProfile.landscape);
},
),
],
),
const SizedBox(height: AppConstants.spacingLg),
SettingsSectionHeader(
l10n.englishForFilipino.geometry,
sectionId: 'geometry',
),
SettingsCard(
children: [
SliderSetting(
icon: LucideIcons.radius,
title: l10n.englishForFilipino.curvature,
subtitle: l10n.curveOfTheOrbitArcHigher,
value: prefs.orbitRadiusRatio,
displayValue: prefs.orbitRadiusRatio.toStringAsFixed(2),
value: radiusRatio,
displayValue: radiusRatio.toStringAsFixed(2),
min: 0.5,
max: 2.0,
divisions: 30,
onChanged: notifier.setOrbitRadiusRatio,
onChanged: _landscape
? notifier.setOrbitLandscapeRadiusRatio
: notifier.setOrbitRadiusRatio,
),
const SettingsDivider(),
SliderSetting(
icon: LucideIcons.moveVertical,
title: l10n.englishForFilipino.verticalPosition,
subtitle: l10n.whereTheFocalSongSitsVertically,
value: prefs.orbitCenterYRatio,
displayValue: '${(prefs.orbitCenterYRatio * 100).round()}%',
value: centerYRatio,
displayValue: '${(centerYRatio * 100).round()}%',
min: 0.30,
max: 0.60,
divisions: 30,
onChanged: notifier.setOrbitCenterYRatio,
),
const SettingsDivider(),
SliderSetting(
icon: LucideIcons.moveHorizontal,
title: l10n.englishForFilipino.horizontalReach,
subtitle: l10n.howFarTheArcOpensFrom,
value: prefs.orbitCenterOffsetRatio,
displayValue: prefs.orbitCenterOffsetRatio.toStringAsFixed(2),
min: -1.0,
max: 0.0,
divisions: 20,
onChanged: notifier.setOrbitCenterOffsetRatio,
onChanged: _landscape
? notifier.setOrbitLandscapeCenterYRatio
: notifier.setOrbitCenterYRatio,
),
if (!_landscape) ...[
const SettingsDivider(),
SliderSetting(
icon: LucideIcons.moveHorizontal,
title: l10n.englishForFilipino.horizontalReach,
subtitle: l10n.howFarTheArcOpensFrom,
value: prefs.orbitCenterOffsetRatio,
displayValue: prefs.orbitCenterOffsetRatio.toStringAsFixed(2),
min: -1.0,
max: 0.0,
divisions: 20,
onChanged: notifier.setOrbitCenterOffsetRatio,
),
],
const SettingsDivider(),
SliderSetting(
icon: LucideIcons.ruler,
title: l10n.englishForFilipino.itemSpacing,
subtitle: l10n.distanceBetweenSongsAlongTheArc,
value: prefs.orbitItemSpacing,
displayValue: prefs.orbitItemSpacing.toStringAsFixed(2),
value: itemSpacing,
displayValue: itemSpacing.toStringAsFixed(2),
min: 0.15,
max: 0.50,
divisions: 35,
onChanged: notifier.setOrbitItemSpacing,
onChanged: _landscape
? notifier.setOrbitLandscapeItemSpacing
: notifier.setOrbitItemSpacing,
),
],
),
const SizedBox(height: AppConstants.spacingLg),
SettingsSectionHeader(l10n.englishForFilipino.sizing, sectionId: 'sizing'),
SettingsSectionHeader(
l10n.englishForFilipino.sizing,
sectionId: 'sizing',
),
SettingsCard(
children: [
SliderSetting(
icon: LucideIcons.expand,
title: l10n.englishForFilipino.cardSize,
subtitle: l10n.baseAlbumArtSizeForEach,
value: prefs.orbitCardArtSize,
displayValue: '${prefs.orbitCardArtSize.round()}px',
min: 48,
max: 120,
divisions: 72,
onChanged: notifier.setOrbitCardArtSize,
),
const SettingsDivider(),
if (!_landscape) ...[
SliderSetting(
icon: LucideIcons.expand,
title: l10n.englishForFilipino.cardSize,
subtitle: l10n.baseAlbumArtSizeForEach,
value: prefs.orbitCardArtSize,
displayValue: '${prefs.orbitCardArtSize.round()}px',
min: 48,
max: 120,
divisions: 72,
onChanged: notifier.setOrbitCardArtSize,
),
const SettingsDivider(),
],
SliderSetting(
icon: LucideIcons.arrowLeftRight,
title: l10n.englishForFilipino.cardWidth,
subtitle: l10n.howWideEachCardSpansAcross,
value: prefs.orbitCardWidthRatio,
displayValue: '${(prefs.orbitCardWidthRatio * 100).round()}%',
value: cardWidthRatio,
displayValue: '${(cardWidthRatio * 100).round()}%',
min: 0.5,
max: 0.85,
divisions: 35,
onChanged: notifier.setOrbitCardWidthRatio,
onChanged: _landscape
? notifier.setOrbitLandscapeCardWidthRatio
: notifier.setOrbitCardWidthRatio,
),
const SettingsDivider(),
_VisibleItemsRow(
value: prefs.orbitVisibleItems,
onChanged: notifier.setOrbitVisibleItems,
value: visibleItems,
onChanged: _landscape
? notifier.setOrbitLandscapeVisibleItems
: notifier.setOrbitVisibleItems,
),
],
),
const SizedBox(height: AppConstants.spacingLg),
SettingsSectionHeader(l10n.englishForFilipino.depth, sectionId: 'depth'),
SettingsSectionHeader(
l10n.englishForFilipino.depth,
sectionId: 'depth',
),
SettingsCard(
children: [
SliderSetting(
icon: LucideIcons.maximize,
title: l10n.englishForFilipino.selectedSize,
subtitle: l10n.scaleOfTheCenteredFocusedSong,
value: prefs.orbitSelectedScale,
displayValue: prefs.orbitSelectedScale.toStringAsFixed(2),
value: selectedScale,
displayValue: selectedScale.toStringAsFixed(2),
min: 1.0,
max: 1.8,
divisions: 16,
onChanged: notifier.setOrbitSelectedScale,
onChanged: _landscape
? notifier.setOrbitLandscapeSelectedScale
: notifier.setOrbitSelectedScale,
),
const SettingsDivider(),
SliderSetting(
icon: LucideIcons.chevronsDown,
title: l10n.englishForFilipino.depth,
subtitle: l10n.howMuchSideCardsShrinkAway,
value: prefs.orbitDepth,
displayValue: '${(prefs.orbitDepth * 100).round()}%',
value: depth,
displayValue: '${(depth * 100).round()}%',
min: 0.0,
max: 1.0,
divisions: 20,
onChanged: notifier.setOrbitDepth,
onChanged: _landscape
? notifier.setOrbitLandscapeDepth
: notifier.setOrbitDepth,
),
],
),
const SizedBox(height: AppConstants.spacingLg),
SettingsSectionHeader(l10n.englishForFilipino.artResolution, sectionId: 'artResolution'),
SettingsSectionHeader(
l10n.englishForFilipino.artResolution,
tag: l10n.englishForFilipino.orbitSharedVisuals,
sectionId: 'artResolution',
),
SettingsCard(
children: [
SelectionSetting(
Expand Down Expand Up @@ -176,7 +279,11 @@ class OrbitSettingsScreen extends ConsumerWidget {
],
),
const SizedBox(height: AppConstants.spacingLg),
SettingsSectionHeader(l10n.englishForFilipino.visuals, sectionId: 'visuals'),
SettingsSectionHeader(
l10n.englishForFilipino.visuals,
tag: l10n.englishForFilipino.orbitSharedVisuals,
sectionId: 'visuals',
),
SettingsCard(
children: [
ToggleSetting(
Expand All @@ -202,13 +309,18 @@ class OrbitSettingsScreen extends ConsumerWidget {
NavigationSetting(
icon: LucideIcons.refreshCw,
title: l10n.englishForFilipino.resetToDefaults,
subtitle: l10n.restoreTheOriginalOrbitalLayout,
subtitle: l10n.restoreThisProfilesOrbitLayout,
onTap: () {
notifier.resetOrbitSettings();
final landscape = _landscape;
notifier.resetOrbitLayout(landscape: landscape);
ScaffoldMessenger.of(context).showFlickSnackBar(
SnackBar(
content: Text(l10n.orbitalSettingsReset),
duration: Duration(seconds: 2),
content: Text(
landscape
? l10n.landscapeLayoutReset
: l10n.portraitLayoutReset,
),
duration: const Duration(seconds: 2),
),
);
},
Expand Down
Loading
Loading