-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dev-cat-templ
- Loading branch information
Showing
21 changed files
with
561 additions
and
195 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
code/cat_visual/src/main/kotlin/canvas/items/impl/ToggleItem.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| package canvas.items.impl | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.material.* | ||
| import androidx.compose.runtime.* | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.focus.FocusRequester | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.platform.LocalDensity | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
| import canvas.items.Draggable | ||
| import canvas.items.interfaces.CanvasItemInterface | ||
| import canvas.items.interfaces.Focusable | ||
| import connection.AbstractClient | ||
| import java.util.* | ||
|
|
||
| class ToggleItem( | ||
| override val id: UUID = UUID.randomUUID(), | ||
| override var x: Float = 0f, | ||
| override var y: Float = 0f, | ||
| override val modifier: Modifier = Modifier, | ||
| override val client: AbstractClient, | ||
| ): AbstractItem( | ||
| x = x, | ||
| y = y, | ||
| modifier = modifier, | ||
| inputs = listOf(), | ||
| outputs = listOf(), | ||
| client = client, | ||
| ), Draggable, Focusable { | ||
|
|
||
|
|
||
| override val type = CanvasItemInterface.Type.TOGGLE | ||
|
|
||
| @Composable | ||
| override fun getContent(deleteCurrentItem: (String) -> Unit) { | ||
| val localDensity = LocalDensity.current | ||
| val xPosition = remember { mutableStateOf(x) } | ||
| val yPosition = remember { mutableStateOf(y) } | ||
| val focusRequester = remember { FocusRequester() } | ||
| val color = remember { mutableStateOf(Color.Black) } | ||
| val checkedStateToggle = remember { mutableStateOf(false) } | ||
| var connectMenu by remember { mutableStateOf( false) } | ||
| var expandedDropDownMenu by remember { mutableStateOf(false) } | ||
| val idStaq by remember {mutableStateOf(id.toString())} | ||
| Box( | ||
| modifier.makeDraggable(localDensity, xPosition, yPosition) | ||
| .makeFocusable(focusRequester, color) | ||
| .clickable{ | ||
| expandedDropDownMenu = !expandedDropDownMenu | ||
| } | ||
| ) { | ||
| Switch( | ||
| modifier = modifier | ||
| .size(50.dp) | ||
| .wrapContentSize(), | ||
| checked = checkedStateToggle.value, | ||
| onCheckedChange = {checkedStateToggle.value = !checkedStateToggle.value}, | ||
| ) | ||
| DropdownMenu( | ||
| expanded = expandedDropDownMenu, | ||
| onDismissRequest = { | ||
| expandedDropDownMenu = false | ||
| }, | ||
| modifier = Modifier.width(200.dp) | ||
| ) { | ||
| DropdownMenuItem(onClick = { | ||
| deleteCurrentItem(idStaq) | ||
| }) { | ||
| Text( | ||
| text = "Удалить", | ||
| modifier = Modifier | ||
| .padding(5.dp), | ||
| fontSize = 15.sp, | ||
| ) | ||
| } | ||
| DropdownMenuItem( | ||
| onClick = { | ||
| connectMenu = !connectMenu | ||
| }, | ||
| ) { | ||
| Text( | ||
| text = "Соединить", | ||
| modifier = Modifier | ||
| .padding(5.dp), | ||
| fontSize = 15.sp, | ||
| ) | ||
| } | ||
| if (connectMenu) { | ||
| DropdownMenuItem( | ||
| onClick = { | ||
| connectMenu = false | ||
| }, | ||
| ) { | ||
| Text( | ||
| text = "Toggle 1", | ||
| modifier = Modifier | ||
| .padding(10.dp), | ||
| fontSize = 15.sp, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| x = xPosition.value | ||
| y = yPosition.value | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ interface CanvasItemInterface { | |
| enum class Type { | ||
| TEXT, | ||
| LAMP, | ||
| TOGGLE, | ||
| UNKNOWN, | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.