mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-08-04 07:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fix for bottom menu bar for specific screen dimensions.

Browse source
This commit is contained in:
Koen 2023-11-07 16:02:55 +01:00
commit e28dc7a3a6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt
View file

@ -218,14 +218,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
if (buyIndex != -1) { if (buyIndex != -1) {
val button = buttons[buyIndex] val button = buttons[buyIndex]
buttons.removeAt(buyIndex) buttons.removeAt(buyIndex)
buttons.add(0, button) buttons.add(buttons.size, button)
} }
//Force faq to be second //Force faq to be second
val faqIndex = buttons.indexOfFirst { b -> b.id == 97 }; val faqIndex = buttons.indexOfFirst { b -> b.id == 97 };
if (faqIndex != -1) { if (faqIndex != -1) {
val button = buttons[faqIndex] val button = buttons[faqIndex]
buttons.removeAt(faqIndex) buttons.removeAt(faqIndex)
buttons.add(1, button) buttons.add(buttons.size, button)
} }
for (data in buttons) { for (data in buttons) {
@ -252,8 +252,8 @@ class MenuBottomBarFragment : MainActivityFragment() {
val defs = currentButtonDefinitions?.toMutableList() ?: return val defs = currentButtonDefinitions?.toMutableList() ?: return
val metrics = StateApp.instance.displayMetrics ?: resources.displayMetrics; val metrics = StateApp.instance.displayMetrics ?: resources.displayMetrics;
_buttonsVisible = floor(metrics.widthPixels.toDouble() / 65.dp(resources).toDouble()).roundToInt(); _buttonsVisible = floor(metrics.widthPixels.toDouble() / 65.dp(resources).toDouble()).roundToInt();
if (_buttonsVisible - 2 >= defs.size) { if (_buttonsVisible - 1 >= defs.size) {
updateBottomMenuButtons(defs.slice(IntRange(0, defs.size - 1)).toMutableList(), false); updateBottomMenuButtons(defs.toMutableList(), false);
} else { } else {
updateBottomMenuButtons(defs.slice(IntRange(0, _buttonsVisible - 2)).toMutableList(), true); updateBottomMenuButtons(defs.slice(IntRange(0, _buttonsVisible - 2)).toMutableList(), true);
updateMoreButtons(defs.slice(IntRange(_buttonsVisible - 1, defs.size - 1)).toMutableList()); updateMoreButtons(defs.slice(IntRange(_buttonsVisible - 1, defs.size - 1)).toMutableList());