diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt index 4eee8e1b..88410a9b 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt @@ -23,7 +23,6 @@ import boostcamp.and07.mindsync.ui.mindmap.MindMapViewModel class EditDescriptionDialog : DialogFragment() { private var _binding: DialogEditDescriptionBinding? = null private val binding get() = _binding!! - private lateinit var editDialogInterface: EditDialogInterface private val mindMapViewModel: MindMapViewModel by navGraphViewModels(R.id.nav_graph) private val args: EditDescriptionDialogArgs by navArgs() @@ -49,8 +48,19 @@ class EditDescriptionDialog : DialogFragment() { savedInstanceState: Bundle?, ) { super.onViewCreated(view, savedInstanceState) + setBinding() setupCancelBtn() setupSubmitBtn() + updateOperationType(args.operation.command) + } + + override fun onStart() { + super.onStart() + resizeDialog() + } + + private fun setBinding() { + binding.vm = mindMapViewModel } private fun setupSubmitBtn() { @@ -83,9 +93,8 @@ class EditDescriptionDialog : DialogFragment() { } } - override fun onStart() { - super.onStart() - resizeDialog() + private fun updateOperationType(operationType: String) { + mindMapViewModel.updateOperationType(operationType) } private fun resizeDialog() { diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt index 7ec4c61b..d7927b7e 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt @@ -43,6 +43,8 @@ class MindMapViewModel val socketState: StateFlow = _socketState private val _socketEvent = MutableStateFlow(null) val socketEvent: StateFlow = _socketEvent + private val _operationType = MutableStateFlow("") + val operationType: StateFlow = _operationType init { setSocketState() @@ -198,8 +200,16 @@ class MindMapViewModel ) { crdtTree.tree.setRootNode( crdtTree.tree.getRootNode().copy( - path = crdtTree.tree.getRootNode().path.copy(centerX = windowWidth, centerY = windowHeight), + path = + crdtTree.tree.getRootNode().path.copy( + centerX = windowWidth, + centerY = windowHeight, + ), ), ) } + + fun updateOperationType(operationType: String) { + _operationType.value = operationType + } } diff --git a/AOS/app/src/main/res/layout/dialog_edit_description.xml b/AOS/app/src/main/res/layout/dialog_edit_description.xml index 844cffe6..6682a4f1 100644 --- a/AOS/app/src/main/res/layout/dialog_edit_description.xml +++ b/AOS/app/src/main/res/layout/dialog_edit_description.xml @@ -1,41 +1,51 @@ - + + + + - + - - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/AOS/app/src/main/res/values/strings-mindmap.xml b/AOS/app/src/main/res/values/strings-mindmap.xml new file mode 100644 index 00000000..5feefe1c --- /dev/null +++ b/AOS/app/src/main/res/values/strings-mindmap.xml @@ -0,0 +1,7 @@ + + + add + + 텍스트 입력 + 작성 + \ No newline at end of file