Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import 'package:finamp/l10n/app_localizations.dart';
import 'package:finamp/services/finamp_settings_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

class CrossfadeDurationSlider extends ConsumerWidget {
const CrossfadeDurationSlider({super.key});

@override
Widget build(BuildContext context, WidgetRef ref) {
final crossfadeDuration = ref.watch(finampSettingsProvider.crossfadeDuration);
final seconds = crossfadeDuration.inSeconds;

return ListTile(
title: Text(AppLocalizations.of(context)!.crossfadeDurationSettingTitle),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(AppLocalizations.of(context)!.crossfadeDurationSettingSubtitle),
Slider(
min: 0,
max: 15,
divisions: 15,
value: seconds.clamp(0, 15).toDouble(),
label: seconds == 0
? AppLocalizations.of(context)!.crossfadeDurationSettingOff
: AppLocalizations.of(context)!.crossfadeDurationSettingValue(seconds),
onChanged: (value) {
FinampSetters.setCrossfadeDuration(Duration(seconds: value.toInt()));
},
),
],
),
);
}
}
21 changes: 21 additions & 0 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2618,6 +2618,27 @@
"@audioFadeInDurationSettingSubtitle": {
"description": "Subtitle for the audio fade-in duration setting. Set to 0 to disable fade-in."
},
"crossfadeDurationSettingTitle": "Crossfade",
"@crossfadeDurationSettingTitle": {
"description": "Title for the crossfade duration setting."
},
"crossfadeDurationSettingSubtitle": "Overlap audio between tracks during automatic transitions. Set to 0 to disable.",
"@crossfadeDurationSettingSubtitle": {
"description": "Subtitle for the crossfade duration setting."
},
"crossfadeDurationSettingValue": "{seconds}s",
"@crossfadeDurationSettingValue": {
"description": "Label showing the current crossfade duration value in seconds.",
"placeholders": {
"seconds": {
"type": "int"
}
}
},
"crossfadeDurationSettingOff": "Off",
"@crossfadeDurationSettingOff": {
"description": "Label shown when crossfade is disabled (0 seconds)."
},
"outputMenuButtonTitle": "Output",
"@outputMenuButtonTitle": {
"description": "Button title for opening the output menu/panel"
Expand Down
5 changes: 5 additions & 0 deletions lib/models/finamp_models.dart
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ class DefaultSettings {
static const forceAudioOffloadingOnAndroid = false;
static const previousTracksPersistenceMode = PreviousTracksPersistenceMode.persistent;
static const useAndroidGainEffect = true;
static const crossfadeDuration = Duration.zero;
}

@HiveType(typeId: 28)
Expand Down Expand Up @@ -396,6 +397,7 @@ class FinampSettings {
this.forceAudioOffloadingOnAndroid = DefaultSettings.forceAudioOffloadingOnAndroid,
this.previousTracksPersistenceMode = DefaultSettings.previousTracksPersistenceMode,
this.useAndroidGainEffect = DefaultSettings.useAndroidGainEffect,
this.crossfadeDuration = DefaultSettings.crossfadeDuration,
});

@HiveField(0, defaultValue: DefaultSettings.isOffline)
Expand Down Expand Up @@ -857,6 +859,9 @@ class FinampSettings {
@HiveField(147, defaultValue: DefaultSettings.useAndroidGainEffect)
bool useAndroidGainEffect;

@HiveField(148, defaultValue: DefaultSettings.crossfadeDuration)
Duration crossfadeDuration;

static Future<FinampSettings> create() async {
final downloadLocation = await DownloadLocation.create(
name: DownloadLocation.internalStorageName,
Expand Down
9 changes: 7 additions & 2 deletions lib/models/finamp_models.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions lib/screens/audio_service_settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:finamp/services/finamp_settings_helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:finamp/components/AudioServiceSettingsScreen/buffer_duration_list_tile.dart';
import 'package:finamp/components/AudioServiceSettingsScreen/crossfade_duration_slider.dart';
import 'package:finamp/components/AudioServiceSettingsScreen/loadQueueOnStartup_selector.dart';
import 'package:finamp/components/AudioServiceSettingsScreen/stop_foreground_selector.dart';
import 'package:finamp/components/AudioServiceSettingsScreen/track_shuffle_item_count_editor.dart';
Expand Down Expand Up @@ -43,6 +44,7 @@ class _AudioServiceSettingsScreenState extends State<AudioServiceSettingsScreen>
const TrackShuffleItemCountEditor(),
const AudioFadeInDurationListTile(),
const AudioFadeOutDurationListTile(),
const CrossfadeDurationSlider(),
if (Platform.isAndroid) const BufferSizeListTile(),
const BufferDurationListTile(),
const BufferDisableSizeConstraintsSelector(),
Expand Down
10 changes: 10 additions & 0 deletions lib/services/finamp_settings_helper.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading