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

Merge pull request #3953 from Bnyro/master

Browse Source 
Fix crash when opening description while chapter updates
This commit is contained in:
Bnyro 2023-06-08 19:15:02 +02:00 committed by GitHub
commit d27e5fae0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/extensions/FormatShort.kt
View File

@ -16,7 +16,7 @@ fun Long?.formatShort(): String {
val units = arrayOf("", "K", "M", "B", "T") val units = arrayOf("", "K", "M", "B", "T")
for (i in units.size downTo 1) { for (i in units.size downTo 1) {
val step = 1000.0.pow(i.toDouble()) val step = 1000.0.pow(i.toDouble())
if (value > step) return String.format("%3.0f%s", value / step, units[i]).trim() if (value > step) return "%3.0f%s".format(value / step, units[i]).trim()
} }
value.toString() value.toString()
} }

2
app/src/main/java/com/github/libretube/helpers/ThemeHelper.kt
View File

@ -133,7 +133,7 @@ object ThemeHelper {
*/ */
fun getStyledAppName(context: Context): Spanned { fun getStyledAppName(context: Context): Spanned {
val colorPrimary = getThemeColor(context, androidx.appcompat.R.attr.colorPrimaryDark) val colorPrimary = getThemeColor(context, androidx.appcompat.R.attr.colorPrimaryDark)
val hexColor = String.format("#%06X", (0xFFFFFF and colorPrimary)) val hexColor = "#%06X".format(0xFFFFFF and colorPrimary)
return "Libre<span style='color:$hexColor';>Tube</span>" return "Libre<span style='color:$hexColor';>Tube</span>"
.parseAsHtml(HtmlCompat.FROM_HTML_MODE_COMPACT) .parseAsHtml(HtmlCompat.FROM_HTML_MODE_COMPACT)
} }

4
app/src/main/java/com/github/libretube/ui/adapters/ChaptersAdapter.kt
View File

@ -53,7 +53,5 @@ class ChaptersAdapter(
notifyItemChanged(newPosition) notifyItemChanged(newPosition)
} }
override fun getItemCount(): Int { override fun getItemCount() = chapters.size
return chapters.size
}
} }

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

@ -563,7 +563,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
streams.views.formatShort() streams.views.formatShort()
} else { } else {
// show exact view count // show exact view count
String.format("%,d", streams.views) "%,d".format(streams.views)
} }
val viewInfo = getString(R.string.normal_views, views, localizeDate(streams)) val viewInfo = getString(R.string.normal_views, views, localizeDate(streams))
if (binding.descLinLayout.isVisible) { if (binding.descLinLayout.isVisible) {
@ -586,9 +586,8 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
if (this::chapters.isInitialized && chapters.isNotEmpty()) { if (this::chapters.isInitialized && chapters.isNotEmpty()) {
val chapterIndex = getCurrentChapterIndex() ?: return val chapterIndex = getCurrentChapterIndex() ?: return
// scroll to the current chapter in the chapterRecView in the description // scroll to the current chapter in the chapterRecView in the description
val layoutManager = binding.chaptersRecView.layoutManager as LinearLayoutManager binding.chaptersRecView.scrollToPosition(chapterIndex)
layoutManager.scrollToPositionWithOffset(chapterIndex, 0) // set selected item, that should be highlighted
// set selected
val chaptersAdapter = binding.chaptersRecView.adapter as ChaptersAdapter val chaptersAdapter = binding.chaptersRecView.adapter as ChaptersAdapter
chaptersAdapter.updateSelectedPosition(chapterIndex) chaptersAdapter.updateSelectedPosition(chapterIndex)
} }

3
app/src/main/res/layout/chapter_column.xml
View File

@ -6,6 +6,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:backgroundTint="@android:color/transparent" android:backgroundTint="@android:color/transparent"
android:layout_marginHorizontal="1dp"
app:strokeWidth="0dp"> app:strokeWidth="0dp">
<LinearLayout <LinearLayout
@ -13,7 +14,7 @@
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="5dp"> android:padding="5dp">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"