Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all: cleanup

Browse source
This commit is contained in:
Alexander Capehart 2024-07-04 15:44:15 -06:00
parent b89499fb36
commit 3d177b05f1
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/org/oxycblt/auxio/MainFragment.kt
View file

@ -35,9 +35,7 @@ import com.google.android.material.bottomsheet.BackportBottomSheetBehavior
import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.shape.MaterialShapeDrawable
import com.google.android.material.shape.ShapeAppearanceModel import com.google.android.material.shape.ShapeAppearanceModel
import com.google.android.material.transition.MaterialFadeThrough import com.google.android.material.transition.MaterialFadeThrough
import com.leinardi.android.speeddial.SpeedDialOverlayLayout
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import java.lang.reflect.Field
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
import org.oxycblt.auxio.databinding.FragmentMainBinding import org.oxycblt.auxio.databinding.FragmentMainBinding
@ -60,7 +58,6 @@ import org.oxycblt.auxio.util.context
import org.oxycblt.auxio.util.coordinatorLayoutBehavior import org.oxycblt.auxio.util.coordinatorLayoutBehavior
import org.oxycblt.auxio.util.getAttrColorCompat import org.oxycblt.auxio.util.getAttrColorCompat
import org.oxycblt.auxio.util.getDimen import org.oxycblt.auxio.util.getDimen
import org.oxycblt.auxio.util.lazyReflectedField
import org.oxycblt.auxio.util.logD import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.navigateSafe import org.oxycblt.auxio.util.navigateSafe
import org.oxycblt.auxio.util.unlikelyToBeNull import org.oxycblt.auxio.util.unlikelyToBeNull
@ -239,18 +236,13 @@ class MainFragment :
binding.queueSheet.coordinatorLayoutBehavior as QueueBottomSheetBehavior? binding.queueSheet.coordinatorLayoutBehavior as QueueBottomSheetBehavior?
val playbackRatio = max(playbackSheetBehavior.calculateSlideOffset(), 0f) val playbackRatio = max(playbackSheetBehavior.calculateSlideOffset(), 0f)
if (playbackRatio > 0f) { if (playbackRatio > 0f && homeModel.speedDialOpen.value) {
if (homeModel.speedDialOpen.value) { // Stupid hack to prevent you from sliding the sheet up without closing the speed
// Stupid hack to prevent you from sliding the sheet up without closing the speed // dial. Filtering out ACTION_MOVE events will cause back gestures to close the
// dial. Filtering out ACTION_MOVE events will cause back gestures to close the // speed dial, which is super finicky behavior.
// speed homeModel.setSpeedDialOpen(false)
// dial, which is super finicky behavior.
homeModel.setSpeedDialOpen(false)
}
homeModel.setSheetRising(true)
} else {
homeModel.setSheetRising(false)
} }
homeModel.setSheetObscuresFab(playbackRatio > 0f)
val playbackOutRatio = 1 - min(playbackRatio * 2, 1f) val playbackOutRatio = 1 - min(playbackRatio * 2, 1f)
val playbackInRatio = max(playbackRatio - 0.5f, 0f) * 2 val playbackInRatio = max(playbackRatio - 0.5f, 0f) * 2
@ -508,13 +500,11 @@ class MainFragment :
} }
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
// If expanded, collapse the queue sheet first.
if (queueSheetShown()) { if (queueSheetShown()) {
unlikelyToBeNull(queueSheetBehavior).handleBackInvoked() unlikelyToBeNull(queueSheetBehavior).handleBackInvoked()
return return
} }
// If expanded, collapse the playback sheet next.
if (playbackSheetShown()) { if (playbackSheetShown()) {
playbackSheetBehavior.handleBackInvoked() playbackSheetBehavior.handleBackInvoked()
return return
@ -585,9 +575,4 @@ class MainFragment :
isEnabled = open isEnabled = open
} }
} }
private companion object {
val SPEED_DIAL_OVERLAY_ANIMATION_DURATION_FIELD: Field by
lazyReflectedField(SpeedDialOverlayLayout::class, "mAnimationDuration")
}
} }

2
app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt
View file

@ -310,7 +310,7 @@ constructor(
_speedDialOpen.value = speedDialOpen _speedDialOpen.value = speedDialOpen
} }
fun setSheetRising(sheetRising: Boolean) { fun setSheetObscuresFab(sheetRising: Boolean) {
logD("Updating sheet rising state: $sheetRising") logD("Updating sheet rising state: $sheetRising")
_sheetObscuresFab.value = sheetRising _sheetObscuresFab.value = sheetRising
} }