From 8c0d05498791211e6701fdb54a90a9b2cbb23a86 Mon Sep 17 00:00:00 2001 From: Nguyen Duc Tuan Minh Date: Sun, 11 Aug 2024 16:38:39 +0700 Subject: [PATCH] Hotfix --- app/build.gradle.kts | 4 +-- .../com/maxrave/simpmusic/extension/AllExt.kt | 18 ++--------- .../service/SimpleMediaServiceHandler.kt | 3 ++ app/src/main/res/raw/aboutlibraries.json | 30 +++++++++---------- app/src/main/res/values/strings.xml | 2 +- .../metadata/android/en-US/changelogs/20.txt | 1 + .../metadata/android/vi-VN/changelogs/20.txt | 1 + 7 files changed, 25 insertions(+), 34 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/20.txt create mode 100644 fastlane/metadata/android/vi-VN/changelogs/20.txt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 590bd315..10da7cd6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,8 +18,8 @@ android { applicationId = "com.maxrave.simpmusic" minSdk = 26 targetSdk = 35 - versionCode = 19 - versionName = "0.2.3" + versionCode = 20 + versionName = "0.2.3-hotfix" vectorDrawables.useSupportLibrary = true ksp { diff --git a/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt b/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt index 9830d9fc..5d4dd99d 100644 --- a/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt +++ b/app/src/main/java/com/maxrave/simpmusic/extension/AllExt.kt @@ -865,7 +865,7 @@ fun LocalDateTime.formatTimeAgo(context: Context): String { hoursDiff >= 24 -> context.getString(R.string.day_s_ago, daysDiff) hoursDiff > 1 -> context.getString(R.string.hour_s_ago, hoursDiff) hoursDiff <= 1 -> context.getString(R.string.recently) - else -> context.getString(androidx.media3.ui.R.string.exo_track_unknown) + else -> context.getString(R.string.unknown) } } @@ -875,21 +875,7 @@ fun formatDuration(duration: Long): String { TimeUnit.SECONDS.convert(duration, TimeUnit.MILLISECONDS) - minutes * TimeUnit.SECONDS.convert(1, TimeUnit.MINUTES) ) - return "%02d:%02d".format(minutes, seconds) -} - -fun String?.format(vararg data: Any): String { - return try { - if (this != null) { - String.format(Locale.getDefault(), this, data) - } - else { - "" - } - } - catch (e: Exception) { - "" - } + return String.format(Locale.ENGLISH, "%02d:%02d", minutes, seconds) } fun parseTimestampToMilliseconds(timestamp: String): Double { diff --git a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt index a672dd18..fc0c2ecf 100644 --- a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt +++ b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaServiceHandler.kt @@ -1431,6 +1431,9 @@ class SimpleMediaServiceHandler( ) Log.d("MusicSource", "updateCatalog: ${track.title}") } + if (!player.isPlaying) { + player.playWhenReady = false + } _queueData.value = _queueData.value?.addTrackList(catalogMetadata) _stateFlow.value = StateSource.STATE_INITIALIZED } diff --git a/app/src/main/res/raw/aboutlibraries.json b/app/src/main/res/raw/aboutlibraries.json index ffa9d3ff..1a815fb6 100644 --- a/app/src/main/res/raw/aboutlibraries.json +++ b/app/src/main/res/raw/aboutlibraries.json @@ -113,14 +113,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "1.8.0", + "artifactVersion": "1.8.1", "description": "Provides source annotations for tooling and readability.", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "Annotation", - "website": "https://developer.android.com/jetpack/androidx/releases/annotation#1.8.0", + "website": "https://developer.android.com/jetpack/androidx/releases/annotation#1.8.1", "licenses": [ "Apache-2.0" ], @@ -1105,7 +1105,7 @@ "developers": [ ], - "artifactVersion": "8.5.1", + "artifactVersion": "8.5.2", "description": "", "name": "androidx.databinding:viewbinding", "licenses": [ @@ -2549,14 +2549,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "3.3.1", + "artifactVersion": "3.3.2", "description": "Android Paging-Common", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "Paging-Common", - "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.1", + "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.2", "licenses": [ "Apache-2.0" ], @@ -2574,14 +2574,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "3.3.1", + "artifactVersion": "3.3.2", "description": "Kotlin extensions for 'paging-common' artifact", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "Paging-Common Kotlin Extensions", - "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.1", + "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.2", "licenses": [ "Apache-2.0" ], @@ -2599,14 +2599,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "3.3.1", + "artifactVersion": "3.3.2", "description": "Android Paging-Runtime", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "Paging-Runtime", - "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.1", + "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.2", "licenses": [ "Apache-2.0" ], @@ -2624,14 +2624,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "3.3.1", + "artifactVersion": "3.3.2", "description": "Kotlin extensions for 'paging-runtime' artifact", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "Paging-Runtime Kotlin Extensions", - "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.1", + "website": "https://developer.android.com/jetpack/androidx/releases/paging#3.3.2", "licenses": [ "Apache-2.0" ], @@ -3221,14 +3221,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "2.9.0", + "artifactVersion": "2.9.1", "description": "Android WorkManager runtime library", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "WorkManager Runtime", - "website": "https://developer.android.com/jetpack/androidx/releases/work#2.9.0", + "website": "https://developer.android.com/jetpack/androidx/releases/work#2.9.1", "licenses": [ "Apache-2.0" ], @@ -3246,14 +3246,14 @@ "name": "The Android Open Source Project" } ], - "artifactVersion": "2.9.0", + "artifactVersion": "2.9.1", "description": "Android WorkManager Kotlin Extensions", "scm": { "connection": "scm:git:https://android.googlesource.com/platform/frameworks/support", "url": "https://cs.android.com/androidx/platform/frameworks/support" }, "name": "WorkManager Kotlin Extensions", - "website": "https://developer.android.com/jetpack/androidx/releases/work#2.9.0", + "website": "https://developer.android.com/jetpack/androidx/releases/work#2.9.1", "licenses": [ "Apache-2.0" ], diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b817a71f..c8dea3b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -155,7 +155,7 @@ Your device doesn\'t have equalizer Open system equalizer Use your system equalizer - v0.2.3 + v0.2.3-hotfix Streaming data provider (Piped) Itag Mime Type diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt new file mode 100644 index 00000000..8bfc7767 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/20.txt @@ -0,0 +1 @@ +- Fix bugs \ No newline at end of file diff --git a/fastlane/metadata/android/vi-VN/changelogs/20.txt b/fastlane/metadata/android/vi-VN/changelogs/20.txt new file mode 100644 index 00000000..7ec85140 --- /dev/null +++ b/fastlane/metadata/android/vi-VN/changelogs/20.txt @@ -0,0 +1 @@ +- Sửa lỗi \ No newline at end of file