Mastodon/SubwayTooter-Android-App
1
0
Fork 0
mirror of https://github.com/tateisu/SubwayTooter synced 2025-01-30 18:44:52 +01:00
Code Issues Releases Wiki Activity

rename to OutsideDrawerLayout

Browse Source
This commit is contained in:
tateisu 2020-02-11 18:11:06 +09:00
parent 2bfd7d6011
commit 1461506ce4
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.kt
View File

@ -1643,7 +1643,7 @@ class ColumnViewHolder(
layoutParams = lp
}
llColumnHeader = customView<CutoutLinearLayout> {
llColumnHeader = customView<OutsideDrawerLayout> {
lparams(matchParent, wrapContent)
orientation = LinearLayout.VERTICAL
@ -1730,7 +1730,7 @@ class ColumnViewHolder(
color = getAttributeColor(context, R.attr.colorSearchFormBackground)
}
val path = Path()
addCutoutDrawer(this){canvas,parent,view,left,top->
addOutsideDrawer(this){ canvas, parent, view, left, top->
if( llAnnouncementsBox.visibility == View.VISIBLE){
val viewW = view.width
val viewH = view.height
@ -1780,7 +1780,7 @@ class ColumnViewHolder(
color = getAttributeColor(context, R.attr.colorColumnSettingBackground)
}
val path = Path()
addCutoutDrawer(this){canvas,parent,view,left,top->
addOutsideDrawer(this){ canvas, parent, view, left, top->
if( llColumnSetting.visibility == View.VISIBLE){
val viewW = view.width
val viewH = view.height

36
app/src/main/java/jp/juggler/subwaytooter/view/CutoutLinearLayout.kt → app/src/main/java/jp/juggler/subwaytooter/view/OutsideDrawerLayout.kt
View File

@ -6,15 +6,16 @@ import android.util.AttributeSet
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import jp.juggler.util.LogCategory
import jp.juggler.util.cast
import java.util.*
class CutoutLinearLayout : LinearLayout {
companion object {
private val log = LogCategory("CutoutLinearLayout")
}
/*
「Viewからはみ出した部分の描画」を実現する。
子孫Viewとコールバックを登録すると、onDraw時に子孫Viewの位置とcanvasをコールバックに渡す。
*/
class OutsideDrawerLayout : LinearLayout {
constructor(context : Context) :
super(context) {
init()
@ -33,12 +34,8 @@ class CutoutLinearLayout : LinearLayout {
fun init() {
setWillNotDraw(false)
}
// override fun dispatchDraw(canvas : Canvas?) {
// super.dispatchDraw(canvas)
// }
class CutoutDrawer(
private class Callback(
val view : View,
val draw : (
canvas : Canvas,
@ -49,9 +46,9 @@ class CutoutLinearLayout : LinearLayout {
) -> Unit
)
private val cutoutList = LinkedList<CutoutDrawer>()
private val callbackList = LinkedList<Callback>()
fun addCutoutDrawer(
fun addOutsideDrawer(
view : View,
draw : (
canvas : Canvas,
@ -61,14 +58,14 @@ class CutoutLinearLayout : LinearLayout {
top : Int
) -> Unit
) {
if(null == cutoutList.find { it.view == view && it.draw == draw }) cutoutList.add(
CutoutDrawer(view, draw)
if(null == callbackList.find { it.view == view && it.draw == draw }) callbackList.add(
Callback(view, draw)
)
}
@Suppress("unused")
fun removeCutoutDrawer(view : View) {
val it = cutoutList.iterator()
fun removeOutsideDrawer(view : View) {
val it = callbackList.iterator()
while(it.hasNext()) {
val cb = it.next()
if(cb.view == view) it.remove()
@ -78,9 +75,8 @@ class CutoutLinearLayout : LinearLayout {
override fun onDraw(canvas : Canvas?) {
super.onDraw(canvas)
canvas ?: return
log.d("CutoutLinearLayout.onDraw!")
val it = cutoutList.iterator()
val it = callbackList.iterator()
while(it.hasNext()) {
val drawer = it.next()