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
586 changes: 586 additions & 0 deletions composeApp/src/commonMain/composeResources/values-zh-rCN/strings.xml

Large diffs are not rendered by default.

235 changes: 230 additions & 5 deletions composeApp/src/commonMain/composeResources/values-zh-rTW/strings.xml

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions composeApp/src/commonMain/composeResources/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1151,4 +1151,14 @@
<string name="browser_login_rejected">Sign-in could not be verified. Check your connection, or sign in again in this browser profile and refresh.</string>
<string name="browser_login_refresh">Refresh browser profiles</string>
<string name="soundcloud_play_count_info">%1$s - song info</string>

<string name="sleep_timer_duration_minutes">%1$d min</string>
<string name="sleep_timer_one_hour">1 hour</string>
<string name="sleep_timer_end_of_song_option">End of song</string>
<string name="sleep_timer_custom_option">Custom</string>
<string name="minute_unit">min</string>
<string name="new_blog_post">New blog post</string>
<string name="introducing_simpmusic_chart">Introducing SimpMusic Chart</string>
<string name="lyrics_vote_id">ID: %1$s</string>
<string name="lyrics_vote_count">Vote: %1$s</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,9 @@ import coil3.request.ImageRequest
import coil3.request.crossfade
import com.maxrave.data.io.readLocalImageBytes
import com.maxrave.domain.data.entities.DownloadState
import com.maxrave.domain.data.model.browse.album.Track
import com.maxrave.domain.utils.toSongEntity
import com.maxrave.domain.data.entities.LocalPlaylistEntity
import com.maxrave.domain.data.entities.SongEntity
import com.maxrave.domain.data.model.browse.album.Track
import com.maxrave.domain.data.model.download.DownloadProgress
import com.maxrave.domain.data.model.searchResult.playlists.PlaylistsResult
import com.maxrave.domain.data.model.searchResult.songs.Artist
Expand All @@ -136,6 +135,7 @@ import com.maxrave.domain.repository.LocalPlaylistRepository
import com.maxrave.domain.utils.FilterState
import com.maxrave.domain.utils.connectArtists
import com.maxrave.domain.utils.toListName
import com.maxrave.domain.utils.toSongEntity
import com.maxrave.logger.Logger
import com.maxrave.simpmusic.expect.copyToClipboard
import com.maxrave.simpmusic.expect.shareUrl
Expand All @@ -162,7 +162,6 @@ import com.maxrave.simpmusic.ui.icon.FavoriteBorder
import com.maxrave.simpmusic.ui.icon.KeyboardArrowDown
import com.maxrave.simpmusic.ui.icon.KeyboardDoubleArrowDown
import com.maxrave.simpmusic.ui.icon.KeyboardDoubleArrowUp
import com.maxrave.simpmusic.ui.icon.SkipNext
import com.maxrave.simpmusic.ui.icon.Lyrics
import com.maxrave.simpmusic.ui.icon.PeopleAlt
import com.maxrave.simpmusic.ui.icon.PlayCircle
Expand All @@ -173,6 +172,7 @@ import com.maxrave.simpmusic.ui.icon.Search
import com.maxrave.simpmusic.ui.icon.Sensors
import com.maxrave.simpmusic.ui.icon.Share
import com.maxrave.simpmusic.ui.icon.SimpIcons
import com.maxrave.simpmusic.ui.icon.SkipNext
import com.maxrave.simpmusic.ui.icon.Speed
import com.maxrave.simpmusic.ui.icon.Sync
import com.maxrave.simpmusic.ui.icon.SyncDisabled
Expand Down Expand Up @@ -215,11 +215,12 @@ import simpmusic.composeapp.generated.resources.bpm
import simpmusic.composeapp.generated.resources.can_not_be_empty
import simpmusic.composeapp.generated.resources.cancel
import simpmusic.composeapp.generated.resources.cancel_download
import simpmusic.composeapp.generated.resources.crop_cover
import simpmusic.composeapp.generated.resources.codec
import simpmusic.composeapp.generated.resources.copied_to_clipboard
import simpmusic.composeapp.generated.resources.create_new_queue_and_play
import simpmusic.composeapp.generated.resources.crop_cover
import simpmusic.composeapp.generated.resources.delete
import simpmusic.composeapp.generated.resources.delete_from_queue
import simpmusic.composeapp.generated.resources.delete_playlist
import simpmusic.composeapp.generated.resources.delete_song_from_playlist
import simpmusic.composeapp.generated.resources.description
Expand Down Expand Up @@ -249,10 +250,10 @@ import simpmusic.composeapp.generated.resources.lrclib
import simpmusic.composeapp.generated.resources.main_lyrics_provider
import simpmusic.composeapp.generated.resources.merging_audio_and_video
import simpmusic.composeapp.generated.resources.mime_type
import simpmusic.composeapp.generated.resources.minute_unit
import simpmusic.composeapp.generated.resources.move_down
import simpmusic.composeapp.generated.resources.move_up
import simpmusic.composeapp.generated.resources.move_to_play_next
import simpmusic.composeapp.generated.resources.delete_from_queue
import simpmusic.composeapp.generated.resources.move_up
import simpmusic.composeapp.generated.resources.no_album
import simpmusic.composeapp.generated.resources.no_description
import simpmusic.composeapp.generated.resources.no_playlist_found
Expand Down Expand Up @@ -283,8 +284,12 @@ import simpmusic.composeapp.generated.resources.share_url
import simpmusic.composeapp.generated.resources.simpmusic_lyrics
import simpmusic.composeapp.generated.resources.sleep_minutes
import simpmusic.composeapp.generated.resources.sleep_timer
import simpmusic.composeapp.generated.resources.sleep_timer_custom_option
import simpmusic.composeapp.generated.resources.sleep_timer_duration_minutes
import simpmusic.composeapp.generated.resources.sleep_timer_end_of_song
import simpmusic.composeapp.generated.resources.sleep_timer_end_of_song_option
import simpmusic.composeapp.generated.resources.sleep_timer_off
import simpmusic.composeapp.generated.resources.sleep_timer_one_hour
import simpmusic.composeapp.generated.resources.sleep_timer_set_error
import simpmusic.composeapp.generated.resources.sleep_timer_warning
import simpmusic.composeapp.generated.resources.sort_by
Expand Down Expand Up @@ -2300,12 +2305,12 @@ fun SleepTimerBottomSheet(

val presets =
listOf(
Preset("5 min", 5),
Preset("10 min", 10),
Preset("15 min", 15),
Preset("30 min", 30),
Preset("45 min", 45),
Preset("1 hour", 60),
Preset(stringResource(Res.string.sleep_timer_duration_minutes, 5), 5),
Preset(stringResource(Res.string.sleep_timer_duration_minutes, 10), 10),
Preset(stringResource(Res.string.sleep_timer_duration_minutes, 15), 15),
Preset(stringResource(Res.string.sleep_timer_duration_minutes, 30), 30),
Preset(stringResource(Res.string.sleep_timer_duration_minutes, 45), 45),
Preset(stringResource(Res.string.sleep_timer_one_hour), 60),
)

// Whether the Set button should be enabled
Expand Down Expand Up @@ -2434,7 +2439,7 @@ fun SleepTimerBottomSheet(
contentPadding = PaddingValues(vertical = 10.dp, horizontal = 4.dp),
) {
Text(
text = "End of song",
text = stringResource(Res.string.sleep_timer_end_of_song_option),
style = typo().bodySmall,
color = if (isEndSelected) seed else rememberSurfaceDarkColors().subtitle,
fontWeight = if (isEndSelected) FontWeight.SemiBold else FontWeight.Normal,
Expand Down Expand Up @@ -2462,7 +2467,7 @@ fun SleepTimerBottomSheet(
contentPadding = PaddingValues(vertical = 10.dp, horizontal = 4.dp),
) {
Text(
text = "Custom",
text = stringResource(Res.string.sleep_timer_custom_option),
style = typo().bodySmall,
color = if (isCustomSelected) seed else rememberSurfaceDarkColors().subtitle,
fontWeight = if (isCustomSelected) FontWeight.SemiBold else FontWeight.Normal,
Expand All @@ -2489,7 +2494,7 @@ fun SleepTimerBottomSheet(
},
suffix = {
Text(
text = "min",
text = stringResource(Res.string.minute_unit),
style = typo().bodySmall,
color = rememberSurfaceDarkColors().disabled,
)
Expand Down Expand Up @@ -3503,4 +3508,4 @@ sealed class DevLogInType {
is YouTube -> getString(Res.string.your_youtube_cookie)
is Discord -> getString(Res.string.your_discord_token)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.maxrave.simpmusic.ui.theme.LocalIsDarkTheme
import org.jetbrains.compose.resources.stringResource
import simpmusic.composeapp.generated.resources.Res
import simpmusic.composeapp.generated.resources.introducing_simpmusic_chart

@Composable
fun SimpMusicChartButton(
Expand Down Expand Up @@ -52,7 +55,7 @@ fun SimpMusicChartButton(

// Text
Text(
text = "Introducing SimpMusic Chart",
text = stringResource(Res.string.introducing_simpmusic_chart),
fontSize = 13.sp,
color = labelColor,
fontWeight = FontWeight.Normal
Expand All @@ -72,4 +75,4 @@ fun PreviewSimpMusicChartButton() {
) {
SimpMusicChartButton(onClick = {})
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import org.jetbrains.compose.resources.stringResource
import simpmusic.composeapp.generated.resources.Res
import simpmusic.composeapp.generated.resources.cancel
import simpmusic.composeapp.generated.resources.downvote
import simpmusic.composeapp.generated.resources.lyrics_vote_count
import simpmusic.composeapp.generated.resources.lyrics_vote_id
import simpmusic.composeapp.generated.resources.rate_lyrics
import simpmusic.composeapp.generated.resources.rate_translated_lyrics
import simpmusic.composeapp.generated.resources.upvote
Expand Down Expand Up @@ -105,7 +107,7 @@ private fun VoteRow(
style = typo().bodySmall,
)
Text(
text = "ID: ${voteState.id}",
text = stringResource(Res.string.lyrics_vote_id, voteState.id.toString()),
style = typo().bodySmall,
)
}
Expand All @@ -115,7 +117,7 @@ private fun VoteRow(
verticalArrangement = Arrangement.spacedBy(8.dp),
) {
Text(
text = "Vote: ${voteState.vote}",
text = stringResource(Res.string.lyrics_vote_count, voteState.vote.toString()),
style = typo().bodySmall,
)
when (voteState.state) {
Expand Down Expand Up @@ -172,4 +174,4 @@ private fun VoteRow(
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
import simpmusic.composeapp.generated.resources.Res
import simpmusic.composeapp.generated.resources.album
import simpmusic.composeapp.generated.resources.new_blog_post
import simpmusic.composeapp.generated.resources.new_release
import simpmusic.composeapp.generated.resources.no_notification
import simpmusic.composeapp.generated.resources.notification
Expand Down Expand Up @@ -348,7 +349,7 @@ fun BlogNotificationItem(notification: NotificationEntity) {
}
Spacer(modifier = Modifier.width(12.dp))
Column(Modifier.padding(end = 56.dp)) {
Text(text = "New blog post", style = typo().titleSmall)
Text(text = stringResource(Res.string.new_blog_post), style = typo().titleSmall)
Spacer(modifier = Modifier.height(3.dp))
Text(text = notification.name, style = typo().titleMedium)
notification.description?.takeIf { it.isNotBlank() }?.let { desc ->
Expand Down Expand Up @@ -447,4 +448,4 @@ fun ItemAlbumNotification(
)
}
}
}
}