Add: play seed song first (Play similar songs) #60

sawyerf · sawyerf · commit 6903f51c720d · 2025-08-20T15:03:52.000+02:00
diff --git a/app/components/lists/CustomScroll.js b/app/components/lists/CustomScroll.js
@@ -6,7 +6,7 @@ import { ThemeContext } from '~/contexts/theme';
 import { SettingsContext } from '~/contexts/settings';
 import size from '~/styles/size';
 
-const CustomScroll = ({ children, data, renderItem, style = { width: '100%' }, contentContainerStyle = { paddingHorizontal: 20, columnGap: 10 }, widthItem = 0 }) => {
+const CustomScroll = ({ children, data, renderItem, style = { width: '100%' }, contentContainerStyle = { paddingHorizontal: 20, columnGap: 10 } }) => {
 	const theme = React.useContext(ThemeContext)
 	const settings = React.useContext(SettingsContext)
 	const indexScroll = React.useRef(0)
diff --git a/app/components/options/OptionsSongsList.js b/app/components/options/OptionsSongsList.js
@@ -10,13 +10,15 @@ import { SongContext, SongDispatchContext } from '~/contexts/song';
 import { urlCover } from '~/utils/api';
 import size from '~/styles/size';
 import OptionsPopup from '~/components/popup/OptionsPopup';
+import { SettingsContext } from '~/contexts/settings';
 
 const OptionsSongsList = ({ songs, indexOptions, setIndexOptions, onUpdate = () => { }, idPlaylist = null }) => {
 	const { t } = useTranslation();
 	const navigation = useNavigation();
 	const song = React.useContext(SongContext);
 	const songDispatch = React.useContext(SongDispatchContext);
 	const config = React.useContext(ConfigContext);
+	const settings = React.useContext(SettingsContext);
 	const refOption = React.useRef();
 
 	const playSimilarSongs = () => {
@@ -25,7 +27,8 @@ const OptionsSongsList = ({ songs, indexOptions, setIndexOptions, onUpdate = ()
 				if (!json.similarSongs?.song) {
 					playSong(config, songDispatch, [songs[indexOptions]], 0)
 				} else {
-					playSong(config, songDispatch, json.similarSongs?.song, 0)
+					if (settings.playSeedFirst) playSong(config, songDispatch, [songs[indexOptions], ...json.similarSongs.song], 0)
+					else playSong(config, songDispatch, json.similarSongs.song, 0)
 				}
 			})
 			.catch(() => { })
diff --git a/app/contexts/settings.js b/app/contexts/settings.js
@@ -57,6 +57,7 @@ export const defaultSettings = {
 	// Player settings
 	streamFormat: 'raw',
 	maxBitRate: 0,
+	playSeedFirst: false,
 	// Playlist settings
 	reversePlaylist: false,
 	orderPlaylist: 'title',
diff --git a/app/i18next/de.json b/app/i18next/de.json
@@ -64,7 +64,8 @@
         "Stream format": "Übertragungsformat",
         "Stream format Description": "Lege das Format der zu wiedergebenden Übertragung fest.",
         "Max bitrate": "Maximale Bitrate",
-        "Max bitrate Description": "Lege die maximale Bitrate in Kilobits pro Sekunde für den zu wiedergebenden Stream fest. Eine niedrigere Bitrate sort für geringere Datennutzung, kann jedoch die Wiedergabequalität beinträchtigen"
+        "Max bitrate Description": "Lege die maximale Bitrate in Kilobits pro Sekunde für den zu wiedergebenden Stream fest. Eine niedrigere Bitrate sort für geringere Datennutzung, kann jedoch die Wiedergabequalität beinträchtigen",
+        "Play seed first": "Seed-Lied zuerst abspielen"
       },
       "theme": {
         "Player Theme": "Darstellung des Players"
diff --git a/app/i18next/en.json b/app/i18next/en.json
@@ -64,7 +64,8 @@
         "Stream format": "Stream format",
         "Stream format Description": "Specify the format of the stream to be played.",
         "Max bitrate": "Max bitrate",
-        "Max bitrate Description": "Specify the maximum bit rate in kilobits per second for the stream to be played. Lower bit rates will consume less data but may result in lower audio quality."
+        "Max bitrate Description": "Specify the maximum bit rate in kilobits per second for the stream to be played. Lower bit rates will consume less data but may result in lower audio quality.",
+        "Play seed first": "Play seed song first"
       },
       "theme": {
         "Player Theme": "Player Theme"
diff --git a/app/i18next/fr.json b/app/i18next/fr.json
@@ -64,7 +64,8 @@
         "Stream format": "Format du flux",
         "Stream format description": "Spécifiez le format du flux à lire.",
         "Max bitrate": "Débit maximal",
-        "Max bitrate description": "Spécifiez le débit maximal en kilobits par seconde pour le flux à lire. Des débits plus bas consommeront moins de données mais peuvent entraîner une qualité audio inférieure."
+        "Max bitrate description": "Spécifiez le débit maximal en kilobits par seconde pour le flux à lire. Des débits plus bas consommeront moins de données mais peuvent entraîner une qualité audio inférieure.",
+        "Play seed first": "Lire la référence en premier"
       },
       "theme": {
         "Player Theme": "Thème du lecteur"
diff --git a/app/i18next/it.json b/app/i18next/it.json
@@ -64,7 +64,8 @@
         "Stream format": "Formato streaming",
         "Stream format Description": "Specifica il formato dello streaming da riprodurre.",
         "Max bitrate": "Bitrate massimo",
-        "Max bitrate Description": "Specifica il bitrate massimo in kilobit al secondo per lo streaming. Bitrate inferiori consumano meno dati ma possono ridurre la qualità audio."
+        "Max bitrate Description": "Specifica il bitrate massimo in kilobit al secondo per lo streaming. Bitrate inferiori consumano meno dati ma possono ridurre la qualità audio.",
+        "Play seed first": "Prima il brano di riferimento"
       },
       "theme": {
         "Player Theme": "Tema del lettore"
diff --git a/app/i18next/ru.json b/app/i18next/ru.json
@@ -64,7 +64,8 @@
         "Stream format": "Формат потока",
         "Stream format Description": "Укажите формат потока для воспроизведения.",
         "Max bitrate": "Максимальный битрейт",
-        "Max bitrate Description": "Укажите максимальный битрейт в килобитах в секунду для воспроизведения. Меньшие битрейты будут потреблять меньше данных, но могут привести к снижению качества звука."
+        "Max bitrate Description": "Укажите максимальный битрейт в килобитах в секунду для воспроизведения. Меньшие битрейты будут потреблять меньше данных, но могут привести к снижению качества звука.",
+        "Play seed first": "Сначала воспроизвести трек"
       },
       "theme": {
         "Player Theme": "Тема плеера"
diff --git a/app/i18next/zh-Hans.json b/app/i18next/zh-Hans.json
@@ -64,7 +64,8 @@
         "Stream format": "流格式",
         "Stream format Description": "指定播放流的格式。",
         "Max bitrate": "最大比特率",
-        "Max bitrate Description": "指定播放流的最大比特率（单位：kbps）。较低的比特率将消耗较少的数据，但可能会导致音频质量下降。"
+        "Max bitrate Description": "指定播放流的最大比特率（单位：kbps）。较低的比特率将消耗较少的数据，但可能会导致音频质量下降。",
+        "Play seed first": "优先播放种子曲目"
       },
       "theme": {
         "Player Theme": "播放器主题"
diff --git a/app/i18next/zh-Hant.json b/app/i18next/zh-Hant.json
@@ -64,7 +64,8 @@
         "Stream format": "流格式",
         "Stream format Description": "指定播放流的格式。",
         "Max bitrate": "最大比特率",
-        "Max bitrate Description": "指定播放流的最大比特率（單位：kbps）。較低的比特率將消耗較少的數據，但可能會導致音質下降。"
+        "Max bitrate Description": "指定播放流的最大比特率（單位：kbps）。較低的比特率將消耗較少的數據，但可能會導致音質下降。",
+        "Play seed first": "優先播放種子曲目"
       },
       "theme": {
         "Player Theme": "播放器主題"
diff --git a/app/screens/Settings/Player.js b/app/screens/Settings/Player.js
@@ -6,10 +6,11 @@ import { useTranslation } from 'react-i18next';
 import { SettingsContext } from '~/contexts/settings'
 import { SetSettingsContext } from '~/contexts/settings'
 import { ThemeContext } from '~/contexts/theme'
+import ButtonSwitch from '~/components/settings/ButtonSwitch'
 import Header from '~/components/Header'
 import mainStyles from '~/styles/main'
-import settingStyles from '~/styles/settings'
 import SelectItem from '~/components/settings/SelectItem'
+import settingStyles from '~/styles/settings'
 
 const FORMATS = [
   { name: 'Raw', value: 'raw' },
@@ -34,7 +35,7 @@ const BITRATES = [
 ]
 
 const PlayerSettings = () => {
-	const { t } = useTranslation()
+  const { t } = useTranslation()
   const insets = useSafeAreaInsets()
   const theme = React.useContext(ThemeContext)
   const settings = React.useContext(SettingsContext)
@@ -62,7 +63,7 @@ const PlayerSettings = () => {
             />
           ))}
         </View>
-				<Text style={settingStyles.description(theme)}>{t('settings.player.Stream format Description')}</Text>
+        <Text style={settingStyles.description(theme)}>{t('settings.player.Stream format Description')}</Text>
 
         <Text style={settingStyles.titleContainer(theme)}>{t('settings.player.Max bitrate')}</Text>
         <View style={[settingStyles.optionsContainer(theme), { marginBottom: 5 }]}>
@@ -81,7 +82,17 @@ const PlayerSettings = () => {
             ))
           }
         </View>
-				<Text style={settingStyles.description(theme)}>{t('settings.player.Max bitrate Description')}</Text>
+        <Text style={settingStyles.description(theme)}>{t('settings.player.Max bitrate Description')}</Text>
+
+        <Text style={settingStyles.titleContainer(theme)}>{t('Play similar songs')}</Text>
+        <View style={settingStyles.optionsContainer(theme)}>
+          <ButtonSwitch
+            title={t('settings.player.Play seed first')}
+            value={settings.playSeedFirst}
+            onPress={() => setSettings({ ...settings, playSeedFirst: !settings.playSeedFirst })}
+            isLast
+          />
+        </View>
       </View>
     </ScrollView>
   )
