third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-25 13:12:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some more polishes

Browse Source
This commit is contained in:
birdbird 2022-07-14 09:08:02 +00:00
parent f8b66c97d7
commit 9402e69033
23 changed files with 211 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Utils.kt
View File

@ -60,7 +60,8 @@ object Utils {
private fun getDrawables(context: Context) {
pinImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_pin)!!
downloadedImage = ContextCompat.getDrawable(context, R.drawable.ic_menu_download)!!
downloadedImage =
ContextCompat.getDrawable(context, R.drawable.stat_sys_download_anim_0)!!
errorImage = ContextCompat.getDrawable(context, R.drawable.ic_baseline_error)!!
downloadingImage = ContextCompat.getDrawable(context, R.drawable.stat_sys_download)!!
playingImage = ContextCompat.getDrawable(context, R.drawable.ic_stat_play)!!

18
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt
View File

@ -255,8 +255,7 @@ class PlayerFragment :
}
previousButton.setOnRepeatListener {
val incrementTime = Settings.incrementTime
changeProgress(-incrementTime)
seek(false)
}
nextButton.setOnClickListener {
@ -269,8 +268,7 @@ class PlayerFragment :
}
nextButton.setOnRepeatListener {
val incrementTime = Settings.incrementTime
changeProgress(incrementTime)
seek(true)
}
pauseButton.setOnClickListener {
@ -1126,13 +1124,13 @@ class PlayerFragment :
displaySongRating()
}
private fun changeProgress(ms: Int) {
private fun seek(forward: Boolean) {
launch(CommunicationError.getHandler(context)) {
val msPlayed: Int = max(0, mediaPlayerController.playerPosition)
val duration = mediaPlayerController.playerDuration
val seekTo = (msPlayed + ms).coerceAtMost(duration)
mediaPlayerController.seekTo(seekTo)
progressBar.progress = seekTo
if (forward) {
mediaPlayerController.controller?.seekForward()
} else {
mediaPlayerController.controller?.seekBack()
}
}
}

3
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt
View File

@ -68,7 +68,6 @@ class SettingsFragment :
private var cacheSize: ListPreference? = null
private var cacheLocation: Preference? = null
private var preloadCount: ListPreference? = null
private var bufferLength: ListPreference? = null
private var incrementTime: ListPreference? = null
private var networkTimeout: ListPreference? = null
private var maxAlbums: ListPreference? = null
@ -105,7 +104,6 @@ class SettingsFragment :
cacheSize = findPreference(getString(R.string.setting_key_cache_size))
cacheLocation = findPreference(getString(R.string.setting_key_cache_location))
preloadCount = findPreference(getString(R.string.setting_key_preload_count))
bufferLength = findPreference(getString(R.string.setting_key_buffer_length))
incrementTime = findPreference(getString(R.string.setting_key_increment_time))
networkTimeout = findPreference(getString(R.string.setting_key_network_timeout))
maxAlbums = findPreference(getString(R.string.setting_key_max_albums))
@ -384,7 +382,6 @@ class SettingsFragment :
maxBitrateMobile!!.summary = maxBitrateMobile!!.entry
cacheSize!!.summary = cacheSize!!.entry
preloadCount!!.summary = preloadCount!!.entry
bufferLength!!.summary = bufferLength!!.entry
incrementTime!!.summary = incrementTime!!.entry
networkTimeout!!.summary = networkTimeout!!.entry
maxAlbums!!.summary = maxAlbums!!.entry

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt
View File

@ -107,6 +107,8 @@ class PlaybackService : MediaLibraryService(), KoinComponent {
.setHandleAudioBecomingNoisy(true)
.setMediaSourceFactory(DefaultMediaSourceFactory(cacheDataSourceFactory))
.setRenderersFactory(renderer)
.setSeekBackIncrementMs(Settings.seekInterval.toLong())
.setSeekForwardIncrementMs(Settings.seekInterval.toLong())
.build()
// Enable audio offload

29
ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt
View File

@ -33,10 +33,10 @@ object Settings {
if (!network.connected) return 0
if (network.unmetered) {
return maxWifiBitRate
return if (network.unmetered) {
maxWifiBitRate
} else {
return maxMobileBitRate
maxMobileBitRate
}
}
@ -105,31 +105,31 @@ object Settings {
@JvmStatic
var defaultAlbums
by StringIntSetting(getKey(R.string.setting_key_default_albums), "5")
by StringIntSetting(getKey(R.string.setting_key_default_albums), 5)
@JvmStatic
var maxAlbums
by StringIntSetting(getKey(R.string.setting_key_max_albums), "20")
by StringIntSetting(getKey(R.string.setting_key_max_albums), 20)
@JvmStatic
var defaultSongs
by StringIntSetting(getKey(R.string.setting_key_default_songs), "10")
by StringIntSetting(getKey(R.string.setting_key_default_songs), 10)
@JvmStatic
var maxSongs
by StringIntSetting(getKey(R.string.setting_key_max_songs), "25")
by StringIntSetting(getKey(R.string.setting_key_max_songs), 25)
@JvmStatic
var maxArtists
by StringIntSetting(getKey(R.string.setting_key_max_artists), "10")
by StringIntSetting(getKey(R.string.setting_key_max_artists), 10)
@JvmStatic
var defaultArtists
by StringIntSetting(getKey(R.string.setting_key_default_artists), "3")
by StringIntSetting(getKey(R.string.setting_key_default_artists), 3)
@JvmStatic
var incrementTime
by StringIntSetting(getKey(R.string.setting_key_increment_time), "5")
var seekInterval
by StringIntSetting(getKey(R.string.setting_key_increment_time), 5000)
@JvmStatic
var mediaButtonsEnabled
@ -187,12 +187,12 @@ object Settings {
@JvmStatic
var chatRefreshInterval by StringIntSetting(
getKey(R.string.setting_key_chat_refresh_interval),
"5000"
5000
)
var directoryCacheTime by StringIntSetting(
getKey(R.string.setting_key_directory_cache_time),
"300"
300
)
var shouldSortByDisc
@ -229,7 +229,6 @@ object Settings {
val defaultShareExpirationInMillis: Long
get() {
val preferences = preferences
val preference =
preferences.getString(getKey(R.string.setting_key_default_share_expiration), "0")!!
val split = PATTERN.split(preference)
@ -276,7 +275,7 @@ object Settings {
return preferences.contains(key)
}
fun getKey(key: Int): String {
private fun getKey(key: Int): String {
return appContext.getString(key)
}

4
ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettingsDelegate.kt
View File

@ -40,10 +40,10 @@ class IntSetting(private val key: String, private val defaultValue: Int = 0) :
sharedPreferences.edit { putInt(key, value) }
}
class StringIntSetting(private val key: String, private val defaultValue: String = "0") :
class StringIntSetting(private val key: String, private val defaultValue: Int = 0) :
SettingsDelegate<Int>() {
override fun getValue(thisRef: Any, property: KProperty<*>) =
sharedPreferences.getString(key, defaultValue)!!.toInt()
sharedPreferences.getString(key, defaultValue.toString())!!.toInt()
override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) =
sharedPreferences.edit { putString(key, value.toString()) }

25
ultrasonic/src/main/res/values-cs/strings.xml
View File

@ -125,19 +125,18 @@
<string name="select_genre.empty">Žánry nenalezeny</string>
<string name="select_playlist.empty">Žádné uložené playlisty na serveru</string>
<string name="settings.appearance_title">Vzhled</string>
<string name="settings.buffer_length">Délka bufferu</string>
<string name="settings.buffer_length_0">Vypnuto</string>
<string name="settings.buffer_length_1">1 sekunda</string>
<string name="settings.buffer_length_10">10 sekund</string>
<string name="settings.buffer_length_12">12 sekund</string>
<string name="settings.buffer_length_120">2 minuty</string>
<string name="settings.buffer_length_15">15 sekund</string>
<string name="settings.buffer_length_2">2 seconds</string>
<string name="settings.buffer_length_20">20 sekund</string>
<string name="settings.buffer_length_30">30 sekund</string>
<string name="settings.buffer_length_5">5 sekund</string>
<string name="settings.buffer_length_60">1 minuta</string>
<string name="settings.buffer_length_8">8 sekund</string>
<string name="settings.increment_time_0">Vypnuto</string>
<string name="settings.increment_time_1">1 sekunda</string>
<string name="settings.increment_time_10">10 sekund</string>
<string name="settings.increment_time_12">12 sekund</string>
<string name="settings.increment_time_120">2 minuty</string>
<string name="settings.increment_time_15">15 sekund</string>
<string name="settings.increment_time_2">2 seconds</string>
<string name="settings.increment_time_20">20 sekund</string>
<string name="settings.increment_time_30">30 sekund</string>
<string name="settings.increment_time_5">5 sekund</string>
<string name="settings.increment_time_60">1 minuta</string>
<string name="settings.increment_time_8">8 sekund</string>
<string name="settings.cache_location">Umístění cache</string>
<string name="settings.cache_location_error">Neplatné umístění cache. Používám výchozí cestu.</string>
<string name="settings.cache_size">Velikost cache</string>

25
ultrasonic/src/main/res/values-de/strings.xml
View File

@ -157,19 +157,18 @@
<string name="select_genre.empty">Keine Genres gefunden</string>
<string name="select_playlist.empty">Keine Wiedergabelisten auf dem Server</string>
<string name="settings.appearance_title">Aussehen</string>
<string name="settings.buffer_length">Puffer-Länge</string>
<string name="settings.buffer_length_0">Deaktiviert</string>
<string name="settings.buffer_length_1">1 Sekunde</string>
<string name="settings.buffer_length_10">10 Sekunden</string>
<string name="settings.buffer_length_12">12 Sekunden</string>
<string name="settings.buffer_length_120">2 Minuten</string>
<string name="settings.buffer_length_15">15 Sekunden</string>
<string name="settings.buffer_length_2">2 Sekunden</string>
<string name="settings.buffer_length_20">20 Sekunden</string>
<string name="settings.buffer_length_30">30 Sekunden</string>
<string name="settings.buffer_length_5">5 Sekunden</string>
<string name="settings.buffer_length_60">1 Minute</string>
<string name="settings.buffer_length_8">8 Sekunden</string>
<string name="settings.increment_time_0">Deaktiviert</string>
<string name="settings.increment_time_1">1 Sekunde</string>
<string name="settings.increment_time_10">10 Sekunden</string>
<string name="settings.increment_time_12">12 Sekunden</string>
<string name="settings.increment_time_120">2 Minuten</string>
<string name="settings.increment_time_15">15 Sekunden</string>
<string name="settings.increment_time_2">2 Sekunden</string>
<string name="settings.increment_time_20">20 Sekunden</string>
<string name="settings.increment_time_30">30 Sekunden</string>
<string name="settings.increment_time_5">5 Sekunden</string>
<string name="settings.increment_time_60">1 Minute</string>
<string name="settings.increment_time_8">8 Sekunden</string>
<string name="settings.custom_cache_location">Verwende eigenen Cache Ort</string>
<string name="settings.cache_location">Ort des Caches</string>
<string name="settings.cache_location_error">Ungültiger Ort des Caches. Verwende Standard.</string>

25
ultrasonic/src/main/res/values-es/strings.xml
View File

@ -157,19 +157,18 @@
<string name="select_genre.empty">No se han encontrado géneros</string>
<string name="select_playlist.empty">No hay listas de reproducción almacenadas en el servidor</string>
<string name="settings.appearance_title">Apariencia</string>
<string name="settings.buffer_length">Duración del Buffer</string>
<string name="settings.buffer_length_0">Deshabilitado</string>
<string name="settings.buffer_length_1">1 segundo</string>
<string name="settings.buffer_length_10">10 segundos</string>
<string name="settings.buffer_length_12">12 segundos</string>
<string name="settings.buffer_length_120">2 minutos</string>
<string name="settings.buffer_length_15">15 segundos</string>
<string name="settings.buffer_length_2">2 segundos</string>
<string name="settings.buffer_length_20">20 segundos</string>
<string name="settings.buffer_length_30">30 segundos</string>
<string name="settings.buffer_length_5">5 segundos</string>
<string name="settings.buffer_length_60">1 minuto</string>
<string name="settings.buffer_length_8">8 segundos</string>
<string name="settings.increment_time_0">Deshabilitado</string>
<string name="settings.increment_time_1">1 segundo</string>
<string name="settings.increment_time_10">10 segundos</string>
<string name="settings.increment_time_12">12 segundos</string>
<string name="settings.increment_time_120">2 minutos</string>
<string name="settings.increment_time_15">15 segundos</string>
<string name="settings.increment_time_2">2 segundos</string>
<string name="settings.increment_time_20">20 segundos</string>
<string name="settings.increment_time_30">30 segundos</string>
<string name="settings.increment_time_5">5 segundos</string>
<string name="settings.increment_time_60">1 minuto</string>
<string name="settings.increment_time_8">8 segundos</string>
<string name="settings.custom_cache_location">Usar ubicación de caché personalizada</string>
<string name="settings.cache_location">Ubicación de la Caché</string>
<string name="settings.cache_location_error">Ubicación de la caché no válida. Usando la localización predeterminada.</string>

25
ultrasonic/src/main/res/values-fr/strings.xml
View File

@ -141,19 +141,18 @@
<string name="select_genre.empty">Aucun genre trouvé</string>
<string name="select_playlist.empty">Aucune playlist sur le serveur</string>
<string name="settings.appearance_title">Apparence</string>
<string name="settings.buffer_length">Taille de la mémoire tampon</string>
<string name="settings.buffer_length_0">Désactivé</string>
<string name="settings.buffer_length_1">1 seconde</string>
<string name="settings.buffer_length_10">10 secondes</string>
<string name="settings.buffer_length_12">12 secondes</string>
<string name="settings.buffer_length_120">2 minutes</string>
<string name="settings.buffer_length_15">15 secondes</string>
<string name="settings.buffer_length_2">2 secondes</string>
<string name="settings.buffer_length_20">20 secondes</string>
<string name="settings.buffer_length_30">30 secondes</string>
<string name="settings.buffer_length_5">5 secondes</string>
<string name="settings.buffer_length_60">1 minute</string>
<string name="settings.buffer_length_8">8 secondes</string>
<string name="settings.increment_time_0">Désactivé</string>
<string name="settings.increment_time_1">1 seconde</string>
<string name="settings.increment_time_10">10 secondes</string>
<string name="settings.increment_time_12">12 secondes</string>
<string name="settings.increment_time_120">2 minutes</string>
<string name="settings.increment_time_15">15 secondes</string>
<string name="settings.increment_time_2">2 secondes</string>
<string name="settings.increment_time_20">20 secondes</string>
<string name="settings.increment_time_30">30 secondes</string>
<string name="settings.increment_time_5">5 secondes</string>
<string name="settings.increment_time_60">1 minute</string>
<string name="settings.increment_time_8">8 secondes</string>
<string name="settings.custom_cache_location">Utiliser un emplacement personnalisé pour le cache </string>
<string name="settings.cache_location">Emplacement du cache</string>
<string name="settings.cache_location_error">Emplacement du cache invalide. Utilisation du cache par défaut.</string>

25
ultrasonic/src/main/res/values-hu/strings.xml
View File

@ -131,19 +131,18 @@
<string name="select_genre.empty">Műfajok nem találhatók!</string>
<string name="select_playlist.empty">Nincs mentett lejátszási lista a kiszolgálón.</string>
<string name="settings.appearance_title">Megjelenés</string>
<string name="settings.buffer_length">Pufferméret</string>
<string name="settings.buffer_length_0">Letiltva</string>
<string name="settings.buffer_length_1">1 másodperc</string>
<string name="settings.buffer_length_10">10 másodperc</string>
<string name="settings.buffer_length_12">12 másodperc</string>
<string name="settings.buffer_length_120">2 perc</string>
<string name="settings.buffer_length_15">15 másodperc</string>
<string name="settings.buffer_length_2">2 másodperc</string>
<string name="settings.buffer_length_20">20 másodperc</string>
<string name="settings.buffer_length_30">30 másodperc</string>
<string name="settings.buffer_length_5">5 másodperc</string>
<string name="settings.buffer_length_60">1 perc</string>
<string name="settings.buffer_length_8">8 másodperc</string>
<string name="settings.increment_time_0">Letiltva</string>
<string name="settings.increment_time_1">1 másodperc</string>
<string name="settings.increment_time_10">10 másodperc</string>
<string name="settings.increment_time_12">12 másodperc</string>
<string name="settings.increment_time_120">2 perc</string>
<string name="settings.increment_time_15">15 másodperc</string>
<string name="settings.increment_time_2">2 másodperc</string>
<string name="settings.increment_time_20">20 másodperc</string>
<string name="settings.increment_time_30">30 másodperc</string>
<string name="settings.increment_time_5">5 másodperc</string>
<string name="settings.increment_time_60">1 perc</string>
<string name="settings.increment_time_8">8 másodperc</string>
<string name="settings.cache_location">Gyorsítótár helye</string>
<string name="settings.cache_location_error">Hibás gyorsítótár hely! Az alapértelmezett használata.</string>
<string name="settings.cache_size">Gyorsítótár mérete</string>

25
ultrasonic/src/main/res/values-it/strings.xml
View File

@ -121,19 +121,18 @@
<string name="select_genre.empty">Nessun genere trovato</string>
<string name="select_playlist.empty">Nessuna playlist salvata sul server</string>
<string name="settings.appearance_title">Aspetto</string>
<string name="settings.buffer_length">Lunghezza buffer</string>
<string name="settings.buffer_length_0">Disabilitato</string>
<string name="settings.buffer_length_1">1 secondo</string>
<string name="settings.buffer_length_10">10 secondi</string>
<string name="settings.buffer_length_12">12 secondi</string>
<string name="settings.buffer_length_120">2 minuti</string>
<string name="settings.buffer_length_15">15 secondi</string>
<string name="settings.buffer_length_2">2 secondi</string>
<string name="settings.buffer_length_20">20 secondi</string>
<string name="settings.buffer_length_30">30 secondi</string>
<string name="settings.buffer_length_5">5 secondi</string>
<string name="settings.buffer_length_60">1 minuto</string>
<string name="settings.buffer_length_8">8 secondi</string>
<string name="settings.increment_time_0">Disabilitato</string>
<string name="settings.increment_time_1">1 secondo</string>
<string name="settings.increment_time_10">10 secondi</string>
<string name="settings.increment_time_12">12 secondi</string>
<string name="settings.increment_time_120">2 minuti</string>
<string name="settings.increment_time_15">15 secondi</string>
<string name="settings.increment_time_2">2 secondi</string>
<string name="settings.increment_time_20">20 secondi</string>
<string name="settings.increment_time_30">30 secondi</string>
<string name="settings.increment_time_5">5 secondi</string>
<string name="settings.increment_time_60">1 minuto</string>
<string name="settings.increment_time_8">8 secondi</string>
<string name="settings.cache_location">Posizione Cache</string>
<string name="settings.cache_location_error">Posizione cache non valida. Uso la predefinita.</string>
<string name="settings.cache_size">Dimensione Cache</string>

25
ultrasonic/src/main/res/values-nl/strings.xml
View File

@ -157,19 +157,18 @@
<string name="select_genre.empty">Geen genres gevonden</string>
<string name="select_playlist.empty">Geen opgeslagen afspeellijsten op server</string>
<string name="settings.appearance_title">Uiterlijk</string>
<string name="settings.buffer_length">Bufferduur</string>
<string name="settings.buffer_length_0">Uitgeschakeld</string>
<string name="settings.buffer_length_1">1 seconde</string>
<string name="settings.buffer_length_10">10 seconden</string>
<string name="settings.buffer_length_12">12 seconden</string>
<string name="settings.buffer_length_120">2 minuten</string>
<string name="settings.buffer_length_15">15 seconden</string>
<string name="settings.buffer_length_2">2 seconden</string>
<string name="settings.buffer_length_20">20 seconden</string>
<string name="settings.buffer_length_30">30 seconden</string>
<string name="settings.buffer_length_5">5 seconden</string>
<string name="settings.buffer_length_60">1 minuut</string>
<string name="settings.buffer_length_8">8 seconden</string>
<string name="settings.increment_time_0">Uitgeschakeld</string>
<string name="settings.increment_time_1">1 seconde</string>
<string name="settings.increment_time_10">10 seconden</string>
<string name="settings.increment_time_12">12 seconden</string>
<string name="settings.increment_time_120">2 minuten</string>
<string name="settings.increment_time_15">15 seconden</string>
<string name="settings.increment_time_2">2 seconden</string>
<string name="settings.increment_time_20">20 seconden</string>
<string name="settings.increment_time_30">30 seconden</string>
<string name="settings.increment_time_5">5 seconden</string>
<string name="settings.increment_time_60">1 minuut</string>
<string name="settings.increment_time_8">8 seconden</string>
<string name="settings.custom_cache_location">Aangepaste cachelocatie gebruiken</string>
<string name="settings.cache_location">Cachelocatie</string>
<string name="settings.cache_location_error">Ongeldige cachelocatie; de standaardlocatie wordt gebruikt.</string>

25
ultrasonic/src/main/res/values-pl/strings.xml
View File

@ -125,19 +125,18 @@
<string name="select_genre.empty">Brak gatunków</string>
<string name="select_playlist.empty">Brak zapisanych playlist na serwerze</string>
<string name="settings.appearance_title">Wygląd</string>
<string name="settings.buffer_length">Wielkość bufora</string>
<string name="settings.buffer_length_0">Wyłączone</string>
<string name="settings.buffer_length_1">1 sekunda</string>
<string name="settings.buffer_length_10">10 sekund</string>
<string name="settings.buffer_length_12">12 sekund</string>
<string name="settings.buffer_length_120">2 minuty</string>
<string name="settings.buffer_length_15">15 sekund</string>
<string name="settings.buffer_length_2">2 sekundy</string>
<string name="settings.buffer_length_20">20 sekund</string>
<string name="settings.buffer_length_30">30 sekund</string>
<string name="settings.buffer_length_5">5 sekund</string>
<string name="settings.buffer_length_60">1 minuta</string>
<string name="settings.buffer_length_8">8 sekund</string>
<string name="settings.increment_time_0">Wyłączone</string>
<string name="settings.increment_time_1">1 sekunda</string>
<string name="settings.increment_time_10">10 sekund</string>
<string name="settings.increment_time_12">12 sekund</string>
<string name="settings.increment_time_120">2 minuty</string>
<string name="settings.increment_time_15">15 sekund</string>
<string name="settings.increment_time_2">2 sekundy</string>
<string name="settings.increment_time_20">20 sekund</string>
<string name="settings.increment_time_30">30 sekund</string>
<string name="settings.increment_time_5">5 sekund</string>
<string name="settings.increment_time_60">1 minuta</string>
<string name="settings.increment_time_8">8 sekund</string>
<string name="settings.cache_location">Lokalizacja pamięci podręcznej</string>
<string name="settings.cache_location_error">Nieprawidłowa lokalizacja pamięci podręcznej. Przywrócono domyślną.</string>
<string name="settings.cache_size">Wielkość pamięci podręcznej</string>

25
ultrasonic/src/main/res/values-pt-rBR/strings.xml
View File

@ -137,19 +137,18 @@
<string name="select_genre.empty">Nenhum gênero encontrado</string>
<string name="select_playlist.empty">Não existe nenhuma playlist no servidor</string>
<string name="settings.appearance_title">Aparência</string>
<string name="settings.buffer_length">Tamanho do Buffer</string>
<string name="settings.buffer_length_0">Desativado</string>
<string name="settings.buffer_length_1">1 segundo</string>
<string name="settings.buffer_length_10">10 segundos</string>
<string name="settings.buffer_length_12">12 segundos</string>
<string name="settings.buffer_length_120">2 minutos</string>
<string name="settings.buffer_length_15">15 segundos</string>
<string name="settings.buffer_length_2">2 segundos</string>
<string name="settings.buffer_length_20">20 segundos</string>
<string name="settings.buffer_length_30">30 segundos</string>
<string name="settings.buffer_length_5">5 segundos</string>
<string name="settings.buffer_length_60">1 minuto</string>
<string name="settings.buffer_length_8">8 segundos</string>
<string name="settings.increment_time_0">Desativado</string>
<string name="settings.increment_time_1">1 segundo</string>
<string name="settings.increment_time_10">10 segundos</string>
<string name="settings.increment_time_12">12 segundos</string>
<string name="settings.increment_time_120">2 minutos</string>
<string name="settings.increment_time_15">15 segundos</string>
<string name="settings.increment_time_2">2 segundos</string>
<string name="settings.increment_time_20">20 segundos</string>
<string name="settings.increment_time_30">30 segundos</string>
<string name="settings.increment_time_5">5 segundos</string>
<string name="settings.increment_time_60">1 minuto</string>
<string name="settings.increment_time_8">8 segundos</string>
<string name="settings.cache_location">Localização do Cache</string>
<string name="settings.cache_location_error">Localização do cache inválida. Usando o padrão.</string>
<string name="settings.cache_size">Tamanho do Cache</string>

25
ultrasonic/src/main/res/values-pt/strings.xml
View File

@ -125,19 +125,18 @@
<string name="select_genre.empty">Nenhum gênero encontrado</string>
<string name="select_playlist.empty">Não existe nenhuma playlist no servidor</string>
<string name="settings.appearance_title">Aparência</string>
<string name="settings.buffer_length">Tamanho do Buffer</string>
<string name="settings.buffer_length_0">Disabilitando</string>
<string name="settings.buffer_length_1">1 segundo</string>
<string name="settings.buffer_length_10">10 segundos</string>
<string name="settings.buffer_length_12">12 segundos</string>
<string name="settings.buffer_length_120">2 minutos</string>
<string name="settings.buffer_length_15">15 segundos</string>
<string name="settings.buffer_length_2">2 segundos</string>
<string name="settings.buffer_length_20">20 segundos</string>
<string name="settings.buffer_length_30">30 segundos</string>
<string name="settings.buffer_length_5">5 segundos</string>
<string name="settings.buffer_length_60">1 minuto</string>
<string name="settings.buffer_length_8">8 segundos</string>
<string name="settings.increment_time_0">Disabilitando</string>
<string name="settings.increment_time_1">1 segundo</string>
<string name="settings.increment_time_10">10 segundos</string>
<string name="settings.increment_time_12">12 segundos</string>
<string name="settings.increment_time_120">2 minutos</string>
<string name="settings.increment_time_15">15 segundos</string>
<string name="settings.increment_time_2">2 segundos</string>
<string name="settings.increment_time_20">20 segundos</string>
<string name="settings.increment_time_30">30 segundos</string>
<string name="settings.increment_time_5">5 segundos</string>
<string name="settings.increment_time_60">1 minuto</string>
<string name="settings.increment_time_8">8 segundos</string>
<string name="settings.cache_location">Localização do Cache</string>
<string name="settings.cache_location_error">Localização do cache inválida. Usando o padrão.</string>
<string name="settings.cache_size">Tamanho do Cache</string>

25
ultrasonic/src/main/res/values-ru/strings.xml
View File

@ -149,19 +149,18 @@
<string name="select_genre.empty">Жанры не найдены</string>
<string name="select_playlist.empty">Нет сохраненных плейлистов на сервере</string>
<string name="settings.appearance_title">Появление</string>
<string name="settings.buffer_length">Размер буфера</string>
<string name="settings.buffer_length_0">Отключить</string>
<string name="settings.buffer_length_1">1 секунда</string>
<string name="settings.buffer_length_10">10 секунд</string>
<string name="settings.buffer_length_12">12 секунд</string>
<string name="settings.buffer_length_120">2 минуты</string>
<string name="settings.buffer_length_15">15 секунд</string>
<string name="settings.buffer_length_2">2 секунды</string>
<string name="settings.buffer_length_20">20 секунд</string>
<string name="settings.buffer_length_30">30 секунд</string>
<string name="settings.buffer_length_5">5 секунд</string>
<string name="settings.buffer_length_60">1 минута</string>
<string name="settings.buffer_length_8">8 секунд</string>
<string name="settings.increment_time_0">Отключить</string>
<string name="settings.increment_time_1">1 секунда</string>
<string name="settings.increment_time_10">10 секунд</string>
<string name="settings.increment_time_12">12 секунд</string>
<string name="settings.increment_time_120">2 минуты</string>
<string name="settings.increment_time_15">15 секунд</string>
<string name="settings.increment_time_2">2 секунды</string>
<string name="settings.increment_time_20">20 секунд</string>
<string name="settings.increment_time_30">30 секунд</string>
<string name="settings.increment_time_5">5 секунд</string>
<string name="settings.increment_time_60">1 минута</string>
<string name="settings.increment_time_8">8 секунд</string>
<string name="settings.cache_location">Расположение кэша</string>
<string name="settings.cache_location_error">Неверное расположение кеша. Использование по умолчанию.</string>
<string name="settings.cache_size">Размер кэша</string>

25
ultrasonic/src/main/res/values-zh-rCN/strings.xml
View File

@ -141,19 +141,18 @@
<string name="select_genre.empty">找不到流派</string>
<string name="select_playlist.empty">服务器上没有保存的播放列表</string>
<string name="settings.appearance_title">外观</string>
<string name="settings.buffer_length">缓冲长度</string>
<string name="settings.buffer_length_0">已禁用</string>
<string name="settings.buffer_length_1">1 秒</string>
<string name="settings.buffer_length_10">10 秒</string>
<string name="settings.buffer_length_12">12 秒</string>
<string name="settings.buffer_length_120">2 分钟</string>
<string name="settings.buffer_length_15">15 秒</string>
<string name="settings.buffer_length_2">2 秒</string>
<string name="settings.buffer_length_20">20 秒</string>
<string name="settings.buffer_length_30">30 秒</string>
<string name="settings.buffer_length_5">5 秒</string>
<string name="settings.buffer_length_60">1 分钟</string>
<string name="settings.buffer_length_8">8 秒</string>
<string name="settings.increment_time_0">已禁用</string>
<string name="settings.increment_time_1">1 秒</string>
<string name="settings.increment_time_10">10 秒</string>
<string name="settings.increment_time_12">12 秒</string>
<string name="settings.increment_time_120">2 分钟</string>
<string name="settings.increment_time_15">15 秒</string>
<string name="settings.increment_time_2">2 秒</string>
<string name="settings.increment_time_20">20 秒</string>
<string name="settings.increment_time_30">30 秒</string>
<string name="settings.increment_time_5">5 秒</string>
<string name="settings.increment_time_60">1 分钟</string>
<string name="settings.increment_time_8">8 秒</string>
<string name="settings.custom_cache_location">使用自定义的缓存路径</string>
<string name="settings.cache_location">缓存路径</string>
<string name="settings.cache_location_error">缓存路径错误，正在使用默认路径。</string>

6
ultrasonic/src/main/res/values-zh-rTW/strings.xml
View File

@ -41,9 +41,9 @@
<string name="search.artists">作者</string>
<string name="search.label">搜尋</string>
<string name="search.title">搜尋</string>
<string name="settings.buffer_length_0">已停用</string>
<string name="settings.buffer_length_120">2 分</string>
<string name="settings.buffer_length_60">1 分</string>
<string name="settings.increment_time_0">已停用</string>
<string name="settings.increment_time_120">2 分</string>
<string name="settings.increment_time_60">1 分</string>
<string name="settings.directory_cache_time_0">已停用</string>
<string name="settings.directory_cache_time_1">1 分</string>
<string name="settings.directory_cache_time_10">10 分</string>

55
ultrasonic/src/main/res/values/arrays.xml
View File

@ -97,17 +97,6 @@
<item>@string/settings.max_bitrate_320</item>
<item>@string/settings.max_bitrate_unlimited</item>
</string-array>
<string-array name="bufferLengthValues" translatable="false">
<item>1</item>
<item>2</item>
<item>5</item>
<item>8</item>
<item>10</item>
<item>12</item>
<item>15</item>
<item>20</item>
<item>30</item>
</string-array>
<string-array name="incrementTimeValues" translatable="false">
<item>1000</item>
<item>2000</item>
@ -134,18 +123,18 @@
<item>120000</item>
</string-array>
<string-array name="chatRefreshNames" translatable="false">
<item>@string/settings.buffer_length_0</item>
<item>@string/settings.buffer_length_1</item>
<item>@string/settings.buffer_length_2</item>
<item>@string/settings.buffer_length_5</item>
<item>@string/settings.buffer_length_8</item>
<item>@string/settings.buffer_length_10</item>
<item>@string/settings.buffer_length_12</item>
<item>@string/settings.buffer_length_15</item>
<item>@string/settings.buffer_length_20</item>
<item>@string/settings.buffer_length_30</item>
<item>@string/settings.buffer_length_60</item>
<item>@string/settings.buffer_length_120</item>
<item>@string/settings.increment_time_0</item>
<item>@string/settings.increment_time_1</item>
<item>@string/settings.increment_time_2</item>
<item>@string/settings.increment_time_5</item>
<item>@string/settings.increment_time_8</item>
<item>@string/settings.increment_time_10</item>
<item>@string/settings.increment_time_12</item>
<item>@string/settings.increment_time_15</item>
<item>@string/settings.increment_time_20</item>
<item>@string/settings.increment_time_30</item>
<item>@string/settings.increment_time_60</item>
<item>@string/settings.increment_time_120</item>
</string-array>
<string-array name="directoryCacheTimeValues" translatable="false">
<item>0</item>
@ -165,16 +154,16 @@
<item>@string/settings.directory_cache_time_30</item>
<item>@string/settings.directory_cache_time_60</item>
</string-array>
<string-array name="bufferLengthNames" translatable="false">
<item>@string/settings.buffer_length_1</item>
<item>@string/settings.buffer_length_2</item>
<item>@string/settings.buffer_length_5</item>
<item>@string/settings.buffer_length_8</item>
<item>@string/settings.buffer_length_10</item>
<item>@string/settings.buffer_length_12</item>
<item>@string/settings.buffer_length_15</item>
<item>@string/settings.buffer_length_20</item>
<item>@string/settings.buffer_length_30</item>
<string-array name="incrementTimeNames" translatable="false">
<item>@string/settings.increment_time_1</item>
<item>@string/settings.increment_time_2</item>
<item>@string/settings.increment_time_5</item>
<item>@string/settings.increment_time_8</item>
<item>@string/settings.increment_time_10</item>
<item>@string/settings.increment_time_12</item>
<item>@string/settings.increment_time_15</item>
<item>@string/settings.increment_time_20</item>
<item>@string/settings.increment_time_30</item>
</string-array>
<string-array name="networkTimeoutValues" translatable="false">
<item>15000</item>

1
ultrasonic/src/main/res/values/setting_keys.xml
View File

@ -21,7 +21,6 @@
<string name="setting_key.scrobble" translatable="false">scrobble</string>
<string name="setting_key.server_scaling" translatable="false">serverScaling</string>
<string name="setting_key.wifi_required_for_download" translatable="false">wifiRequiredForDownload</string>
<string name="setting_key.buffer_length" translatable="false">bufferLength</string>
<string name="setting_key.network_timeout" translatable="false">networkTimeout</string>
<string name="setting_key.max_albums" translatable="false">maxAlbums</string>
<string name="setting_key.max_songs" translatable="false">maxSongs</string>

27
ultrasonic/src/main/res/values/strings.xml
View File

@ -160,19 +160,18 @@
<string name="select_genre.empty">No genres found</string>
<string name="select_playlist.empty">No saved playlists on server</string>
<string name="settings.appearance_title">Appearance</string>
<string name="settings.buffer_length">Buffer Length</string>
<string name="settings.buffer_length_0">Disabled</string>
<string name="settings.buffer_length_1">1 second</string>
<string name="settings.buffer_length_10">10 seconds</string>
<string name="settings.buffer_length_12">12 seconds</string>
<string name="settings.buffer_length_120">2 minutes</string>
<string name="settings.buffer_length_15">15 seconds</string>
<string name="settings.buffer_length_2">2 seconds</string>
<string name="settings.buffer_length_20">20 seconds</string>
<string name="settings.buffer_length_30">30 seconds</string>
<string name="settings.buffer_length_5">5 seconds</string>
<string name="settings.buffer_length_60">1 minute</string>
<string name="settings.buffer_length_8">8 seconds</string>
<string name="settings.increment_time_0">Disabled</string>
<string name="settings.increment_time_1">1 second</string>
<string name="settings.increment_time_10">10 seconds</string>
<string name="settings.increment_time_12">12 seconds</string>
<string name="settings.increment_time_120">2 minutes</string>
<string name="settings.increment_time_15">15 seconds</string>
<string name="settings.increment_time_2">2 seconds</string>
<string name="settings.increment_time_20">20 seconds</string>
<string name="settings.increment_time_30">30 seconds</string>
<string name="settings.increment_time_5">5 seconds</string>
<string name="settings.increment_time_60">1 minute</string>
<string name="settings.increment_time_8">8 seconds</string>
<string name="settings.custom_cache_location">Use Custom Cache Location</string>
<string name="settings.cache_location">Cache Location</string>
<string name="settings.cache_location_error">Invalid cache location. Using default.</string>
@ -221,7 +220,7 @@
<string name="settings.hide_media_summary">Hide music files from other apps.</string>
<string name="settings.hide_media_title">Hide From Other</string>
<string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>
<string name="settings.increment_time">Skip Interval</string>
<string name="settings.increment_time">Seek Interval</string>
<string name="settings.invalid_url">Please specify a valid URL.</string>
<string name="settings.max_albums">Max Albums</string>
<string name="settings.max_artists">Max Artists</string>

9
ultrasonic/src/main/res/xml/settings.xml
View File

@ -92,7 +92,7 @@
app:iconSpaceReserved="false"/>
<ListPreference
a:defaultValue="5000"
a:entries="@array/bufferLengthNames"
a:entries="@array/incrementTimeNames"
a:entryValues="@array/incrementTimeValues"
a:key="@string/setting_key.increment_time"
a:title="@string/settings.increment_time"
@ -186,13 +186,6 @@
a:summary="@string/settings.wifi_required_summary"
a:title="@string/settings.wifi_required_title"
app:iconSpaceReserved="false"/>
<ListPreference
a:defaultValue="5"
a:entries="@array/bufferLengthNames"
a:entryValues="@array/bufferLengthValues"
a:key="@string/setting_key.buffer_length"
a:title="@string/settings.buffer_length"
app:iconSpaceReserved="false"/>
<ListPreference
a:defaultValue="15000"
a:entries="@array/networkTimeoutNames"