@@ -9,12 +9,10 @@ import android.os.CountDownTimer
9
9
import android.os.ParcelFileDescriptor
10
10
import android.provider.MediaStore
11
11
import android.util.Log
12
- import androidx.compose.runtime.Composable
13
12
import androidx.compose.runtime.getValue
14
13
import androidx.compose.runtime.mutableIntStateOf
15
14
import androidx.compose.runtime.mutableStateOf
16
15
import androidx.compose.runtime.setValue
17
- import androidx.compose.ui.res.stringResource
18
16
import androidx.lifecycle.AndroidViewModel
19
17
import androidx.lifecycle.viewModelScope
20
18
import androidx.media3.common.MediaItem
@@ -26,6 +24,7 @@ import androidx.media3.session.MediaController
26
24
import androidx.media3.session.SessionToken
27
25
import com.google.common.util.concurrent.MoreExecutors
28
26
import com.kyant.taglib.TagLib
27
+ import com.sosauce.cutemusic.R
29
28
import com.sosauce.cutemusic.data.MusicState
30
29
import com.sosauce.cutemusic.data.actions.PlayerActions
31
30
import com.sosauce.cutemusic.domain.model.Lyrics
@@ -44,7 +43,6 @@ import kotlinx.coroutines.flow.asStateFlow
44
43
import kotlinx.coroutines.launch
45
44
import java.io.File
46
45
import java.io.FileNotFoundException
47
- import com.sosauce.cutemusic.R
48
46
49
47
class MusicViewModel (
50
48
private val application : Application ,
@@ -217,14 +215,12 @@ class MusicViewModel(
217
215
}
218
216
}
219
217
220
- @SuppressLint(" StateFlowValueCalledInComposition" )
221
- @Composable
222
218
fun loadEmbeddedLyrics (): String {
223
219
224
220
val fd = getFileDescriptorFromPath(application, musicState.value.currentPath)
225
221
return fd?.dup()?.detachFd()?.let {
226
- TagLib .getMetadata(it)?.propertyMap[" LYRICS" ]?.getOrNull(0 ) ? : stringResource(id = R .string.no_lyrics_note)
227
- } ? : stringResource(id = R .string.no_lyrics_note)
222
+ TagLib .getMetadata(it)?.propertyMap[" LYRICS" ]?.getOrNull(0 ) ? : application.getString( R .string.no_lyrics_note)
223
+ } ? : application.getString( R .string.no_lyrics_note)
228
224
229
225
}
230
226
0 commit comments