x/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2026-05-16 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bottom bar highlighting change

Browse Source
This commit is contained in:
Kelvin
2025-11-13 14:52:16 +01:00
parent 8cc82e4d16
commit e8d1f73e29
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt
+30 -5
View File
@@ -142,6 +142,10 @@ class MenuBottomBarFragment : MainActivityFragment() {
moreOverlay.visibility = VISIBLE moreOverlay.visibility = VISIBLE
val animations = arrayListOf<Animator>() val animations = arrayListOf<Animator>()
animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 0.0f, 1.0f).setDuration(duration)) animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 0.0f, 1.0f).setDuration(duration))
_bottomButtons.find { it.definition.id == 99 }?.let {
animations.add(ObjectAnimator.ofFloat(it, "alpha", 0.4f, 1.0f)
.setDuration(duration));
}
for ((index, button) in _moreButtons.withIndex()) { for ((index, button) in _moreButtons.withIndex()) {
val i = _moreButtons.size - index val i = _moreButtons.size - index
@@ -157,7 +161,13 @@ class MenuBottomBarFragment : MainActivityFragment() {
animatorSet.start() animatorSet.start()
} else { } else {
val animations = arrayListOf<Animator>() val animations = arrayListOf<Animator>()
animations.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f).setDuration(duration)) animations
.add(ObjectAnimator.ofFloat(moreOverlayBackground, "alpha", 1.0f, 0.0f)
.setDuration(duration))
_bottomButtons.find { it.definition.id == 99 }?.let {
animations.add(ObjectAnimator.ofFloat(it, "alpha", 1.0f, 0.4f)
.setDuration(duration));
}
for ((index, button) in _moreButtons.withIndex()) { for ((index, button) in _moreButtons.withIndex()) {
val i = _moreButtons.size - index val i = _moreButtons.size - index
@@ -259,7 +269,7 @@ class MenuBottomBarFragment : MainActivityFragment() {
for(button in _bottomButtons.toList()) for(button in _bottomButtons.toList())
button.updateActive(_fragment); button.updateActive(_fragment);
for(button in _moreButtons.toList()) for(button in _moreButtons.toList())
button.updateActive(_fragment); button.updateActive(_fragment, true);
} }
override fun onConfigurationChanged(newConfig: Configuration?) { override fun onConfigurationChanged(newConfig: Configuration?) {
@@ -353,7 +363,14 @@ class MenuBottomBarFragment : MainActivityFragment() {
this.definition = def; this.definition = def;
_buttonImage = findViewById(R.id.image_button); _buttonImage = findViewById(R.id.image_button);
_buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon); //_buttonImage.setImageResource(if (def.isActive(fragment)) def.iconActive else def.icon);
_buttonImage.setImageResource(definition.iconActive);
if(definition.isActive(fragment) || isMore) {
this.alpha = 1f;
}
else {
this.alpha = 0.4f;
}
_textButton = findViewById(R.id.text_button); _textButton = findViewById(R.id.text_button);
_textButton.text = resources.getString(def.string); _textButton.text = resources.getString(def.string);
@@ -364,8 +381,16 @@ class MenuBottomBarFragment : MainActivityFragment() {
} }
} }
fun updateActive(fragment: MenuBottomBarFragment) { fun updateActive(fragment: MenuBottomBarFragment, isMore: Boolean = false, overrideValue: Boolean? = null) {
_buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon); //_buttonImage.setImageResource(if (definition.isActive(fragment)) definition.iconActive else definition.icon);
_buttonImage.setImageResource(definition.iconActive);
val isActive = overrideValue ?: definition.isActive(fragment) || isMore
if(isActive) {
this.alpha = 1f;
}
else {
this.alpha = 0.4f;
}
} }
} }
} }