Updated MDC
This commit is contained in:
parent
9b9def5a73
commit
802cab7818
5 changed files with 13 additions and 11 deletions
|
@ -62,9 +62,9 @@ import code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment
|
|||
import code.name.monkey.retromusic.helper.MusicPlayerRemote
|
||||
import code.name.monkey.retromusic.model.CategoryInfo
|
||||
import code.name.monkey.retromusic.util.PreferenceUtil
|
||||
import code.name.monkey.retromusic.util.RetroUtil
|
||||
import code.name.monkey.retromusic.util.ViewUtil
|
||||
import com.google.android.material.bottomsheet.BottomSheetBehavior.*
|
||||
import dev.chrisbanes.insetter.applyInsetter
|
||||
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||
|
||||
|
||||
|
@ -145,9 +145,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
|
|||
windowInsets = insets
|
||||
insets
|
||||
}
|
||||
if (RetroUtil.isLandscape()) {
|
||||
binding.slidingPanel.drawAboveSystemBarsWithPadding()
|
||||
}
|
||||
chooseFragmentForTheme()
|
||||
setupSlidingUpPanel()
|
||||
setupBottomSheet()
|
||||
|
@ -357,7 +354,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
|
|||
}
|
||||
}
|
||||
|
||||
fun setBottomNavVisibility(visible: Boolean, animate: Boolean = false, hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty()) {
|
||||
fun setBottomNavVisibility(
|
||||
visible: Boolean,
|
||||
animate: Boolean = false,
|
||||
hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty()
|
||||
) {
|
||||
if (isInOneTabMode) {
|
||||
hideBottomSheet(
|
||||
hide = hideBottomSheet,
|
||||
|
|
|
@ -24,7 +24,6 @@ import android.text.TextWatcher
|
|||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import android.view.inputmethod.InputMethodManager
|
||||
import androidx.annotation.IdRes
|
||||
import androidx.core.content.getSystemService
|
||||
import androidx.core.view.*
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
|
@ -52,7 +51,7 @@ import java.util.*
|
|||
|
||||
|
||||
class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWatcher,
|
||||
ChipGroup.OnCheckedChangeListener {
|
||||
ChipGroup.OnCheckedStateChangeListener {
|
||||
companion object {
|
||||
const val QUERY = "query"
|
||||
const val REQ_CODE_SPEECH_INPUT = 9001
|
||||
|
@ -134,7 +133,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa
|
|||
it.chipBackgroundColor = ColorStateList(states, colors)
|
||||
}
|
||||
}
|
||||
binding.searchFilterGroup.setOnCheckedChangeListener(this)
|
||||
binding.searchFilterGroup.setOnCheckedStateChangeListener(this)
|
||||
}
|
||||
|
||||
private fun showData(data: List<Any>) {
|
||||
|
@ -241,7 +240,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa
|
|||
}
|
||||
}
|
||||
|
||||
override fun onCheckedChanged(group: ChipGroup?, @IdRes checkedId: Int) {
|
||||
override fun onCheckedChanged(group: ChipGroup, checkedIds: MutableList<Int>) {
|
||||
search(binding.searchView.text.toString())
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,8 @@ class BottomNavigationBarTinted @JvmOverloads constructor(
|
|||
} else {
|
||||
applyInsetter {
|
||||
type(navigationBars = true) {
|
||||
padding()
|
||||
padding(vertical = true)
|
||||
margin(horizontal = true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -188,6 +188,7 @@
|
|||
</style>
|
||||
|
||||
<style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
|
||||
<item name="paddingBottomSystemWindowInsets">false</item>
|
||||
<item name="android:maxWidth">@empty</item>
|
||||
</style>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ buildscript {
|
|||
ext {
|
||||
kotlin_version = '1.6.10'
|
||||
navigation_version = '2.4.1'
|
||||
mdc_version = '1.5.0'
|
||||
mdc_version = '1.6.0-beta01'
|
||||
preference_version = '1.2.0'
|
||||
appcompat_version = '1.4.1'
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue