kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 14:50:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2711 from Isira-Seneviratne/ConfigurationCompat

Browse Source 
Use ConfigurationCompat.getLocales().
This commit is contained in:
Bnyro 2023-01-16 15:02:00 +01:00 committed by GitHub
commit b925c58119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -27,6 +27,7 @@ import android.widget.Toast
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.constraintlayout.motion.widget.MotionLayout import androidx.constraintlayout.motion.widget.MotionLayout
import androidx.core.net.toUri import androidx.core.net.toUri
import androidx.core.os.ConfigurationCompat
import androidx.core.os.bundleOf import androidx.core.os.bundleOf
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
@ -829,11 +830,8 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
} }
private fun localizedDate(date: String?): String? { private fun localizedDate(date: String?): String? {
return if (SDK_INT >= Build.VERSION_CODES.N) { val locale = ConfigurationCompat.getLocales(resources.configuration)[0]!!
TextUtils.localizeDate(date, resources.configuration.locales[0]) return TextUtils.localizeDate(date, locale)
} else {
TextUtils.localizeDate(date)
}
} }
private fun handleLiveVideo() { private fun handleLiveVideo() {

2
app/src/main/java/com/github/libretube/util/TextUtils.kt
View File

@ -45,7 +45,7 @@ object TextUtils {
* @param locale The locale to use, otherwise uses system default * @param locale The locale to use, otherwise uses system default
* return Localized date string * return Localized date string
*/ */
fun localizeDate(date: String?, locale: Locale? = null): String? { fun localizeDate(date: String?, locale: Locale): String? {
date ?: return null date ?: return null
// relative time span // relative time span