Skip to content

Commit 476cb2a

Browse files
committed
fixed reproducible build
1 parent 38b19fa commit 476cb2a

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

app/.DS_Store

0 Bytes
Binary file not shown.

app/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
applicationId = "com.sosauce.cutemusic"
1616
minSdk = 26
1717
targetSdk = 35
18-
versionCode = 19
19-
versionName = "2.3.2"
18+
versionCode = 20
19+
versionName = "2.3.3"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
vectorDrawables {
2222
useSupportLibrary = true
14 Bytes
Binary file not shown.
42 Bytes
Binary file not shown.

app/release/output-metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 18,
15-
"versionName": "2.3.1",
14+
"versionCode": 19,
15+
"versionName": "2.3.2",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

app/src/main/java/com/sosauce/cutemusic/ui/shared_components/MusicViewModel.kt

+3-7
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ import android.os.CountDownTimer
99
import android.os.ParcelFileDescriptor
1010
import android.provider.MediaStore
1111
import android.util.Log
12-
import androidx.compose.runtime.Composable
1312
import androidx.compose.runtime.getValue
1413
import androidx.compose.runtime.mutableIntStateOf
1514
import androidx.compose.runtime.mutableStateOf
1615
import androidx.compose.runtime.setValue
17-
import androidx.compose.ui.res.stringResource
1816
import androidx.lifecycle.AndroidViewModel
1917
import androidx.lifecycle.viewModelScope
2018
import androidx.media3.common.MediaItem
@@ -26,6 +24,7 @@ import androidx.media3.session.MediaController
2624
import androidx.media3.session.SessionToken
2725
import com.google.common.util.concurrent.MoreExecutors
2826
import com.kyant.taglib.TagLib
27+
import com.sosauce.cutemusic.R
2928
import com.sosauce.cutemusic.data.MusicState
3029
import com.sosauce.cutemusic.data.actions.PlayerActions
3130
import com.sosauce.cutemusic.domain.model.Lyrics
@@ -44,7 +43,6 @@ import kotlinx.coroutines.flow.asStateFlow
4443
import kotlinx.coroutines.launch
4544
import java.io.File
4645
import java.io.FileNotFoundException
47-
import com.sosauce.cutemusic.R
4846

4947
class MusicViewModel(
5048
private val application: Application,
@@ -217,14 +215,12 @@ class MusicViewModel(
217215
}
218216
}
219217

220-
@SuppressLint("StateFlowValueCalledInComposition")
221-
@Composable
222218
fun loadEmbeddedLyrics(): String {
223219

224220
val fd = getFileDescriptorFromPath(application, musicState.value.currentPath)
225221
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)
228224

229225
}
230226

app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@
7474
<string name="manage_shown_tabs">Manage shown tabs</string>
7575
<string name="set_sleep_timer">Set sleep timer</string>
7676
<string name="go_to">Go to:</string>
77-
<string name="no_lyrics_note">No Lyrics Found !</string>
77+
<string name="no_lyrics_note">No lyrics found !</string>
7878
</resources>

0 commit comments

Comments
 (0)