From 6660936ee44ba727399ebab3e5c64a014c532450 Mon Sep 17 00:00:00 2001
From: stitch <skaxodn97@gmail.com>
Date: Fri, 1 Jul 2022 10:27:58 +0900
Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=EC=9D=B4=EC=8A=88=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Markwon 라이브러리 이용
마크원 라이브러리를 통해 텍스트 뷰 내용을 마크다운 형식으로 변환
---
 app/build.gradle                              |  6 ++-
 .../issue/register/RegisterIssueFragment.kt   | 43 +++++++++++++++++--
 .../drawable/edittext_enabled_text_color.xml  |  5 +++
 .../res/layout/fragment_register_issue.xml    | 19 ++++++++
 4 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/edittext_enabled_text_color.xml

diff --git a/app/build.gradle b/app/build.gradle
index 434f48ba85..093a09f173 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -86,5 +86,9 @@ dependencies {
 
     // Glide
     implementation 'com.github.bumptech.glide:glide:4.13.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
+    kapt 'com.github.bumptech.glide:compiler:4.13.0'
+
+    // MarkWon
+    implementation "io.noties.markwon:core:4.2.0"
+    implementation "io.noties.markwon:image:4.2.0"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index 14a2105373..a44f5fb44a 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -1,23 +1,58 @@
 package com.example.it.issuetracker.presentation.main.issue.register
 
+import android.content.Context
 import android.os.Bundle
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentRegisterIssueBinding
 import com.example.it.issuetracker.presentation.common.DataBindingBaseFragment
+import io.noties.markwon.Markwon
 
 class RegisterIssueFragment :
     DataBindingBaseFragment<FragmentRegisterIssueBinding>(R.layout.fragment_register_issue) {
 
+    private val imm: InputMethodManager by lazy { activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager }
+    private lateinit var markOne: Markwon
+    private var markDownFlag = false
+    private var previousText = ""
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        markOne = Markwon.builder(requireContext())
+            .build()
+        initView()
     }
 
     override fun initView() {
-        TODO("Not yet implemented")
+        previewMarkDown()
+        binding.etText.text.toString()
+    }
+
+    private fun previewMarkDown() {
+        binding.btn.setOnClickListener {
+            if (!markDownFlag) getMarkDownView()
+            else getEditView()
+        }
     }
 
-    override fun observerData() {
-        TODO("Not yet implemented")
+    private fun getMarkDownView() {
+        previousText = binding.etText.text.toString()
+        binding.etText.isEnabled = false
+        imm.hideSoftInputFromWindow(binding.etText.windowToken, 0)
+        markOne.setMarkdown(binding.etText, binding.etText.text.toString())
+        markDownFlag = true
     }
+
+    private fun getEditView() {
+        with(binding) {
+            etText.setText(previousText)
+            etText.isEnabled = true
+            etText.setSelection(etText.text.toString().length)
+        }
+        imm.showSoftInput(binding.etText, 0)
+        previousText = ""
+        markDownFlag = false
+    }
+
+    override fun observerData() = Unit
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/edittext_enabled_text_color.xml b/app/src/main/res/drawable/edittext_enabled_text_color.xml
new file mode 100644
index 0000000000..16f1b8d6e4
--- /dev/null
+++ b/app/src/main/res/drawable/edittext_enabled_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black" android:state_enabled="false" />
+    <item android:color="@color/black" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register_issue.xml b/app/src/main/res/layout/fragment_register_issue.xml
index c3906a9b40..d70c4611b6 100644
--- a/app/src/main/res/layout/fragment_register_issue.xml
+++ b/app/src/main/res/layout/fragment_register_issue.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -11,5 +12,23 @@
         android:layout_height="match_parent"
         tools:context=".presentation.main.issue.register.RegisterIssueFragment">
 
+        <EditText
+            android:id="@+id/et_text"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:textColor="@drawable/edittext_enabled_text_color"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn" />
+
+        <Button
+            android:id="@+id/btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="선택"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file

From 952525e85f3479b196d5600621957169b305fa65 Mon Sep 17 00:00:00 2001
From: banjjak2 <interr0bang@naver.com>
Date: Fri, 1 Jul 2022 08:34:06 +0900
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20=EB=A0=88=EC=9D=B4=EB=B8=94,=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=BC=EC=8A=A4=ED=86=A4=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datasource/LabelDataSourceDefaultImpl.kt   | 13 ++++++++++++-
 .../datasource/MilestoneDataSourceDefaultImpl.kt    | 12 +++++++++++-
 .../data/network/IssueTrackerService.kt             |  6 ++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
index 2f3d080764..400579f401 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
@@ -30,7 +30,18 @@ class LabelDataSourceDefaultImpl(
     }
 
     override suspend fun editLabel(labelDto: LabelDto) {
-        LabelFakeDatabase.edit(labelDto)
+        try {
+            val editLabelDto = AddLabelDto(
+                labelDto.title,
+                labelDto.description,
+                labelDto.color,
+                labelDto.textColor
+            )
+            issueTrackerApi.editLabelInfo(labelDto.id, editLabelDto)
+        } catch (e: Exception) {
+            Log.e(TAG, e.message, e)
+            error(e)
+        }
     }
 
     override suspend fun deleteLabelInfo(id: Int) {
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
index c2d4b12d19..da17fe2208 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
@@ -30,7 +30,17 @@ class MilestoneDataSourceDefaultImpl(
     }
 
     override suspend fun editMilestone(milestoneDto: MilestoneDto) {
-
+        try {
+            val editMilestoneDto = AddMilestoneDto(
+                milestoneDto.title,
+                milestoneDto.description ?: "",
+                milestoneDto.deadline ?: ""
+            )
+            issueTrackerApi.editMilestoneInfo(milestoneDto.id!!, editMilestoneDto)
+        } catch (e: Exception) {
+            Log.e(TAG, e.message, e)
+            error(e)
+        }
     }
 
     override suspend fun deleteMilestone(id: Long) {
diff --git a/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt b/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
index b769a0042c..069419a4b8 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
@@ -17,6 +17,9 @@ interface IssueTrackerService {
     @POST("labels")
     suspend fun addLabelInfo(@Body addLabelDto: AddLabelDto)
 
+    @PATCH("labels/{id}")
+    suspend fun editLabelInfo(@Path("id") id: Int, @Body addLabelDto: AddLabelDto)
+
     @DELETE("labels/{id}")
     suspend fun deleteLabelInfo(@Path("id") id: Int)
 
@@ -26,6 +29,9 @@ interface IssueTrackerService {
     @POST("milestones")
     suspend fun addMilestone(@Body addMilestoneDto: AddMilestoneDto)
 
+    @PATCH("milestones/{id}")
+    suspend fun editMilestoneInfo(@Path("id") id: Long, @Body addMilestoneDto: AddMilestoneDto)
+
     @DELETE("milestones/{id}")
     suspend fun deleteMilestone(@Path("id") id: Long)
 }
\ No newline at end of file

From 9c816af4d41e6b7a74556eab85f59ca8076638e1 Mon Sep 17 00:00:00 2001
From: banjjak2 <interr0bang@naver.com>
Date: Fri, 1 Jul 2022 08:43:05 +0900
Subject: [PATCH 3/9] =?UTF-8?q?feat:=20API=20=EB=AA=85=EC=84=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=86=8D?=
 =?UTF-8?q?=EC=84=B1=EA=B0=92=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issuetracker/data/datasource/MilestoneFakeDatabase.kt | 8 ++++----
 .../com/example/it/issuetracker/data/dto/MilestoneDto.kt  | 8 ++++----
 .../com/example/it/issuetracker/domain/model/MileStone.kt | 4 ++--
 app/src/main/res/layout/milestone_item.xml                | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt
index c4ad11a6ef..a8487b92c1 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt
@@ -11,8 +11,8 @@ object MilestoneFakeDatabase {
             title = "마일스톤",
             deadline = "2022-06-14",
             description = "",
-            openedIssue = 1,
-            closedIssue = 1
+            openedIssues = 1,
+            closedIssues = 1
         ),
         MilestoneDto(
             id = 2,
@@ -25,8 +25,8 @@ object MilestoneFakeDatabase {
             title = "테스트 그룹",
             deadline = "2022-06-17",
             description = "",
-            openedIssue = 3,
-            closedIssue = 2
+            openedIssues = 3,
+            closedIssues = 2
         ),
         MilestoneDto(
             id = 4,
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
index 473f7ae6e2..0717eba5b6 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
@@ -8,8 +8,8 @@ data class MilestoneDto(
     val description: String? = null,
     val startDate: String? = null,
     val deadline: String? = null,
-    val openedIssue: Int? = null,
-    val closedIssue: Int? = null,
+    val openedIssues: Int? = null,
+    val closedIssues: Int? = null,
 )
 
 fun MilestoneDto.toMilestone(): MileStone =
@@ -19,6 +19,6 @@ fun MilestoneDto.toMilestone(): MileStone =
         description = description,
         startDate = startDate,
         deadLine = deadline,
-        openedIssue = openedIssue,
-        closedIssue = closedIssue
+        openedIssues = openedIssues,
+        closedIssue = closedIssues
     )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
index 4f1818e409..d00f859ad8 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
@@ -10,7 +10,7 @@ data class MileStone(
     val description: String? = null,
     val startDate: String? = null,
     val deadLine: String? = null,
-    val openedIssue: Int? = null,
+    val openedIssues: Int? = null,
     val closedIssue: Int? = null,
     var isChecked: Boolean = false,
     val mode: Mode = Mode.DEFAULT,
@@ -23,7 +23,7 @@ fun MileStone.toMileStoneDto(): MilestoneDto {
         description,
         startDate,
         deadLine,
-        openedIssue,
+        openedIssues,
         closedIssue
     )
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/milestone_item.xml b/app/src/main/res/layout/milestone_item.xml
index d14b690c9e..0dd7a169f4 100644
--- a/app/src/main/res/layout/milestone_item.xml
+++ b/app/src/main/res/layout/milestone_item.xml
@@ -105,9 +105,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:text="@{@string/open_issue_string(milestoneInfo.openedIssue)}"
+                android:text="@{@string/open_issue_string(milestoneInfo.openedIssues)}"
                 android:textColor="@color/open_issue_text_color"
-                android:visibility="@{milestoneInfo.openedIssue==null? View.GONE : View.VISIBLE}"
+                android:visibility="@{milestoneInfo.openedIssues==null? View.GONE : View.VISIBLE}"
                 app:chipBackgroundColor="@color/open_issue_bg_color"
                 app:chipIcon="@drawable/ic_info_blue"
                 app:chipIconSize="20dp"

From c8ee3a9247fcd3c5de45fbd68cb1251ee02dd8ad Mon Sep 17 00:00:00 2001
From: banjjak2 <interr0bang@naver.com>
Date: Wed, 29 Jun 2022 18:11:54 +0900
Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=ED=95=84=ED=84=B0=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EA=B3=BC=20=EC=9D=B4=EC=8A=88=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20Spinner=EC=9D=98=20Text?=
 =?UTF-8?q?=20=EC=83=89=EC=83=81=EC=9D=B4=20=EB=8B=AC=EB=9D=BC=20=EC=86=8D?=
 =?UTF-8?q?=EC=84=B1=EC=9C=BC=EB=A1=9C=20=EB=94=B0=EB=A1=9C=20=EC=A0=95?=
 =?UTF-8?q?=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../it/issuetracker/presentation/customview/CustomFilter.kt   | 1 +
 app/src/main/res/layout/fragment_filter.xml                   | 4 ++++
 app/src/main/res/values/attrs.xml                             | 1 +
 3 files changed, 6 insertions(+)

diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomFilter.kt b/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomFilter.kt
index 53dbe674c4..cceeb30fda 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomFilter.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomFilter.kt
@@ -18,6 +18,7 @@ class CustomFilter(context: Context, attrs: AttributeSet?) : ConstraintLayout(co
     init {
         val a = context.obtainStyledAttributes(attrs, R.styleable.FilterCondition)
         binding.tvTitle.text = a.getString(R.styleable.FilterCondition_title).toString()
+        binding.tvTitle.setTextColor(a.getColor(R.styleable.FilterCondition_textColor, 0))
         a.recycle()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml
index ccf324c9e1..daa90adb0b 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -61,6 +61,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/toolbar_filter_issue"
+            app:textColor="@android:color/white"
             app:title="상태" />
 
         <com.example.it.issuetracker.presentation.customview.CustomFilter
@@ -71,6 +72,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/filter_state"
+            app:textColor="@android:color/white"
             app:title="작성자" />
 
         <com.example.it.issuetracker.presentation.customview.CustomFilter
@@ -81,6 +83,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/filter_writer"
+            app:textColor="@android:color/white"
             app:title="레이블" />
 
         <com.example.it.issuetracker.presentation.customview.CustomFilter
@@ -91,6 +94,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/filter_label"
+            app:textColor="@android:color/white"
             app:title="마일스톤" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a9a02a5d51..19bb98fe69 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,5 +2,6 @@
 <resources>
     <declare-styleable name="FilterCondition">
         <attr name="title" format="string|reference" />
+        <attr name="textColor" format="integer|reference" />
     </declare-styleable>
 </resources>
\ No newline at end of file

From d0f1dbeab54e78df43fac953f56a4ab37537ae3f Mon Sep 17 00:00:00 2001
From: banjjak2 <interr0bang@naver.com>
Date: Fri, 1 Jul 2022 10:55:26 +0900
Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=EC=9D=B4=EC=8A=88=20=EB=93=B1?=
 =?UTF-8?q?=EB=A1=9D=20=ED=99=94=EB=A9=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

서버에서 구현되지 않아 메모리로 관리
---
 .../data/datasource/IssueTrackerDataSource.kt |   2 +
 .../IssueTrackerDefaultDataSource.kt          |  28 +++
 .../remote/IssueTrackerRemoteDataSource.kt    |   5 +
 .../repository/IssueTrackerRepositoryImpl.kt  |   5 +
 .../it/issuetracker/di/viewModelModule.kt     |   2 +
 .../issuetracker/domain/model/IssueDetail.kt  |   4 +-
 .../repository/IssueTrackerRepository.kt      |   3 +
 .../presentation/common/Constants.kt          |   3 +
 .../main/issue/detail/DetailFragment.kt       |  17 +-
 .../main/issue/list/IssueFragment.kt          |  10 +-
 .../main/issue/list/IssueViewModel.kt         |   2 +-
 .../main/issue/register/NewIssue.kt           |  14 ++
 .../main/issue/register/RegisterIssue.kt      |   9 +
 .../issue/register/RegisterIssueFragment.kt   | 185 ++++++++++++++++--
 .../issue/register/RegisterIssueUiState.kt    |  36 ++++
 .../issue/register/RegisterIssueViewModel.kt  | 158 +++++++++++++++
 .../res/layout/fragment_register_issue.xml    | 141 ++++++++++++-
 app/src/main/res/menu/issue_write_menu.xml    |  16 ++
 app/src/main/res/values/strings.xml           |   8 +
 19 files changed, 615 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
 create mode 100644 app/src/main/res/menu/issue_write_menu.xml

diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
index 13c44cba2f..7762265125 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
@@ -5,6 +5,7 @@ import com.example.it.issuetracker.data.dto.IssueDto
 import com.example.it.issuetracker.data.dto.MemberDto
 import com.example.it.issuetracker.data.dto.MilestoneDto
 import com.example.it.issuetracker.domain.model.Issue
+import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import java.util.*
 
@@ -21,6 +22,7 @@ interface IssueTrackerDataSource {
     suspend fun getFilterList(value: HashMap<String, Any>): Result<List<IssueDto>>
     fun findByIssueName(title: String): Flow<List<IssueDto>>
     fun getIssueDetail(id: Long): Flow<IssueDetailDto>
+    suspend fun saveIssue(newIssue: NewIssue)
     suspend fun addLike(id: Long, uid: Long)
     suspend fun addBest(id: Long, uid: Long)
     suspend fun addHate(id: Long, uid: Long)
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt
index 9c321d3691..816e821d9a 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt
@@ -3,6 +3,7 @@ package com.example.it.issuetracker.data.datasource
 import android.util.Log
 import com.example.it.issuetracker.data.dto.*
 import com.example.it.issuetracker.domain.model.Issue
+import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import java.util.*
@@ -242,6 +243,33 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
         }
     }
 
+    override suspend fun saveIssue(newIssue: NewIssue) {
+        val labelList = mutableListOf<LabelDto>()
+        newIssue.labels?.forEach { label ->
+            labelList.add(
+                LabelDto(
+                    label.id,
+                    label.title,
+                    label.description,
+                    label.color,
+                    label.textColor
+                )
+            )
+        }
+
+        issues.add(
+            IssueDto(
+                issues.size + 1L,
+                newIssue.title,
+                newIssue.description,
+                true,
+                labelList,
+                newIssue.milestoneId?.title ?: "",
+                "2022-06-30",
+            )
+        )
+    }
+
     override fun findByIssueName(title: String): Flow<List<IssueDto>> = flow {
         val result = issues.filter { it.title.contains(title) }
         emit(result)
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
index 1666ada484..3fa4a9dcfa 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
@@ -7,6 +7,7 @@ import com.example.it.issuetracker.data.dto.MemberDto
 import com.example.it.issuetracker.data.dto.MilestoneDto
 import com.example.it.issuetracker.data.network.IssueTrackerService
 import com.example.it.issuetracker.domain.model.Issue
+import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import java.util.*
@@ -29,6 +30,10 @@ class IssueTrackerRemoteDataSource(
 
     override suspend fun revertIssue(list: SortedMap<Int, Issue>) {}
 
+    override suspend fun saveIssue(newIssue: NewIssue) {
+        // TODO: saveIssue
+    }
+
     override suspend fun getMember(): Result<List<MemberDto>> {
         return runCatching { emptyList() }
     }
diff --git a/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
index b6436c0b34..484edb4275 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
@@ -10,6 +10,7 @@ import com.example.it.issuetracker.domain.model.IssueDetail
 import com.example.it.issuetracker.domain.model.Member
 import com.example.it.issuetracker.domain.model.MileStone
 import com.example.it.issuetracker.domain.repository.IssueTrackerRepository
+import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import java.util.*
@@ -74,6 +75,10 @@ class IssueTrackerRepositoryImpl(
         }
     }
 
+    override suspend fun saveIssue(newIssue: NewIssue): Result<Unit> {
+        return runCatching { issueTrackerDataSource.saveIssue(newIssue) }
+    }
+
     override suspend fun addLike(id: Long, uid: Long) {
         issueTrackerDataSource.addLike(id, uid)
     }
diff --git a/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt b/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
index 66d71b9b94..949cb3505b 100644
--- a/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
+++ b/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
@@ -4,6 +4,7 @@ import com.example.it.issuetracker.presentation.login.LoginViewModel
 import com.example.it.issuetracker.presentation.main.issue.detail.DetailViewModel
 import com.example.it.issuetracker.presentation.main.issue.filter.FilterViewModel
 import com.example.it.issuetracker.presentation.main.issue.list.IssueViewModel
+import com.example.it.issuetracker.presentation.main.issue.register.RegisterIssueViewModel
 import com.example.it.issuetracker.presentation.main.issue.search.SearchViewModel
 import com.example.it.issuetracker.presentation.main.label.LabelViewModel
 import com.example.it.issuetracker.presentation.main.label.add.LabelAddViewModel
@@ -24,4 +25,5 @@ val viewModelModule = module {
     viewModel { MilestoneAddViewModel(get()) }
     viewModel { DetailViewModel(get(), get()) }
     viewModel { MyPageViewModel(get(), get()) }
+    viewModel { RegisterIssueViewModel(get(), get(), get()) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
index 006fa8a51c..9085559bfa 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
@@ -1,5 +1,7 @@
 package com.example.it.issuetracker.domain.model
 
+import java.io.Serializable
+
 data class IssueDetail(
     val id: Long,
     val title: String,
@@ -11,4 +13,4 @@ data class IssueDetail(
     val labels: List<Label>,
     val milestones: List<MileStone>,
     val comments: List<Comment>,
-)
+) : Serializable
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt b/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
index ae3fc4134e..93206d9349 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
@@ -4,6 +4,7 @@ import com.example.it.issuetracker.domain.model.Issue
 import com.example.it.issuetracker.domain.model.IssueDetail
 import com.example.it.issuetracker.domain.model.Member
 import com.example.it.issuetracker.domain.model.MileStone
+import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import java.util.*
 
@@ -31,6 +32,8 @@ interface IssueTrackerRepository {
 
     fun getIssueDetail(id: Long): Flow<IssueDetail>
 
+    suspend fun saveIssue(newIssue: NewIssue): Result<Unit>
+
     suspend fun addLike(id: Long, uid: Long)
 
     suspend fun addBest(id: Long, uid: Long)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
index ec03159a47..1f0295dc55 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
@@ -12,4 +12,7 @@ object Constants {
 
     // 필터 페이지에서 리셋 초기화를 눌렀을 때 사용될 값
     const val FILTER_RESET_NUMBER = 0
+
+    // Issue 추가 및 수정 부분에서 번들로 받기 위한 Key값 정의
+    const val ISSUE_BUNDLE_KEY = "issue_bundle"
 }
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
index e897fcf8da..34403ce805 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
@@ -4,13 +4,17 @@ import android.os.Bundle
 import android.view.View
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.commit
 import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentDetailBinding
+import com.example.it.issuetracker.presentation.common.Constants
 import com.example.it.issuetracker.presentation.common.DataBindingBaseFragment
 import com.example.it.issuetracker.presentation.common.repeatOnLifecycleExtension
 import com.example.it.issuetracker.presentation.main.issue.list.IssueViewModel
+import com.example.it.issuetracker.presentation.main.issue.register.RegisterIssueFragment
 import kotlinx.coroutines.flow.collectLatest
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -20,6 +24,9 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
     private var id: Long = -1
     private val viewModel by sharedViewModel<DetailViewModel>()
     private val issueViewModel by viewModel<IssueViewModel>()
+    private val registerIssueFragment = RegisterIssueFragment().apply {
+        setOnRefreshListener { issueViewModel.getIssues() }
+    }
     private val adapter = CommentAdapter { view, uid ->
         val popupMenu = PopupMenu(requireContext(), view)
         popupMenu.setOnMenuItemClickListener { item ->
@@ -103,7 +110,7 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
             popup.setOnMenuItemClickListener { menuItem ->
                 when (menuItem.itemId) {
                     R.id.edit -> {
-                        Toast.makeText(requireContext(), "수정하기 눌렀습니다.", Toast.LENGTH_SHORT).show()
+                        navigateRegisterPage()
                     }
                     R.id.delete -> {
                         issueViewModel.deleteIssue(id)
@@ -114,8 +121,13 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
             }
             popup.show()
         }
+    }
 
-
+    private fun navigateRegisterPage() {
+        parentFragmentManager.commit {
+            addToBackStack("register_issue")
+            replace(R.id.container_main, registerIssueFragment)
+        }
     }
 
     override fun observerData() {
@@ -155,6 +167,7 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
                 binding.chipCloseIssue.isVisible = true
             }
         }
+        registerIssueFragment.arguments = bundleOf(Constants.ISSUE_BUNDLE_KEY to state.issue)
     }
 
     private fun handlerLoading() {
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
index cb577e42f5..793799a283 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.commit
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -55,7 +56,14 @@ class IssueFragment : DataBindingBaseFragment<FragmentIssueBinding>(R.layout.fra
 
     override fun initView() = with(binding) {
         ivSearch.setOnClickListener { navigateFragment(SearchFragment(), "search_issue") }
-        btnIssue.setOnClickListener { navigateFragment(RegisterIssueFragment(), "register_issue") }
+        btnIssue.setOnClickListener {
+            val registerIssueFragment = RegisterIssueFragment().apply {
+                setOnRefreshListener {
+                    viewModel.getIssues()
+                }
+            }
+            navigateFragment(registerIssueFragment, "register_issue")
+        }
         rvIssue.adapter = adapter
         val swipeHelper = SwipeHelper()
         val itemTouchHelper = ItemTouchHelper(swipeHelper)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
index 344a724f55..d6c56a98b3 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
@@ -26,7 +26,7 @@ class IssueViewModel(
         getIssues()
     }
 
-    private fun getIssues() = viewModelScope.launch {
+    fun getIssues() = viewModelScope.launch {
         _uiState.update { IssueUiState.Loading }
         issueRepository.getIssue().collectLatest { issues ->
             _uiState.update { IssueUiState.GetIssues(issues) }
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
new file mode 100644
index 0000000000..d2b04db365
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
@@ -0,0 +1,14 @@
+package com.example.it.issuetracker.presentation.main.issue.register
+
+import com.example.it.issuetracker.domain.model.Label
+import com.example.it.issuetracker.domain.model.Member
+import com.example.it.issuetracker.domain.model.MileStone
+
+data class NewIssue(
+    val title: String,
+    val description: String,
+    // TODO: 서버의 레이블 추가/수정 기능이 완료되면 인덱스 번호로 변경해야 함
+    val labels: List<Label>? = null,
+    val milestoneId: MileStone? = null,
+    val assignee: Long? = null
+)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt
new file mode 100644
index 0000000000..50809d8008
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt
@@ -0,0 +1,9 @@
+package com.example.it.issuetracker.presentation.main.issue.register
+
+data class RegisterIssue(
+    val title: String,
+    val description: String,
+    val labels: List<String> = emptyList(),
+    val milestones: String = "",
+    val assignee: String = ""
+)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index a44f5fb44a..b9fbca4767 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -4,10 +4,25 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.InputMethodManager
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.widget.AdapterView
+import android.widget.Toast
+import androidx.core.widget.doAfterTextChanged
 import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentRegisterIssueBinding
+import com.example.it.issuetracker.domain.model.IssueDetail
+import com.example.it.issuetracker.domain.model.Label
+import com.example.it.issuetracker.presentation.common.Constants
+import com.example.it.issuetracker.presentation.common.Constants.INIT_ERROR_MSG_ID
 import com.example.it.issuetracker.presentation.common.DataBindingBaseFragment
 import io.noties.markwon.Markwon
+import com.example.it.issuetracker.presentation.common.repeatOnLifecycleExtension
+import com.example.it.issuetracker.presentation.main.issue.filter.SpinnerAdapter
+import com.google.android.material.chip.Chip
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class RegisterIssueFragment :
     DataBindingBaseFragment<FragmentRegisterIssueBinding>(R.layout.fragment_register_issue) {
@@ -16,43 +31,177 @@ class RegisterIssueFragment :
     private lateinit var markOne: Markwon
     private var markDownFlag = false
     private var previousText = ""
+    private val viewModel by viewModel<RegisterIssueViewModel>()
+    private var editIssueDetail: IssueDetail? = null
+    private var onRefresh: (() -> Unit)? = null
+
+    fun setOnRefreshListener(listener: () -> Unit) {
+        onRefresh = listener
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         markOne = Markwon.builder(requireContext())
             .build()
+        binding.lifecycleOwner = viewLifecycleOwner
+        editIssueDetail = arguments?.getSerializable(Constants.ISSUE_BUNDLE_KEY) as? IssueDetail
+        if (editIssueDetail != null) viewModel.setDataForEditIssue(editIssueDetail!!)
+
         initView()
+        observerData()
     }
 
     override fun initView() {
-        previewMarkDown()
-        binding.etText.text.toString()
+        binding.editDescription.text.toString()
+        setupSpinner()
+        setupEditText()
+        setupToolbar()
     }
 
-    private fun previewMarkDown() {
-        binding.btn.setOnClickListener {
-            if (!markDownFlag) getMarkDownView()
-            else getEditView()
+    private fun getMarkDownView() {
+        previousText = binding.editDescription.text.toString()
+        binding.editDescription.isEnabled = false
+        imm.hideSoftInputFromWindow(binding.editDescription.windowToken, 0)
+        markOne.setMarkdown(binding.editDescription, binding.editDescription.text.toString())
+        markDownFlag = true
+    }
+
+    private fun setupToolbar() {
+        binding.toolbar.title = getString(R.string.new_issue_title_string)
+        binding.toolbar.setNavigationOnClickListener { parentFragmentManager.popBackStack() }
+        binding.toolbar.setOnMenuItemClickListener { menu ->
+            when (menu.itemId) {
+                R.id.save_issue -> {
+                    viewModel.saveIssue()
+                    onRefresh?.invoke()
+                    parentFragmentManager.popBackStack()
+                    true
+                }
+                R.id.menu_preview -> {
+                    if (!markDownFlag) getMarkDownView()
+                    else getEditView()
+                    true
+                }
+                else -> false
+            }
         }
     }
 
-    private fun getMarkDownView() {
-        previousText = binding.etText.text.toString()
-        binding.etText.isEnabled = false
-        imm.hideSoftInputFromWindow(binding.etText.windowToken, 0)
-        markOne.setMarkdown(binding.etText, binding.etText.text.toString())
-        markDownFlag = true
+    private fun setupEditText() {
+        binding.editSubject.doAfterTextChanged { input ->
+            val text = input.toString()
+            viewModel.setSubjectEmptyState(text.isEmpty())
+            viewModel.setSubject(text)
+        }
+        binding.editDescription.doAfterTextChanged { input ->
+            val text = input.toString()
+            viewModel.setDescriptionEmptyState(text.isEmpty())
+            viewModel.setDescription(text)
+        }
+    }
+
+    private fun setupSpinner() {
+        binding.filterMilestone.spinner.onItemSelectedListener =
+            setSpinnerItemSelectedListener { index -> viewModel.setSelectedMilestoneIndex(index) }
+        binding.filterAssignee.spinner.onItemSelectedListener =
+            setSpinnerItemSelectedListener { index -> viewModel.setSelectedAssigneeIndex(index) }
+    }
+
+    private fun setSpinnerItemSelectedListener(listener: (position: Int) -> Unit): AdapterView.OnItemSelectedListener {
+        return object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) = listener(position)
+
+            override fun onNothingSelected(parent: AdapterView<*>?) = Unit
+        }
+    }
+
+    override fun observerData() {
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.filterItems }
+                .distinctUntilChanged()
+                .collect { filterItems ->
+                    createLabelChipItems(filterItems.labelList)
+
+                    val milestoneTitleList =
+                        filterItems.milestoneList.map { it.title }.toMutableList()
+                    milestoneTitleList.add(0, "선택")
+                    binding.filterMilestone.spinner.adapter =
+                        SpinnerAdapter(requireContext(), R.layout.item_spinner, milestoneTitleList)
+
+                    val assigneeNameList = filterItems.assigneeList.map { it.name }.toMutableList()
+                    assigneeNameList.add(0, "선택")
+                    binding.filterAssignee.spinner.adapter =
+                        SpinnerAdapter(requireContext(), R.layout.item_spinner, assigneeNameList)
+                }
+        }
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.selectedFilters }
+                .distinctUntilChanged()
+                .collect {
+                    if (it.labelIndex != null) checkedLabel(it.labelIndex)
+                    if (it.milestoneIndex != null) binding.filterMilestone.spinner.setSelection(it.milestoneIndex.toInt())
+                    if (it.assigneeIndex != null) binding.filterAssignee.spinner.setSelection(it.assigneeIndex)
+                }
+        }
+        repeatOnLifecycleExtension {
+            val saveMenu = binding.toolbar.menu.findItem(R.id.save_issue)
+            viewModel.uiState.map { it.requiredField }
+                .distinctUntilChanged()
+                .collect {
+                    saveMenu.isEnabled = !it.isEmptySubject && !it.isEmptyDescription
+                }
+        }
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.errorMsgId }
+                .distinctUntilChanged()
+                .collect { msgId ->
+                    if (msgId == INIT_ERROR_MSG_ID) return@collect
+                    val text = getString(msgId)
+                    Toast.makeText(requireContext(), text, Toast.LENGTH_LONG).show()
+                }
+        }
+    }
+
+    private fun checkedLabel(labelList: List<Int>) {
+        labelList.forEach { index ->
+            binding.labelChipGroup.findViewWithTag<Chip>(index)?.apply {
+                isChecked = true
+            }
+        }
+    }
+
+    private fun createLabelChipItems(labelList: List<Label>) {
+        binding.labelChipGroup.removeAllViews()
+        labelList.forEach { label ->
+            binding.labelChipGroup.addView(createChip(requireContext(), label))
+        }
+    }
+
+    private fun createChip(context: Context, label: Label): Chip {
+        return Chip(context).apply {
+            text = label.title
+            chipBackgroundColor = ColorStateList.valueOf(Color.parseColor(label.color))
+            isCheckable = true
+            tag = label.id
+            setTextColor(Color.parseColor(label.textColor))
+            setOnCheckedChangeListener { buttonView, isChecked ->
+                viewModel.setCheckedLabel(buttonView.tag as Int, isChecked)
+            }
+        }
     }
 
     private fun getEditView() {
         with(binding) {
-            etText.setText(previousText)
-            etText.isEnabled = true
-            etText.setSelection(etText.text.toString().length)
+            editDescription.setText(previousText)
+            editDescription.isEnabled = true
+            editDescription.setSelection(editDescription.text.toString().length)
         }
-        imm.showSoftInput(binding.etText, 0)
+        imm.showSoftInput(binding.editDescription, 0)
         previousText = ""
         markDownFlag = false
     }
-
-    override fun observerData() = Unit
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
new file mode 100644
index 0000000000..29c90fc586
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
@@ -0,0 +1,36 @@
+package com.example.it.issuetracker.presentation.main.issue.register
+
+import com.example.it.issuetracker.data.dto.LabelDto
+import com.example.it.issuetracker.data.dto.MemberDto
+import com.example.it.issuetracker.data.dto.MilestoneDto
+import com.example.it.issuetracker.domain.model.Label
+import com.example.it.issuetracker.domain.model.Member
+import com.example.it.issuetracker.domain.model.MileStone
+import com.example.it.issuetracker.presentation.common.Constants.FILTER_RESET_NUMBER
+import com.example.it.issuetracker.presentation.common.Constants.INIT_ERROR_MSG_ID
+
+data class RegisterIssueUiState(
+    val title: String = "",
+    val description: String = "",
+    val filterItems: FilterItems = FilterItems(),
+    val selectedFilters: SelectedFilters = SelectedFilters(),
+    val requiredField: RequireField = RequireField(),
+    val errorMsgId: Int = INIT_ERROR_MSG_ID
+) {
+    data class FilterItems(
+        val labelList: List<Label> = emptyList(),
+        val milestoneList: List<MileStone> = emptyList(),
+        val assigneeList: List<Member> = emptyList()
+    )
+
+    data class SelectedFilters(
+        val labelIndex: List<Int>? = emptyList(),
+        val milestoneIndex: Int? = FILTER_RESET_NUMBER,
+        val assigneeIndex: Int? = FILTER_RESET_NUMBER
+    )
+
+    data class RequireField(
+        val isEmptySubject: Boolean = true,
+        val isEmptyDescription: Boolean = true
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
new file mode 100644
index 0000000000..9f9b7de79f
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
@@ -0,0 +1,158 @@
+package com.example.it.issuetracker.presentation.main.issue.register
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.it.issuetracker.R
+import com.example.it.issuetracker.data.dto.toLabel
+import com.example.it.issuetracker.data.dto.toMilestone
+import com.example.it.issuetracker.domain.model.IssueDetail
+import com.example.it.issuetracker.domain.model.Label
+import com.example.it.issuetracker.domain.model.MileStone
+import com.example.it.issuetracker.domain.repository.IssueTrackerRepository
+import com.example.it.issuetracker.domain.repository.LabelRepository
+import com.example.it.issuetracker.domain.repository.MilestoneRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+
+class RegisterIssueViewModel(
+    private val labelRepository: LabelRepository,
+    private val milestoneRepository: MilestoneRepository,
+    private val issueTrackerRepository: IssueTrackerRepository
+) : ViewModel() {
+
+    private var _uiState = MutableStateFlow(RegisterIssueUiState())
+    val uiState = _uiState.asStateFlow()
+
+    init {
+        getLabelList()
+        getMilestoneList()
+        getAssigneeList()
+    }
+
+    private fun getLabelList() = viewModelScope.launch {
+        labelRepository.getLabelInfoList()
+            .onSuccess { labelDtoList ->
+                _uiState.update { state ->
+                    val labelList = labelDtoList.map { it.toLabel() }
+                    val filterItems = state.filterItems.copy(labelList = labelList)
+                    state.copy(filterItems = filterItems)
+                }
+            }
+            .onFailure {
+                _uiState.update { it.copy(errorMsgId = R.string.network_error) }
+            }
+    }
+
+    private fun getMilestoneList() = viewModelScope.launch {
+        milestoneRepository.getMilestoneInfoList()
+            .onSuccess { milestoneDtoList ->
+                _uiState.update { state ->
+                    val milestoneList = milestoneDtoList.map { it.toMilestone() }
+                    val filterItems = state.filterItems.copy(milestoneList = milestoneList)
+                    state.copy(filterItems = filterItems)
+                }
+            }
+            .onFailure {
+                _uiState.update { it.copy(errorMsgId = R.string.network_error) }
+            }
+    }
+
+    private fun getAssigneeList() = viewModelScope.launch {
+        issueTrackerRepository.getWriter()
+            .onSuccess { memberList ->
+                _uiState.update { state ->
+                    val filterItems = state.filterItems.copy(assigneeList = memberList)
+                    state.copy(filterItems = filterItems)
+                }
+            }
+            .onFailure {
+                _uiState.update { it.copy(errorMsgId = R.string.network_error) }
+            }
+    }
+
+    fun saveIssue() = viewModelScope.launch {
+        val state = _uiState.value
+
+        // TODO: 서버에 이슈/수정 기능이 완료되면 인덱스 번호로 변경해야 함.
+        val labelList = mutableListOf<Label>()
+        state.selectedFilters.labelIndex?.forEach { index ->
+            labelList.add(state.filterItems.labelList.filter { it.id == index }[0])
+        }
+        var milestone: MileStone? = null
+        val milestoneIndex = state.selectedFilters.milestoneIndex
+        if (milestoneIndex != null && milestoneIndex != 0) milestone =
+            state.filterItems.milestoneList[milestoneIndex.toInt() - 1]
+        val newIssue = NewIssue(
+            state.title,
+            state.description,
+            labelList,
+            milestone,
+            state.filterItems.assigneeList[0].id
+        )
+
+        issueTrackerRepository.saveIssue(newIssue)
+    }
+
+    fun setSubject(subject: String) {
+        _uiState.update { it.copy(title = subject) }
+    }
+
+    fun setDescription(description: String) {
+        _uiState.update { it.copy(description = description) }
+    }
+
+    fun setSubjectEmptyState(state: Boolean) {
+        _uiState.update {
+            val requiredField = it.requiredField.copy(isEmptySubject = state)
+            it.copy(requiredField = requiredField)
+        }
+    }
+
+    fun setDescriptionEmptyState(state: Boolean) {
+        _uiState.update {
+            val requiredField = it.requiredField.copy(isEmptyDescription = state)
+            it.copy(requiredField = requiredField)
+        }
+    }
+
+    fun setSelectedMilestoneIndex(index: Int) {
+        _uiState.update {
+            val selectedFilters = it.selectedFilters.copy(milestoneIndex = index)
+            it.copy(selectedFilters = selectedFilters)
+        }
+    }
+
+    fun setSelectedAssigneeIndex(index: Int) {
+        _uiState.update {
+            val selectedFilters = it.selectedFilters.copy(assigneeIndex = index)
+            it.copy(selectedFilters = selectedFilters)
+        }
+    }
+
+    fun setCheckedLabel(id: Int, isChecked: Boolean) {
+        val labelList = _uiState.value.selectedFilters.labelIndex?.toMutableSet()
+        if (isChecked) {
+            labelList?.add(id)
+        } else {
+            val removeId = labelList?.find { it == id } ?: return
+            labelList.remove(removeId)
+        }
+        _uiState.update {
+            val selectedFilters = it.selectedFilters.copy(labelIndex = labelList?.toList())
+            it.copy(selectedFilters = selectedFilters)
+        }
+    }
+
+    fun setDataForEditIssue(issueDetail: IssueDetail) {
+        setSubject(issueDetail.title)
+        setDescription(issueDetail.description)
+        issueDetail.labels.forEach { label ->
+            setCheckedLabel(label.id, true)
+        }
+        issueDetail.milestones[0].id?.let {
+            setSelectedMilestoneIndex(it.toInt())
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register_issue.xml b/app/src/main/res/layout/fragment_register_issue.xml
index d70c4611b6..8016d2695d 100644
--- a/app/src/main/res/layout/fragment_register_issue.xml
+++ b/app/src/main/res/layout/fragment_register_issue.xml
@@ -10,25 +10,146 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".presentation.main.issue.register.RegisterIssueFragment">
+        tools:context=".presentation.main.issue.register.RegisterIssue">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:menu="@menu/issue_write_menu"
+                app:navigationIcon="@drawable/ic_back"
+                app:titleTextColor="@color/white"
+                tools:title="이슈 작성" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <TextView
+            android:id="@+id/tv_subject"
+            style="@style/Subtitle1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:text="@string/issue_write_subject_string"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appbar_layout" />
 
         <EditText
-            android:id="@+id/et_text"
+            android:id="@+id/edit_subject"
+            style="@style/Subtitle2"
             android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/label_background"
+            android:hint="제목을 입력하세요"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_subject"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/tv_subject"
+            app:layout_constraintTop_toTopOf="@id/tv_subject"
+            tools:text="테스트 이슈 작성" />
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="12dp"
+            android:background="@color/gray"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/edit_subject" />
+
+        <EditText
+            android:id="@+id/edit_description"
+            style="@style/Subtitle2"
+            android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:textColor="@drawable/edittext_enabled_text_color"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="10dp"
+            android:background="@drawable/label_background"
+            android:gravity="top"
+            app:layout_constraintBottom_toTopOf="@id/filterLabel"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn" />
+            app:layout_constraintTop_toBottomOf="@id/divider"
+            tools:text="::마크다운::이 어떻게 보여지는지 확인합니다." />
 
-        <Button
-            android:id="@+id/btn"
-            android:layout_width="wrap_content"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/filterLabel"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="선택"
+            android:background="#F2F2F7"
+            android:orientation="horizontal"
+            android:padding="20dp"
+            app:layout_constraintBottom_toTopOf="@id/filter_milestone"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintStart_toStartOf="parent">
+
+            <TextView
+                android:id="@+id/tv_title"
+                style="@style/Subtitle1"
+                android:layout_width="60dp"
+                android:layout_height="wrap_content"
+                android:text="@string/label_string"
+                android:textColor="@color/black"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <HorizontalScrollView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="@id/filterLabel"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/tv_title"
+                app:layout_constraintTop_toTopOf="@id/filterLabel">
+
+                <com.google.android.material.chip.ChipGroup
+                    android:id="@+id/label_chip_group"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/tv_title"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:singleLine="true" />
+            </HorizontalScrollView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <com.example.it.issuetracker.presentation.customview.CustomFilter
+            android:id="@+id/filter_milestone"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="#F2F2F7"
+            app:layout_constraintBottom_toTopOf="@id/filter_assignee"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:textColor="@android:color/black"
+            app:title="마일스톤" />
+
+        <com.example.it.issuetracker.presentation.customview.CustomFilter
+            android:id="@+id/filter_assignee"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="#F2F2F7"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:textColor="@android:color/black"
+            app:title="담당자" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/issue_write_menu.xml b/app/src/main/res/menu/issue_write_menu.xml
new file mode 100644
index 0000000000..0d2de8d68e
--- /dev/null
+++ b/app/src/main/res/menu/issue_write_menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_preview"
+        android:title="@string/preview_string"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/save_issue"
+        android:enabled="false"
+        android:title="@string/save_issue_string"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef570b98c5..4010222fe6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -75,4 +75,12 @@
     <string name="logout_question_negative_string">취소</string>
     <string name="logout_question_title_string">로그아웃</string>
     <string name="logout_question_message_string">로그아웃 하시겠습니까?</string>
+
+    <!-- issue write -->
+    <string name="preview_string">미리보기</string>
+    <string name="save_issue_string">저장</string>
+    <string name="edit_issue_string">수정</string>
+    <string name="issue_write_subject_string">제목</string>
+    <string name="new_issue_title_string">새로운 이슈</string>
+    <string name="edit_issue_title_string">이슈 수정</string>
 </resources>
\ No newline at end of file

From f9a2f01b047136350d02026973805d069b8ec3ff Mon Sep 17 00:00:00 2001
From: stitch <skaxodn97@gmail.com>
Date: Fri, 1 Jul 2022 11:49:54 +0900
Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=EC=9D=B4=EC=8A=88=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=EB=8C=93=EA=B8=80=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?=
 =?UTF-8?q?=20=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20=ED=86=B5=EC=8B=A0(?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A1=B0=ED=9A=8C,=20=EC=9D=B4=EC=8A=88=20?=
 =?UTF-8?q?=EB=8B=AB=EA=B8=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 이슈 상세 댓글 추가
- 키보드 컨트롤(숨김, 보여주기)
- 댓글 커서로 움직이기(현재 위치)
- 서버 통신
상세 DTO 변경
이슈 닫기 -> query를 status로 보내주기 때문에 불필요한 함수 제거
---
 .../data/datasource/IssueTrackerDataSource.kt |  10 +-
 .../IssueTrackerDefaultDataSource.kt          | 121 +++++-----
 .../remote/IssueTrackerRemoteDataSource.kt    |  49 ++--
 .../it/issuetracker/data/dto/AssigneeDto.kt   |  16 ++
 .../it/issuetracker/data/dto/CommentDto.kt    |  18 +-
 .../issuetracker/data/dto/IssueDetailDto.kt   |  15 +-
 .../it/issuetracker/data/dto/IssueDto.kt      |   1 +
 .../it/issuetracker/data/dto/MilestoneDto.kt  |   5 +-
 .../it/issuetracker/data/dto/WriterDto.kt     |  20 ++
 .../data/network/IssueTrackerService.kt       |   7 +
 .../repository/IssueTrackerRepositoryImpl.kt  |  29 +--
 .../it/issuetracker/di/datasourceModule.kt    |   1 +
 .../it/issuetracker/di/viewModelModule.kt     |   2 +-
 .../it/issuetracker/domain/model/Assignee.kt  |   7 +
 .../it/issuetracker/domain/model/Comment.kt   |   5 +-
 .../issuetracker/domain/model/IssueDetail.kt  |   8 +-
 .../issuetracker/domain/model/IssuesIDList.kt |   3 +
 .../it/issuetracker/domain/model/MileStone.kt |   2 -
 .../it/issuetracker/domain/model/Writer.kt    |   9 +
 .../repository/IssueTrackerRepository.kt      |  13 +-
 .../presentation/common/BaseSwipeHelper.kt    |  42 +---
 .../presentation/common/GlideModule.kt        |   7 +
 .../common/ImageBindingAdapters.kt            |  13 +
 .../common/TextBindingAdapters.kt             |   5 +-
 .../presentation/customview/CustomSnackBar.kt |   8 +-
 .../main/issue/detail/BottomSheetMenu.kt      |   2 +-
 .../main/issue/detail/CommentAdapter.kt       |  19 +-
 .../main/issue/detail/DetailFragment.kt       | 228 +++++++++++-------
 .../main/issue/detail/DetailViewModel.kt      |  71 +++++-
 .../main/issue/list/IssueFragment.kt          |  20 +-
 .../main/issue/list/IssueViewModel.kt         |  87 +++----
 .../main/issue/register/NewIssue.kt           |   7 +-
 .../main/issue/register/RegisterIssue.kt      |   9 -
 .../issue/register/RegisterIssueFragment.kt   |  15 +-
 .../issue/register/RegisterIssueUiState.kt    |  11 +-
 .../issue/register/RegisterIssueViewModel.kt  |  12 +-
 .../main/milestone/MilestoneAdapter.kt        |  16 +-
 .../res/layout/fragment_bottom_sheet_menu.xml |   2 +-
 app/src/main/res/layout/fragment_detail.xml   |   6 +-
 .../res/layout/fragment_register_issue.xml    |   5 +-
 app/src/main/res/layout/item_comment.xml      |   9 +-
 app/src/main/res/layout/item_writer.xml       |   7 +-
 app/src/main/res/values-night/strings.xml     |   1 +
 app/src/main/res/values/strings.xml           |   5 +-
 44 files changed, 538 insertions(+), 410 deletions(-)
 rename app/src/main/java/com/example/it/issuetracker/data/datasource/{ => local}/IssueTrackerDefaultDataSource.kt (77%)
 create mode 100644 app/src/main/java/com/example/it/issuetracker/data/dto/AssigneeDto.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/data/dto/WriterDto.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/domain/model/IssuesIDList.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/common/GlideModule.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/common/ImageBindingAdapters.kt
 delete mode 100644 app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt

diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
index 7762265125..07cf7840db 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
@@ -4,19 +4,14 @@ import com.example.it.issuetracker.data.dto.IssueDetailDto
 import com.example.it.issuetracker.data.dto.IssueDto
 import com.example.it.issuetracker.data.dto.MemberDto
 import com.example.it.issuetracker.data.dto.MilestoneDto
-import com.example.it.issuetracker.domain.model.Issue
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
-import java.util.*
 
 interface IssueTrackerDataSource {
 
     fun getIssue(): Flow<List<IssueDto>>
-    suspend fun deleteIssue(list: List<Issue>)
-    suspend fun deleteIssue(id: Long)
-    suspend fun closeIssue(list: List<Issue>)
-    suspend fun closeIssue(id: Long)
-    suspend fun revertIssue(list: SortedMap<Int, Issue>)
+    suspend fun updateIssueDelete(status: Boolean, list: List<Long>)
+    suspend fun updateIssueClose(status: Boolean, list: List<Long>)
     suspend fun getMember(): Result<List<MemberDto>>
     suspend fun getMilestone(): Result<List<MilestoneDto>>
     suspend fun getFilterList(value: HashMap<String, Any>): Result<List<IssueDto>>
@@ -27,4 +22,5 @@ interface IssueTrackerDataSource {
     suspend fun addBest(id: Long, uid: Long)
     suspend fun addHate(id: Long, uid: Long)
     suspend fun addOk(id: Long, uid: Long)
+    suspend fun addComment(id: Long, text: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
similarity index 77%
rename from app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt
rename to app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
index 816e821d9a..442ebf9c81 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDefaultDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
@@ -1,12 +1,12 @@
-package com.example.it.issuetracker.data.datasource
+package com.example.it.issuetracker.data.datasource.local
 
-import android.util.Log
+import com.example.it.issuetracker.data.datasource.IssueTrackerDataSource
+import com.example.it.issuetracker.data.datasource.LabelFakeDatabase
 import com.example.it.issuetracker.data.dto.*
-import com.example.it.issuetracker.domain.model.Issue
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import java.util.*
+import java.text.SimpleDateFormat
 
 class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
 
@@ -19,6 +19,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
             labels = listOf(LabelFakeDatabase.database[0]),
             mileStone = "마일스톤",
             createdTime = "2022-05-21",
+            isDelete = false
         ),
         IssueDto(
             id = 2L,
@@ -28,6 +29,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
             labels = listOf(LabelFakeDatabase.database[1]),
             mileStone = "마스터즈 코스",
             createdTime = "2022-05-21",
+            isDelete = false
         ),
         IssueDto(
             id = 3L,
@@ -37,6 +39,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
             labels = listOf(LabelFakeDatabase.database[2]),
             mileStone = "테스트 그룹",
             createdTime = "2022-05-21",
+            isDelete = false
         ),
         IssueDto(
             id = 4L,
@@ -46,6 +49,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
             labels = listOf(LabelFakeDatabase.database[3]),
             mileStone = "마스터즈 코스 숫자",
             createdTime = "2022-05-21",
+            isDelete = false
         ),
         IssueDto(
             id = 5,
@@ -55,6 +59,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
             labels = listOf(LabelFakeDatabase.database[0], LabelFakeDatabase.database[1]),
             mileStone = "마스터즈 코스 숫자",
             createdTime = "2022-05-06 09:11:23",
+            isDelete = false
         )
     )
 
@@ -116,36 +121,34 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
     private var issueDetail = IssueDetailDto(
         id = 5,
         title = "제목쓰",
-        issueStatus = "open",
-        writer = "stitch",
-        manager = "wooki",
+        issueStatus = true,
+        writer = WriterDto(id = 1L, name = "stitch", email = "", githubId = "", imageUrl = ""),
+        manager = listOf(AssigneeDto(id = 1L, githubId = "", imageUrl = "")),
         description = "안녕하세요. 제목쓰에 대한 설명입니다.",
         createdTime = "2022-05-06 09:11:23",
         labels = listOf(LabelFakeDatabase.database[0], LabelFakeDatabase.database[1]),
-        milestones = listOf(MilestoneDto(id = 4,
+        milestones = MilestoneDto(id = 4,
             title = "마스터즈 코스 숫자",
             deadline = "2022-06-20",
-            description = "")),
-        comments = listOf(
+            description = ""),
+        comments = mutableListOf(
             CommentDto(
-                uid = 1L,
-                id = "Daniel",
+                id = 1L,
+                githubId = "Daniel",
                 imageUrl = "",
                 content = "내용",
                 createDate = "2022-05-06 12:13:13",
-                reaction = 1,
                 like = 1,
                 hate = 0,
                 best = 4,
                 ok = 0
             ),
             CommentDto(
-                uid = 2L,
-                id = "Stitch",
+                id = 2L,
+                githubId = "Stitch",
                 imageUrl = "",
                 content = "happy day",
                 createDate = "2022-05-06 12:13:13",
-                reaction = 1,
                 like = 4,
                 hate = 2,
                 best = 0,
@@ -158,54 +161,19 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
         emit(issues.filter { it.state }.toList())
     }
 
-    override suspend fun deleteIssue(list: List<Issue>) {
-        list.forEach { issue ->
-            val removeIssue = issues.find { it.id == issue.id }
-            issues.remove(removeIssue)
+    override suspend fun updateIssueDelete(status: Boolean, list: List<Long>) {
+        list.forEach { id ->
+            val issue = issues.find { it.id == id }
+            val index = issues.indexOf(issue)
+            issues[index].isDelete = status
         }
     }
 
-    override suspend fun deleteIssue(id: Long) {
-        val issue = issues.find { it.id == id }
-        issues.remove(issue)
-    }
-
-    override suspend fun closeIssue(list: List<Issue>) {
-        list.forEach { issue ->
-            val closeIssue = issues.find { it.id == issue.id }
-            val index = issues.indexOf(closeIssue)
-            issues[index].state = false
-        }
-    }
-
-    override suspend fun closeIssue(id: Long) {
-        val issue = issues.find { it.id == id }
-        val index = issues.indexOf(issue)
-        issueDetail.issueStatus = "close"
-        issues[index].state = false
-        Log.d("test", "closeIssue: $issues")
-    }
-
-    override suspend fun revertIssue(list: SortedMap<Int, Issue>) {
-        for ((idx, issue) in list) {
-            val issueDto = IssueDto(
-                id = issue.id,
-                title = issue.title,
-                description = issue.description,
-                state = issue.state,
-                labels = issue.label.map {
-                    LabelDto(
-                        id = issues.size + 1,
-                        title = it.title,
-                        description = it.description,
-                        color = it.color,
-                        textColor = it.textColor
-                    )
-                },
-                mileStone = issue.mileStone,
-                createdTime = "2022-06-21",
-            )
-            issues.add(idx, issueDto)
+    override suspend fun updateIssueClose(status: Boolean, list: List<Long>) {
+        list.forEach { id ->
+            val issue = issues.find { it.id == id }
+            val index = issues.indexOf(issue)
+            issues[index].state = status
         }
     }
 
@@ -281,7 +249,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
 
     override suspend fun addLike(id: Long, uid: Long) {
         val map = issueDetail.comments.map {
-            if (it.uid == uid) {
+            if (it.id == uid) {
                 it.copy(like = it.like + 1)
             } else {
                 it
@@ -292,7 +260,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
 
     override suspend fun addBest(id: Long, uid: Long) {
         val map = issueDetail.comments.map {
-            if (it.uid == uid) {
+            if (it.id == uid) {
                 it.copy(best = it.best + 1)
             } else {
                 it
@@ -303,7 +271,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
 
     override suspend fun addHate(id: Long, uid: Long) {
         val map = issueDetail.comments.map {
-            if (it.uid == uid) {
+            if (it.id == uid) {
                 it.copy(hate = it.hate + 1)
             } else {
                 it
@@ -314,7 +282,7 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
 
     override suspend fun addOk(id: Long, uid: Long) {
         val map = issueDetail.comments.map {
-            if (it.uid == uid) {
+            if (it.id == uid) {
                 it.copy(ok = it.ok + 1)
             } else {
                 it
@@ -322,4 +290,27 @@ class IssueTrackerDefaultDataSource : IssueTrackerDataSource {
         }
         issueDetail = issueDetail.copy(comments = map)
     }
+
+    override suspend fun addComment(id: Long, text: String) {
+        val comments = issueDetail.comments.toMutableList()
+        comments.add(
+            CommentDto(
+                id = (issueDetail.comments.size + 1).toLong(),
+                githubId = "Stitch",
+                imageUrl = "",
+                content = text,
+                createDate = convertTimestampToDate(System.currentTimeMillis()),
+                like = 0,
+                best = 0,
+                hate = 0,
+                ok = 0
+            )
+        )
+        issueDetail.comments = comments
+    }
+
+    private fun convertTimestampToDate(timestamp: Long): String {
+        val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        return sdf.format(timestamp)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
index 3fa4a9dcfa..2ca73dac4f 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/IssueTrackerRemoteDataSource.kt
@@ -6,11 +6,10 @@ import com.example.it.issuetracker.data.dto.IssueDto
 import com.example.it.issuetracker.data.dto.MemberDto
 import com.example.it.issuetracker.data.dto.MilestoneDto
 import com.example.it.issuetracker.data.network.IssueTrackerService
-import com.example.it.issuetracker.domain.model.Issue
+import com.example.it.issuetracker.domain.model.IssuesIDList
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import java.util.*
 
 class IssueTrackerRemoteDataSource(
     private val issueTrackerApi: IssueTrackerService,
@@ -20,48 +19,27 @@ class IssueTrackerRemoteDataSource(
         emit(issueTrackerApi.getIssues())
     }
 
-    override suspend fun deleteIssue(list: List<Issue>) {}
+    override suspend fun updateIssueDelete(status: Boolean, list: List<Long>) = Unit
 
-    override suspend fun deleteIssue(id: Long) {}
-
-    override suspend fun closeIssue(list: List<Issue>) {}
-
-    override suspend fun closeIssue(id: Long) {}
-
-    override suspend fun revertIssue(list: SortedMap<Int, Issue>) {}
-
-    override suspend fun saveIssue(newIssue: NewIssue) {
-        // TODO: saveIssue
-    }
+    override suspend fun saveIssue(newIssue: NewIssue) = Unit
 
     override suspend fun getMember(): Result<List<MemberDto>> {
         return runCatching { emptyList() }
     }
 
-    override suspend fun getMilestone(): Result<List<MilestoneDto>> {
-        return runCatching { emptyList() }
+    override suspend fun updateIssueClose(status: Boolean, list: List<Long>) {
+        issueTrackerApi.updateIssueClose(status = status, issueList = IssuesIDList(list))
     }
 
-    override suspend fun getFilterList(hm: HashMap<String, Any>): Result<List<IssueDto>> {
-        return runCatching { emptyList() }
-    }
+    override suspend fun getMilestone(): Result<List<MilestoneDto>> = runCatching { emptyList() }
 
-    override fun findByIssueName(title: String): Flow<List<IssueDto>> = flow {
-        emit(emptyList())
-    }
+    override suspend fun getFilterList(hm: HashMap<String, Any>): Result<List<IssueDto>> =
+        runCatching { emptyList() }
 
-    override fun getIssueDetail(id: Long): Flow<IssueDetailDto> = flow {
-        emit(IssueDetailDto(id = 0,
-            title = "",
-            issueStatus = "",
-            createdTime = "",
-            description = "",
-            writer = "",
-            manager = "",
-            labels = emptyList(),
-            milestones = emptyList(),
-            comments = emptyList()))
-    }
+    override fun findByIssueName(title: String): Flow<List<IssueDto>> = flow { emit(emptyList()) }
+
+    override fun getIssueDetail(id: Long): Flow<IssueDetailDto> =
+        flow { emit(issueTrackerApi.getIssue(id)) }
 
     override suspend fun addLike(id: Long, uid: Long) {}
 
@@ -70,4 +48,7 @@ class IssueTrackerRemoteDataSource(
     override suspend fun addHate(id: Long, uid: Long) {}
 
     override suspend fun addOk(id: Long, uid: Long) {}
+
+    override suspend fun addComment(id: Long, text: String) {}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/AssigneeDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/AssigneeDto.kt
new file mode 100644
index 0000000000..0451924357
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/AssigneeDto.kt
@@ -0,0 +1,16 @@
+package com.example.it.issuetracker.data.dto
+
+import com.example.it.issuetracker.domain.model.Assignee
+
+data class AssigneeDto(
+    val id: Long,
+    val githubId: String,
+    val imageUrl: String,
+)
+
+fun AssigneeDto.toAssignee(): Assignee =
+    Assignee(
+        id = id,
+        githubId = githubId,
+        imageUrl = imageUrl
+    )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/CommentDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/CommentDto.kt
index c887583d7b..fe4468dede 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/CommentDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/CommentDto.kt
@@ -1,19 +1,19 @@
 package com.example.it.issuetracker.data.dto
 
 import com.example.it.issuetracker.domain.model.Comment
+import com.squareup.moshi.Json
 
 data class CommentDto(
-    val uid: Long,
-    val id: String,
+    val id: Long,
+    val githubId: String,
     val imageUrl: String,
     val content: String,
-    val createDate: String,
-    val reaction: Int,
-    var like: Int,
-    var best: Int,
-    var hate: Int,
-    var ok: Int,
+    @Json(name = "createdTime") val createDate: String,
+    var like: Int = 0,
+    var best: Int = 0,
+    var hate: Int = 0,
+    var ok: Int = 0,
 )
 
 fun CommentDto.toComment(): Comment =
-    Comment(uid, id, imageUrl, content, createDate, reaction, like, hate, best, ok)
\ No newline at end of file
+    Comment(id, githubId, imageUrl, content, createDate, like, hate, best, ok)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDetailDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDetailDto.kt
index 850251d327..0987516451 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDetailDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDetailDto.kt
@@ -1,17 +1,18 @@
 package com.example.it.issuetracker.data.dto
 
 import com.example.it.issuetracker.domain.model.IssueDetail
+import com.squareup.moshi.Json
 
 data class IssueDetailDto(
     val id: Long,
     val title: String,
-    var issueStatus: String,
+    @Json(name = "status") var issueStatus: Boolean,
     val createdTime: String,
     val description: String,
-    val writer: String,
-    val manager: String,
+    val writer: WriterDto,
+    @Json(name = "assignees") val manager: List<AssigneeDto>,
     val labels: List<LabelDto>,
-    val milestones: List<MilestoneDto>,
+    @Json(name = "milestone") val milestones: MilestoneDto,
     var comments: List<CommentDto>,
 )
 
@@ -21,10 +22,10 @@ fun IssueDetailDto.toIssueDetail(): IssueDetail =
         title = title,
         issueStatus = issueStatus,
         description = description,
-        writer = writer,
-        manager = manager,
+        writer = writer.toWriter(),
+        manager = manager.map { it.toAssignee() },
         createdTime = createdTime,
         labels = labels.map { it.toLabel() },
-        milestones = milestones.map { it.toMilestone() },
+        milestones = milestones.toMilestone(),
         comments = comments.map { it.toComment() }
     )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDto.kt
index c08b5fb616..2fe77455aa 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/IssueDto.kt
@@ -11,6 +11,7 @@ data class IssueDto(
     val labels: List<LabelDto>,
     @Json(name = "milestoneName") val mileStone: String,
     val createdTime: String,
+    var isDelete: Boolean = false,
 )
 
 fun IssueDto.toIssue(): Issue =
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
index 0717eba5b6..1a4991fe4f 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
@@ -1,13 +1,13 @@
 package com.example.it.issuetracker.data.dto
 
 import com.example.it.issuetracker.domain.model.MileStone
+import com.squareup.moshi.Json
 
 data class MilestoneDto(
     val id: Long? = null,
     val title: String,
     val description: String? = null,
-    val startDate: String? = null,
-    val deadline: String? = null,
+    @Json(name = "deadLine") val deadline: String? = null,
     val openedIssues: Int? = null,
     val closedIssues: Int? = null,
 )
@@ -17,7 +17,6 @@ fun MilestoneDto.toMilestone(): MileStone =
         id = id,
         title = title,
         description = description,
-        startDate = startDate,
         deadLine = deadline,
         openedIssues = openedIssues,
         closedIssue = closedIssues
diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/WriterDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/WriterDto.kt
new file mode 100644
index 0000000000..31b3d9e8eb
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/WriterDto.kt
@@ -0,0 +1,20 @@
+package com.example.it.issuetracker.data.dto
+
+import com.example.it.issuetracker.domain.model.Writer
+
+data class WriterDto(
+    val id: Long,
+    val name: String,
+    val email: String?,
+    val githubId: String,
+    val imageUrl: String,
+)
+
+fun WriterDto.toWriter(): Writer =
+    Writer(
+        id = id,
+        name = name,
+        email = email,
+        githubId = githubId,
+        imageUrl = imageUrl
+    )
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt b/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
index 069419a4b8..686dcd1f8d 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/network/IssueTrackerService.kt
@@ -1,6 +1,7 @@
 package com.example.it.issuetracker.data.network
 
 import com.example.it.issuetracker.data.dto.*
+import com.example.it.issuetracker.domain.model.IssuesIDList
 import retrofit2.http.*
 
 interface IssueTrackerService {
@@ -8,6 +9,12 @@ interface IssueTrackerService {
     @GET("issues")
     suspend fun getIssues(): List<IssueDto>
 
+    @GET("issues/{id}")
+    suspend fun getIssue(@Path("id") id: Long): IssueDetailDto
+
+    @PATCH("issues")
+    suspend fun updateIssueClose(@Query("status") status: Boolean, @Body issueList: IssuesIDList)
+
     @GET("login/oauth/github")
     suspend fun loginOAuthGithub(@Query("code") code: String): LoginDto
 
diff --git a/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
index 484edb4275..46a8346a9e 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/repository/IssueTrackerRepositoryImpl.kt
@@ -13,36 +13,23 @@ import com.example.it.issuetracker.domain.repository.IssueTrackerRepository
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import java.util.*
 
 class IssueTrackerRepositoryImpl(
     private val issueTrackerDataSource: IssueTrackerDataSource,
     private val issueRemoteDataSource: IssueTrackerDataSource,
 ) : IssueTrackerRepository {
     override fun getIssue(): Flow<List<Issue>> {
-        return issueTrackerDataSource.getIssue().map { issues ->
+        return issueRemoteDataSource.getIssue().map { issues ->
             issues.map { issue -> issue.toIssue() }
         }
     }
 
-    override suspend fun deleteIssue(list: List<Issue>) {
-        issueTrackerDataSource.deleteIssue(list)
+    override suspend fun updateIssueDelete(status: Boolean, list: List<Long>) {
+        issueRemoteDataSource.updateIssueDelete(status, list)
     }
 
-    override suspend fun deleteIssue(id: Long) {
-        issueTrackerDataSource.deleteIssue(id)
-    }
-
-    override suspend fun closeIssue(list: List<Issue>) {
-        issueTrackerDataSource.closeIssue(list)
-    }
-
-    override suspend fun closeIssue(id: Long) {
-        issueTrackerDataSource.closeIssue(id)
-    }
-
-    override suspend fun revertIssue(list: SortedMap<Int, Issue>) {
-        issueTrackerDataSource.revertIssue(list)
+    override suspend fun updateIssueClose(status: Boolean, list: List<Long>) {
+        issueRemoteDataSource.updateIssueClose(status, list)
     }
 
     override suspend fun getWriter(): Result<List<Member>> {
@@ -70,7 +57,7 @@ class IssueTrackerRepositoryImpl(
     }
 
     override fun getIssueDetail(id: Long): Flow<IssueDetail> {
-        return issueTrackerDataSource.getIssueDetail(id).map { issueDetail ->
+        return issueRemoteDataSource.getIssueDetail(id).map { issueDetail ->
             issueDetail.toIssueDetail()
         }
     }
@@ -94,4 +81,8 @@ class IssueTrackerRepositoryImpl(
     override suspend fun addOk(id: Long, uid: Long) {
         issueTrackerDataSource.addOk(id, uid)
     }
+
+    override suspend fun addComment(id: Long, text: String) {
+        issueTrackerDataSource.addComment(id, text)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt b/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
index a90c6f7457..27cc5272ff 100644
--- a/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
+++ b/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
@@ -1,6 +1,7 @@
 package com.example.it.issuetracker.di
 
 import com.example.it.issuetracker.data.datasource.*
+import com.example.it.issuetracker.data.datasource.local.IssueTrackerDefaultDataSource
 import com.example.it.issuetracker.data.datasource.remote.IssueTrackerRemoteDataSource
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
diff --git a/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt b/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
index 949cb3505b..87d1cf1d72 100644
--- a/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
+++ b/app/src/main/java/com/example/it/issuetracker/di/viewModelModule.kt
@@ -23,7 +23,7 @@ val viewModelModule = module {
     viewModel { SearchViewModel(get()) }
     viewModel { MilestoneViewModel(get()) }
     viewModel { MilestoneAddViewModel(get()) }
-    viewModel { DetailViewModel(get(), get()) }
+    viewModel { DetailViewModel(get()) }
     viewModel { MyPageViewModel(get(), get()) }
     viewModel { RegisterIssueViewModel(get(), get(), get()) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
new file mode 100644
index 0000000000..bccb3fa0b7
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
@@ -0,0 +1,7 @@
+package com.example.it.issuetracker.domain.model
+
+data class Assignee(
+    val id: Long,
+    val githubId: String,
+    val imageUrl: String,
+)
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
index d57f3f83cf..538723394a 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
@@ -1,12 +1,11 @@
 package com.example.it.issuetracker.domain.model
 
 data class Comment(
-    val uid: Long,
-    val id: String,
+    val id: Long,
+    val githubId: String,
     val imageUrl: String,
     val content: String,
     val createDate: String,
-    val reaction: Int,
     val like: Int,
     val hate: Int,
     val best: Int,
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
index 9085559bfa..faf050d01d 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/IssueDetail.kt
@@ -6,11 +6,11 @@ data class IssueDetail(
     val id: Long,
     val title: String,
     val description: String,
-    val issueStatus: String,
-    val writer: String,
-    val manager: String,
+    val issueStatus: Boolean,
+    val writer: Writer,
+    val manager: List<Assignee>,
     val createdTime: String,
     val labels: List<Label>,
-    val milestones: List<MileStone>,
+    val milestones: MileStone,
     val comments: List<Comment>,
 ) : Serializable
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/IssuesIDList.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/IssuesIDList.kt
new file mode 100644
index 0000000000..79e010a442
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/IssuesIDList.kt
@@ -0,0 +1,3 @@
+package com.example.it.issuetracker.domain.model
+
+data class IssuesIDList(val issueList: List<Long>)
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
index d00f859ad8..3cf879d31e 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/MileStone.kt
@@ -8,7 +8,6 @@ data class MileStone(
     val id: Long? = null,
     val title: String,
     val description: String? = null,
-    val startDate: String? = null,
     val deadLine: String? = null,
     val openedIssues: Int? = null,
     val closedIssue: Int? = null,
@@ -21,7 +20,6 @@ fun MileStone.toMileStoneDto(): MilestoneDto {
         id,
         title,
         description,
-        startDate,
         deadLine,
         openedIssues,
         closedIssue
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
new file mode 100644
index 0000000000..ce237d53e1
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
@@ -0,0 +1,9 @@
+package com.example.it.issuetracker.domain.model
+
+data class Writer(
+    val id: Long,
+    val name: String,
+    val email: String?,
+    val githubId: String,
+    val imageUrl: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt b/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
index 93206d9349..f61650b83b 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/repository/IssueTrackerRepository.kt
@@ -6,21 +6,14 @@ import com.example.it.issuetracker.domain.model.Member
 import com.example.it.issuetracker.domain.model.MileStone
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
-import java.util.*
 
 interface IssueTrackerRepository {
 
     fun getIssue(): Flow<List<Issue>>
 
-    suspend fun deleteIssue(list: List<Issue>)
+    suspend fun updateIssueDelete(status: Boolean, list: List<Long>)
 
-    suspend fun deleteIssue(id: Long)
-
-    suspend fun closeIssue(list: List<Issue>)
-
-    suspend fun closeIssue(id: Long)
-
-    suspend fun revertIssue(list: SortedMap<Int, Issue>)
+    suspend fun updateIssueClose(status: Boolean, list: List<Long>)
 
     suspend fun getWriter(): Result<List<Member>>
 
@@ -41,4 +34,6 @@ interface IssueTrackerRepository {
     suspend fun addHate(id: Long, uid: Long)
 
     suspend fun addOk(id: Long, uid: Long)
+
+    suspend fun addComment(id: Long, text: String)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
index ff059dd381..60255ebbc0 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
@@ -1,24 +1,22 @@
 package com.example.it.issuetracker.presentation.common
 
 import android.graphics.Canvas
-import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import kotlin.math.min
 import kotlin.math.max
+import kotlin.math.min
 
-abstract class BaseSwipeHelper: ItemTouchHelper.Callback() {  // ItemTouchHelper.Callback 을 구현해야 한다
+abstract class BaseSwipeHelper : ItemTouchHelper.Callback() {
 
     private var currentPosition: Int? = null
     private var previousPosition: Int? = null
     private var currentDx = 0f
     private var clamp = 0f
 
-
-    override fun getMovementFlags(  // 이동 방향을 결정!!,  스와이프 시 항상 onChildDraw 보다 먼저 호출!
+    override fun getMovementFlags(
         recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder
+        viewHolder: RecyclerView.ViewHolder,
     ): Int {
         val view = getView(viewHolder)
         clamp = view.width.toFloat() / 10 * 3
@@ -28,7 +26,7 @@ abstract class BaseSwipeHelper: ItemTouchHelper.Callback() {  // ItemTouchHelper
     override fun onMove(
         recyclerView: RecyclerView,
         viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
+        target: RecyclerView.ViewHolder,
     ): Boolean = false
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) = Unit
@@ -53,9 +51,9 @@ abstract class BaseSwipeHelper: ItemTouchHelper.Callback() {  // ItemTouchHelper
         dX: Float,
         dY: Float,
         actionState: Int,
-        isCurrentlyActive: Boolean
+        isCurrentlyActive: Boolean,
     ) {
-        if(actionState == ItemTouchHelper.ACTION_STATE_SWIPE){
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
             val view = getView(viewHolder)
             val isClamped = getClamped(viewHolder)
             val x = clampViewPositionHorizontal(view, dX, isClamped, isCurrentlyActive)
@@ -77,8 +75,8 @@ abstract class BaseSwipeHelper: ItemTouchHelper.Callback() {  // ItemTouchHelper
         view: View,
         dX: Float,
         isClamped: Boolean,
-        isCurrentlyActive: Boolean
-    ) : Float {
+        isCurrentlyActive: Boolean,
+    ): Float {
         val maxSwipe: Float = -view.width.toFloat() / 10 * 3
         val right: Float = 0f
 
@@ -105,27 +103,5 @@ abstract class BaseSwipeHelper: ItemTouchHelper.Callback() {  // ItemTouchHelper
 
     abstract fun getClamped(viewHolder: RecyclerView.ViewHolder): Boolean
 
-    fun setClamp(clamp: Float) {
-        this.clamp = clamp
-    }
-
-    private fun setTag(viewHolder: RecyclerView.ViewHolder, isClamped: Boolean) {
-        viewHolder.itemView.tag = isClamped
-    }
-
-    private fun getTag(viewHolder: RecyclerView.ViewHolder) : Boolean {
-        return viewHolder.itemView.tag as? Boolean ?: false
-    }
-
-    fun removePreviousClamp(recyclerView: RecyclerView) {
-        if (currentPosition == previousPosition)
-            return
-        previousPosition?.let {
-            val viewHolder = recyclerView.findViewHolderForAdapterPosition(it) ?: return
-            getView(viewHolder).translationX = 0f
-            setClamped(viewHolder, false)
-            previousPosition = null
-        }
-    }
 }
 
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/GlideModule.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/GlideModule.kt
new file mode 100644
index 0000000000..303daadf1d
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/GlideModule.kt
@@ -0,0 +1,7 @@
+package com.example.it.issuetracker.presentation.common
+
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+
+@GlideModule
+class GlideModule : AppGlideModule()
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/ImageBindingAdapters.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/ImageBindingAdapters.kt
new file mode 100644
index 0000000000..42896781be
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/ImageBindingAdapters.kt
@@ -0,0 +1,13 @@
+package com.example.it.issuetracker.presentation.common
+
+import android.widget.ImageView
+import androidx.databinding.BindingAdapter
+
+@BindingAdapter("imageUrl")
+fun loadImage(view: ImageView, imageUrl: String?) {
+    if (!imageUrl.isNullOrEmpty()) {
+        GlideApp.with(view)
+            .load(imageUrl)
+            .into(view)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/TextBindingAdapters.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/TextBindingAdapters.kt
index 769c711a7b..b65881770b 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/TextBindingAdapters.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/TextBindingAdapters.kt
@@ -3,6 +3,7 @@ package com.example.it.issuetracker.presentation.common
 import android.widget.TextView
 import androidx.databinding.BindingAdapter
 import com.example.it.issuetracker.R
+import com.example.it.issuetracker.domain.model.Assignee
 import com.example.it.issuetracker.presentation.common.utils.calculateTime
 import java.text.SimpleDateFormat
 
@@ -33,6 +34,6 @@ fun issueFormat(view: TextView, number: Long) {
 }
 
 @BindingAdapter("exists")
-fun hasManager(view: TextView, name: String?) {
-    view.text = name ?: "없음"
+fun hasManager(view: TextView, assignee: Assignee?) {
+    view.text = assignee?.githubId ?: "없음"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomSnackBar.kt b/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomSnackBar.kt
index a8f18783ac..32b7079e51 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomSnackBar.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/customview/CustomSnackBar.kt
@@ -11,7 +11,7 @@ import com.google.android.material.snackbar.Snackbar
 class CustomSnackBar(
     view: View,
     private val message: String,
-    private val onClick: () -> Unit,
+    private val onRevert: () -> Unit,
 ) {
 
     private val context = view.context
@@ -38,7 +38,7 @@ class CustomSnackBar(
 
     private fun initData() = with(binding) {
         tvMessage.text = message
-        btnCancel.setOnClickListener { onClick() }
+        btnCancel.setOnClickListener { onRevert() }
     }
 
     fun show() {
@@ -46,7 +46,7 @@ class CustomSnackBar(
     }
 
     companion object {
-        fun make(view: View, message: String, onClick: () -> Unit) =
-            CustomSnackBar(view, message, onClick)
+        fun make(view: View, message: String, onRevert: () -> Unit) =
+            CustomSnackBar(view, message, onRevert)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
index 0d8ac0e04e..9dcc254368 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
@@ -77,7 +77,7 @@ class BottomSheetMenu(
         binding.tvSearchResult.isVisible = false
         binding.issue = state.issue
         labelAdapter.submitList(state.issue.labels)
-        milestoneAdapter.submitList(state.issue.milestones)
+        milestoneAdapter.submitList(listOf(state.issue.milestones))
 
     }
 
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/CommentAdapter.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/CommentAdapter.kt
index c72f9cb88d..9a7842f07c 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/CommentAdapter.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/CommentAdapter.kt
@@ -1,5 +1,6 @@
 package com.example.it.issuetracker.presentation.main.issue.detail
 
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -14,6 +15,8 @@ class CommentAdapter(
     private val onClickMenu: (View, Long) -> Unit,
 ) : ListAdapter<Comment, CommentAdapter.CommentViewHolder>(CommentDiffUtil()) {
 
+    private var currentPosition = 0
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CommentViewHolder {
         val binding = ItemCommentBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         return CommentViewHolder(binding, onClickMenu)
@@ -23,17 +26,29 @@ class CommentAdapter(
         holder.bind(getItem(position))
     }
 
-    class CommentViewHolder(
+    fun setCurrentPosition(position: Int) {
+        val previousPosition = currentPosition
+        currentPosition = position
+        notifyItemChanged(previousPosition)
+        notifyItemChanged(currentPosition)
+    }
+
+    inner class CommentViewHolder(
         private val binding: ItemCommentBinding,
         private val onClickMenu: (View, Long) -> Unit,
     ) : RecyclerView.ViewHolder(binding.root) {
         fun bind(comment: Comment) {
+            if (currentPosition == adapterPosition) {
+                binding.commentContainer.setBackgroundColor(Color.LTGRAY)
+            } else {
+                binding.commentContainer.setBackgroundColor(Color.WHITE)
+            }
             binding.comment = comment
             binding.layoutLike.isVisible = comment.like != 0
             binding.layoutHate.isVisible = comment.hate != 0
             binding.layoutBest.isVisible = comment.best != 0
             binding.layoutOk.isVisible = comment.ok != 0
-            binding.btnOption.setOnClickListener { onClickMenu(it, comment.uid) }
+            binding.btnOption.setOnClickListener { onClickMenu(it, comment.id) }
         }
     }
 
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
index 34403ce805..246a53ee4b 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
@@ -1,13 +1,17 @@
 package com.example.it.issuetracker.presentation.main.issue.detail
 
+import android.content.Context
 import android.os.Bundle
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import android.widget.PopupMenu
-import android.widget.Toast
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentDetailBinding
 import com.example.it.issuetracker.presentation.common.Constants
@@ -15,52 +19,23 @@ import com.example.it.issuetracker.presentation.common.DataBindingBaseFragment
 import com.example.it.issuetracker.presentation.common.repeatOnLifecycleExtension
 import com.example.it.issuetracker.presentation.main.issue.list.IssueViewModel
 import com.example.it.issuetracker.presentation.main.issue.register.RegisterIssueFragment
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
+
 class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.fragment_detail) {
 
     private var id: Long = -1
+    private val imm: InputMethodManager by lazy { activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager }
     private val viewModel by sharedViewModel<DetailViewModel>()
     private val issueViewModel by viewModel<IssueViewModel>()
     private val registerIssueFragment = RegisterIssueFragment().apply {
         setOnRefreshListener { issueViewModel.getIssues() }
     }
-    private val adapter = CommentAdapter { view, uid ->
-        val popupMenu = PopupMenu(requireContext(), view)
-        popupMenu.setOnMenuItemClickListener { item ->
-            when (item.itemId) {
-                R.id.like -> {
-                    issueViewModel.addLike(id, uid)
-                }
-                R.id.best -> {
-                    issueViewModel.addBest(id, uid)
-                }
-                R.id.hate -> {
-                    issueViewModel.addHate(id, uid)
-                }
-                R.id.ok -> {
-                    issueViewModel.addOk(id, uid)
-                }
-            }
-            viewModel.getIssueDetail(id)
-            true
-        }
-        popupMenu.inflate(R.menu.comment_menu)
-        try {
-            val fieldMPopup = PopupMenu::class.java.getDeclaredField("mPopup")
-            fieldMPopup.isAccessible = true
-            val mPopup = fieldMPopup.get(popupMenu)
-            mPopup.javaClass
-                .getDeclaredMethod("setForceShowIcon", Boolean::class.java)
-                .invoke(mPopup, true)
-        } catch (e: Exception) {
-
-        } finally {
-            popupMenu.show()
-        }
-    }
+    private val adapter = CommentAdapter { view, uid -> commenterOptionMenuEvent(view, uid) }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -74,60 +49,17 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
         observerData()
     }
 
-    override fun initView() = with(binding) {
-        ivOption.setOnClickListener {
-            val bottomSheet = BottomSheetMenu(
-                onDeleteClick = {
-                    issueViewModel.deleteIssue(id)
-                    parentFragmentManager.popBackStack()
-                },
-                onCloseClick = {
-                    issueViewModel.closeIssue(id)
-                    viewModel.getIssueDetail(id)
-                }
-            )
-            bottomSheet.show(parentFragmentManager, "detail_information")
-        }
-        toolbarDefaultIssue.setNavigationOnClickListener {
-            val count = parentFragmentManager.backStackEntryCount
-            if (count - 2 >= 0) {
-                val backStackEntryAt = parentFragmentManager.getBackStackEntryAt(count - 2)
-                if (backStackEntryAt.name == "search_issue") {
-                    parentFragmentManager.popBackStack(
-                        "search_issue",
-                        FragmentManager.POP_BACK_STACK_INCLUSIVE
-                    )
-                }
-            } else {
-                parentFragmentManager.popBackStack()
-            }
-        }
-        rvComment.adapter = adapter
-
-        viewWriter.btnOption.setOnClickListener {
-            val popup = PopupMenu(requireContext(), it)
-            popup.menuInflater.inflate(R.menu.detail_menu, popup.menu)
-            popup.setOnMenuItemClickListener { menuItem ->
-                when (menuItem.itemId) {
-                    R.id.edit -> {
-                        navigateRegisterPage()
-                    }
-                    R.id.delete -> {
-                        issueViewModel.deleteIssue(id)
-                        parentFragmentManager.popBackStack()
-                    }
-                }
-                false
-            }
-            popup.show()
-        }
-    }
-
-    private fun navigateRegisterPage() {
-        parentFragmentManager.commit {
-            addToBackStack("register_issue")
-            replace(R.id.container_main, registerIssueFragment)
-        }
+    override fun initView() {
+        val dividerItemDecoration =
+            DividerItemDecoration(context, LinearLayoutManager(context).orientation)
+        binding.rvComment.addItemDecoration(dividerItemDecoration)
+        binding.rvComment.adapter = adapter
+        binding.btnUp.setOnClickListener { viewModel.upPosition() }
+        binding.btnDown.setOnClickListener { viewModel.downPosition() }
+        detailOptionMenuEvent()
+        toolbarBackButtonEvent()
+        writerOptionMenuEvent()
+        addCommentEvent()
     }
 
     override fun observerData() {
@@ -146,6 +78,19 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
                 }
             }
         }
+
+        repeatOnLifecycleExtension {
+            viewModel.currentPosition.collectLatest { position ->
+                adapter.setCurrentPosition(position)
+                smoothPosition(position)
+            }
+        }
+
+        repeatOnLifecycleExtension {
+            viewModel.focusPosition.collectLatest { position ->
+                smoothPosition(position)
+            }
+        }
     }
 
     private fun handlerUnInitialization() {
@@ -158,11 +103,11 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
         binding.issue = state.issue
         adapter.submitList(state.issue.comments)
         when (state.issue.issueStatus) {
-            context?.getString(R.string.issue_open_eng) -> {
+            true -> {
                 binding.chipOpenIssue.isVisible = true
                 binding.chipCloseIssue.isVisible = false
             }
-            context?.getString(R.string.issue_close_eng) -> {
+            false -> {
                 binding.chipOpenIssue.isVisible = false
                 binding.chipCloseIssue.isVisible = true
             }
@@ -175,4 +120,105 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
         binding.tvSearchResult.isVisible = false
     }
 
+    private fun addCommentEvent() {
+        binding.btnAddComment.setOnClickListener {
+            viewModel.addComment(id, binding.etComment.text.toString())
+            imm.hideSoftInputFromWindow(binding.etComment.windowToken, 0)
+            binding.etComment.text.clear()
+        }
+    }
+
+    private fun writerOptionMenuEvent() {
+        binding.viewWriter.btnOption.setOnClickListener {
+            val popup = PopupMenu(requireContext(), it)
+            popup.menuInflater.inflate(R.menu.detail_menu, popup.menu)
+            popup.setOnMenuItemClickListener { menuItem ->
+                when (menuItem.itemId) {
+                    R.id.edit -> {
+                        navigateRegisterPage()
+                    }
+                    R.id.delete -> {
+                        issueViewModel.deleteIssue(id)
+                        parentFragmentManager.popBackStack()
+                    }
+                }
+                false
+            }
+            popup.show()
+        }
+    }
+
+    private fun toolbarBackButtonEvent() {
+        binding.toolbarDefaultIssue.setNavigationOnClickListener {
+            val count = parentFragmentManager.backStackEntryCount
+            if (count - 2 >= 0) {
+                val backStackEntryAt = parentFragmentManager.getBackStackEntryAt(count - 2)
+                if (backStackEntryAt.name == "search_issue") {
+                    parentFragmentManager.popBackStack(
+                        "search_issue",
+                        FragmentManager.POP_BACK_STACK_INCLUSIVE
+                    )
+                }
+            } else {
+                parentFragmentManager.popBackStack()
+            }
+        }
+    }
+
+    private fun detailOptionMenuEvent() {
+        binding.ivOption.setOnClickListener {
+            val bottomSheet = BottomSheetMenu(
+                onDeleteClick = {
+                    issueViewModel.deleteIssue(id)
+                    parentFragmentManager.popBackStack()
+                },
+                onCloseClick = {
+                    issueViewModel.closeIssue(id)
+                    viewModel.getIssueDetail(id)
+                }
+            )
+            bottomSheet.show(parentFragmentManager, "detail_information")
+        }
+    }
+
+    private fun commenterOptionMenuEvent(view: View, uid: Long) {
+        val popupMenu = PopupMenu(requireContext(), view)
+        popupMenu.setOnMenuItemClickListener { item ->
+            when (item.itemId) {
+                R.id.like -> viewModel.addLike(id, uid)
+                R.id.best -> viewModel.addBest(id, uid)
+                R.id.hate -> viewModel.addHate(id, uid)
+                R.id.ok -> viewModel.addOk(id, uid)
+            }
+            viewModel.getIssueDetail(id)
+            true
+        }
+        popupMenu.inflate(R.menu.comment_menu)
+        try {
+            val fieldMPopup = PopupMenu::class.java.getDeclaredField("mPopup")
+            fieldMPopup.isAccessible = true
+            val mPopup = fieldMPopup.get(popupMenu)
+            mPopup.javaClass
+                .getDeclaredMethod("setForceShowIcon", Boolean::class.java)
+                .invoke(mPopup, true)
+        } catch (e: Exception) {
+
+        } finally {
+            popupMenu.show()
+        }
+    }
+
+    private fun smoothPosition(position: Int) {
+        lifecycleScope.launch {
+            delay(200L)
+            binding.rvComment.scrollToPosition(position)
+        }
+    }
+
+    private fun navigateRegisterPage() {
+        parentFragmentManager.commit {
+            addToBackStack("register_issue")
+            replace(R.id.container_main, registerIssueFragment)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailViewModel.kt
index 3b69187c6a..87986d2f4f 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailViewModel.kt
@@ -2,7 +2,6 @@ package com.example.it.issuetracker.presentation.main.issue.detail
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.it.issuetracker.data.datasource.UserSharedPrefDataSource
 import com.example.it.issuetracker.domain.repository.IssueTrackerRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -12,12 +11,17 @@ import kotlinx.coroutines.launch
 
 class DetailViewModel(
     private val issueRepository: IssueTrackerRepository,
-    private val sharedPref: UserSharedPrefDataSource,
 ) : ViewModel() {
 
     private val _issueDetail = MutableStateFlow<DetailUiState>(DetailUiState.UnInitialization)
     val issueDetail = _issueDetail.asStateFlow()
 
+    private val _currentPosition = MutableStateFlow<Int>(0)
+    val currentPosition = _currentPosition.asStateFlow()
+
+    private val _focusPosition = MutableStateFlow<Int>(0)
+    val focusPosition = _focusPosition.asStateFlow()
+
     fun getIssueDetail(id: Long) = viewModelScope.launch {
         _issueDetail.update { DetailUiState.Loading }
         issueRepository.getIssueDetail(id).collectLatest { issueDetail ->
@@ -25,4 +29,67 @@ class DetailViewModel(
         }
     }
 
+    fun addComment(id: Long, text: String) = viewModelScope.launch {
+        if (text.isBlank()) return@launch
+        issueRepository.addComment(id, text)
+        when (val state = _issueDetail.value) {
+            is DetailUiState.GetDetailIssue -> {
+                _focusPosition.update { state.issue.comments.size }
+            }
+            else -> Unit
+        }
+        getIssueDetail(id)
+    }
+
+    private fun getFocusPosition(id: Long) {
+        when (val state = _issueDetail.value) {
+            is DetailUiState.GetDetailIssue -> {
+                val comment = state.issue.comments.find { it.id == id } ?: return
+                val index = state.issue.comments.indexOf(comment)
+                _focusPosition.update { index }
+            }
+            else -> Unit
+        }
+    }
+
+    fun addLike(id: Long, uid: Long) = viewModelScope.launch {
+        issueRepository.addLike(id, uid)
+        getFocusPosition(uid)
+    }
+
+    fun addBest(id: Long, uid: Long) = viewModelScope.launch {
+        issueRepository.addBest(id, uid)
+        getFocusPosition(uid)
+    }
+
+    fun addHate(id: Long, uid: Long) = viewModelScope.launch {
+        issueRepository.addHate(id, uid)
+        getFocusPosition(uid)
+    }
+
+    fun addOk(id: Long, uid: Long) = viewModelScope.launch {
+        issueRepository.addOk(id, uid)
+        getFocusPosition(uid)
+    }
+
+    fun upPosition() {
+        when (val state = _issueDetail.value) {
+            is DetailUiState.GetDetailIssue -> {
+                if (_currentPosition.value - 1 < 0) return
+                _currentPosition.value = (_currentPosition.value - 1)
+            }
+            else -> {}
+        }
+    }
+
+    fun downPosition() {
+        when (val state = _issueDetail.value) {
+            is DetailUiState.GetDetailIssue -> {
+                if (_currentPosition.value + 1 > state.issue.comments.size - 1) return
+                _currentPosition.value = (_currentPosition.value + 1)
+            }
+            else -> {}
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
index 793799a283..05367b0783 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueFragment.kt
@@ -5,7 +5,6 @@ import android.util.Log
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.commit
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -55,6 +54,7 @@ class IssueFragment : DataBindingBaseFragment<FragmentIssueBinding>(R.layout.fra
     }
 
     override fun initView() = with(binding) {
+        viewModel.getIssues()
         ivSearch.setOnClickListener { navigateFragment(SearchFragment(), "search_issue") }
         btnIssue.setOnClickListener {
             val registerIssueFragment = RegisterIssueFragment().apply {
@@ -122,12 +122,18 @@ class IssueFragment : DataBindingBaseFragment<FragmentIssueBinding>(R.layout.fra
         }
 
         repeatOnLifecycleExtension {
-            viewModel.cache.collectLatest {
-                if (it.message != "") {
-                    CustomSnackBar.make(binding.issueContainer, "선택한 이슈를 닫았습니다.") {
-                        viewModel.revertIssue(it.issues)
-                    }.show()
-                }
+            viewModel.onCloseEvent.collectLatest {
+                CustomSnackBar.make(binding.issueContainer, "선택한 이슈를 닫았습니다.") {
+                    viewModel.revertCloseIssue()
+                }.show()
+            }
+        }
+
+        repeatOnLifecycleExtension {
+            viewModel.onDeleteEvent.collectLatest {
+                CustomSnackBar.make(binding.issueContainer, "선택한 이슈를 삭제했습니다.") {
+                    viewModel.revertDeleteIssue()
+                }.show()
             }
         }
     }
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
index d6c56a98b3..0056ff7489 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueViewModel.kt
@@ -1,16 +1,11 @@
 package com.example.it.issuetracker.presentation.main.issue.list
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.it.issuetracker.domain.model.Issue
 import com.example.it.issuetracker.domain.repository.IssueTrackerRepository
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import java.util.*
 
 class IssueViewModel(
     private val issueRepository: IssueTrackerRepository,
@@ -19,19 +14,19 @@ class IssueViewModel(
     private val _uiState = MutableStateFlow<IssueUiState>(IssueUiState.UnInitialization)
     val uiState = _uiState.asStateFlow()
 
-    private val _cache = MutableStateFlow<CacheIssue>(CacheIssue(sortedMapOf(), ""))
-    val cache = _cache.asStateFlow()
+    private var cache: MutableList<Long> = mutableListOf()
 
-    init {
-        getIssues()
-    }
+    private val _onCloseEvent = MutableSharedFlow<String>()
+    val onCloseEvent = _onCloseEvent.asSharedFlow()
+
+    private val _onDeleteEvent = MutableSharedFlow<String>()
+    val onDeleteEvent = _onDeleteEvent.asSharedFlow()
 
     fun getIssues() = viewModelScope.launch {
         _uiState.update { IssueUiState.Loading }
         issueRepository.getIssue().collectLatest { issues ->
             _uiState.update { IssueUiState.GetIssues(issues) }
         }
-        _cache.value = CacheIssue(sortedMapOf(), "")
     }
 
     fun toggleViewType() {
@@ -44,7 +39,7 @@ class IssueViewModel(
                     }
                 }
                 _uiState.update { IssueUiState.GetIssues(editIssueList) }
-                _cache.value = CacheIssue(sortedMapOf(), "")
+                cache.clear()
             }
             else -> {}
         }
@@ -58,8 +53,7 @@ class IssueViewModel(
                         issue.copy(viewType = Mode.DEFAULT)
                     }
                 _uiState.update { IssueUiState.GetIssues(defaultIssueList) }
-                _cache.value = CacheIssue(sortedMapOf(), "")
-
+                cache.clear()
             }
             else -> {}
         }
@@ -69,54 +63,46 @@ class IssueViewModel(
         when (val state = _uiState.value) {
             is IssueUiState.GetIssues -> {
                 val filterList = state.issues.filter { issue -> issue.isChecked }
+                val filterIdList = filterList.map { it.id }
 
-                val newList: SortedMap<Int, Issue> = sortedMapOf()
-                state.issues.mapIndexed { idx, issue ->
-                    if (issue.isChecked) {
-                        newList[idx] = issue
-                    }
-                }
-
-                if (isCheckEmpty(filterList)) return@launch
-                issueRepository.deleteIssue(filterList)
+                if (isCheckEmpty(filterIdList)) return@launch
+                issueRepository.updateIssueClose(false, filterIdList)
                 getIssues()
-                _cache.value = CacheIssue(newList, "선택한 이슈를 삭제했습니다.")
+                cache = filterIdList.toMutableList()
+                _onDeleteEvent.emit("선택한 이슈를 삭제했습니다.")
+
             }
             else -> {}
         }
     }
 
     fun deleteIssue(id: Long) = viewModelScope.launch {
-        issueRepository.deleteIssue(id)
+        issueRepository.updateIssueClose(false, listOf(id))
+        getIssues()
     }
 
     fun closeIssue() = viewModelScope.launch {
         when (val state = _uiState.value) {
             is IssueUiState.GetIssues -> {
                 val filterList = state.issues.filter { issue -> issue.isChecked }
+                val filterIdList = filterList.map { it.id }
 
-                val newList: SortedMap<Int, Issue> = sortedMapOf()
-                state.issues.mapIndexed { idx, issue ->
-                    if (issue.isChecked) {
-                        newList[idx] = issue
-                    }
-                }
-
-                if (isCheckEmpty(filterList)) return@launch
-                issueRepository.closeIssue(filterList)
+                if (isCheckEmpty(filterIdList)) return@launch
+                issueRepository.updateIssueClose(false, filterIdList)
                 getIssues()
-                _cache.value = CacheIssue(newList, "선택한 이슈를 닫았습니다.")
+                cache = filterIdList.toMutableList()
+                _onCloseEvent.emit("선택한 이슈를 닫았습니다.")
             }
             else -> {}
         }
     }
 
     fun closeIssue(id: Long) = viewModelScope.launch {
-        issueRepository.closeIssue(id)
+        issueRepository.updateIssueClose(false, listOf(id))
         getIssues()
     }
 
-    private fun isCheckEmpty(filterList: List<Issue>): Boolean {
+    private fun isCheckEmpty(filterList: List<Long>): Boolean {
         if (filterList.isEmpty()) {
             updateDefaultViewType()
             return true
@@ -124,8 +110,13 @@ class IssueViewModel(
         return false
     }
 
-    fun revertIssue(list: SortedMap<Int, Issue>) = viewModelScope.launch {
-        issueRepository.revertIssue(list)
+    fun revertCloseIssue() = viewModelScope.launch {
+        issueRepository.updateIssueClose(true, cache)
+        getIssues()
+    }
+
+    fun revertDeleteIssue() = viewModelScope.launch {
+        issueRepository.updateIssueClose(true, cache)
         getIssues()
     }
 
@@ -136,20 +127,4 @@ class IssueViewModel(
         }
         _uiState.update { IssueUiState.GetIssues(value) }
     }
-
-    fun addLike(id: Long, uid: Long) = viewModelScope.launch {
-        issueRepository.addLike(id, uid)
-    }
-
-    fun addBest(id: Long, uid: Long) = viewModelScope.launch {
-        issueRepository.addBest(id, uid)
-    }
-
-    fun addHate(id: Long, uid: Long) = viewModelScope.launch {
-        issueRepository.addHate(id, uid)
-    }
-
-    fun addOk(id: Long, uid: Long) = viewModelScope.launch {
-        issueRepository.addOk(id, uid)
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
index d2b04db365..bc022d4d96 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/NewIssue.kt
@@ -1,7 +1,6 @@
 package com.example.it.issuetracker.presentation.main.issue.register
 
 import com.example.it.issuetracker.domain.model.Label
-import com.example.it.issuetracker.domain.model.Member
 import com.example.it.issuetracker.domain.model.MileStone
 
 data class NewIssue(
@@ -11,4 +10,8 @@ data class NewIssue(
     val labels: List<Label>? = null,
     val milestoneId: MileStone? = null,
     val assignee: Long? = null
-)
+) {
+    companion object {
+        val DEFAULT_ISSUE = NewIssue("", "")
+    }
+}
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt
deleted file mode 100644
index 50809d8008..0000000000
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssue.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.example.it.issuetracker.presentation.main.issue.register
-
-data class RegisterIssue(
-    val title: String,
-    val description: String,
-    val labels: List<String> = emptyList(),
-    val milestones: String = "",
-    val assignee: String = ""
-)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index b9fbca4767..721e632840 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -1,11 +1,11 @@
 package com.example.it.issuetracker.presentation.main.issue.register
 
 import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.content.res.ColorStateList
-import android.graphics.Color
 import android.widget.AdapterView
 import android.widget.Toast
 import androidx.core.widget.doAfterTextChanged
@@ -16,10 +16,11 @@ import com.example.it.issuetracker.domain.model.Label
 import com.example.it.issuetracker.presentation.common.Constants
 import com.example.it.issuetracker.presentation.common.Constants.INIT_ERROR_MSG_ID
 import com.example.it.issuetracker.presentation.common.DataBindingBaseFragment
-import io.noties.markwon.Markwon
 import com.example.it.issuetracker.presentation.common.repeatOnLifecycleExtension
 import com.example.it.issuetracker.presentation.main.issue.filter.SpinnerAdapter
 import com.google.android.material.chip.Chip
+import io.noties.markwon.Markwon
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -112,7 +113,7 @@ class RegisterIssueFragment :
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long
+                id: Long,
             ) = listener(position)
 
             override fun onNothingSelected(parent: AdapterView<*>?) = Unit
@@ -164,6 +165,12 @@ class RegisterIssueFragment :
                     Toast.makeText(requireContext(), text, Toast.LENGTH_LONG).show()
                 }
         }
+        repeatOnLifecycleExtension {
+            viewModel.newIssue.collectLatest {
+                if (it == NewIssue.DEFAULT_ISSUE) return@collectLatest
+                Toast.makeText(requireContext(), "$it 작성 완료!", Toast.LENGTH_LONG).show()
+            }
+        }
     }
 
     private fun checkedLabel(labelList: List<Int>) {
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
index 29c90fc586..bcc74c11b5 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
@@ -1,8 +1,5 @@
 package com.example.it.issuetracker.presentation.main.issue.register
 
-import com.example.it.issuetracker.data.dto.LabelDto
-import com.example.it.issuetracker.data.dto.MemberDto
-import com.example.it.issuetracker.data.dto.MilestoneDto
 import com.example.it.issuetracker.domain.model.Label
 import com.example.it.issuetracker.domain.model.Member
 import com.example.it.issuetracker.domain.model.MileStone
@@ -15,22 +12,22 @@ data class RegisterIssueUiState(
     val filterItems: FilterItems = FilterItems(),
     val selectedFilters: SelectedFilters = SelectedFilters(),
     val requiredField: RequireField = RequireField(),
-    val errorMsgId: Int = INIT_ERROR_MSG_ID
+    val errorMsgId: Int = INIT_ERROR_MSG_ID,
 ) {
     data class FilterItems(
         val labelList: List<Label> = emptyList(),
         val milestoneList: List<MileStone> = emptyList(),
-        val assigneeList: List<Member> = emptyList()
+        val assigneeList: List<Member> = emptyList(),
     )
 
     data class SelectedFilters(
         val labelIndex: List<Int>? = emptyList(),
         val milestoneIndex: Int? = FILTER_RESET_NUMBER,
-        val assigneeIndex: Int? = FILTER_RESET_NUMBER
+        val assigneeIndex: Int? = FILTER_RESET_NUMBER,
     )
 
     data class RequireField(
         val isEmptySubject: Boolean = true,
-        val isEmptyDescription: Boolean = true
+        val isEmptyDescription: Boolean = true,
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
index 9f9b7de79f..8c419d5e88 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
@@ -1,5 +1,6 @@
 package com.example.it.issuetracker.presentation.main.issue.register
 
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.it.issuetracker.R
@@ -19,12 +20,15 @@ import kotlinx.coroutines.launch
 class RegisterIssueViewModel(
     private val labelRepository: LabelRepository,
     private val milestoneRepository: MilestoneRepository,
-    private val issueTrackerRepository: IssueTrackerRepository
+    private val issueTrackerRepository: IssueTrackerRepository,
 ) : ViewModel() {
 
-    private var _uiState = MutableStateFlow(RegisterIssueUiState())
+    private val _uiState = MutableStateFlow(RegisterIssueUiState())
     val uiState = _uiState.asStateFlow()
 
+    private val _newIssue = MutableStateFlow<NewIssue>(NewIssue("", ""))
+    val newIssue = _newIssue.asStateFlow()
+
     init {
         getLabelList()
         getMilestoneList()
@@ -93,6 +97,8 @@ class RegisterIssueViewModel(
         )
 
         issueTrackerRepository.saveIssue(newIssue)
+        Log.d("test", "saveIssue: $newIssue")
+        _newIssue.value = newIssue
     }
 
     fun setSubject(subject: String) {
@@ -151,7 +157,7 @@ class RegisterIssueViewModel(
         issueDetail.labels.forEach { label ->
             setCheckedLabel(label.id, true)
         }
-        issueDetail.milestones[0].id?.let {
+        issueDetail.milestones.id?.let {
             setSelectedMilestoneIndex(it.toInt())
         }
     }
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneAdapter.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneAdapter.kt
index f6333877f4..f0292b6c5f 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneAdapter.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneAdapter.kt
@@ -11,14 +11,14 @@ import com.example.it.issuetracker.domain.model.MileStone
 import com.example.it.issuetracker.presentation.main.issue.list.Mode
 
 class MilestoneAdapter(
-    private val editModeListener: (editMode: Boolean) -> Unit,
-    private val itemClickListener: (milestone: MileStone) -> Unit,
+    private val onEditMode: (editMode: Boolean) -> Unit,
+    private val onClick: (milestone: MileStone) -> Unit,
 ) : ListAdapter<MileStone, MilestoneAdapter.MilestoneViewHolder>(diffUtil) {
 
     class MilestoneViewHolder(
         private val binding: MilestoneItemBinding,
-        private val editModeListener: (editMode: Boolean) -> Unit,
-        private val itemClickListener: (milestone: MileStone) -> Unit,
+        private val onEditMode: (editMode: Boolean) -> Unit,
+        private val onClick: (milestone: MileStone) -> Unit,
     ) : RecyclerView.ViewHolder(binding.root) {
 
         fun bind(milestone: MileStone) {
@@ -41,7 +41,7 @@ class MilestoneAdapter(
         private fun setItemClickListener(milestone: MileStone) {
             if (milestone.mode == Mode.DEFAULT) {
                 itemView.setOnClickListener {
-                    itemClickListener(milestone)
+                    onClick(milestone)
                 }
             } else {
                 itemView.setOnClickListener {
@@ -49,7 +49,7 @@ class MilestoneAdapter(
                 }
             }
             itemView.setOnLongClickListener {
-                editModeListener(true)
+                onEditMode(true)
                 true
             }
         }
@@ -62,8 +62,8 @@ class MilestoneAdapter(
                 parent,
                 false
             ),
-            editModeListener,
-            itemClickListener
+            onEditMode,
+            onClick
         )
     }
 
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_menu.xml b/app/src/main/res/layout/fragment_bottom_sheet_menu.xml
index 12800f26c2..1c53c90519 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet_menu.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet_menu.xml
@@ -112,7 +112,7 @@
             <TextView
                 android:id="@+id/tv_manager_information"
                 style="@style/Body2"
-                exists="@{issue.manager}"
+                exists="@{issue.manager[0]}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:layout_constraintBottom_toBottomOf="@id/tv_manager"
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 10b5d851a2..6b38163d99 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -65,9 +65,9 @@
         <com.google.android.material.chip.ChipGroup
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@id/tv_created"
             app:layout_constraintStart_toStartOf="@id/tv_title"
-            app:layout_constraintTop_toTopOf="@id/tv_created"
-            app:layout_constraintBottom_toBottomOf="@id/tv_created">
+            app:layout_constraintTop_toTopOf="@id/tv_created">
 
             <com.google.android.material.chip.Chip
                 android:id="@+id/chip_open_issue"
@@ -107,7 +107,7 @@
         <TextView
             android:id="@+id/tv_created"
             formatDate="@{issue.createdTime}"
-            writer="@{issue.writer}"
+            writer="@{issue.writer.name}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="96dp"
diff --git a/app/src/main/res/layout/fragment_register_issue.xml b/app/src/main/res/layout/fragment_register_issue.xml
index 8016d2695d..f640939636 100644
--- a/app/src/main/res/layout/fragment_register_issue.xml
+++ b/app/src/main/res/layout/fragment_register_issue.xml
@@ -9,8 +9,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".presentation.main.issue.register.RegisterIssue">
+        android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar_layout"
@@ -50,7 +49,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:background="@drawable/label_background"
-            android:hint="제목을 입력하세요"
+            android:hint="@string/edit_subject_hint"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/tv_subject"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 268115df08..3a492a6b92 100644
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -11,18 +11,20 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/comment_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/iv_profile"
+            imageUrl="@{comment.imageUrl}"
             android:layout_width="44dp"
             android:layout_height="44dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:src="@drawable/img_google_logo"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/img_google_logo" />
 
         <TextView
             android:id="@+id/tv_name"
@@ -30,7 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:text="@{comment.id}"
+            android:text="@{comment.githubId}"
             app:layout_constraintStart_toEndOf="@id/iv_profile"
             app:layout_constraintTop_toTopOf="@id/iv_profile"
             tools:text="Sam" />
@@ -62,6 +64,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="10dp"
+            android:paddingBottom="10dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/iv_profile"
             app:layout_constraintTop_toBottomOf="@id/tv_description">
diff --git a/app/src/main/res/layout/item_writer.xml b/app/src/main/res/layout/item_writer.xml
index 9bb5df6b9d..5708923c85 100644
--- a/app/src/main/res/layout/item_writer.xml
+++ b/app/src/main/res/layout/item_writer.xml
@@ -16,13 +16,14 @@
 
         <ImageView
             android:id="@+id/iv_profile"
+            imageUrl="@{issue.writer.imageUrl}"
             android:layout_width="44dp"
             android:layout_height="44dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="16dp"
-            android:src="@drawable/img_google_logo"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/img_google_logo" />
 
         <TextView
             android:id="@+id/tv_name"
@@ -30,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:text="@{issue.writer}"
+            android:text="@{issue.writer.name}"
             app:layout_constraintStart_toEndOf="@id/iv_profile"
             app:layout_constraintTop_toTopOf="@id/iv_profile"
             tools:text="Sam" />
diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
index 366dbf50da..5486ef6218 100644
--- a/app/src/main/res/values-night/strings.xml
+++ b/app/src/main/res/values-night/strings.xml
@@ -25,4 +25,5 @@
     <string name="issue_close">닫힘</string>
     <string name="detail_menu_edit">수정하기</string>
     <string name="detail_menu_delete">삭제하기</string>
+    <string name="edit_subject_hint">제목을 입력하세요</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4010222fe6..8aae0c49f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@
 
     <!--issue-->
     <string name="description_add_issue">add_issue</string>
-    <string name="date_format">yyyy-MM-dd HH:mm:ss</string>
+    <string name="date_format">yyyy-MM-dd\'T\'HH:mm:ss</string>
     <string name="issue_write_time"> %s, %s님이 작성했습니다."</string>
     <string name="issue_number">#%d</string>
 
@@ -59,8 +59,6 @@
     <string name="detail_edit">편집하기</string>
     <string name="issue_open">열림</string>
     <string name="issue_close">닫힘</string>
-    <string name="issue_open_eng">open</string>
-    <string name="issue_close_eng">close</string>
     <string name="detail_menu_edit">수정하기</string>
     <string name="detail_menu_delete">삭제하기</string>
 
@@ -83,4 +81,5 @@
     <string name="issue_write_subject_string">제목</string>
     <string name="new_issue_title_string">새로운 이슈</string>
     <string name="edit_issue_title_string">이슈 수정</string>
+    <string name="edit_subject_hint">제목을 입력하세요</string>
 </resources>
\ No newline at end of file

From b755b27c29055fc3b5b2f7f064119627724ee4db Mon Sep 17 00:00:00 2001
From: banjjak2 <interr0bang@naver.com>
Date: Fri, 1 Jul 2022 14:10:22 +0900
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=EC=9D=B4=EC=8A=88=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=EC=8B=9C=20Exception=20=EC=97=90=EB=9F=AC=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- data loading 속성을 추가해 데이터를 받아올 수 있도록 수정
---
 .../it/issuetracker/data/dto/MilestoneDto.kt  |  2 +-
 .../it/issuetracker/domain/model/Assignee.kt  |  4 ++-
 .../it/issuetracker/domain/model/Comment.kt   |  4 ++-
 .../it/issuetracker/domain/model/Writer.kt    |  4 ++-
 .../main/issue/detail/BottomSheetMenu.kt      | 18 +++++++++++++
 .../main/issue/detail/DetailFragment.kt       |  8 +++---
 .../issue/register/RegisterIssueFragment.kt   | 27 ++++++++++++++++---
 .../issue/register/RegisterIssueUiState.kt    |  1 +
 .../issue/register/RegisterIssueViewModel.kt  |  4 +++
 9 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
index 1a4991fe4f..9baf1db13b 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/dto/MilestoneDto.kt
@@ -7,7 +7,7 @@ data class MilestoneDto(
     val id: Long? = null,
     val title: String,
     val description: String? = null,
-    @Json(name = "deadLine") val deadline: String? = null,
+    val deadline: String? = null,
     val openedIssues: Int? = null,
     val closedIssues: Int? = null,
 )
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
index bccb3fa0b7..821b520874 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Assignee.kt
@@ -1,7 +1,9 @@
 package com.example.it.issuetracker.domain.model
 
+import java.io.Serializable
+
 data class Assignee(
     val id: Long,
     val githubId: String,
     val imageUrl: String,
-)
+) : Serializable
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
index 538723394a..9165b3a0ac 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Comment.kt
@@ -1,5 +1,7 @@
 package com.example.it.issuetracker.domain.model
 
+import java.io.Serializable
+
 data class Comment(
     val id: Long,
     val githubId: String,
@@ -10,4 +12,4 @@ data class Comment(
     val hate: Int,
     val best: Int,
     val ok: Int,
-)
+) : Serializable
diff --git a/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt b/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
index ce237d53e1..fcff4c604d 100644
--- a/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
+++ b/app/src/main/java/com/example/it/issuetracker/domain/model/Writer.kt
@@ -1,9 +1,11 @@
 package com.example.it.issuetracker.domain.model
 
+import java.io.Serializable
+
 data class Writer(
     val id: Long,
     val name: String,
     val email: String?,
     val githubId: String,
     val imageUrl: String,
-)
\ No newline at end of file
+) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
index 9dcc254368..5d59be6775 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/BottomSheetMenu.kt
@@ -4,10 +4,15 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
+import androidx.fragment.app.commit
+import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentBottomSheetMenuBinding
+import com.example.it.issuetracker.presentation.common.Constants
 import com.example.it.issuetracker.presentation.common.repeatOnLifecycleExtension
 import com.example.it.issuetracker.presentation.main.issue.list.LabelAdapter
+import com.example.it.issuetracker.presentation.main.issue.register.RegisterIssueFragment
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.coroutines.flow.collectLatest
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -40,6 +45,10 @@ class BottomSheetMenu(
         btnClose.setOnClickListener { dismiss() }
         rvLabel.adapter = labelAdapter
         rvMilestone.adapter = milestoneAdapter
+        btnIssueEdit.setOnClickListener {
+            navigateRegisterPage()
+            dismiss()
+        }
         btnIssueClose.setOnClickListener {
             onCloseClick()
             dismiss()
@@ -85,4 +94,13 @@ class BottomSheetMenu(
         binding.progressBar.isVisible = true
         binding.tvSearchResult.isVisible = false
     }
+
+    private fun navigateRegisterPage() {
+        val registerIssueFragment = RegisterIssueFragment()
+        registerIssueFragment.arguments = bundleOf(Constants.ISSUE_BUNDLE_KEY to binding.issue)
+        parentFragmentManager.commit {
+            addToBackStack("register_issue")
+            replace(R.id.container_main, registerIssueFragment)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
index 246a53ee4b..c26d576e1e 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/detail/DetailFragment.kt
@@ -32,9 +32,6 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
     private val imm: InputMethodManager by lazy { activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager }
     private val viewModel by sharedViewModel<DetailViewModel>()
     private val issueViewModel by viewModel<IssueViewModel>()
-    private val registerIssueFragment = RegisterIssueFragment().apply {
-        setOnRefreshListener { issueViewModel.getIssues() }
-    }
     private val adapter = CommentAdapter { view, uid -> commenterOptionMenuEvent(view, uid) }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -112,7 +109,6 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
                 binding.chipCloseIssue.isVisible = true
             }
         }
-        registerIssueFragment.arguments = bundleOf(Constants.ISSUE_BUNDLE_KEY to state.issue)
     }
 
     private fun handlerLoading() {
@@ -216,6 +212,10 @@ class DetailFragment : DataBindingBaseFragment<FragmentDetailBinding>(R.layout.f
     }
 
     private fun navigateRegisterPage() {
+        val registerIssueFragment = RegisterIssueFragment().apply {
+            setOnRefreshListener { issueViewModel.getIssues() }
+        }
+        registerIssueFragment.arguments = bundleOf(Constants.ISSUE_BUNDLE_KEY to binding.issue)
         parentFragmentManager.commit {
             addToBackStack("register_issue")
             replace(R.id.container_main, registerIssueFragment)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index 721e632840..78c1e74bf0 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.AdapterView
 import android.widget.Toast
+import androidx.core.view.size
 import androidx.core.widget.doAfterTextChanged
 import com.example.it.issuetracker.R
 import com.example.it.issuetracker.databinding.FragmentRegisterIssueBinding
@@ -45,7 +46,6 @@ class RegisterIssueFragment :
             .build()
         binding.lifecycleOwner = viewLifecycleOwner
         editIssueDetail = arguments?.getSerializable(Constants.ISSUE_BUNDLE_KEY) as? IssueDetail
-        if (editIssueDetail != null) viewModel.setDataForEditIssue(editIssueDetail!!)
 
         initView()
         observerData()
@@ -144,8 +144,10 @@ class RegisterIssueFragment :
                 .distinctUntilChanged()
                 .collect {
                     if (it.labelIndex != null) checkedLabel(it.labelIndex)
-                    if (it.milestoneIndex != null) binding.filterMilestone.spinner.setSelection(it.milestoneIndex.toInt())
-                    if (it.assigneeIndex != null) binding.filterAssignee.spinner.setSelection(it.assigneeIndex)
+                    if (it.milestoneIndex != null && binding.filterMilestone.spinner.size != 0)
+                        binding.filterMilestone.spinner.setSelection(it.milestoneIndex.toInt())
+                    if (it.assigneeIndex != null && binding.filterAssignee.spinner.size != 0)
+                        binding.filterAssignee.spinner.setSelection(it.assigneeIndex)
                 }
         }
         repeatOnLifecycleExtension {
@@ -171,6 +173,25 @@ class RegisterIssueFragment :
                 Toast.makeText(requireContext(), "$it 작성 완료!", Toast.LENGTH_LONG).show()
             }
         }
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.dataLoading }
+                .collect { loading ->
+                    if (!loading) return@collect
+                    if (editIssueDetail != null) viewModel.setDataForEditIssue(editIssueDetail!!)
+                }
+        }
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.title }
+                .collect {
+                    binding.editSubject.setText(it)
+                }
+        }
+        repeatOnLifecycleExtension {
+            viewModel.uiState.map { it.description }
+                .collect {
+                    binding.editDescription.setText(it)
+                }
+        }
     }
 
     private fun checkedLabel(labelList: List<Int>) {
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
index bcc74c11b5..15cdd4bf8e 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueUiState.kt
@@ -13,6 +13,7 @@ data class RegisterIssueUiState(
     val selectedFilters: SelectedFilters = SelectedFilters(),
     val requiredField: RequireField = RequireField(),
     val errorMsgId: Int = INIT_ERROR_MSG_ID,
+    val dataLoading: Boolean = false,
 ) {
     data class FilterItems(
         val labelList: List<Label> = emptyList(),
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
index 8c419d5e88..e0667ddca1 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueViewModel.kt
@@ -30,9 +30,11 @@ class RegisterIssueViewModel(
     val newIssue = _newIssue.asStateFlow()
 
     init {
+        _uiState.update { it.copy(dataLoading = false) }
         getLabelList()
         getMilestoneList()
         getAssigneeList()
+        _uiState.update { it.copy(dataLoading = true) }
     }
 
     private fun getLabelList() = viewModelScope.launch {
@@ -160,5 +162,7 @@ class RegisterIssueViewModel(
         issueDetail.milestones.id?.let {
             setSelectedMilestoneIndex(it.toInt())
         }
+        if (issueDetail.manager.isNotEmpty())
+            setSelectedAssigneeIndex(issueDetail.manager[0].id.toInt())
     }
 }
\ No newline at end of file

From 03f373d176668bc1633c90fe12daf606ddbfecf5 Mon Sep 17 00:00:00 2001
From: stitch <skaxodn97@gmail.com>
Date: Fri, 1 Jul 2022 15:18:53 +0900
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20bundle=20=EC=9D=BD=EC=96=B4=EC=99=80?=
 =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/register/RegisterIssueFragment.kt     | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index 78c1e74bf0..9e99673d5b 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -46,7 +46,10 @@ class RegisterIssueFragment :
             .build()
         binding.lifecycleOwner = viewLifecycleOwner
         editIssueDetail = arguments?.getSerializable(Constants.ISSUE_BUNDLE_KEY) as? IssueDetail
-
+        if(editIssueDetail != null) {
+            binding.editDescription.setText(editIssueDetail?.description)
+            binding.editSubject.setText(editIssueDetail?.title)
+        }
         initView()
         observerData()
     }
@@ -180,18 +183,6 @@ class RegisterIssueFragment :
                     if (editIssueDetail != null) viewModel.setDataForEditIssue(editIssueDetail!!)
                 }
         }
-        repeatOnLifecycleExtension {
-            viewModel.uiState.map { it.title }
-                .collect {
-                    binding.editSubject.setText(it)
-                }
-        }
-        repeatOnLifecycleExtension {
-            viewModel.uiState.map { it.description }
-                .collect {
-                    binding.editDescription.setText(it)
-                }
-        }
     }
 
     private fun checkedLabel(labelList: List<Int>) {

From 26a384302f6b7adb2790c89c195a15a88b6a7911 Mon Sep 17 00:00:00 2001
From: stitch <skaxodn97@gmail.com>
Date: Fri, 1 Jul 2022 20:56:55 +0900
Subject: [PATCH 9/9] =?UTF-8?q?factor:=203=EC=A3=BC=EC=B0=A8=20=EC=88=98?=
 =?UTF-8?q?=EC=9A=94=EC=9D=BC=20=ED=94=BC=EB=93=9C=EB=B0=B1=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datasource/IssueTrackerDataSource.kt |  1 +
 .../datasource/LabelDataSourceDefaultImpl.kt  | 55 -------------------
 .../MilestoneDataSourceDefaultImpl.kt         | 54 ------------------
 .../local/IssueTrackerDefaultDataSource.kt    |  1 -
 .../{ => local}/LabelFakeDatabase.kt          |  2 +-
 .../{ => local}/MilestoneFakeDatabase.kt      |  2 +-
 .../{ => local}/UserSharedPrefDataSource.kt   |  2 +-
 .../remote/LabelRemoteDataSourceImpl.kt       | 33 +++++++++++
 .../remote/MilestoneRemoteDataSourceImpl.kt   | 33 +++++++++++
 .../it/issuetracker/di/datasourceModule.kt    |  6 +-
 .../issuetracker/di/sharedPreferenceModule.kt |  2 +-
 .../presentation/common/BaseSwipeHelper.kt    |  4 +-
 .../presentation/common/Constants.kt          |  5 ++
 .../presentation/common/utils/DateUtils.kt    | 26 +++++----
 .../presentation/login/LoginViewModel.kt      |  2 +-
 .../main/issue/filter/FilterViewModel.kt      |  2 +-
 .../main/issue/list/IssueAdapter.kt           |  6 +-
 .../issue/register/RegisterIssueFragment.kt   |  4 --
 .../presentation/main/label/LabelFragment.kt  |  3 -
 .../main/milestone/MilestoneFragment.kt       |  3 -
 .../main/mypage/MyPageFragment.kt             |  2 -
 .../main/mypage/MyPageViewModel.kt            |  2 +-
 22 files changed, 107 insertions(+), 143 deletions(-)
 delete mode 100644 app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
 delete mode 100644 app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
 rename app/src/main/java/com/example/it/issuetracker/data/datasource/{ => local}/LabelFakeDatabase.kt (94%)
 rename app/src/main/java/com/example/it/issuetracker/data/datasource/{ => local}/MilestoneFakeDatabase.kt (96%)
 rename app/src/main/java/com/example/it/issuetracker/data/datasource/{ => local}/UserSharedPrefDataSource.kt (91%)
 create mode 100644 app/src/main/java/com/example/it/issuetracker/data/datasource/remote/LabelRemoteDataSourceImpl.kt
 create mode 100644 app/src/main/java/com/example/it/issuetracker/data/datasource/remote/MilestoneRemoteDataSourceImpl.kt

diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
index 07cf7840db..8ccf3ba409 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/IssueTrackerDataSource.kt
@@ -4,6 +4,7 @@ import com.example.it.issuetracker.data.dto.IssueDetailDto
 import com.example.it.issuetracker.data.dto.IssueDto
 import com.example.it.issuetracker.data.dto.MemberDto
 import com.example.it.issuetracker.data.dto.MilestoneDto
+import com.example.it.issuetracker.domain.model.IssueDetail
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
 
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
deleted file mode 100644
index 400579f401..0000000000
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelDataSourceDefaultImpl.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.example.it.issuetracker.data.datasource
-
-import android.util.Log
-import com.example.it.issuetracker.data.dto.AddLabelDto
-import com.example.it.issuetracker.data.dto.LabelDto
-import com.example.it.issuetracker.data.network.IssueTrackerService
-
-private const val TAG = "LabelDataSourceImpl"
-
-class LabelDataSourceDefaultImpl(
-    private val issueTrackerApi: IssueTrackerService,
-) : LabelDataSource {
-
-    override suspend fun getLabelInfoList(): List<LabelDto> {
-        try {
-            return issueTrackerApi.getLabelInfoList()
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun addLabel(addLabelDto: AddLabelDto) {
-        try {
-            issueTrackerApi.addLabelInfo(addLabelDto)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun editLabel(labelDto: LabelDto) {
-        try {
-            val editLabelDto = AddLabelDto(
-                labelDto.title,
-                labelDto.description,
-                labelDto.color,
-                labelDto.textColor
-            )
-            issueTrackerApi.editLabelInfo(labelDto.id, editLabelDto)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun deleteLabelInfo(id: Int) {
-        try {
-            issueTrackerApi.deleteLabelInfo(id)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
deleted file mode 100644
index da17fe2208..0000000000
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneDataSourceDefaultImpl.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.example.it.issuetracker.data.datasource
-
-import android.util.Log
-import com.example.it.issuetracker.data.dto.AddMilestoneDto
-import com.example.it.issuetracker.data.dto.MilestoneDto
-import com.example.it.issuetracker.data.network.IssueTrackerService
-
-private const val TAG = "MilestoneDataSourceImpl"
-
-class MilestoneDataSourceDefaultImpl(
-    private val issueTrackerApi: IssueTrackerService,
-) : MilestoneDataSource {
-
-    override suspend fun getMilestoneInfoList(): List<MilestoneDto> {
-        try {
-            return issueTrackerApi.getMilestoneInfoList()
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun addMilestone(addMilestoneDto: AddMilestoneDto) {
-        try {
-            issueTrackerApi.addMilestone(addMilestoneDto)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun editMilestone(milestoneDto: MilestoneDto) {
-        try {
-            val editMilestoneDto = AddMilestoneDto(
-                milestoneDto.title,
-                milestoneDto.description ?: "",
-                milestoneDto.deadline ?: ""
-            )
-            issueTrackerApi.editMilestoneInfo(milestoneDto.id!!, editMilestoneDto)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-
-    override suspend fun deleteMilestone(id: Long) {
-        try {
-            issueTrackerApi.deleteMilestone(id)
-        } catch (e: Exception) {
-            Log.e(TAG, e.message, e)
-            error(e)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
index 442ebf9c81..92e6389487 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/IssueTrackerDefaultDataSource.kt
@@ -1,7 +1,6 @@
 package com.example.it.issuetracker.data.datasource.local
 
 import com.example.it.issuetracker.data.datasource.IssueTrackerDataSource
-import com.example.it.issuetracker.data.datasource.LabelFakeDatabase
 import com.example.it.issuetracker.data.dto.*
 import com.example.it.issuetracker.presentation.main.issue.register.NewIssue
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelFakeDatabase.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/LabelFakeDatabase.kt
similarity index 94%
rename from app/src/main/java/com/example/it/issuetracker/data/datasource/LabelFakeDatabase.kt
rename to app/src/main/java/com/example/it/issuetracker/data/datasource/local/LabelFakeDatabase.kt
index baa9193f6c..cc67c52d53 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/LabelFakeDatabase.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/LabelFakeDatabase.kt
@@ -1,4 +1,4 @@
-package com.example.it.issuetracker.data.datasource
+package com.example.it.issuetracker.data.datasource.local
 
 import com.example.it.issuetracker.data.dto.LabelDto
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/MilestoneFakeDatabase.kt
similarity index 96%
rename from app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt
rename to app/src/main/java/com/example/it/issuetracker/data/datasource/local/MilestoneFakeDatabase.kt
index a8487b92c1..2474c7f0d0 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/MilestoneFakeDatabase.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/MilestoneFakeDatabase.kt
@@ -1,4 +1,4 @@
-package com.example.it.issuetracker.data.datasource
+package com.example.it.issuetracker.data.datasource.local
 
 import com.example.it.issuetracker.data.dto.MilestoneDto
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/UserSharedPrefDataSource.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/UserSharedPrefDataSource.kt
similarity index 91%
rename from app/src/main/java/com/example/it/issuetracker/data/datasource/UserSharedPrefDataSource.kt
rename to app/src/main/java/com/example/it/issuetracker/data/datasource/local/UserSharedPrefDataSource.kt
index 73219fa955..88090e5da7 100644
--- a/app/src/main/java/com/example/it/issuetracker/data/datasource/UserSharedPrefDataSource.kt
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/local/UserSharedPrefDataSource.kt
@@ -1,4 +1,4 @@
-package com.example.it.issuetracker.data.datasource
+package com.example.it.issuetracker.data.datasource.local
 
 import android.content.Context
 import androidx.core.content.edit
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/LabelRemoteDataSourceImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/LabelRemoteDataSourceImpl.kt
new file mode 100644
index 0000000000..f2d80a8886
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/LabelRemoteDataSourceImpl.kt
@@ -0,0 +1,33 @@
+package com.example.it.issuetracker.data.datasource.remote
+
+import com.example.it.issuetracker.data.datasource.LabelDataSource
+import com.example.it.issuetracker.data.dto.AddLabelDto
+import com.example.it.issuetracker.data.dto.LabelDto
+import com.example.it.issuetracker.data.network.IssueTrackerService
+
+private const val TAG = "LabelDataSourceImpl"
+
+class LabelRemoteDataSourceImpl(
+    private val issueTrackerApi: IssueTrackerService,
+) : LabelDataSource {
+
+    override suspend fun getLabelInfoList(): List<LabelDto> = issueTrackerApi.getLabelInfoList()
+
+    override suspend fun addLabel(addLabelDto: AddLabelDto) {
+        issueTrackerApi.addLabelInfo(addLabelDto)
+    }
+
+    override suspend fun editLabel(labelDto: LabelDto) {
+        val editLabelDto = AddLabelDto(
+            labelDto.title,
+            labelDto.description,
+            labelDto.color,
+            labelDto.textColor
+        )
+        issueTrackerApi.editLabelInfo(labelDto.id, editLabelDto)
+    }
+
+    override suspend fun deleteLabelInfo(id: Int) {
+        issueTrackerApi.deleteLabelInfo(id)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/MilestoneRemoteDataSourceImpl.kt b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/MilestoneRemoteDataSourceImpl.kt
new file mode 100644
index 0000000000..84f2048a26
--- /dev/null
+++ b/app/src/main/java/com/example/it/issuetracker/data/datasource/remote/MilestoneRemoteDataSourceImpl.kt
@@ -0,0 +1,33 @@
+package com.example.it.issuetracker.data.datasource.remote
+
+import com.example.it.issuetracker.data.datasource.MilestoneDataSource
+import com.example.it.issuetracker.data.dto.AddMilestoneDto
+import com.example.it.issuetracker.data.dto.MilestoneDto
+import com.example.it.issuetracker.data.network.IssueTrackerService
+
+private const val TAG = "MilestoneDataSourceImpl"
+
+class MilestoneRemoteDataSourceImpl(
+    private val issueTrackerApi: IssueTrackerService,
+) : MilestoneDataSource {
+
+    override suspend fun getMilestoneInfoList(): List<MilestoneDto> =
+        issueTrackerApi.getMilestoneInfoList()
+
+    override suspend fun addMilestone(addMilestoneDto: AddMilestoneDto) {
+        issueTrackerApi.addMilestone(addMilestoneDto)
+    }
+
+    override suspend fun editMilestone(milestoneDto: MilestoneDto) {
+        val editMilestoneDto = AddMilestoneDto(
+            milestoneDto.title,
+            milestoneDto.description ?: "",
+            milestoneDto.deadline ?: ""
+        )
+        issueTrackerApi.editMilestoneInfo(milestoneDto.id!!, editMilestoneDto)
+    }
+
+    override suspend fun deleteMilestone(id: Long) {
+        issueTrackerApi.deleteMilestone(id)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt b/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
index 27cc5272ff..6073bc3a3d 100644
--- a/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
+++ b/app/src/main/java/com/example/it/issuetracker/di/datasourceModule.kt
@@ -3,12 +3,14 @@ package com.example.it.issuetracker.di
 import com.example.it.issuetracker.data.datasource.*
 import com.example.it.issuetracker.data.datasource.local.IssueTrackerDefaultDataSource
 import com.example.it.issuetracker.data.datasource.remote.IssueTrackerRemoteDataSource
+import com.example.it.issuetracker.data.datasource.remote.LabelRemoteDataSourceImpl
+import com.example.it.issuetracker.data.datasource.remote.MilestoneRemoteDataSourceImpl
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val dataSourceModule = module {
     single<IssueTrackerDataSource>(named("local_data_source")) { IssueTrackerDefaultDataSource() }
     single<IssueTrackerDataSource>(named("remote_data_source")) { IssueTrackerRemoteDataSource(get()) }
-    single<LabelDataSource> { LabelDataSourceDefaultImpl(get()) }
-    single<MilestoneDataSource> { MilestoneDataSourceDefaultImpl(get()) }
+    single<LabelDataSource> { LabelRemoteDataSourceImpl(get()) }
+    single<MilestoneDataSource> { MilestoneRemoteDataSourceImpl(get()) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/it/issuetracker/di/sharedPreferenceModule.kt b/app/src/main/java/com/example/it/issuetracker/di/sharedPreferenceModule.kt
index 99c4035be7..4f951899af 100644
--- a/app/src/main/java/com/example/it/issuetracker/di/sharedPreferenceModule.kt
+++ b/app/src/main/java/com/example/it/issuetracker/di/sharedPreferenceModule.kt
@@ -1,6 +1,6 @@
 package com.example.it.issuetracker.di
 
-import com.example.it.issuetracker.data.datasource.UserSharedPrefDataSource
+import com.example.it.issuetracker.data.datasource.local.UserSharedPrefDataSource
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
index 60255ebbc0..06fa60cf59 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/BaseSwipeHelper.kt
@@ -4,6 +4,8 @@ import android.graphics.Canvas
 import android.view.View
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
+import com.example.it.issuetracker.presentation.common.Constants.PERCENT
+import com.example.it.issuetracker.presentation.common.Constants.RATIO
 import kotlin.math.max
 import kotlin.math.min
 
@@ -77,7 +79,7 @@ abstract class BaseSwipeHelper : ItemTouchHelper.Callback() {
         isClamped: Boolean,
         isCurrentlyActive: Boolean,
     ): Float {
-        val maxSwipe: Float = -view.width.toFloat() / 10 * 3
+        val maxSwipe: Float = -view.width.toFloat() / PERCENT * RATIO
         val right: Float = 0f
 
         val x = if (isClamped) {
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
index 1f0295dc55..12dce7441c 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/Constants.kt
@@ -15,4 +15,9 @@ object Constants {
 
     // Issue 추가 및 수정 부분에서 번들로 받기 위한 Key값 정의
     const val ISSUE_BUNDLE_KEY = "issue_bundle"
+
+    // Swipe
+    const val PERCENT = 10
+    const val RATIO = 3
+    const val REVERSE = -1f
 }
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/common/utils/DateUtils.kt b/app/src/main/java/com/example/it/issuetracker/presentation/common/utils/DateUtils.kt
index f38aa4f445..acec309219 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/common/utils/DateUtils.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/common/utils/DateUtils.kt
@@ -1,31 +1,37 @@
 package com.example.it.issuetracker.presentation.common.utils
 
+import java.time.Duration
 import java.util.*
 
 enum class TimeValue(val value: Int, val maximum: Int, val message: String) {
     SEC(60, 60, TimeValue.MIN_AGO),
-    MIN(60, 24, TimeValue.TIME_AGE),
-    HOUR(24, 30, TimeValue.DAY_AGE),
-    DAY(30, 12, TimeValue.MONTH_AGE),
-    MONTH(12, Int.MAX_VALUE, TimeValue.YEAR_AGE);
+    MIN(60, 24, TimeValue.TIME_AGO),
+    HOUR(24, 30, TimeValue.DAY_AGO),
+    DAY(30, 12, TimeValue.MONTH_AGO),
+    MONTH(12, Int.MAX_VALUE, TimeValue.YEAR_AGO);
 
     companion object {
-        const val SECOND_AGE = "초 전"
+        const val SECOND_AGO = "초 전"
         const val MIN_AGO = "분 전"
-        const val TIME_AGE = "시간 전"
-        const val DAY_AGE = "일 전"
-        const val MONTH_AGE = "달 전"
-        const val YEAR_AGE = "년 전"
+        const val TIME_AGO = "시간 전"
+        const val DAY_AGO = "일 전"
+        const val MONTH_AGO = "달 전"
+        const val YEAR_AGO = "년 전"
     }
 }
 
+/**
+ * @param : 날짜 타입
+ * @return : 현재 시간부로 얼마나 지났는지 반환
+ *           (초 전, 분 전, 시간 전, 일 전, 달 전, 년 전)에 해당하지 안하면 null
+ */
 fun calculateTime(date: Date): String? {
     val currentTime = System.currentTimeMillis()
     val registerTime = date.time
     var differenceTime = (currentTime - registerTime) / 1000
 
     if (differenceTime < TimeValue.SEC.value) {
-        return "${differenceTime}${TimeValue.SECOND_AGE}"
+        return "${differenceTime}${TimeValue.SECOND_AGO}"
     } else {
         for (timeValue in TimeValue.values()) {
             differenceTime /= timeValue.value
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/login/LoginViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/login/LoginViewModel.kt
index e5d39643d7..ea8c6d7538 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/login/LoginViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/login/LoginViewModel.kt
@@ -2,7 +2,7 @@ package com.example.it.issuetracker.presentation.login
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.it.issuetracker.data.datasource.UserSharedPrefDataSource
+import com.example.it.issuetracker.data.datasource.local.UserSharedPrefDataSource
 import com.example.it.issuetracker.domain.model.LoginInformation
 import com.example.it.issuetracker.domain.repository.LoginRepository
 import com.example.it.issuetracker.presentation.common.Constants
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/filter/FilterViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/filter/FilterViewModel.kt
index 0363183e8c..91d88e841e 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/filter/FilterViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/filter/FilterViewModel.kt
@@ -3,7 +3,7 @@ package com.example.it.issuetracker.presentation.main.issue.filter
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.it.issuetracker.R
-import com.example.it.issuetracker.data.datasource.UserSharedPrefDataSource
+import com.example.it.issuetracker.data.datasource.local.UserSharedPrefDataSource
 import com.example.it.issuetracker.data.dto.LabelDto
 import com.example.it.issuetracker.domain.model.Issue
 import com.example.it.issuetracker.domain.model.Member
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueAdapter.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueAdapter.kt
index c086e0d172..fb3c008f2b 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueAdapter.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/list/IssueAdapter.kt
@@ -9,6 +9,9 @@ import androidx.recyclerview.widget.RecyclerView
 import com.example.it.issuetracker.databinding.ItemEditIssueBinding
 import com.example.it.issuetracker.databinding.ItemIssueBinding
 import com.example.it.issuetracker.domain.model.Issue
+import com.example.it.issuetracker.presentation.common.Constants.PERCENT
+import com.example.it.issuetracker.presentation.common.Constants.RATIO
+import com.example.it.issuetracker.presentation.common.Constants.REVERSE
 
 class IssueAdapter(
     private val onToggle: () -> Unit,
@@ -56,7 +59,8 @@ class IssueAdapter(
         private val adapter = LabelAdapter()
 
         fun bind(issue: Issue) {
-            if (issue.isSwiped) binding.container.translationX = binding.root.width * -1f / 10 * 3
+            if (issue.isSwiped) binding.container.translationX =
+                binding.root.width * REVERSE / PERCENT * RATIO
             else binding.container.translationX = 0f
 
             binding.issue = issue
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
index 9e99673d5b..a514476d72 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/issue/register/RegisterIssueFragment.kt
@@ -126,7 +126,6 @@ class RegisterIssueFragment :
     override fun observerData() {
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.filterItems }
-                .distinctUntilChanged()
                 .collect { filterItems ->
                     createLabelChipItems(filterItems.labelList)
 
@@ -144,7 +143,6 @@ class RegisterIssueFragment :
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.selectedFilters }
-                .distinctUntilChanged()
                 .collect {
                     if (it.labelIndex != null) checkedLabel(it.labelIndex)
                     if (it.milestoneIndex != null && binding.filterMilestone.spinner.size != 0)
@@ -156,14 +154,12 @@ class RegisterIssueFragment :
         repeatOnLifecycleExtension {
             val saveMenu = binding.toolbar.menu.findItem(R.id.save_issue)
             viewModel.uiState.map { it.requiredField }
-                .distinctUntilChanged()
                 .collect {
                     saveMenu.isEnabled = !it.isEmptySubject && !it.isEmptyDescription
                 }
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.errorMsgId }
-                .distinctUntilChanged()
                 .collect { msgId ->
                     if (msgId == INIT_ERROR_MSG_ID) return@collect
                     val text = getString(msgId)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/label/LabelFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/label/LabelFragment.kt
index 2056ae14e0..da5b555b53 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/label/LabelFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/label/LabelFragment.kt
@@ -35,14 +35,12 @@ class LabelFragment : DataBindingBaseFragment<FragmentLabelBinding>(R.layout.fra
     override fun observerData() {
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.labelList }
-                .distinctUntilChanged()
                 .collect {
                     adapter.submitList(it)
                 }
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.completeTask }
-                .distinctUntilChanged()
                 .collect { isCompleted ->
                     if (isCompleted) {
                         viewModel.getLabelInfoList()
@@ -52,7 +50,6 @@ class LabelFragment : DataBindingBaseFragment<FragmentLabelBinding>(R.layout.fra
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.errorMsgId }
-                .distinctUntilChanged()
                 .collect { msgId ->
                     if (msgId == Constants.INIT_ERROR_MSG_ID) return@collect
                     val msg = getString(msgId)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneFragment.kt
index afa3a51b0a..c8c29c9b24 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/milestone/MilestoneFragment.kt
@@ -38,14 +38,12 @@ class MilestoneFragment :
     override fun observerData() {
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.milestoneList }
-                .distinctUntilChanged()
                 .collect {
                     adapter.submitList(it)
                 }
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.completeTask }
-                .distinctUntilChanged()
                 .collect { isCompleted ->
                     if (isCompleted) {
                         viewModel.getMilestoneInfoList()
@@ -55,7 +53,6 @@ class MilestoneFragment :
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.errorMsgId }
-                .distinctUntilChanged()
                 .collect { msgId ->
                     if (msgId == Constants.INIT_ERROR_MSG_ID) return@collect
                     val msg = getString(msgId)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageFragment.kt
index 3538080bd7..bb73959156 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageFragment.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageFragment.kt
@@ -51,14 +51,12 @@ class MyPageFragment : DataBindingBaseFragment<FragmentMyPageBinding>(R.layout.f
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.logout }
-                .distinctUntilChanged()
                 .collect { logout ->
                     if (logout) goToLoginActivity()
                 }
         }
         repeatOnLifecycleExtension {
             viewModel.uiState.map { it.errorMsgId }
-                .distinctUntilChanged()
                 .collect { msgId ->
                     if (msgId == Constants.INIT_ERROR_MSG_ID) return@collect
                     val msg = getString(msgId)
diff --git a/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageViewModel.kt b/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageViewModel.kt
index 5e2f5cbd80..a27a8f6da7 100644
--- a/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageViewModel.kt
+++ b/app/src/main/java/com/example/it/issuetracker/presentation/main/mypage/MyPageViewModel.kt
@@ -3,7 +3,7 @@ package com.example.it.issuetracker.presentation.main.mypage
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.it.issuetracker.R
-import com.example.it.issuetracker.data.datasource.UserSharedPrefDataSource
+import com.example.it.issuetracker.data.datasource.local.UserSharedPrefDataSource
 import com.example.it.issuetracker.domain.repository.LoginRepository
 import com.example.it.issuetracker.presentation.common.Constants
 import com.example.it.issuetracker.presentation.login.LoginOption