Fix diagnostic popup paddings

zhelenskiy · Apr 9, 2024 · ec458df · ec458df
1 parent d82d88d
commit ec458df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ development=true
 
 #Publication
 group=com.zhelenskiy
-version=0.0.2
+version=0.0.3
diff --git a/library/src/commonMain/kotlin/kotlinlang/compose/DiagnosticsPopup.kt b/library/src/commonMain/kotlin/kotlinlang/compose/DiagnosticsPopup.kt
@@ -155,8 +155,11 @@ private fun DiagnosticsHeader(
                 .clickable { onCollapsedChanged(!collapsed) }
                 .padding(settings.padding),
         ) {
-            for (severity in DiagnosticSeverity.entries) {
-                val currentDiagnostics = diagnostics.filter { it.severity == severity }
+            val severity2diagnostics = diagnostics.groupBy { it.severity }
+            for ((index, severity) in DiagnosticSeverity.entries.withIndex()) {
+                val currentDiagnostics = severity2diagnostics[severity] ?: emptyList()
+                val isLast = DiagnosticSeverity.entries.slice((index + 1)..DiagnosticSeverity.entries.lastIndex)
+                    .all { severity2diagnostics[it].isNullOrEmpty() }
                 AnimatedVisibility(currentDiagnostics.isNotEmpty() || diagnostics.isEmpty()) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
                         severity.icon(
@@ -173,9 +176,11 @@ private fun DiagnosticsHeader(
                             style = settings.labelTextStyle,
                             color = colorScheme.countLabelColor,
                         )
+                        AnimatedVisibility(!isLast) {
+                            Spacer(Modifier.width(settings.spaceBetweenDiagnosticSeverities))
+                        }
                     }
                 }
-                Spacer(Modifier.width(settings.spaceBetweenDiagnosticSeverities))
             }
         }
     }

diff --git a/sample/sample.podspec b/sample/sample.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'sample'
-    spec.version                  = '0.0.1'
+    spec.version                  = '0.0.3'
     spec.homepage                 = 'h'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''