Show complete metadata in log pills
This commit is contained in:
@@ -79,7 +79,7 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
|
|||||||
val metadataPill = metadataPill(metadata).apply {
|
val metadataPill = metadataPill(metadata).apply {
|
||||||
layoutParams = LinearLayout.LayoutParams(
|
layoutParams = LinearLayout.LayoutParams(
|
||||||
if (hasContents) 0 else LinearLayout.LayoutParams.MATCH_PARENT,
|
if (hasContents) 0 else LinearLayout.LayoutParams.MATCH_PARENT,
|
||||||
if (hasContents) LinearLayout.LayoutParams.MATCH_PARENT else LinearLayout.LayoutParams.WRAP_CONTENT,
|
LinearLayout.LayoutParams.WRAP_CONTENT,
|
||||||
if (hasContents) LEFT_PILL_WEIGHT else 0f,
|
if (hasContents) LEFT_PILL_WEIGHT else 0f,
|
||||||
).apply {
|
).apply {
|
||||||
if (hasContents) marginEnd = dp(6)
|
if (hasContents) marginEnd = dp(6)
|
||||||
@@ -87,7 +87,7 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
|
|||||||
}
|
}
|
||||||
if (metadata.isNotEmpty()) addView(metadataPill)
|
if (metadata.isNotEmpty()) addView(metadataPill)
|
||||||
if (hasContents) {
|
if (hasContents) {
|
||||||
addView(contentsPill(row, contents!!, metadata.size.coerceAtLeast(1), expanded) {
|
val contentsPill = contentsPill(row, contents!!, metadata.size.coerceAtLeast(1), expanded) {
|
||||||
if (!expandedIds.add(row.entry.id)) expandedIds.remove(row.entry.id)
|
if (!expandedIds.add(row.entry.id)) expandedIds.remove(row.entry.id)
|
||||||
renderExpanded(row.entry.id in expandedIds)
|
renderExpanded(row.entry.id in expandedIds)
|
||||||
}.apply {
|
}.apply {
|
||||||
@@ -96,7 +96,9 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
|
|||||||
LinearLayout.LayoutParams.WRAP_CONTENT,
|
LinearLayout.LayoutParams.WRAP_CONTENT,
|
||||||
if (metadata.isNotEmpty()) RIGHT_PILL_WEIGHT else 0f,
|
if (metadata.isNotEmpty()) RIGHT_PILL_WEIGHT else 0f,
|
||||||
)
|
)
|
||||||
})
|
}
|
||||||
|
addView(contentsPill)
|
||||||
|
if (metadata.isNotEmpty()) equalizePillHeights(metadataPill, contentsPill)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,6 +218,16 @@ class ViewLogsFragment : Fragment(R.layout.fragment_view_logs) {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun equalizePillHeights(left: View, right: View) {
|
||||||
|
left.post {
|
||||||
|
val targetHeight = maxOf(left.height, right.height)
|
||||||
|
if (left.minimumHeight != targetHeight || right.minimumHeight != targetHeight) {
|
||||||
|
left.minimumHeight = targetHeight
|
||||||
|
right.minimumHeight = targetHeight
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt()
|
private fun dp(value: Int): Int = (value * resources.displayMetrics.density).toInt()
|
||||||
|
|
||||||
private data class LogRow(val entry: NotificationLogEntry, val imageBytes: ByteArray?)
|
private data class LogRow(val entry: NotificationLogEntry, val imageBytes: ByteArray?)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<dimen name="navigation_drawer_width">177dp</dimen>
|
<dimen name="navigation_drawer_width">159dp</dimen>
|
||||||
<dimen name="folded_portrait_width">360dp</dimen>
|
<dimen name="folded_portrait_width">360dp</dimen>
|
||||||
<dimen name="navigation_menu_item_height">48dp</dimen>
|
<dimen name="navigation_menu_item_height">48dp</dimen>
|
||||||
<dimen name="drawer_header_height">86dp</dimen>
|
<dimen name="drawer_header_height">86dp</dimen>
|
||||||
|
|||||||
Reference in New Issue
Block a user