Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed log commits design

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-11-13 00:07:31 +01:00
parent 61464a02ba
commit 1056e60f96
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/kotlin/app/ui/Log.kt
View File

@ -15,6 +15,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.drawscope.DrawStyle
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.graphics.drawscope.clipRect import androidx.compose.ui.graphics.drawscope.clipRect
import androidx.compose.ui.input.pointer.PointerIconDefaults import androidx.compose.ui.input.pointer.PointerIconDefaults
import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.input.pointer.pointerHoverIcon
@ -420,7 +422,7 @@ fun CommitsGraphLine(
val passingLanes = plotCommit.passingLanes val passingLanes = plotCommit.passingLanes
val forkingOffLanes = plotCommit.forkingOffLanes val forkingOffLanes = plotCommit.forkingOffLanes
val mergingLanes = plotCommit.mergingLanes val mergingLanes = plotCommit.mergingLanes
val backgroundColor = MaterialTheme.colors.surface
Box(modifier = modifier) { Box(modifier = modifier) {
Canvas( Canvas(
modifier = Modifier modifier = Modifier
@ -468,11 +470,26 @@ fun CommitsGraphLine(
) )
} }
drawCircle( if(plotCommit.parentCount >= 2) { // A merge
color = colors[itemPosition % colors.size], drawCircle(
radius = 10f, color = colors[itemPosition % colors.size],
center = Offset(20f * (itemPosition + 1), this.center.y), radius = 7.dp.toPx(),
) center = Offset(20f * (itemPosition + 1), this.center.y),
)
} else {
drawCircle(
color = backgroundColor,
radius = 10.dp.toPx(),
center = Offset(20f * (itemPosition + 1), this.center.y),
)
drawCircle(
color = colors[itemPosition % colors.size],
radius = 10.dp.toPx(),
center = Offset(20f * (itemPosition + 1), this.center.y),
style = Stroke(width = 2.dp.toPx())
)
}
} }
} }
} }