config/detekt/detekt.yml

@@ -52,11 +52,7 @@ style:
     active: true
   ForbiddenComment:
     active: true
-    comments:
-      - reason: 'Forbidden FIXME todo marker in comment, please fix the problem.'
-        value: 'FIXME:'
-      - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code.'
-        value: 'STOPSHIP:'
+    values: ['FIXME:', 'STOPSHIP:']
   WildcardImport:
     active: true
   MaxLineLength:

gradle/libs.versions.toml

@@ -3,11 +3,11 @@
 gradle                 = "8.1.1"
 
 navigation             = "2.5.3"
-gradlePlugin           = "8.0.2"
+gradlePlugin           = "8.0.1"
 androidxcore           = "1.10.1"
 ktlint                 = "0.43.2"
 ktlintGradle           = "11.3.2"
-detekt                 = "1.23.0"
+detekt                 = "1.22.0"
 preferences            = "1.2.0"
 media3                 = "1.0.2"
 

ultrasonic/build.gradle

@@ -14,7 +14,7 @@ android {
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        resourceConfigurations += ['cs', 'de', 'en', 'es', 'fr', 'gl', 'hu', 'it', 'ja', 'nb-rNO', 'nl', 'pl', 'pt', 'pt-rBR', 'ru', 'zh-rCN', 'zh-rTW']
+        resConfigs 'cs', 'de', 'en', 'es', 'fr', 'gl', 'hu', 'it', 'ja', 'nb-rNO', 'nl', 'pl', 'pt', 'pt-rBR', 'ru', 'zh-rCN', 'zh-rTW'
     }
 
     bundle.language.enableSplit = false

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt

@@ -14,6 +14,6 @@ data class PlaybackState(
     var repeatMode: Int = 0
 ) : Serializable {
     companion object {
-        private const val serialVersionUID = -293487987L
+        const val serialVersionUID = -293487987L
     }
 }

ultrasonic/src/main/res/values-es/strings.xml

@@ -452,5 +452,4 @@
     <string name="supported_server_features">Funciones soportadas</string>
     <string name="foreground_exception_title">No se puede reanudar la reproducción</string>
     <string name="foreground_exception_text">Presione el botón de reproducción en la notificación de medios si aún está presente; de lo contrario, abra la aplicación para iniciar la reproducción y vuelva a conectar la sesión al controlador</string>
-    <string name="settings.max_bitrate_pinning">Tasa de bits máxima: al fijar una canción de forma permanente</string>
 </resources>

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

@@ -67,7 +67,7 @@
     <string name="download.menu_save">保存播放列表</string>
     <string name="download.menu_screen_off">关闭屏幕常亮</string>
     <string name="download.menu_screen_on">开启屏幕常亮</string>
-    <string name="download.menu_show_album">转到专辑</string>
+    <string name="download.menu_show_album">显示专辑</string>
     <string name="download.menu_shuffle">随机</string>
     <string name="download.menu_shuffle_on">随机播放模式已启用</string>
     <string name="download.menu_shuffle_off">随机播放模式已禁用</string>
@@ -280,7 +280,7 @@
     <string name="settings.test_connection_title">测试连接</string>
     <string name="settings.theme_light">亮色</string>
     <string name="settings.theme_dark">暗色</string>
-    <string name="settings.theme_black">黑色</string>
+    <string name="settings.theme_black">Black</string>
     <string name="settings.theme_title">主题</string>
     <string name="settings.title.allow_self_signed_certificate">允许自签名 HTTPS 证书</string>
     <string name="settings.title.force_plain_text_password">强制原始密码认证</string>
@@ -337,7 +337,7 @@
     <string name="share_default_greeting">看看我从 %s 分享的这首音乐</string>
     <string name="share_via">分享歌曲通过</string>
     <string name="menu.share">分享</string>
-    <string name="download.menu_show_artist">转到艺术家</string>
+    <string name="download.menu_show_artist">显示艺术家</string>
     <string name="common_multiple_years">数年</string>
     <string name="settings.debug.title">调试选项</string>
     <string name="settings.debug.log_to_file">将调试日志写入文件</string>
@@ -448,5 +448,4 @@
     <string name="language.cs">捷克语</string>
     <string name="language.de">德语</string>
     <string name="language.pt_BR">葡萄牙语（巴西）</string>
-    <string name="settings.max_bitrate_pinning">最大比特率 - 永久固定歌曲时</string>
 </resources>

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

@@ -84,7 +84,7 @@
     <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>
