Funkwhale/Otter-App-Android-Funkwhale
1
0
Fork 0
mirror of https://github.com/apognu/otter synced 2025-02-18 19:50:35 +01:00
Code Issues Releases Wiki Activity

Cleaned up DisableableFrameLayout.

Browse Source
This commit is contained in:
Antoine POPINEAU 2020-07-12 19:05:51 +02:00
parent 1e62cc1f4e
commit 85e9f14e2a
No known key found for this signature in database
GPG Key ID: A78AC64694F84063
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/github/apognu/otter/activities/MainActivity.kt
View File

@ -78,15 +78,14 @@ class MainActivity : AppCompatActivity() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
(container as? DisableableFrameLayout)?.callback = object : DisableableFrameLayout.Callback { (container as? DisableableFrameLayout)?.setShouldRegisterTouch { _ ->
override fun shouldRegisterTouch(): Boolean { if (now_playing.isOpened()) {
if (now_playing.isOpened()) { now_playing.close()
now_playing.close()
return false
}
return true return@setShouldRegisterTouch false
} }
true
} }
favoritedRepository.update(this, lifecycleScope) favoritedRepository.update(this, lifecycleScope)

14
app/src/main/java/com/github/apognu/otter/views/InterceptedFrameLayout.kt → app/src/main/java/com/github/apognu/otter/views/DisableableFrameLayout.kt
View File

@ -6,21 +6,21 @@ import android.view.MotionEvent
import android.widget.FrameLayout import android.widget.FrameLayout
class DisableableFrameLayout : FrameLayout { class DisableableFrameLayout : FrameLayout {
interface Callback { var callback: ((MotionEvent?) -> Boolean)? = null
fun shouldRegisterTouch(): Boolean
}
var callback: Callback? = null
constructor(context: Context) : super(context) constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, style: Int) : super(context, attrs, style) constructor(context: Context, attrs: AttributeSet?, style: Int) : super(context, attrs, style)
override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean { override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
callback?.let { callback?.let {
return !it.shouldRegisterTouch() return !it(event)
} }
return false return false
} }
fun setShouldRegisterTouch(callback: (event: MotionEvent?) -> Boolean) {
this.callback = callback
}
} }