Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

노드 편집 시 기존 내용 보이게 적용 #294

Merged
merged 5 commits into from
Dec 13, 2023
Merged

노드 편집 시 기존 내용 보이게 적용 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
295c11f
feat(#293): strings-mindmap 추가
hegleB Dec 13, 2023
b8d1021
feat(#293): operationType 프로퍼티 추가 및 updateOperationType 함수 추가
hegleB Dec 13, 2023
d16da32
design(#293): operationType에 따라 EditText의 텍스트 설정 변경
hegleB Dec 13, 2023
0d080f5
feat(#293): binding 설정 및 operationType 업데이트
hegleB Dec 13, 2023
e1f3f32
style: ktlint 적용
hegleB Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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() {
Expand Down Expand Up @@ -83,9 +93,8 @@ class EditDescriptionDialog : DialogFragment() {
}
}

override fun onStart() {
super.onStart()
resizeDialog()
private fun updateOperationType(operationType: String) {
mindMapViewModel.updateOperationType(operationType)
}

private fun resizeDialog() {
Expand Down
12 changes: 11 additions & 1 deletion AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class MindMapViewModel
val socketState: StateFlow<SocketState> = _socketState
private val _socketEvent = MutableStateFlow<SocketEvent?>(null)
val socketEvent: StateFlow<SocketEvent?> = _socketEvent
private val _operationType = MutableStateFlow("")
val operationType: StateFlow<String> = _operationType

init {
setSocketState()
Expand Down Expand Up @@ -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
}
}
82 changes: 46 additions & 36 deletions AOS/app/src/main/res/layout/dialog_edit_description.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="300dp"
android:background="@drawable/bg_round_dialog"
android:padding="10dp"
android:layout_height="300dp">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>
<variable
name="vm"
type="boostcamp.and07.mindsync.ui.mindmap.MindMapViewModel" />
</data>

<EditText
android:id="@+id/et_node_description"
android:layout_width="0dp"
android:layout_height="0dp"
android:hint="텍스트 입력"
android:textAlignment="center"
android:fontFamily="@font/pretendard_regular"
app:layout_constraintBottom_toTopOf="@id/btn_submit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp"
android:background="@drawable/bg_round_dialog"
android:padding="10dp"
android:layout_height="300dp">

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="취소"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_submit"
android:fontFamily="@font/pretendard_medium"
app:layout_constraintStart_toStartOf="parent" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="작성"
android:fontFamily="@font/pretendard_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>
<EditText
android:id="@+id/et_node_description"
android:layout_width="0dp"
android:layout_height="0dp"
android:hint="@string/mindmap_input_text"
android:text="@{vm.operationType.equals(@string/mindmap_add) ? @string/mindmap_text_empty : vm.selectedNode.description}"
android:textAlignment="center"
android:fontFamily="@font/pretendard_regular"
app:layout_constraintBottom_toTopOf="@id/btn_submit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel_message"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_submit"
android:fontFamily="@font/pretendard_medium"
app:layout_constraintStart_toStartOf="parent" />

<com.google.android.material.button.MaterialButton
android:id="@+id/btn_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/mindmap_write"
android:fontFamily="@font/pretendard_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
7 changes: 7 additions & 0 deletions AOS/app/src/main/res/values/strings-mindmap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="mindmap_add">add</string>
<string name="mindmap_text_empty"></string>
<string name="mindmap_input_text">텍스트 입력</string>
<string name="mindmap_write">작성</string>
</resources>