+    <string name="settings.cache_location_error">錯誤緩衝路徑，使用預設緩衝路徑</string>
     <string name="settings.cache_size">緩衝大小</string>
     <string name="settings.cache_size_100">100 MB</string>
     <string name="settings.cache_size_1000">1 GB</string>
@@ -129,7 +129,7 @@
     <string name="time_span_disabled">已停用</string>
     <string name="share_comment">註記</string>
     <string name="server_menu.delete">刪除</string>
-    <string name="download.menu_show_album">轉至專輯</string>
+    <string name="download.menu_show_album">顯示專輯</string>
     <string name="language.zh_CN">簡體中文（中國）</string>
     <string name="download.menu_save">儲存播放清單</string>
     <string name="download.bookmark_set_at_position" formatted="false">書籤設置在 %s。</string>
@@ -232,68 +232,4 @@
     <string name="settings.hide_media_toast">在 Android 系統下次掃描裝置內音樂時生效。</string>
     <string name="settings.download_transition">播放時顯示正在播放介面</string>
     <string name="settings.download_transition_summary">在媒體庫介面開始播放後切換到正在播放介面</string>
-    <string name="settings.search_50">50</string>
-    <string name="settings.preload_3">3 首歌</string>
-    <string name="settings.search_1">1</string>
-    <string name="settings.search_20">20</string>
-    <string name="settings.search_75">75</string>
-    <string name="settings.share_minutes">分鐘</string>
-    <string name="settings.preload_500">500 首歌</string>
-    <string name="settings.max_bitrate_112">112 Kbps</string>
-    <string name="settings.preload_1">1 首歌</string>
-    <string name="settings.search_3">3</string>
-    <string name="settings.search_40">40</string>
-    <string name="settings.search_500">500</string>
-    <string name="settings.max_bitrate_160">160 Kbps</string>
-    <string name="util.zero_time">0:00</string>
-    <string name="settings.network_timeout_120000">120 秒</string>
-    <string name="settings.share_hours">小時</string>
-    <string name="settings.theme_black">黑色</string>
-    <string name="server_editor.authentication">認證</string>
-    <string name="settings.preload_2">2 首歌</string>
-    <string name="settings.search_10">10</string>
-    <string name="settings.server_address">伺服器地址</string>
-    <string name="settings.network_timeout_60000">60 秒</string>
-    <string name="settings.search_5">5</string>
-    <string name="settings.preload_100">100 首歌</string>
-    <string name="settings.theme_light">明色</string>
-    <string name="settings.max_bitrate_96">96 Kbps</string>
-    <string name="util.bytes_format.kilobyte">0 KB</string>
-    <string name="settings.override_language">覆寫當前語言</string>
-    <string name="settings.preload_5">5 首歌</string>
-    <string name="settings.search_250">250</string>
-    <string name="settings.max_bitrate_192">192 Kbps</string>
-    <string name="settings.max_bitrate_80">80 Kbps</string>
-    <string name="settings.search_25">25</string>
-    <string name="settings.search_30">30</string>
-    <string name="settings.search_100">100</string>
-    <string name="main.video" tools:ignore="UnusedResources">影片</string>
-    <string name="time_span_disable">禁用</string>
-    <string name="settings.preload_50">50 首歌</string>
-    <string name="song_details.kbps">%d kbps</string>
-    <string name="settings.preload_10">10 首歌</string>
-    <string name="settings.max_bitrate_256">256 Kbps</string>
-    <string name="settings.max_bitrate_32">32 Kbps</string>
-    <string name="settings.max_bitrate_320">320 Kbps</string>
-    <string name="settings.max_bitrate_64">64 Kbps</string>
-    <string name="settings.network_timeout">網路延時</string>
-    <string name="settings.network_timeout_105000">105 秒</string>
-    <string name="settings.network_timeout_45000">45 秒</string>
-    <string name="settings.network_timeout_75000">75 秒</string>
-    <string name="settings.network_timeout_90000">90 秒</string>
-    <string name="settings.notifications_title">通知</string>
-    <string name="settings.network_title">網路</string>
-    <string name="settings.other_title">其他設定</string>
-    <string name="settings.search_15">15</string>
-    <string name="settings.server_color">伺服器顏色</string>
-    <string name="util.bytes_format.byte">0 B</string>
-    <string name="util.bytes_format.gigabyte">0.00 GB</string>
-    <string name="settings.server_username">用戶名</string>
-    <string name="settings.theme_dark">暗色</string>
-    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
-    <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="settings.preload_1000">1000 首歌</string>
-    <string name="settings.server_password">密碼</string>
-    <string name="settings.share_days">天</string>
-    <string name="settings.max_bitrate_128">128 Kbps</string>
 </resources>