Skip to content

ADFA-2786 | Harden structure view drawing #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jatezzz wants to merge 1 commit into
base: stage
Choose a base branch
from
+4 −4
Open

ADFA-2786 | Harden structure view drawing #1360

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/views/StructureView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ class StructureView(
super.dispatchDraw(canvas)

for (text in textViewMap.keys) {
val view = textViewMap[text]
val parent = text.parent.parent as ViewGroup
val view = textViewMap[text] ?: continue
val parent = (text.parent?.parent as? ViewGroup) ?: continue

val centerX = parent.x
val centerY = parent.y + parent.height.toFloat() / 2
Expand Down Expand Up @@ -265,7 +265,7 @@ class StructureView(

val editText = view.editText ?: continue
val current = viewTextMap[editText] ?: continue
val currentParent = current.parent.parent as ViewGroup
val currentParent = (current.parent?.parent as? ViewGroup) ?: continue

drawLine(currentParent)
}
Expand All @@ -276,7 +276,7 @@ class StructureView(
for (i in 0 until view.childCount) {
val child = view.getChildAt(i)
val current = viewTextMap[child] ?: continue
val currentParent = current.parent.parent as ViewGroup
val currentParent = (current.parent?.parent as? ViewGroup) ?: continue

drawLine(currentParent)
}
Expand Down
Loading