Added Legend to the Venn Diagram
parent
ae6876022c
commit
244f5a7e80
|
@ -23,8 +23,10 @@ import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.ui.geometry.Rect
|
import androidx.compose.ui.geometry.Rect
|
||||||
import androidx.compose.ui.geometry.Size
|
import androidx.compose.ui.geometry.Size
|
||||||
|
import androidx.compose.ui.graphics.Paint
|
||||||
import androidx.compose.ui.graphics.Path
|
import androidx.compose.ui.graphics.Path
|
||||||
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
|
import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
|
||||||
|
import androidx.compose.ui.graphics.toArgb
|
||||||
import androidx.compose.ui.text.*
|
import androidx.compose.ui.text.*
|
||||||
import androidx.compose.ui.unit.Constraints
|
import androidx.compose.ui.unit.Constraints
|
||||||
|
|
||||||
|
@ -257,7 +259,15 @@ fun IntersectionCircles(
|
||||||
val circleRadius = 300f // Fixed radius for both circles
|
val circleRadius = 300f // Fixed radius for both circles
|
||||||
val circleDistance = (1 - intersectionSize) * 2 * circleRadius // Distance between the centers of the circles
|
val circleDistance = (1 - intersectionSize) * 2 * circleRadius // Distance between the centers of the circles
|
||||||
|
|
||||||
val textMeasurer = rememberTextMeasurer()
|
val textMeasurer = rememberTextMeasurer(
|
||||||
|
)
|
||||||
|
|
||||||
|
Row (
|
||||||
|
modifier = Modifier.fillMaxWidth(),
|
||||||
|
horizontalArrangement = Arrangement.SpaceEvenly
|
||||||
|
) {
|
||||||
|
|
||||||
|
drawLegend(100f, 500f)
|
||||||
|
|
||||||
Canvas(modifier = Modifier.size(500.dp)) {
|
Canvas(modifier = Modifier.size(500.dp)) {
|
||||||
// Draw glossary circle
|
// Draw glossary circle
|
||||||
|
@ -307,7 +317,7 @@ fun IntersectionCircles(
|
||||||
word,
|
word,
|
||||||
Offset(
|
Offset(
|
||||||
(glossaryCircleCenter.x - circleRadius / 1.5).toFloat(),
|
(glossaryCircleCenter.x - circleRadius / 1.5).toFloat(),
|
||||||
glossaryCircleCenter.y - circleRadius / 2 + index * 20f
|
glossaryCircleCenter.y - circleRadius / 2 + index * 30f
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -320,7 +330,7 @@ fun IntersectionCircles(
|
||||||
word,
|
word,
|
||||||
Offset(
|
Offset(
|
||||||
codeCircleCenter.x,
|
codeCircleCenter.x,
|
||||||
codeCircleCenter.y - circleRadius / 2 + index * 20f
|
codeCircleCenter.y - circleRadius / 2 + index * 30f
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -333,18 +343,55 @@ fun IntersectionCircles(
|
||||||
word,
|
word,
|
||||||
Offset(
|
Offset(
|
||||||
size.width / 2 - circleDistance / 2 + circleRadius / 2,
|
size.width / 2 - circleDistance / 2 + circleRadius / 2,
|
||||||
size.height / 2 - circleRadius / 2 + index * 20f
|
size.height / 2 - circleRadius / 2 + index * 30f
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalTextApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun vennDiagramLegend() {
|
fun drawLegend(canvasWidth: Float, canvasHeight: Float) {
|
||||||
|
val legendTextSize = 20f
|
||||||
|
val legendItemHeight = 40f
|
||||||
|
val legendStartOffset = Offset(x = canvasWidth, y = canvasHeight / 2)
|
||||||
|
|
||||||
|
|
||||||
|
val legendItems = listOf(
|
||||||
|
LegendItem("Mots du glossaire", Color(0xFFA1C084)),
|
||||||
|
LegendItem("Mots du code", Color(0xFFE9C46A)),
|
||||||
|
LegendItem("Mots du glossaire et du code", Color(0xFF6E7271))
|
||||||
|
)
|
||||||
|
|
||||||
|
val textMeasurer = rememberTextMeasurer()
|
||||||
|
|
||||||
|
Canvas(modifier = Modifier.size(width = 50.dp, height = 500.dp)) {
|
||||||
|
legendItems.forEachIndexed { index, legendItem ->
|
||||||
|
drawRect(
|
||||||
|
color = legendItem.color,
|
||||||
|
topLeft = legendStartOffset + Offset(x=0f, y = index * legendItemHeight),
|
||||||
|
size = Size(20f, 20f)
|
||||||
|
)
|
||||||
|
drawIntoCanvas { _ ->
|
||||||
|
drawText(
|
||||||
|
textMeasurer,
|
||||||
|
legendItem.label,
|
||||||
|
Offset(
|
||||||
|
-90f,
|
||||||
|
legendStartOffset.y + index * legendItemHeight
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data class LegendItem(val label: String, val color: Color)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue