From 2a4ff9d8217636cf0dfb00e27ba5cb52f374e6fe Mon Sep 17 00:00:00 2001
From: cherrylime69 <95393311+cherrylime69@users.noreply.github.com>
Date: Fri, 24 Jun 2022 19:07:10 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"[Team-04][Android][Linus=5FJay][2?=
 =?UTF-8?q?=EC=A3=BC=EC=B0=A8=20=EC=88=98=EC=9A=94=EC=9D=BC=20=EC=84=B8?=
 =?UTF-8?q?=EB=B2=88=EC=A7=B8=20PR]"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  17 +-
 app/src/main/AndroidManifest.xml              |   9 +-
 .../com/example/issu_tracker/data/Comment.kt  |   9 +-
 .../com/example/issu_tracker/data/Issue.kt    |  11 +-
 .../com/example/issu_tracker/data/Label.kt    |   5 -
 .../example/issu_tracker/data/Repository.kt   |  50 ---
 .../com/example/issu_tracker/data/User.kt     |  12 +-
 .../issu_tracker/data/local/FriendDatabase.kt |  10 -
 .../issu_tracker/data/local/UserDao.kt        |  29 --
 .../data/repository/FilterRepository.kt       |   8 -
 .../data/repository/FilterRepositoryImpl.kt   |  41 --
 .../data/repository/FriendRemoteRepository.kt |  12 -
 .../repository/FriendRemoteRepositoryIml.kt   |  55 ---
 .../data/repository/HomeRepository.kt         |  10 +-
 .../data/repository/HomeRepositoryImpl.kt     |  60 +--
 .../data/repository/IssueEditorRepository.kt  |  14 -
 .../repository/IssueEditorRepositoryImpl.kt   |  89 -----
 .../issu_tracker/di/RepositoryModule.kt       |  55 +--
 .../issu_tracker/filter/ConditionBar.kt       |  43 ++
 .../{ui/common => filter}/CustomToolbar.kt    |   2 +-
 .../{ui => }/filter/FilterFragment.kt         |  32 +-
 .../{ui => }/filter/FilterViewModel.kt        |  39 +-
 .../{ui => }/filter/SpinnerAdapter.kt         |   2 +-
 .../issu_tracker/ui/DetailIssueActivity.kt    |  15 -
 .../ui/account/AccountViewModel.kt            |  35 --
 .../issu_tracker/ui/account/FriendAdapter.kt  |  62 ---
 .../ui/account/MyAccountFragment.kt           |  88 ++--
 .../issu_tracker/ui/common/ConditionBar.kt    |  63 ---
 .../issu_tracker/ui/common/Constants.kt       |   9 +-
 .../issu_tracker/ui/common/LabelAdapter.kt    |  51 ---
 .../ui/common/SwipeHelperCallback.kt          | 116 ------
 .../issu_tracker/ui/common/bndingAdapter.kt   |  15 -
 .../issu_tracker/ui/home/HomeActivity.kt      |   6 -
 .../issu_tracker/ui/home/HomeViewModel.kt     |  56 +--
 .../issu_tracker/ui/issue/IssueAdapter.kt     |  81 +---
 .../ui/issue/IssueEditorFragment.kt           | 375 ------------------
 .../ui/issue/IssueEditorViewModel.kt          | 124 ------
 .../issu_tracker/ui/issue/IssueFragment.kt    | 152 +------
 .../issu_tracker/ui/issue/IssueViewModel.kt   |  30 --
 .../ic_baseline_curtains_closed_24.xml        |  10 -
 .../ic_baseline_restore_from_trash_24.xml     |  10 -
 app/src/main/res/drawable/ic_leading.xml      |   9 -
 app/src/main/res/drawable/ic_plus.xml         |  11 -
 .../drawable/round_rectangle_background.xml   |   4 +-
 .../res/drawable/spinner_selected_text.xml    |   3 +-
 .../main/res/layout/activity_detail_issue.xml |   9 -
 app/src/main/res/layout/fragment_filter.xml   |  14 +-
 app/src/main/res/layout/fragment_issue.xml    | 138 ++-----
 .../main/res/layout/fragment_issue_editor.xml | 130 ------
 .../main/res/layout/fragment_my_account.xml   |  78 +---
 app/src/main/res/layout/item_friend.xml       |  68 ----
 app/src/main/res/layout/item_issue.xml        | 152 +++----
 app/src/main/res/layout/item_label.xml        |  25 --
 app/src/main/res/layout/item_spinner.xml      |   1 +
 .../main/res/layout/view_filter_condition.xml |   1 -
 .../res/menu/issue_editor_context_menu.xml    |  16 -
 .../main/res/navigation/navigation_graph.xml  |  13 +-
 app/src/main/res/values/attrs.xml             |   3 -
 app/src/main/res/values/strings.xml           |  12 -
 app/src/main/res/values/style.xml             |  31 +-
 app/src/main/res/values/themes.xml            |   6 +-
 build.gradle                                  |   4 -
 62 files changed, 266 insertions(+), 2374 deletions(-)
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/Label.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/Repository.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/FilterRepository.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/FilterRepositoryImpl.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
 create mode 100644 app/src/main/java/com/example/issu_tracker/filter/ConditionBar.kt
 rename app/src/main/java/com/example/issu_tracker/{ui/common => filter}/CustomToolbar.kt (98%)
 rename app/src/main/java/com/example/issu_tracker/{ui => }/filter/FilterFragment.kt (80%)
 rename app/src/main/java/com/example/issu_tracker/{ui => }/filter/FilterViewModel.kt (65%)
 rename app/src/main/java/com/example/issu_tracker/{ui => }/filter/SpinnerAdapter.kt (90%)
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/DetailIssueActivity.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/common/ConditionBar.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/common/LabelAdapter.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorFragment.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
 delete mode 100644 app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
 delete mode 100644 app/src/main/res/drawable/ic_baseline_curtains_closed_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_baseline_restore_from_trash_24.xml
 delete mode 100644 app/src/main/res/drawable/ic_leading.xml
 delete mode 100644 app/src/main/res/drawable/ic_plus.xml
 delete mode 100644 app/src/main/res/layout/activity_detail_issue.xml
 delete mode 100644 app/src/main/res/layout/fragment_issue_editor.xml
 delete mode 100644 app/src/main/res/layout/item_friend.xml
 delete mode 100644 app/src/main/res/layout/item_label.xml
 delete mode 100644 app/src/main/res/menu/issue_editor_context_menu.xml

diff --git a/app/build.gradle b/app/build.gradle
index a777ba42b9..f35a3cfa72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.issu_tracker"
-        minSdk 23
+        minSdk 21
         targetSdk 32
         versionCode 1
         versionName "1.0"
@@ -38,14 +38,6 @@ android {
 }
 
 dependencies {
-    //Room
-    implementation "androidx.room:room-ktx:2.4.2"
-    kapt "androidx.room:room-compiler:2.4.2"
-    implementation "androidx.room:room-runtime:2.4.2"
-    annotationProcessor "androidx.room:room-compiler:2.4.2"
-    // Glide
-    implementation 'com.github.bumptech.glide:glide:4.13.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1"
     // hilt
@@ -68,13 +60,12 @@ dependencies {
 
     //cloud fireStore
     implementation 'com.google.firebase:firebase-firestore-ktx'
+
     //firebase for Google and Github Oauth login
     implementation platform('com.google.firebase:firebase-bom:30.0.1')
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.android.gms:play-services-auth:20.2.0'
-    // Declare the dependency for the Cloud Storage library
-    implementation 'com.google.firebase:firebase-storage-ktx'
 
     // Testing
     testImplementation "androidx.arch.core:core-testing:2.1.0"
@@ -83,8 +74,4 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:1.1.2'
     testImplementation "org.robolectric:robolectric:4.4"
 
-    // Markwon (display markdown)
-    implementation "io.noties.markwon:core:$markwon_version"
-    implementation "io.noties.markwon:editor:$markwon_version"
-    implementation "io.noties.markwon:image:$markwon_version"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f193da52c6..48e22f66c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     package="com.example.issu_tracker">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".IssueTrackerApplication"
@@ -13,12 +12,12 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Issutracker">
-        <activity
-            android:name=".ui.DetailIssueActivity"
-            android:exported="false" />
         <activity
             android:name=".ui.home.HomeActivity"
-            android:exported="true"></activity>
+            android:exported="true">
+
+        </activity>
+
         <activity
             android:name=".ui.login.LogInActivity"
             android:exported="true">
diff --git a/app/src/main/java/com/example/issu_tracker/data/Comment.kt b/app/src/main/java/com/example/issu_tracker/data/Comment.kt
index d00c740758..06a4b195ea 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Comment.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Comment.kt
@@ -1,9 +1,6 @@
 package com.example.issu_tracker.data
 
-import java.io.Serializable
-
 data class Comment(
-    val commentUser: User? = null,
-    val content: String = "",
-    val time: String = ""
-) : Serializable
\ No newline at end of file
+    val commentUser: User?=null, val content: String="",
+    val time: String=""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/Issue.kt b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
index 1fb340e84b..26087e03eb 100644
--- a/app/src/main/java/com/example/issu_tracker/data/Issue.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/Issue.kt
@@ -1,10 +1,12 @@
 package com.example.issu_tracker.data
 
-import java.io.Serializable
+import com.google.gson.annotations.SerializedName
+
 import java.lang.Exception
 
+data class Label(val color: String = "", val content: String = "")
+
 data class IssueDto(
-    var id: String = "",
     val commets: List<Comment> = listOf(),
     val description: String = "",
     val label: List<Label> = listOf(),
@@ -15,7 +17,6 @@ data class IssueDto(
 )
 
 data class Issue(
-    var id: String,
     val comments: List<Comment>,
     val description: String,
     val label: List<Label>,
@@ -23,11 +24,11 @@ data class Issue(
     val state: Boolean,
     val title: String,
     val user: User
-) : Serializable
+)
 
 fun IssueDto.toIssue(): Issue? {
     return try {
-        Issue(id, commets, description, label, mileStone, state, title, user!!)
+        Issue(commets, description, label, mileStone, state, title, user!!)
     } catch (e: Exception) {
         null
     }
diff --git a/app/src/main/java/com/example/issu_tracker/data/Label.kt b/app/src/main/java/com/example/issu_tracker/data/Label.kt
deleted file mode 100644
index b159732d1e..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/Label.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.example.issu_tracker.data
-
-import java.io.Serializable
-
-data class Label(val color: String = "", val content: String = "") :Serializable
diff --git a/app/src/main/java/com/example/issu_tracker/data/Repository.kt b/app/src/main/java/com/example/issu_tracker/data/Repository.kt
deleted file mode 100644
index c70a2f6fa0..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/Repository.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.example.issu_tracker.data
-
-import android.util.Log
-import com.example.issu_tracker.data.local.FriendDatabase
-import com.example.issu_tracker.data.repository.FriendRemoteRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class Repository @Inject constructor(
-    private val friendLocalDatabase: FriendDatabase,
-    private val friendRemoteDatabase: FriendRemoteRepository
-) {
-    suspend fun loadFriendList(): List<User> {
-        // TODO  네트워크 상태에 따른 분기 처리 필요
-        Log.d("sdd","0")
-        // 1. 리모트에서 로컬에 캐시해줌
-        updateRemoteDatabase()
-
-
-        // 2. 업데이트된 로컬을 통해서 반환해줌
-        val result = friendLocalDatabase.userDao().getAll()
-
-        return result
-    }
-
-    suspend fun updateRemoteDatabase() {
-        // 1. 리모트에서 로컬에 캐시해줌
-        val userList = friendRemoteDatabase.loadFriendList()
-        Log.d("sdd","1")
-        CoroutineScope(Dispatchers.IO).launch {
-            friendLocalDatabase.userDao().deleteAllUsers()
-            userList.forEach {
-                launch {
-                    friendLocalDatabase.userDao().insert(it)
-                }
-            }
-        }.join()
-        Log.d("sdd","2")
-    }
-
-    suspend fun loadFriendListFromRemote(): List<User> {
-        return friendRemoteDatabase.loadFriendList()
-    }
-
-    suspend fun updateFriend(userList: List<User>) {
-        friendRemoteDatabase.updateFriend(userList)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/User.kt b/app/src/main/java/com/example/issu_tracker/data/User.kt
index f881004a65..df94c092cb 100644
--- a/app/src/main/java/com/example/issu_tracker/data/User.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/User.kt
@@ -1,14 +1,4 @@
 package com.example.issu_tracker.data
 
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import java.io.Serializable
 
-@Entity
-data class User(val UID: String = "", val name: String = "", val userPhoto: String?=null) :
-    Serializable {
-    @PrimaryKey(autoGenerate = true)
-    var id: Int = 0
-}
-
-data class UserDto(val UID: String = "", val name: String = "", val userPhoto: String)
+data class User(val UID: String="", val name: String="", val userPhoto: String? = null)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt b/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
deleted file mode 100644
index b166100384..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/local/FriendDatabase.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.example.issu_tracker.data.local
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import com.example.issu_tracker.data.User
-
-@Database(entities = [User::class], version = 1)
-abstract class FriendDatabase : RoomDatabase() {
-    abstract fun userDao(): UserDao
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt b/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
deleted file mode 100644
index bb1bc4d15c..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/local/UserDao.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.example.issu_tracker.data.local
-
-
-import androidx.room.*
-import com.example.issu_tracker.data.User
-
-@Dao
-interface UserDao {
-    @Insert
-    suspend fun insert(user: User)
-
-    @Update
-    suspend fun update(user: User)
-
-    @Delete
-    suspend fun delete(user: User)
-
-    @Query("SELECT * FROM User") // 테이블의 모든 값을 가져와라
-    suspend fun getAll(): List<User>
-
-    @Query("DELETE FROM User WHERE name = :name")
-    suspend fun deleteUserByName(name: String)
-
-    @Query("UPDATE User SET userPhoto =:userPhoto,name=:name WHERE UID = :UID")
-    suspend fun updateUser(userPhoto: String, UID: String, name: String)
-
-    @Query("DELETE FROM User")
-    suspend fun deleteAllUsers()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepository.kt
deleted file mode 100644
index df2a0c5d87..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepository.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-interface FilterRepository {
-
-    suspend fun loadLabel(): List<String>
-    suspend fun loadUsers(): List<String>
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepositoryImpl.kt
deleted file mode 100644
index d116e0ac10..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FilterRepositoryImpl.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-import com.example.issu_tracker.data.*
-import com.google.firebase.firestore.FirebaseFirestore
-import kotlinx.coroutines.tasks.await
-import javax.inject.Inject
-
-class FilterRepositoryImpl @Inject constructor(private val fireStore: FirebaseFirestore) :
-    FilterRepository {
-
-    override suspend fun loadUsers(): List<String> {
-        val list = mutableListOf<String>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_USER_PATH).get().await()
-
-        collectionData.documents.forEach {
-            val userObj = it.toObject(User::class.java)
-            userObj?.let { label ->
-                list.add(label.name)
-            }
-        }
-        return list
-    }
-
-    override suspend fun loadLabel(): List<String> {
-        val list = mutableListOf<String>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_LABEL_PATH).get().await()
-
-        collectionData.documents.forEach {
-            val labelObj = it.toObject(Label::class.java)
-            labelObj?.let { label ->
-                list.add(label.content)
-            }
-        }
-        return list
-    }
-
-    companion object {
-        const val FIREBASE_COLLECTION_USER_PATH = "User"
-        const val FIREBASE_COLLECTION_LABEL_PATH = "Label"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
deleted file mode 100644
index aa564ddeab..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepository.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-import android.util.Log
-import com.example.issu_tracker.data.User
-import kotlinx.coroutines.tasks.await
-
-interface FriendRemoteRepository {
-
-    suspend fun loadFriendList(): List<User>
-    suspend fun updateFriend(users: List<User>)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt b/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
deleted file mode 100644
index afdaa9a836..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/FriendRemoteRepositoryIml.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-import android.util.Log
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.ui.home.userUid
-import com.google.firebase.firestore.FirebaseFirestore
-import kotlinx.coroutines.tasks.await
-import java.lang.StringBuilder
-import javax.inject.Inject
-
-
-class FriendRemoteRepositoryIml @Inject constructor(private val fireStore: FirebaseFirestore) :
-    FriendRemoteRepository {
-
-    override suspend fun loadFriendList(): List<User> {
-        val userData =
-            fireStore.collection(HomeRepositoryImpl.FIREBASE_COLLECTION_FRIEND_PATH)
-                .document(userUid).get().await()
-        val friendData = userData["friend"] as List<Map<String, String>>
-        Log.d("friend", friendData.toString())
-
-        val friendList = mutableListOf<User>()
-
-        friendData.forEach {
-            val user =
-                User(
-                    it["UID"] ?: "", it["name"] ?: "",
-                    it["userPhoto"] ?: ""
-                )
-            friendList.add(user)
-        }
-        return friendList
-    }
-
-    override suspend fun updateFriend(users: List<User>) {
-        fireStore.collection(HomeRepositoryImpl.FIREBASE_COLLECTION_FRIEND_PATH)
-            .document(userUid).update("friend", users)
-    }
-
-    private fun convertUriToImageUrl(uri: String): String {
-        val parsedUri = StringBuilder(FIRE_STORAGE_FIRST_PATH)
-        val splitUri = uri.substring(5, uri.length).split("/")
-        parsedUri.append(splitUri[0])
-        parsedUri.append(FIRE_STORAGE_MIDDLE_PATH)
-        parsedUri.append(splitUri[1])
-        parsedUri.append(FIRE_STORAGE_LAST_PATH)
-        return parsedUri.toString()
-    }
-
-    companion object {
-        private const val FIRE_STORAGE_FIRST_PATH = "https://firebasestorage.googleapis.com/v0/b/"
-        private const val FIRE_STORAGE_MIDDLE_PATH = "/o/"
-        private const val FIRE_STORAGE_LAST_PATH = "?alt=media"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
index 7cb2e2739b..29707fe830 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepository.kt
@@ -1,16 +1,8 @@
 package com.example.issu_tracker.data.repository
 
 import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.User
 
 interface HomeRepository {
-
+    // TODO  추후 반환타입 수정
     suspend fun loadIssues(): List<Issue>
-    suspend fun updateIssueState(itemId: String, boolean: Boolean)
-
-    suspend fun deleteIssueList(list: List<Issue>)
-
-    suspend fun updateIssueListState(list: List<Issue>, boolean: Boolean)
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
index 2f83fade1d..2a0b1df4a0 100644
--- a/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
+++ b/app/src/main/java/com/example/issu_tracker/data/repository/HomeRepositoryImpl.kt
@@ -1,71 +1,25 @@
 package com.example.issu_tracker.data.repository
 
 import android.util.Log
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.IssueDto
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.data.local.FriendDatabase
-import com.example.issu_tracker.data.toIssue
-import com.example.issu_tracker.ui.home.userUid
+import com.example.issu_tracker.data.*
+import com.google.firebase.firestore.DocumentSnapshot
 import com.google.firebase.firestore.FirebaseFirestore
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
-import java.lang.StringBuilder
 import javax.inject.Inject
-import kotlin.coroutines.CoroutineContext
 
-class HomeRepositoryImpl @Inject constructor(
-    private val fireStore: FirebaseFirestore,
-    override val coroutineContext: CoroutineContext
-) :
-    HomeRepository, CoroutineScope {
+class HomeRepositoryImpl @Inject constructor(private val fireStore: FirebaseFirestore) :
+    HomeRepository {
     override suspend fun loadIssues(): List<Issue> {
         val list = mutableListOf<Issue>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).get().await()
-
+        val collectionData = fireStore.collection(FIREBASE_COLLECTION_PATH).get().await()
         collectionData.documents.forEach {
             val issueObj = it.toObject(IssueDto::class.java)
-            issueObj?.id = it.id
-            issueObj?.let { it1 ->
-                it1.toIssue()?.let { it2 -> list.add(it2) }
-                // 데이터를 추가하는 코드
-                // fireStore.collection(FIREBASE_COLLECTION_PATH).document().set(it1)
-            }
+            issueObj?.let { it1 -> it1.toIssue()?.let { it2 -> list.add(it2) } }
         }
         return list
     }
 
-    override suspend fun updateIssueState(itemId: String, boolean: Boolean) {
-
-        fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(itemId)
-            .update("state", false).await()
-
-    }
-
-
-    override suspend fun deleteIssueList(list: List<Issue>) {
-        CoroutineScope(Dispatchers.IO).launch {
-            for (i in list) {
-                fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id).delete()
-            }
-        }.join()
-    }
-
-
-    override suspend fun updateIssueListState(list: List<Issue>, boolean: Boolean) {
-        CoroutineScope(Dispatchers.IO).launch {
-            for (i in list) {
-                fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document(i.id)
-                    .update("state", false)
-            }
-        }.join()
-    }
-
-
     companion object {
-        const val FIREBASE_COLLECTION_ISSUE_PATH = "Issue"
-        const val FIREBASE_COLLECTION_FRIEND_PATH = "User"
+        const val FIREBASE_COLLECTION_PATH = "Issue"
     }
 }
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
deleted file mode 100644
index 2ab9c7b224..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepository.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.Label
-import com.example.issu_tracker.data.User
-
-interface IssueEditorRepository {
-
-    suspend fun loadLabel(): List<Label>
-    suspend fun loadAssignee(): List<User>
-    fun createNewIssue(newIssue: Issue)
-    suspend fun uploadImageAndGetImageUriFromFireBase(uri: String): String
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt b/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
deleted file mode 100644
index 393ade62f3..0000000000
--- a/app/src/main/java/com/example/issu_tracker/data/repository/IssueEditorRepositoryImpl.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.example.issu_tracker.data.repository
-
-import android.util.Log
-import androidx.core.net.toUri
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.Label
-import com.example.issu_tracker.data.User
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.storage.FirebaseStorage
-import com.google.firebase.storage.UploadTask
-import kotlinx.coroutines.tasks.await
-import javax.inject.Inject
-
-class IssueEditorRepositoryImpl @Inject constructor(private val fireStore: FirebaseFirestore) :
-    IssueEditorRepository {
-
-    override suspend fun loadLabel(): List<Label> {
-        val labelList = mutableListOf<Label>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_LABEL_PATH).get().await()
-
-        collectionData.documents.forEach { it ->
-            val labelObj = it.toObject(Label::class.java)
-            labelObj?.let { label ->
-                labelList.add(label)
-            }
-        }
-        return labelList
-    }
-
-    override suspend fun loadAssignee(): List<User> {
-        val assigneeList = mutableListOf<User>()
-        val collectionData = fireStore.collection(FIREBASE_COLLECTION_USER_PATH).get().await()
-
-        collectionData.documents.forEach {
-            val assigneeObj = it.toObject(User::class.java)
-            assigneeObj?.let { user ->
-                assigneeList.add(user)
-            }
-        }
-        return assigneeList
-    }
-
-    override fun createNewIssue(newIssue: Issue) {
-        fireStore.collection(FIREBASE_COLLECTION_ISSUE_PATH).document().set(newIssue)
-            .addOnSuccessListener {
-                println("성공")
-            }
-    }
-
-    override suspend fun uploadImageAndGetImageUriFromFireBase(imageUriFromLocal: String): String {
-        var imageUrlFromFirebase = ""
-        val imageUriFromLocal = imageUriFromLocal.toUri()
-        val storage = FirebaseStorage.getInstance()
-        val storageRef = storage.reference.child("images/${imageUriFromLocal.lastPathSegment}")
-        val uploadTask = storageRef.putFile(imageUriFromLocal)
-
-        uploadTask.addOnCanceledListener {
-            Log.e("uploadError", "이미지 업로드 에러")
-        }.addOnSuccessListener { taskSnapshot ->
-            imageUrlFromFirebase = convertUriToImageUrl(taskSnapshot)
-        }.await()
-
-        return imageUrlFromFirebase
-    }
-
-    private fun convertUriToImageUrl(taskSnapshot: UploadTask.TaskSnapshot): String {
-        val convertedUrl = taskSnapshot.uploadSessionUri.toString()
-            .replace(OLD_STRING_FOR_IMAGE_URL_CONVERSION, NEW_STRING_FOR_IMAGE_URL_CONVERSION)
-        val imageUriInMarkDown = "![](${
-            convertedUrl.substring(
-                0,
-                convertedUrl.indexOf(SUBSTRING_FOR_IMAGE_URL_CONVERSION)
-            ) + MEDIA_FORMAT
-        })"
-        return imageUriInMarkDown
-    }
-
-    companion object {
-        private const val OLD_STRING_FOR_IMAGE_URL_CONVERSION = "?name="
-        private const val NEW_STRING_FOR_IMAGE_URL_CONVERSION = "/"
-        private const val SUBSTRING_FOR_IMAGE_URL_CONVERSION = "&uploadType"
-        private const val MEDIA_FORMAT = "?alt=media"
-
-        const val FIREBASE_COLLECTION_USER_PATH = "User"
-        const val FIREBASE_COLLECTION_LABEL_PATH = "Label"
-        const val FIREBASE_COLLECTION_ISSUE_PATH = "Issue"
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
index fef85d6c2c..e8127bb170 100644
--- a/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
+++ b/app/src/main/java/com/example/issu_tracker/di/RepositoryModule.kt
@@ -1,71 +1,24 @@
 package com.example.issu_tracker.di
 
-
-import android.content.Context
-import androidx.room.Room
-import com.example.issu_tracker.data.Repository
-import com.example.issu_tracker.data.local.FriendDatabase
-import com.example.issu_tracker.data.local.UserDao
-import com.example.issu_tracker.data.repository.*
+import com.example.issu_tracker.data.repository.HomeRepository
+import com.example.issu_tracker.data.repository.HomeRepositoryImpl
 import com.google.firebase.firestore.FirebaseFirestore
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
 import dagger.hilt.android.components.ActivityRetainedComponent
-import kotlinx.coroutines.Dispatchers
 
 @Module
-@InstallIn(SingletonComponent::class)
+@InstallIn(ActivityRetainedComponent::class)
 object RepositoryModule {
 
-
     @Provides
     fun provideHomeRepository(fireStore: FirebaseFirestore): HomeRepository {
-        return HomeRepositoryImpl(fireStore, Dispatchers.IO)
-    }
-
-    @Provides
-    fun provideFilterRepository(fireStore: FirebaseFirestore): FilterRepository {
-        return FilterRepositoryImpl(fireStore)
-    }
-
-    @Provides
-    fun provideIssueEditorRepository(fireStore: FirebaseFirestore): IssueEditorRepository {
-        return IssueEditorRepositoryImpl(fireStore)
+        return HomeRepositoryImpl(fireStore)
     }
 
     @Provides
     fun provideFireStoreDB(): FirebaseFirestore {
         return FirebaseFirestore.getInstance()
     }
-
-    @Provides
-    fun provideFriendRemoteRepository(fireStore: FirebaseFirestore): FriendRemoteRepository {
-        return FriendRemoteRepositoryIml(fireStore)
-    }
-
-    @Singleton
-    @Provides
-    fun provideUserLocalDataBase(
-        @ApplicationContext context: Context
-    ): FriendDatabase = Room
-        .databaseBuilder(context, FriendDatabase::class.java, "friend.db")
-        .build()
-
-    @Singleton
-    @Provides
-    fun provideUserDao(friendDatabase: FriendDatabase): UserDao = friendDatabase.userDao()
-
-    @Singleton
-    @Provides
-    fun provideRepository(
-        friendDatabase: FriendDatabase,
-        friendRemoteDatabase: FriendRemoteRepository
-    ): Repository = Repository(
-        friendDatabase, friendRemoteDatabase
-    )
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/filter/ConditionBar.kt b/app/src/main/java/com/example/issu_tracker/filter/ConditionBar.kt
new file mode 100644
index 0000000000..e5c02cc7e4
--- /dev/null
+++ b/app/src/main/java/com/example/issu_tracker/filter/ConditionBar.kt
@@ -0,0 +1,43 @@
+package com.example.issu_tracker.filter
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.Spinner
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.databinding.DataBindingUtil
+import com.example.issu_tracker.R
+import com.example.issu_tracker.databinding.ViewFilterConditionBinding
+
+class ConditionBar(
+    context: Context,
+    attrs: AttributeSet?,
+) :
+    ConstraintLayout(context, attrs) {
+
+    private val binding: ViewFilterConditionBinding = DataBindingUtil.inflate(
+        LayoutInflater.from(context), R.layout.view_filter_condition, this, true
+    )
+
+    val spinner: Spinner = binding.spinnerCondition
+
+    init {
+        context.theme.obtainStyledAttributes(
+            attrs,
+            R.styleable.ConditionBar,
+            0,
+            0
+        ).apply {
+            try {
+                setConditionTitle(getResourceId(R.styleable.ConditionBar_conditionBarTitle, 0))
+            } finally {
+                recycle()
+            }
+        }
+    }
+
+    private fun setConditionTitle(textRes: Int) {
+        if (textRes != 0) binding.tvConditionTitle.setText(textRes)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/CustomToolbar.kt b/app/src/main/java/com/example/issu_tracker/filter/CustomToolbar.kt
similarity index 98%
rename from app/src/main/java/com/example/issu_tracker/ui/common/CustomToolbar.kt
rename to app/src/main/java/com/example/issu_tracker/filter/CustomToolbar.kt
index 34f9f03613..451dae81ff 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/common/CustomToolbar.kt
+++ b/app/src/main/java/com/example/issu_tracker/filter/CustomToolbar.kt
@@ -1,4 +1,4 @@
-package com.example.issu_tracker.ui.common
+package com.example.issu_tracker.filter
 
 import android.content.Context
 import android.graphics.drawable.Drawable
diff --git a/app/src/main/java/com/example/issu_tracker/ui/filter/FilterFragment.kt b/app/src/main/java/com/example/issu_tracker/filter/FilterFragment.kt
similarity index 80%
rename from app/src/main/java/com/example/issu_tracker/ui/filter/FilterFragment.kt
rename to app/src/main/java/com/example/issu_tracker/filter/FilterFragment.kt
index 7d89393edb..61a48a3b1c 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/filter/FilterFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/filter/FilterFragment.kt
@@ -1,4 +1,4 @@
-package com.example.issu_tracker.ui.filter
+package com.example.issu_tracker.filter
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -18,10 +18,10 @@ import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import com.example.issu_tracker.R
 import com.example.issu_tracker.databinding.FragmentFilterBinding
-import com.example.issu_tracker.ui.common.Constants.CONDITION_TYPE_LABEL
-import com.example.issu_tracker.ui.common.Constants.CONDITION_TYPE_ASSIGNEE
-import com.example.issu_tracker.ui.common.Constants.CONDITION_TYPE_STATE
-import com.example.issu_tracker.ui.common.Constants.CONDITION_TYPE_WRITER
+import com.example.issu_tracker.ui.common.Constants.FILTER_TYPE_LABEL_CONDITION
+import com.example.issu_tracker.ui.common.Constants.FILTER_TYPE_MILESTONE_CONDITION
+import com.example.issu_tracker.ui.common.Constants.FILTER_TYPE_STATE_CONDITION
+import com.example.issu_tracker.ui.common.Constants.FILTER_TYPE_WRITER_CONDITION
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 
@@ -53,38 +53,31 @@ class FilterFragment : Fragment() {
                 launch { collectConditionValue() }
             }
         }
-        setNavigationIconEventListener()
         setFirstActionItemClickEvent()
         setSecondActionItemClickEvent()
     }
 
-    private fun setNavigationIconEventListener() {
-        binding.tbFilter.setNavigationOnClickListener {
-            navController.popBackStack()
-        }
-    }
-
     private suspend fun setStateSpinner() {
         viewModel.stateStateFlow.collect {
-            setSpinner(binding.cbFilterState.spinner, it, CONDITION_TYPE_STATE)
+            setSpinner(binding.cbFilterState.spinner, it, FILTER_TYPE_STATE_CONDITION)
         }
     }
 
     private suspend fun setWriterSpinner() {
         viewModel.writerStateFlow.collect {
-            setSpinner(binding.cbFilterWriter.spinner, it, CONDITION_TYPE_WRITER)
+            setSpinner(binding.cbFilterWriter.spinner, it, FILTER_TYPE_WRITER_CONDITION)
         }
     }
 
     private suspend fun setLabelSpinner() {
         viewModel.labelStateFlow.collect {
-            setSpinner(binding.cbFilterLabel.spinner, it, CONDITION_TYPE_LABEL)
+            setSpinner(binding.cbFilterLabel.spinner, it, FILTER_TYPE_LABEL_CONDITION)
         }
     }
 
     private suspend fun setMileStoneSpinner() {
         viewModel.mileStoneStateFlow.collect {
-            setSpinner(binding.cbFilterMilestone.spinner, it, CONDITION_TYPE_ASSIGNEE)
+            setSpinner(binding.cbFilterMileStone.spinner, it, FILTER_TYPE_MILESTONE_CONDITION)
         }
     }
 
@@ -105,7 +98,7 @@ class FilterFragment : Fragment() {
             binding.cbFilterState.spinner.setSelection(viewModel.stateStateFlow.value.size - SPINNER_DEFAULT_INDEX)
             binding.cbFilterWriter.spinner.setSelection(viewModel.writerStateFlow.value.size - SPINNER_DEFAULT_INDEX)
             binding.cbFilterLabel.spinner.setSelection(viewModel.labelStateFlow.value.size - SPINNER_DEFAULT_INDEX)
-            binding.cbFilterMilestone.spinner.setSelection(viewModel.mileStoneStateFlow.value.size - SPINNER_DEFAULT_INDEX)
+            binding.cbFilterMileStone.spinner.setSelection(viewModel.mileStoneStateFlow.value.size - SPINNER_DEFAULT_INDEX)
             true
         }
     }
@@ -113,10 +106,7 @@ class FilterFragment : Fragment() {
     private fun setSecondActionItemClickEvent() {
         binding.tbFilter.secondActionItem.setOnMenuItemClickListener {
             val savedValues = viewModel.saveConditionValues()
-            navController.navigate(
-                R.id.action_filterFragment_to_issueFragment2,
-                bundleOf("filterCondition" to savedValues)
-            )
+            navController.navigate(R.id.action_filterFragment_to_issueFragment2, bundleOf("filterCondition" to savedValues))
             true
         }
     }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/filter/FilterViewModel.kt b/app/src/main/java/com/example/issu_tracker/filter/FilterViewModel.kt
similarity index 65%
rename from app/src/main/java/com/example/issu_tracker/ui/filter/FilterViewModel.kt
rename to app/src/main/java/com/example/issu_tracker/filter/FilterViewModel.kt
index 2999c33d6d..3c803202c3 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/filter/FilterViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/filter/FilterViewModel.kt
@@ -1,9 +1,8 @@
-package com.example.issu_tracker.ui.filter
+package com.example.issu_tracker.filter
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.issu_tracker.data.FilterCondition
-import com.example.issu_tracker.data.repository.FilterRepository
 import com.example.issu_tracker.ui.common.Constants
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -12,7 +11,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class FilterViewModel @Inject constructor(private val repository: FilterRepository) : ViewModel() {
+class FilterViewModel @Inject constructor() : ViewModel() {
 
     private val _stateStateFlow = MutableStateFlow<List<String>>(mutableListOf(""))
     val stateStateFlow = _stateStateFlow.asStateFlow()
@@ -45,43 +44,23 @@ class FilterViewModel @Inject constructor(private val repository: FilterReposito
         }
         test.add(DEFAULT_VALUE)
         viewModelScope.launch {
-            setStateList()
-            setWriterList()
-            setLabelList()
+            _stateStateFlow.emit(test)
+            _writerStateFlow.emit(test)
+            _labelStateFlow.emit(test)
             _mileStoneStateFlow.emit(test)
         }
     }
 
-    private suspend fun setStateList() {
-        val stateList = mutableListOf<String>()
-        stateList.add("열린 이슈")
-        stateList.add("닫힌 이슈")
-        stateList.add(DEFAULT_VALUE)
-        _stateStateFlow.emit(stateList)
-    }
-
-    private suspend fun setLabelList() {
-        val labelList = repository.loadLabel().toMutableList()
-        labelList.add(DEFAULT_VALUE)
-        _labelStateFlow.emit(labelList)
-    }
-
-    private suspend fun setWriterList() {
-        val writerList = repository.loadUsers().toMutableList()
-        writerList.add(DEFAULT_VALUE)
-        _writerStateFlow.emit(writerList)
-    }
-
     fun inputSpinnerValue(text: String, conditionType: Int) {
         if (text != DEFAULT_VALUE) {
             viewModelScope.launch {
                 _conditionValueStateFlow.emit(true)
             }
             when (conditionType) {
-                Constants.CONDITION_TYPE_STATE -> stateConditionValue = text
-                Constants.CONDITION_TYPE_WRITER -> writerConditionValue = text
-                Constants.CONDITION_TYPE_LABEL -> labelConditionValue = text
-                Constants.CONDITION_TYPE_ASSIGNEE -> mileStoneConditionValue = text
+                Constants.FILTER_TYPE_STATE_CONDITION -> stateConditionValue = text
+                Constants.FILTER_TYPE_WRITER_CONDITION -> writerConditionValue = text
+                Constants.FILTER_TYPE_LABEL_CONDITION -> labelConditionValue = text
+                Constants.FILTER_TYPE_MILESTONE_CONDITION -> mileStoneConditionValue = text
             }
         }
     }
diff --git a/app/src/main/java/com/example/issu_tracker/ui/filter/SpinnerAdapter.kt b/app/src/main/java/com/example/issu_tracker/filter/SpinnerAdapter.kt
similarity index 90%
rename from app/src/main/java/com/example/issu_tracker/ui/filter/SpinnerAdapter.kt
rename to app/src/main/java/com/example/issu_tracker/filter/SpinnerAdapter.kt
index ce7036d330..cd5837434f 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/filter/SpinnerAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/filter/SpinnerAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.issu_tracker.ui.filter
+package com.example.issu_tracker.filter
 
 import android.content.Context
 import android.widget.ArrayAdapter
diff --git a/app/src/main/java/com/example/issu_tracker/ui/DetailIssueActivity.kt b/app/src/main/java/com/example/issu_tracker/ui/DetailIssueActivity.kt
deleted file mode 100644
index d1a9120185..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/DetailIssueActivity.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.issu_tracker.ui
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.util.Log
-import com.example.issu_tracker.R
-import com.example.issu_tracker.data.Issue
-
-class DetailIssueActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_detail_issue)
-        val issue = intent.getSerializableExtra("issue") as Issue
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
deleted file mode 100644
index 2f1bf9cba0..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/account/AccountViewModel.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.example.issu_tracker.ui.account
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.issu_tracker.data.Repository
-import com.example.issu_tracker.data.User
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class AccountViewModel @Inject constructor(private val repository: Repository) : ViewModel() {
-    private val _friendList = MutableStateFlow<List<User>>(listOf())
-    val friendList: StateFlow<List<User>> = _friendList
-
-    fun loadFriendList() {
-        viewModelScope.launch {
-            _friendList.value = repository.loadFriendList()
-        }
-    }
-
-    fun dltFriend(user: User) {
-        viewModelScope.launch {
-            val updateList = friendList.value.toMutableList()
-            updateList.remove(user)
-            repository.updateFriend(updateList)
-            _friendList.value = repository.loadFriendListFromRemote()
-            repository.updateRemoteDatabase()
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
deleted file mode 100644
index f684162fc8..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/account/FriendAdapter.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.example.issu_tracker.ui.account
-
-import android.graphics.Color
-import android.graphics.drawable.GradientDrawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.databinding.DataBindingUtil
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.bumptech.glide.Glide
-import com.example.issu_tracker.R
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.databinding.ItemFriendBinding
-
-class FriendAdapter(val userAdapterEventListener: UserAdapterEventListener) :
-    ListAdapter<User, FriendAdapter.FriendViewHolder>(diffUtil) {
-    inner class FriendViewHolder(val binding: ItemFriendBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: User) {
-            binding.tvFriendName.text = item.name
-            Glide.with(itemView.context)
-                .load(item.userPhoto)
-                .circleCrop()
-                .into(binding.ivFiendPhoto)
-
-            binding.btDltFriend.setOnClickListener {
-                userAdapterEventListener.dltUser(item)
-            }
-        }
-
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FriendViewHolder {
-        return FriendViewHolder(
-            DataBindingUtil.inflate(
-                LayoutInflater.from(parent.context),
-                R.layout.item_friend,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: FriendViewHolder, position: Int) {
-        holder.bind(getItem(position))
-    }
-
-    companion object {
-        val diffUtil = object : DiffUtil.ItemCallback<User>() {
-            override fun areItemsTheSame(oldItem: User, newItem: User): Boolean {
-                return oldItem.UID == newItem.UID
-            }
-
-            override fun areContentsTheSame(oldItem: User, newItem: User): Boolean {
-                return oldItem == newItem
-            }
-
-        }
-    }
-}
diff --git a/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
index a0992ee3c3..5e8fb8b9ef 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/account/MyAccountFragment.kt
@@ -4,65 +4,57 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.BindingAdapter
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.issu_tracker.R
-import com.example.issu_tracker.databinding.FragmentIssueBinding
-import com.example.issu_tracker.databinding.FragmentMyAccountBinding
-import com.google.firebase.firestore.auth.User
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 
-@AndroidEntryPoint
+// TODO: Rename parameter arguments, choose names that match
+// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+private const val ARG_PARAM1 = "param1"
+private const val ARG_PARAM2 = "param2"
+
+/**
+ * A simple [Fragment] subclass.
+ * Use the [MyAccountFragment.newInstance] factory method to
+ * create an instance of this fragment.
+ */
 class MyAccountFragment : Fragment() {
-    private lateinit var binding: FragmentMyAccountBinding
-    private val accountViewModel: AccountViewModel by viewModels()
-    private lateinit var adapter: FriendAdapter
+    // TODO: Rename and change types of parameters
+    private var param1: String? = null
+    private var param2: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.let {
+            param1 = it.getString(ARG_PARAM1)
+            param2 = it.getString(ARG_PARAM2)
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_my_account, container, false)
-
-        setRecyclerView()
-        listenFriendListUpdate()
-
-
-        return binding.root
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_my_account, container, false)
     }
 
-    private fun listenFriendListUpdate() {
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                accountViewModel.friendList.collect {
-                    adapter.submitList(it)
+    companion object {
+        /**
+         * Use this factory method to create a new instance of
+         * this fragment using the provided parameters.
+         *
+         * @param param1 Parameter 1.
+         * @param param2 Parameter 2.
+         * @return A new instance of fragment MyAccountFragment.
+         */
+        // TODO: Rename and change types and number of parameters
+        @JvmStatic
+        fun newInstance(param1: String, param2: String) =
+            MyAccountFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_PARAM1, param1)
+                    putString(ARG_PARAM2, param2)
                 }
             }
-        }
     }
-
-
-    private fun setRecyclerView() {
-        accountViewModel.loadFriendList()
-
-        adapter = FriendAdapter(object :UserAdapterEventListener{
-            override fun dltUser(user: com.example.issu_tracker.data.User) {
-                accountViewModel.dltFriend(user)
-            }
-        })
-        binding.rvFriendList.adapter = adapter
-        binding.rvFriendList.layoutManager =
-            LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-    }
-
-}
-
-interface UserAdapterEventListener {
-    fun dltUser(user: com.example.issu_tracker.data.User)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/ConditionBar.kt b/app/src/main/java/com/example/issu_tracker/ui/common/ConditionBar.kt
deleted file mode 100644
index d9be73d989..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/common/ConditionBar.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.example.issu_tracker.ui.common
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.os.Build
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.annotation.RequiresApi
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.databinding.DataBindingUtil
-import com.example.issu_tracker.R
-import com.example.issu_tracker.databinding.ViewFilterConditionBinding
-
-class ConditionBar(
-    context: Context,
-    attrs: AttributeSet?,
-) :
-    ConstraintLayout(context, attrs) {
-
-    private val binding: ViewFilterConditionBinding = DataBindingUtil.inflate(
-        LayoutInflater.from(context), R.layout.view_filter_condition, this, true
-    )
-    val title = binding.tvConditionTitle
-    val spinner = binding.spinnerCondition
-    val constraintLayout = binding.clFilterContainer
-
-    init {
-        context.theme.obtainStyledAttributes(
-            attrs,
-            R.styleable.ConditionBar,
-            0,
-            0
-        ).apply {
-            try {
-                setConditionTitle(getResourceId(R.styleable.ConditionBar_conditionBarTitle, 0))
-                setConditionBackground(getResourceId(R.styleable.ConditionBar_conditionBarBackground, 0))
-                setConditionTextAppearance(getResourceId(R.styleable.ConditionBar_conditionBarTextAppearance, 0))
-                setConditionSpinnerBackgroundTint(getResourceId(R.styleable.ConditionBar_conditionBarBackgroundTint, 0))
-            } finally {
-                recycle()
-            }
-        }
-    }
-
-    private fun setConditionTitle(textRes: Int) {
-        if (textRes != 0) title.setText(textRes)
-    }
-
-    private fun setConditionBackground(colorRes: Int) {
-        if (colorRes != 0) {
-            constraintLayout.setBackgroundResource(colorRes)
-        }
-    }
-
-    private fun setConditionTextAppearance(styleRes: Int) {
-        if (styleRes != 0) title.setTextAppearance(styleRes)
-    }
-
-    private fun setConditionSpinnerBackgroundTint(colorRes: Int) {
-        if (colorRes != 0) spinner.backgroundTintList = ColorStateList.valueOf(colorRes)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/Constants.kt b/app/src/main/java/com/example/issu_tracker/ui/common/Constants.kt
index 874867c9fc..2378d5ab34 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/common/Constants.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/common/Constants.kt
@@ -1,9 +1,8 @@
 package com.example.issu_tracker.ui.common
 
 object Constants {
-    const val CONDITION_TYPE_STATE = 1
-    const val CONDITION_TYPE_WRITER = 2
-    const val CONDITION_TYPE_LABEL = 3
-    const val CONDITION_TYPE_MILESTONE = 4
-    const val CONDITION_TYPE_ASSIGNEE = 5
+    const val FILTER_TYPE_STATE_CONDITION = 1
+    const val FILTER_TYPE_WRITER_CONDITION = 2
+    const val FILTER_TYPE_LABEL_CONDITION = 3
+    const val FILTER_TYPE_MILESTONE_CONDITION = 4
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/LabelAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/common/LabelAdapter.kt
deleted file mode 100644
index e86b9f6187..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/common/LabelAdapter.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.example.issu_tracker.ui.common
-
-import android.graphics.Color
-import android.graphics.drawable.GradientDrawable
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.databinding.DataBindingUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.example.issu_tracker.R
-import com.example.issu_tracker.data.Label
-import com.example.issu_tracker.databinding.ItemLabelBinding
-
-
-class LabelAdapter(private val labels: List<Label>) :
-    RecyclerView.Adapter<LabelAdapter.LabelViewHolder>() {
-    inner class LabelViewHolder(val binding: ItemLabelBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        fun bind(item: Label) {
-            binding.tvLabelContent.text = item.content
-
-            val background = ContextCompat.getDrawable(
-                binding.tvLabelContent.context,
-                R.drawable.round_rectangle_background
-            ) as GradientDrawable
-
-            background.setColor(Color.parseColor(item.color))
-
-            binding.tvLabelContent.background = background
-        }
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): LabelViewHolder {
-        return LabelViewHolder(
-            DataBindingUtil.inflate(
-                LayoutInflater.from(parent.context),
-                R.layout.item_label,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: LabelViewHolder, position: Int) {
-        holder.bind(labels[position])
-    }
-
-    override fun getItemCount(): Int {
-        return labels.size
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt b/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
deleted file mode 100644
index 3e8ddc21b5..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/common/SwipeHelperCallback.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.example.issu_tracker.ui.common
-
-import android.graphics.Canvas
-import android.view.View
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.ItemTouchHelper.LEFT
-import androidx.recyclerview.widget.ItemTouchHelper.RIGHT
-import androidx.recyclerview.widget.RecyclerView
-import com.example.issu_tracker.R
-import com.example.issu_tracker.ui.issue.IssueAdapter
-import java.lang.Math.max
-
-class SwipeHelperCallback() : ItemTouchHelper.Callback() {
-
-    private var clamp = 0f
-    private var currentDx = 0f
-
-
-    override fun getMovementFlags(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder
-    ): Int {
-
-        val view = getView(viewHolder)
-        clamp = view.width.toFloat() * (0.3f)
-        return makeMovementFlags(0, LEFT or RIGHT)
-    }
-
-
-    override fun onMove(
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        target: RecyclerView.ViewHolder
-    ): Boolean {
-        return false
-    }
-
-    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-    }
-
-    override fun getSwipeEscapeVelocity(defaultValue: Float): Float {
-        // 스와이프 속도에 따라 없어지는 기준 설정
-        return defaultValue * 100
-    }
-
-    override fun getSwipeThreshold(viewHolder: RecyclerView.ViewHolder): Float {
-        // 현재 위치가 clamp 이상 갔을 때 스와이프 상태로 판단한다.
-        // 스와이프 위치적으로 없어지는 기준 설정
-        (viewHolder as IssueAdapter.IssueViewHolder).issue?.let {
-            if (currentDx <= -clamp) {
-                viewHolder.addSwipedIssue(it)
-            } else {
-                viewHolder.deleteSwipedIssue(it)
-            }
-        }
-        return 2f
-    }
-
-    override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) {
-        getDefaultUIUtil().clearView(getView(viewHolder))
-    }
-
-
-    override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
-        viewHolder?.let {
-            getDefaultUIUtil().onSelected(getView(it))
-        }
-    }
-
-    override fun onChildDraw(
-        c: Canvas,
-        recyclerView: RecyclerView,
-        viewHolder: RecyclerView.ViewHolder,
-        dX: Float,
-        dY: Float,
-        actionState: Int,
-        isCurrentlyActive: Boolean
-    ) {
-        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-            val view = getView(viewHolder)
-            var isSwiped = (viewHolder as IssueAdapter.IssueViewHolder).getSwipedIssueList()
-                .contains(viewHolder.issue)
-            val x = getClampHorizontalPosition(view, dX, isSwiped, isCurrentlyActive)
-
-            currentDx = x
-            getDefaultUIUtil().onDraw(
-                c,
-                recyclerView,
-                view,
-                x,
-                dY,
-                actionState,
-                isCurrentlyActive
-            )
-        }
-    }
-
-    private fun getClampHorizontalPosition(
-        view: View,
-        dX: Float,
-        isSwiped: Boolean,
-        currentlyActive: Boolean
-    ): Float {
-
-        val right = 0f
-
-        val x = if (isSwiped) {
-            if (currentlyActive) -clamp + dX else -clamp
-        } else dX
-        return kotlin.math.min(max(-clamp, x), right)
-    }
-
-    private fun getView(viewHolder: RecyclerView.ViewHolder): View {
-        return (viewHolder as IssueAdapter.IssueViewHolder).itemView.findViewById(R.id.cl_swipe_container) // 아이템뷰에서 스와이프 영역에 해당하는 뷰 가져오기
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/common/bndingAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/common/bndingAdapter.kt
index dee8ebdbf5..80e84ac2dc 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/common/bndingAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/common/bndingAdapter.kt
@@ -9,16 +9,12 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.example.issu_tracker.R
 import com.example.issu_tracker.data.Label
 
-
 @SuppressLint("Range")
 @BindingAdapter("labelList")
 fun setLabels(view: LinearLayout, list: List<Label>) {
-
     list.forEach {
         val textView =
             TextView(view.context)
@@ -42,15 +38,4 @@ fun setLabels(view: LinearLayout, list: List<Label>) {
         view.addView(spaceView)
     }
 
-
 }
-
-@BindingAdapter("labelListOnRecyclerview")
-fun setLabelsOnRecyclerview(view: RecyclerView, list: List<Label>) {
-    val adapter = LabelAdapter(list)
-    view.adapter = adapter
-
-    view.layoutManager =
-        LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
-}
-
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeActivity.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeActivity.kt
index 01480fa163..28df1febb1 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeActivity.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeActivity.kt
@@ -11,8 +11,6 @@ import com.example.issu_tracker.R
 import com.example.issu_tracker.databinding.ActivityHomeBinding
 import dagger.hilt.android.AndroidEntryPoint
 
-var userUid = ""
-
 @AndroidEntryPoint
 class HomeActivity : AppCompatActivity() {
     val homeViewModel: HomeViewModel by viewModels<HomeViewModel>()
@@ -21,10 +19,6 @@ class HomeActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        // TODO User UID 를 로그인 에서 넘겨 받는 작업 필요
-        userUid = "aU0xWZ9AQMYHt26ZAOX1ur79cFk1"
-
         binding = DataBindingUtil.setContentView(this, R.layout.activity_home)
 
         NavigationUI.setupWithNavController(
diff --git a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
index 9ab0898288..cb31afd1bf 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/home/HomeViewModel.kt
@@ -1,9 +1,7 @@
 package com.example.issu_tracker.ui.home
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.example.issu_tracker.data.FilterCondition
 import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.data.repository.HomeRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -18,9 +16,6 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
     private val _issueList = MutableStateFlow<List<Issue>>(listOf())
     val issueList: StateFlow<List<Issue>> = _issueList
 
-    private val _filteredIssueList = MutableStateFlow<List<Issue>>(listOf())
-    val filteredIssueList: StateFlow<List<Issue>> = _filteredIssueList
-
     init {
         viewModelScope.launch {
             getIssueList()
@@ -31,53 +26,4 @@ class HomeViewModel @Inject constructor(private val repository: HomeRepository)
         val issueDummyData = repository.loadIssues()
         _issueList.value = issueDummyData
     }
-
-    suspend fun updateIssueSate(itemId: String, boolean: Boolean) {
-        repository.updateIssueState(itemId, boolean)
-        getIssueList()
-    }
-    
-    suspend fun deleteIssueList(issueList: List<Issue>) {
-        repository.deleteIssueList(issueList)
-        getIssueList()
-        Log.d("updateDelte", issueList.toString())
-    }
-
-    suspend fun updateIssueList(issueList: List<Issue>, boolean: Boolean) {
-        repository.updateIssueListState(issueList, boolean)
-        getIssueList()
-        Log.d("updateDelte", issueList.toString())
-    }
-
-    fun filterIssueList(condition: FilterCondition) {
-        val filteredIssueList = _issueList.value
-            .filter {
-                if (condition.state.isNotEmpty()) {
-                    it.state
-                } else {
-                    true
-                }
-            }.filter {
-                if (condition.writer.isNotEmpty()) {
-                    it.user.name == condition.writer
-                } else {
-                    true
-                }
-            }
-            .filter {
-                it.label.any { label ->
-                    if (condition.label.isNotEmpty()) {
-                        label.content == condition.label
-                    } else {
-                        true
-                    }
-                }
-            }
-
-        _filteredIssueList.value = filteredIssueList
-    }
-}
-
-
-
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
index f33d6a8d4e..f45f8571b2 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueAdapter.kt
@@ -1,10 +1,7 @@
 package com.example.issu_tracker.ui.issue
 
-import android.util.Log
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
@@ -13,13 +10,7 @@ import com.example.issu_tracker.R
 import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.databinding.ItemIssueBinding
 
-
-class IssueAdapter() : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil) {
-    var issueAdapterEventListener: IssueAdapterEventListener? = null
-    var isEditMode = false
-    val swipedIssueList = mutableListOf<Issue>()
-    var rootWidth = 0
-
+class IssueAdapter : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): IssueViewHolder {
         val binding: ItemIssueBinding = DataBindingUtil.inflate(
             LayoutInflater.from(parent.context),
@@ -34,77 +25,11 @@ class IssueAdapter() : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil
         holder.bind(getItem(position))
     }
 
-    inner class IssueViewHolder(private val binding: ItemIssueBinding) :
+    class IssueViewHolder(private val binding: ItemIssueBinding) :
         RecyclerView.ViewHolder(binding.root) {
-        var issue: Issue? = null
-        fun addSwipedIssue(issue: Issue) = swipedIssueList.add(issue)
-        fun deleteSwipedIssue(issue: Issue) = swipedIssueList.remove(issue)
-        fun getSwipedIssueList(): List<Issue> {
-            return swipedIssueList
-        }
-
         fun bind(issue: Issue) {
-            this.issue = issue
             binding.issue = issue
-
-            if (rootWidth == 0) {
-                getRootWidth()
-            }
-
-            if (swipedIssueList.contains(issue)) {
-                binding.clSwipeContainer.x =
-                    (rootWidth) * (-1f / 10 * 3)
-            } else binding.clSwipeContainer.translationX = 0f
-
-            if (isEditMode) {
-                binding.cbIssueSelector.visibility = View.VISIBLE
-                binding.cbIssueSelector.isChecked = false
-
-            } else {
-                binding.cbIssueSelector.visibility = View.GONE
-            }
-
-            binding.tvDeleteClose.setOnClickListener {
-                if (swipedIssueList.contains(issue)) {
-                    issueAdapterEventListener?.updateIssueState(issue.id, false)
-                    swipedIssueList.remove(issue)
-                }
-            }
-
-            binding.root.setOnLongClickListener {
-                issueAdapterEventListener?.switchToEditMode(issue.id)
-                return@setOnLongClickListener (true)
-            }
-
-            binding.root.setOnClickListener {
-                issueAdapterEventListener?.getIntoDetail(issue)
-            }
-
-            binding.cbIssueSelector.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) {
-                    issueAdapterEventListener?.addInCheckList(issue)
-                } else issueAdapterEventListener?.deleteInCheckList(issue)
-            }
-
-
-        }
-
-        private fun getRootWidth() {
-            binding.root.viewTreeObserver.addOnGlobalLayoutListener(object :
-                OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    //뷰의 생성된 후 크기와 위치 구하기
-                    rootWidth = binding.root.width
-                    binding.root.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                }
-            })
         }
-
-    }
-
-
-    override fun getItemViewType(position: Int): Int {
-        return position
     }
 
     companion object {
@@ -119,4 +44,6 @@ class IssueAdapter() : ListAdapter<Issue, IssueAdapter.IssueViewHolder>(diffUtil
 
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorFragment.kt
deleted file mode 100644
index 5c111e1d57..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorFragment.kt
+++ /dev/null
@@ -1,375 +0,0 @@
-package com.example.issu_tracker.ui.issue
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.app.Activity.RESULT_OK
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context.CLIPBOARD_SERVICE
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.database.Cursor
-import android.net.Uri
-import android.os.Bundle
-import android.provider.MediaStore
-import android.text.Editable
-import android.text.SpannableStringBuilder
-import android.view.*
-import android.widget.AdapterView
-import android.widget.Spinner
-import android.widget.TextView
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.core.widget.doAfterTextChanged
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.NavController
-import androidx.navigation.Navigation
-import com.example.issu_tracker.R
-import com.example.issu_tracker.databinding.FragmentIssueEditorBinding
-import com.example.issu_tracker.ui.common.Constants
-import com.example.issu_tracker.ui.filter.FilterFragment
-import com.example.issu_tracker.ui.filter.SpinnerAdapter
-import com.google.android.material.snackbar.Snackbar
-import dagger.hilt.android.AndroidEntryPoint
-import io.noties.markwon.Markwon
-import io.noties.markwon.image.ImagesPlugin
-import kotlinx.coroutines.launch
-import java.io.File
-
-@AndroidEntryPoint
-class IssueEditor : Fragment() {
-
-    private lateinit var binding: FragmentIssueEditorBinding
-    private lateinit var markwon: Markwon
-    private lateinit var navController: NavController
-    private val viewModel: IssueEditorViewModel by viewModels()
-    private lateinit var launcherToGetImageFromGallery: ActivityResultLauncher<Intent>
-    private lateinit var launcherRequestPermission: ActivityResultLauncher<Array<String>>
-    private var startSelectionOfIssueBody = 0
-    private var endSelectionOfIssueBody = 0
-    private var ssbForIssueBody: SpannableStringBuilder = SpannableStringBuilder()
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentIssueEditorBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        navController = Navigation.findNavController(binding.root)
-        binding.tbIssueEditor.firstActionItem.isEnabled = true
-        launcherToGetImageFromGallery = registerImageFromGalleryLauncher()
-        launcherRequestPermission = registerRequestPermissionLauncher()
-        markwon = Markwon.builder(requireContext())
-            .usePlugin(ImagesPlugin.create())
-            .build();
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                launch { inputIssueBody() }
-                launch { inputIssueTitle() }
-                launch { setAssigneeSpinner() }
-                launch { setLabelSpinner() }
-                launch { setMileStoneSpinner() }
-                launch { inputImageUrlFromFireBaseInEditText() }
-            }
-        }
-        addIssueTitleTextChangedListener()
-        addIssueBodyTextChangedListener()
-        setOnPreviewEventListener()
-        setNavigationIconEventListener()
-        setIssueBodyLongClickEventListener()
-        setEditTextActionModeCallbackDisabled()
-    }
-
-
-    private suspend fun inputIssueTitle() {
-        viewModel.issueTitleStateFlow.collect {
-            binding.etIssueEditorBody.isEnabled = (it.isNotEmpty() && it.isNotBlank())
-            binding.tbIssueEditor.secondActionItem.isEnabled =
-                (it.isNotEmpty() && it.isNotBlank() && viewModel.issueBodyStateFlow.value.isNotEmpty())
-        }
-    }
-
-    private suspend fun inputIssueBody() {
-        viewModel.issueBodyStateFlow.collect {
-            displayBodyTextInMarkdown(it)
-            setOnSaveEventListener(it)
-        }
-    }
-
-    private fun setOnSaveEventListener(it: String) {
-        binding.tbIssueEditor.secondActionItem.isEnabled = it.isNotEmpty()
-        binding.tbIssueEditor.secondActionItem.setOnMenuItemClickListener {
-            viewModel.createIssue()
-            navController.navigate(R.id.action_issueEditor_to_issueFragment2)
-            true
-        }
-    }
-
-    private fun displayBodyTextInMarkdown(it: String) {
-        markwon.setMarkdown(binding.tvIssueEditorBody, it)
-    }
-
-
-    private fun setOnPreviewEventListener() {
-        binding.tbIssueEditor.firstActionItem.setOnMenuItemClickListener {
-            binding.tvIssueEditorBody.isVisible = !binding.tvIssueEditorBody.isVisible
-            binding.etIssueEditorBody.isVisible = !binding.etIssueEditorBody.isVisible
-            true
-        }
-    }
-
-    private fun addIssueBodyTextChangedListener() {
-        binding.etIssueEditorBody.doAfterTextChanged { changedText: Editable? ->
-            viewModel.inputIssueBodyText(changedText.toString())
-        }
-    }
-
-    private fun addIssueTitleTextChangedListener() {
-        binding.etIssueEditorTitle.doAfterTextChanged { changedText: Editable? ->
-            viewModel.inputIssueTitleText(changedText.toString())
-        }
-    }
-
-    private suspend fun setAssigneeSpinner() {
-        viewModel.assigneeStateFlow.collect {
-            setSpinner(binding.cbIssueEditorAssignee.spinner, it, Constants.CONDITION_TYPE_ASSIGNEE)
-        }
-    }
-
-    private suspend fun setLabelSpinner() {
-        viewModel.labelStateFlow.collect {
-            setSpinner(binding.cbIssueEditorLabel.spinner, it, Constants.CONDITION_TYPE_LABEL)
-        }
-    }
-
-    private suspend fun setMileStoneSpinner() {
-        viewModel.mileStoneStateFlow.collect {
-            setSpinner(
-                binding.cbIssueEditorMilestone.spinner,
-                it,
-                Constants.CONDITION_TYPE_MILESTONE
-            )
-        }
-    }
-
-    private fun setSpinner(spinner: Spinner, list: List<String>, conditionType: Int) {
-        val spinnerAdapter = SpinnerAdapter(this.requireContext(), R.layout.item_spinner, list)
-        spinner.adapter = spinnerAdapter
-        spinner.setSelection(list.size - FilterFragment.SPINNER_DEFAULT_INDEX)
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-
-            override fun onItemSelected(
-                parent: AdapterView<*>?,
-                view: View?,
-                position: Int,
-                id: Long
-            ) {
-                val selectedView = view as TextView
-                selectedView.setTextColor(ContextCompat.getColor(requireContext(), R.color.label2))
-                viewModel.inputSpinnerValue(selectedView.text.toString(), conditionType)
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-        }
-
-    }
-
-    private fun setNavigationIconEventListener() {
-        binding.tbIssueEditor.setNavigationOnClickListener {
-            navController.popBackStack()
-        }
-    }
-
-    private fun setIssueBodyLongClickEventListener() {
-        binding.etIssueEditorBody.setOnLongClickListener {
-            startEditTextCustomActionMode()
-            true
-        }
-    }
-
-    private fun startEditTextCustomActionMode() {
-        binding.etIssueEditorBody.startActionMode(object : ActionMode.Callback {
-
-            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                val inflater: MenuInflater? = mode?.menuInflater
-                inflater?.inflate(R.menu.issue_editor_context_menu, menu)
-                return true
-            }
-
-            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                return false
-            }
-
-            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-                startSelectionOfIssueBody = binding.etIssueEditorBody.selectionStart
-                endSelectionOfIssueBody = binding.etIssueEditorBody.selectionEnd
-                ssbForIssueBody = SpannableStringBuilder(binding.etIssueEditorBody.text)
-
-                val clipboard =
-                    requireActivity().getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
-
-                when (item?.itemId) {
-                    R.id.copy -> {
-                        val copyClip =
-                            ClipData.newPlainText(
-                                "copy",
-                                ssbForIssueBody.subSequence(
-                                    startSelectionOfIssueBody,
-                                    endSelectionOfIssueBody
-                                )
-                            )
-                        clipboard.setPrimaryClip(copyClip)
-                        mode?.finish()
-                        return true
-                    }
-                    R.id.cut -> {
-                        val cutClip = ClipData.newPlainText(
-                            "cut",
-                            ssbForIssueBody.subSequence(
-                                startSelectionOfIssueBody,
-                                endSelectionOfIssueBody
-                            )
-                        )
-                        ssbForIssueBody.delete(startSelectionOfIssueBody, endSelectionOfIssueBody)
-                        clipboard.setPrimaryClip(cutClip)
-                        binding.etIssueEditorBody.text = ssbForIssueBody
-                        mode?.finish()
-                        return true
-                    }
-                    R.id.paste -> {
-                        val clipData: CharSequence = clipboard.primaryClip?.getItemAt(0)?.text ?: ""
-                        pasteString(clipData)
-                        mode?.finish()
-                        return true
-                    }
-                    R.id.insert_photo -> {
-                        getPhotoUriFromGallery()
-                        mode?.finish()
-                        return true
-                    }
-                }
-                return false
-            }
-
-            override fun onDestroyActionMode(mode: ActionMode?) {
-            }
-
-        }, ActionMode.TYPE_FLOATING)
-    }
-
-    private fun pasteString(text: CharSequence) {
-        ssbForIssueBody.replace(startSelectionOfIssueBody, endSelectionOfIssueBody, text)
-        binding.etIssueEditorBody.text = ssbForIssueBody
-    }
-
-    private suspend fun inputImageUrlFromFireBaseInEditText() {
-        viewModel.imageUrlFromFireBaseStateFlow.collect {
-            ssbForIssueBody = SpannableStringBuilder(binding.etIssueEditorBody.text)
-            pasteString(it)
-        }
-    }
-
-    private fun setEditTextActionModeCallbackDisabled() {
-        binding.etIssueEditorBody.customSelectionActionModeCallback = object : ActionMode.Callback {
-            override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                return false
-            }
-
-            override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-                return false
-            }
-
-            override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-                return false
-            }
-
-            override fun onDestroyActionMode(mode: ActionMode?) {
-            }
-
-        }
-    }
-
-    private fun isAllPermissionsGranted(): Boolean = REQUIRED_PERMISSIONS.all { permission ->
-        ContextCompat.checkSelfPermission(this.requireContext(), permission) ==
-                PackageManager.PERMISSION_GRANTED
-    }
-
-    private fun registerRequestPermissionLauncher() =
-        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
-            permissions.entries.forEach { permission ->
-                when {
-                    permission.value -> {
-                        Snackbar.make(binding.root, "Permission granted", Snackbar.LENGTH_SHORT)
-                            .show()
-                    }
-                    shouldShowRequestPermissionRationale(permission.key) -> {
-                        //Setting 페이지 이동
-                    }
-                    else -> {
-                        Snackbar.make(binding.root, "Permission denied", Snackbar.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-            }
-        }
-
-    private fun getPhotoUriFromGallery() {
-        if (isAllPermissionsGranted()) {
-            launchToGetPhotoFromGallery()
-        } else {
-            launcherRequestPermission.launch(REQUIRED_PERMISSIONS)
-        }
-    }
-
-    private fun launchToGetPhotoFromGallery() {
-        val intent = Intent(Intent.ACTION_PICK).apply {
-            type = "image/*"
-        }
-        launcherToGetImageFromGallery.launch(intent)
-    }
-
-    private fun registerImageFromGalleryLauncher() =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            if (it.data != null && it.resultCode == RESULT_OK) {
-                val currentImageUri = it.data?.data
-
-                try {
-                    currentImageUri?.let { uri ->
-                        val imagePath: String = getPathOfUri(uri)
-                        val file = Uri.fromFile(File(imagePath))
-                        viewModel.uploadImageInFireBase(file.toString())
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-        }
-
-    @SuppressLint("Range")
-    private fun getPathOfUri(uri: Uri): String {
-        val cursor: Cursor? = requireContext().contentResolver.query(uri, null, null, null, null)
-        cursor?.moveToNext()
-        val path: String? = cursor?.getString(cursor.getColumnIndex(MediaStore.Images.Media.DATA))
-        cursor?.close()
-        return path ?: ""
-    }
-
-    companion object {
-        private val REQUIRED_PERMISSIONS = arrayOf(
-//            Manifest.permission.WRITE_EXTERNAL_STORAGE,
-            Manifest.permission.READ_EXTERNAL_STORAGE,
-        )
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
deleted file mode 100644
index 768e516586..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueEditorViewModel.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.example.issu_tracker.ui.issue
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.example.issu_tracker.data.Issue
-import com.example.issu_tracker.data.Label
-import com.example.issu_tracker.data.User
-import com.example.issu_tracker.data.repository.IssueEditorRepository
-import com.example.issu_tracker.ui.common.Constants
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class IssueEditorViewModel @Inject constructor(val repository: IssueEditorRepository) :
-    ViewModel() {
-
-    private val _issueTitleStateFlow = MutableStateFlow<String>("")
-    val issueTitleStateFlow = _issueTitleStateFlow.asStateFlow()
-
-    private val _issueBodyStateFlow = MutableStateFlow<String>("")
-    val issueBodyStateFlow = _issueBodyStateFlow.asStateFlow()
-
-    private val _assigneeList = mutableListOf<User>()
-    private val _assigneeStateFlow = MutableStateFlow<List<String>>(mutableListOf(""))
-    val assigneeStateFlow = _assigneeStateFlow.asStateFlow()
-
-    private val _labelList = mutableListOf<Label>()
-    private val _labelStateFlow = MutableStateFlow<List<String>>(mutableListOf(""))
-    val labelStateFlow = _labelStateFlow.asStateFlow()
-
-    private val _mileStoneStateFlow = MutableStateFlow<List<String>>(mutableListOf(""))
-    val mileStoneStateFlow = _mileStoneStateFlow.asStateFlow()
-
-    private val _imageUrlFromFireBaseStateFlow = MutableStateFlow<String>("")
-    val imageUrlFromFireBaseStateFlow = _imageUrlFromFireBaseStateFlow.asStateFlow()
-
-    private var assigneeConditionValue: User = User()
-    private var labelConditionValue: Label = Label()
-    private var mileStoneConditionValue = ""
-
-    init {
-        viewModelScope.launch {
-            setLabelList()
-            setAssigneeList()
-        }
-    }
-
-    fun inputIssueTitleText(text: String) {
-        _issueTitleStateFlow.value = text
-    }
-
-    fun inputIssueBodyText(text: String) {
-        _issueBodyStateFlow.value = text
-    }
-
-    fun createIssue() {
-        val newIssue = Issue(
-            id = "",
-            comments = listOf(),
-            description = _issueBodyStateFlow.value,
-            label = listOf(labelConditionValue),
-            mileStone = "마일스톤",
-            state = true,
-            title = _issueTitleStateFlow.value,
-            user = assigneeConditionValue
-        )
-        viewModelScope.launch {
-            repository.createNewIssue(newIssue)
-        }
-    }
-
-    private suspend fun setLabelList() {
-        _labelList.addAll(repository.loadLabel())
-        val labelList = mutableListOf<String>()
-        _labelList.forEach {
-            labelList.add(it.content)
-        }
-        labelList.add("")
-        _labelStateFlow.emit(labelList)
-    }
-
-    private suspend fun setAssigneeList() {
-        _assigneeList.addAll(repository.loadAssignee())
-        val assigneeList = mutableListOf<String>()
-        _assigneeList.forEach {
-            assigneeList.add(it.name)
-        }
-        assigneeList.add("")
-        _assigneeStateFlow.emit(assigneeList)
-    }
-
-    fun inputSpinnerValue(condition: String, conditionType: Int) {
-        when (conditionType) {
-            Constants.CONDITION_TYPE_ASSIGNEE -> {
-                _assigneeList.forEach {
-                    if (it.name == condition) {
-                        assigneeConditionValue = it
-                        return
-                    }
-                }
-            }
-            Constants.CONDITION_TYPE_LABEL -> {
-                _labelList.forEach {
-                    if (it.content == condition) {
-                        labelConditionValue = it
-                        return
-                    }
-                }
-            }
-//            Constants.CONDITION_TYPE_ASSIGNEE -> mileStoneConditionValue = text
-        }
-    }
-
-    fun uploadImageInFireBase(imageUriFromLocal: String) {
-        viewModelScope.launch {
-            val imageUrl = repository.uploadImageAndGetImageUriFromFireBase(imageUriFromLocal)
-            _imageUrlFromFireBaseStateFlow.value = imageUrl
-        }
-    }
-}
-
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
index 42c0ae9b82..4005d6df47 100644
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
+++ b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueFragment.kt
@@ -1,202 +1,64 @@
 package com.example.issu_tracker.ui.issue
 
-import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.NavController
 import androidx.navigation.Navigation
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.issu_tracker.R
-import com.example.issu_tracker.ui.common.SwipeHelperCallback
 import com.example.issu_tracker.data.FilterCondition
-import com.example.issu_tracker.data.Issue
 import com.example.issu_tracker.databinding.FragmentIssueBinding
-import com.example.issu_tracker.ui.DetailIssueActivity
 import com.example.issu_tracker.ui.home.HomeViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class IssueFragment : Fragment() {
     private lateinit var binding: FragmentIssueBinding
-    private lateinit var issueAdapter: IssueAdapter
-    private lateinit var navController: NavController
-    private val issueViewModel: IssueViewModel by viewModels()
+    private val issueAdapter = IssueAdapter()
     private val homeViewModel: HomeViewModel by activityViewModels<HomeViewModel>()
-    private lateinit var itemTouchHelper: ItemTouchHelper
-    lateinit var swipeHelperCallback: SwipeHelperCallback
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_issue, container, false)
-        return binding.root
-    }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        navController = Navigation.findNavController(binding.root)
+        val conditions = arguments?.getParcelable<FilterCondition>("filterCondition")
+        println(conditions)
 
-        saveFilterConditionFromFilterFragment()
         settingRecyclerview()
         updateRecyclerview()
         navigateFilterScreen()
-        navigateIssueEditor()
-        listenEditModeEvent()
-        setSelectedIssueCount()
-    }
-
-    private fun saveFilterConditionFromFilterFragment() {
-        val conditions = arguments?.getParcelable<FilterCondition>("filterCondition")
-        conditions?.let {
-            homeViewModel.filterIssueList(conditions)
-        }
-    }
-
-    private fun setSelectedIssueCount() {
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                issueViewModel.selectedIssueList.collect {
-                    binding.tvIssueSelectedCount.text = it.size.toString()
-                }
-            }
-        }
-    }
-
-    private fun listenEditModeEvent() {
-        // editMode 나가기
-        binding.ibEditClose.setOnClickListener {
-            issueAdapter.isEditMode = false
-            binding.clIssueOriginalModeTop.visibility = View.VISIBLE
-            binding.clIssueEditModeTop.visibility = View.GONE
-            issueAdapter.notifyDataSetChanged()
-            issueViewModel.clearSelectedList()
-            itemTouchHelper.attachToRecyclerView(binding.rvIssue)
-
-        }
-
-        // 선택요소 수정
-        binding.ibIssueClose.setOnClickListener {
-            viewLifecycleOwner.lifecycleScope.launch {
-                viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    homeViewModel.updateIssueList(issueViewModel.selectedIssueList.value, false)
-                    issueViewModel.clearSelectedList()
-                }
-            }
-        }
-
-        // 선택요소 삭제
-        binding.ibIssueDelete.setOnClickListener {
-            viewLifecycleOwner.lifecycleScope.launch {
-                viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    homeViewModel.deleteIssueList(issueViewModel.selectedIssueList.value)
-                    issueViewModel.clearSelectedList()
-                }
-            }
-        }
+        return binding.root
     }
 
     private fun updateRecyclerview() {
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                launch {
-                    // open 상태만 보여주기
-                    homeViewModel.issueList.collect {
-                        issueAdapter.submitList(it.filter { it.state })
-                    }
-                }
-                launch {
-                    homeViewModel.filteredIssueList.collect {
-                        issueAdapter.submitList(it)
-                    }
+                homeViewModel.issueList.collect {
+                    issueAdapter.submitList(it)
                 }
             }
         }
     }
 
-
     private fun settingRecyclerview() {
-        issueAdapter = IssueAdapter()
-        issueAdapter.issueAdapterEventListener = object : IssueAdapterEventListener {
-            override fun updateIssueState(itemId: String, boolean: Boolean) {
-                viewLifecycleOwner.lifecycleScope.launch {
-                    homeViewModel.updateIssueSate(itemId, boolean)
-                }
-            }
-
-            override fun switchToEditMode(itemId: String) {
-                issueAdapter.isEditMode = true
-                binding.clIssueOriginalModeTop.visibility = View.GONE
-                binding.clIssueEditModeTop.visibility = View.VISIBLE
-                issueAdapter.notifyDataSetChanged()
-
-                itemTouchHelper.attachToRecyclerView(null)
-            }
-
-            override fun switchToOriginMode() {
-                issueAdapter.isEditMode = false
-                binding.clIssueOriginalModeTop.visibility = View.VISIBLE
-                binding.clIssueEditModeTop.visibility = View.GONE
-                Log.d("sdsd" , "sdsd")
-                itemTouchHelper.attachToRecyclerView(binding.rvIssue)
-            }
-
-            override fun addInCheckList(issue: Issue) {
-                issueViewModel.addSelectedIssue(issue)
-            }
-
-            override fun deleteInCheckList(issue: Issue) {
-                issueViewModel.deleteSelectedIssue(issue)
-            }
-
-            override fun getIntoDetail(issue: Issue) {
-                val intent = Intent(requireContext(), DetailIssueActivity::class.java)
-                intent.putExtra("issue", issue)
-                startActivity(intent)
-            }
-        }
-
         binding.rvIssue.adapter = issueAdapter
         binding.rvIssue.layoutManager =
             LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-
-        swipeHelperCallback = SwipeHelperCallback()
-        itemTouchHelper = ItemTouchHelper(swipeHelperCallback)
-        itemTouchHelper.attachToRecyclerView(binding.rvIssue)
     }
 
     private fun navigateFilterScreen() {
         binding.ivIssueMenu.setOnClickListener {
+            val navController = Navigation.findNavController(binding.root)
             navController.navigate(R.id.action_issueFragment2_to_filterFragment)
         }
     }
-
-    private fun navigateIssueEditor() {
-        binding.fabIssueEdit.setOnClickListener {
-            navController.navigate(R.id.action_issueFragment2_to_issueEditor)
-        }
-    }
-}
-
-interface IssueAdapterEventListener {
-    fun updateIssueState(itemId: String, boolean: Boolean)
-    fun switchToEditMode(itemId: String)
-    fun switchToOriginMode()
-    fun addInCheckList(issue: Issue)
-    fun deleteInCheckList(issue: Issue)
-    fun getIntoDetail(issue: Issue)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt b/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
deleted file mode 100644
index da76697150..0000000000
--- a/app/src/main/java/com/example/issu_tracker/ui/issue/IssueViewModel.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.example.issu_tracker.ui.issue
-
-import androidx.lifecycle.ViewModel
-import com.example.issu_tracker.data.Issue
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-
-class IssueViewModel : ViewModel() {
-
-    private val _selectedIssueList = MutableStateFlow<List<Issue>>(mutableListOf())
-    val selectedIssueList: StateFlow<List<Issue>> = _selectedIssueList
-
-    fun addSelectedIssue(issue: Issue) {
-        val newList = _selectedIssueList.value.toMutableList()
-        newList.add(issue)
-        _selectedIssueList.value = newList
-    }
-
-    fun deleteSelectedIssue(issue: Issue) {
-        val newList = _selectedIssueList.value.toMutableList()
-        newList.remove(issue)
-        _selectedIssueList.value = newList
-    }
-
-    fun clearSelectedList() {
-        val newList = _selectedIssueList.value.toMutableList()
-        newList.clear()
-        _selectedIssueList.value = newList
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_curtains_closed_24.xml b/app/src/main/res/drawable/ic_baseline_curtains_closed_24.xml
deleted file mode 100644
index f951c6b865..0000000000
--- a/app/src/main/res/drawable/ic_baseline_curtains_closed_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,19V3H4v16H2v2h20v-2H20zM11,5h2v14h-2V5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_restore_from_trash_24.xml b/app/src/main/res/drawable/ic_baseline_restore_from_trash_24.xml
deleted file mode 100644
index c83d96981e..0000000000
--- a/app/src/main/res/drawable/ic_baseline_restore_from_trash_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,4h-3.5l-1,-1h-5l-1,1L5,4v2h14zM6,7v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7zM14,14v4h-4v-4L8,14l4,-4 4,4h-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_leading.xml b/app/src/main/res/drawable/ic_leading.xml
deleted file mode 100644
index d05d7cb222..0000000000
--- a/app/src/main/res/drawable/ic_leading.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="20dp"
-    android:viewportWidth="12"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M10,20L0,10L10,0L11.775,1.775L3.55,10L11.775,18.225L10,20Z"
-      android:fillColor="#000000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
deleted file mode 100644
index 821e66cfd9..0000000000
--- a/app/src/main/res/drawable/ic_plus.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M14,8H8V14H6V8H0V6H6V0H8V6H14V8Z"
-      android:fillColor="#000000"
-      android:fillAlpha="0.87"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/round_rectangle_background.xml b/app/src/main/res/drawable/round_rectangle_background.xml
index a52b2a53bc..2aaaba0b50 100644
--- a/app/src/main/res/drawable/round_rectangle_background.xml
+++ b/app/src/main/res/drawable/round_rectangle_background.xml
@@ -3,10 +3,10 @@
     <solid android:color="@color/issue_tracker_indigo" />
 
     <padding
-        android:bottom="6dp"
+        android:bottom="3dp"
         android:left="15dp"
         android:right="15dp"
-        android:top="6dp" />
+        android:top="3dp" />
     <corners
         android:bottomLeftRadius="180dp"
         android:bottomRightRadius="180dp"
diff --git a/app/src/main/res/drawable/spinner_selected_text.xml b/app/src/main/res/drawable/spinner_selected_text.xml
index 72cc49e591..a7a5ccfbcf 100644
--- a/app/src/main/res/drawable/spinner_selected_text.xml
+++ b/app/src/main/res/drawable/spinner_selected_text.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:state_focused="true" android:color="@color/white" />
     <item android:color="@color/black"  />
 
diff --git a/app/src/main/res/layout/activity_detail_issue.xml b/app/src/main/res/layout/activity_detail_issue.xml
deleted file mode 100644
index eee81f7a87..0000000000
--- a/app/src/main/res/layout/activity_detail_issue.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.DetailIssueActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 fd176c2a6c..1e7f7e9f28 100644
--- a/app/src/main/res/layout/fragment_filter.xml
+++ b/app/src/main/res/layout/fragment_filter.xml
@@ -10,9 +10,9 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.filter.FilterFragment">
+        tools:context=".filter.FilterFragment">
 
-        <com.example.issu_tracker.ui.common.CustomToolbar
+        <com.example.issu_tracker.filter.CustomToolbar
             android:id="@+id/tb_filter"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -26,7 +26,7 @@
             app:toolbarNavigationIcon="@drawable/ic_clear"
             app:toolbarTitle="@string/toolbar_title_filter" />
 
-        <com.example.issu_tracker.ui.common.ConditionBar
+        <com.example.issu_tracker.filter.ConditionBar
             android:id="@+id/cb_filter_state"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tb_filter" />
 
-        <com.example.issu_tracker.ui.common.ConditionBar
+        <com.example.issu_tracker.filter.ConditionBar
             android:id="@+id/cb_filter_writer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cb_filter_state" />
 
-        <com.example.issu_tracker.ui.common.ConditionBar
+        <com.example.issu_tracker.filter.ConditionBar
             android:id="@+id/cb_filter_label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -54,8 +54,8 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cb_filter_writer" />
 
-        <com.example.issu_tracker.ui.common.ConditionBar
-            android:id="@+id/cb_filter_milestone"
+        <com.example.issu_tracker.filter.ConditionBar
+            android:id="@+id/cb_filter_mileStone"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:conditionBarTitle="@string/condition_title_mile_stone"
diff --git a/app/src/main/res/layout/fragment_issue.xml b/app/src/main/res/layout/fragment_issue.xml
index 6ebc588c49..ebbe95f3d3 100644
--- a/app/src/main/res/layout/fragment_issue.xml
+++ b/app/src/main/res/layout/fragment_issue.xml
@@ -10,107 +10,38 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-
+        android:padding="19dp"
         tools:context=".ui.issue.IssueFragment">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_top"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_issue_original_mode_top"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="19dp"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageButton
-                    android:id="@+id/iv_issue_menu"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:background="@drawable/ic_baseline_menu_24"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_issue_title"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/tv_issue_title" />
-
-                <TextView
-                    android:id="@+id/tv_issue_title"
-                    style="@style/HeadLine6.26.bold"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="50dp"
-                    android:text="@string/issue_title"
-                    app:layout_constraintEnd_toStartOf="@id/iv_issue_search"
-                    app:layout_constraintStart_toEndOf="@id/iv_issue_menu"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageButton
-                    android:id="@+id/iv_issue_search"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:background="@drawable/ic_baseline_search_24"
-                    app:layout_constraintBottom_toBottomOf="@id/tv_issue_title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/tv_issue_title" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_issue_edit_mode_top"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/issue_tracker_blue"
-                android:padding="15dp"
-                android:visibility="gone"
-
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageButton
-                    android:id="@+id/ib_edit_close"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:background="@drawable/ic_clear"
-                    android:backgroundTint="@color/white"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_issue_selected_count"
-                    style="@style/HeadLine6.26.bold"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="30dp"
-                    android:paddingLeft="10dp"
-                    android:textColor="@color/white"
-                    app:layout_constraintEnd_toStartOf="@+id/ib_issue_delete"
-                    app:layout_constraintStart_toEndOf="@+id/ib_edit_close"
-                    app:layout_constraintTop_toTopOf="parent"
-                    tools:text="1" />
+        <ImageButton
+            android:id="@+id/iv_issue_menu"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/ic_baseline_menu_24"
+            app:layout_constraintBottom_toBottomOf="@id/tv_issue_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_issue_title" />
 
-                <ImageButton
-                    android:id="@+id/ib_issue_delete"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginEnd="20dp"
-                    android:background="@drawable/ic_baseline_restore_from_trash_24"
-                    android:backgroundTint="@color/white"
-                    app:layout_constraintEnd_toStartOf="@+id/ib_issue_close"
-                    app:layout_constraintStart_toEndOf="@+id/tv_issue_selected_count"
-                    app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+            android:id="@+id/tv_issue_title"
+            style="@style/HeadLine6.26.bold"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="50dp"
+            android:text="@string/issue_title"
+            app:layout_constraintEnd_toStartOf="@id/iv_issue_search"
+            app:layout_constraintStart_toEndOf="@id/iv_issue_menu"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:id="@+id/iv_issue_search"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/ic_baseline_search_24"
+            app:layout_constraintBottom_toBottomOf="@id/tv_issue_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_issue_title" />
 
-                <ImageButton
-                    android:id="@+id/ib_issue_close"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:background="@drawable/ic_baseline_curtains_closed_24"
-                    android:backgroundTint="@color/white"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/ib_issue_delete"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_issue"
@@ -119,19 +50,8 @@
             android:layout_marginTop="10dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cl_top"
-            app:layout_constraintVertical_bias="1.0" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab_issue_edit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:srcCompat="@drawable/ic_plus"/>
+            app:layout_constraintTop_toBottomOf="@id/tv_issue_title" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_issue_editor.xml b/app/src/main/res/layout/fragment_issue_editor.xml
deleted file mode 100644
index 1d360f6155..0000000000
--- a/app/src/main/res/layout/fragment_issue_editor.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?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>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.issue.IssueEditor">
-
-        <com.example.issu_tracker.ui.common.CustomToolbar
-            android:id="@+id/tb_issue_editor"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:theme="@style/ToolbarTheme"
-            app:firstActionText="@string/toolbar_action_preview"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:secondActionText="@string/toolbar_action_save"
-            app:toolbarNavigationIcon="@drawable/ic_leading"
-            app:toolbarTitle="@string/toolbar_editor_title" />
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_issue_editor_title"
-            style="@style/Body2.black"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@android:color/transparent"
-            android:ellipsize="end"
-            android:maxLines="1"
-            app:layout_constraintBottom_toBottomOf="@id/tv_issue_editor_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_issue_editor_title"
-            app:layout_constraintTop_toTopOf="@+id/tv_issue_editor_title"
-            tools:text="테스트" />
-
-        <TextView
-            android:id="@+id/tv_issue_editor_title"
-            style="@style/Subtitle1.black"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="18dp"
-            android:text="@string/issue_editor_title"
-            app:layout_constraintEnd_toStartOf="@+id/et_issue_editor_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tb_issue_editor" />
-
-        <View
-            android:id="@+id/view_issue_editor_divider_title"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginVertical="10dp"
-            android:background="@color/grey05"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_issue_editor_title" />
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/et_issue_editor_body"
-            style="@style/Body2"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:background="@android:color/transparent"
-            android:gravity="start"
-            android:hint="@string/issue_editor_body_hint"
-            android:paddingHorizontal="16dp"
-            android:textColorHint="@color/label2"
-            android:textIsSelectable="true"
-            app:layout_constraintBottom_toTopOf="@+id/cb_issue_editor_label"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_issue_editor_divider_title" />
-
-        <TextView
-            android:id="@+id/tv_issue_editor_body"
-            style="@style/Body2"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            android:background="@android:color/transparent"
-            android:gravity="start"
-            android:paddingHorizontal="16dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@+id/cb_issue_editor_label"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_issue_editor_divider_title" />
-
-        <com.example.issu_tracker.ui.common.ConditionBar
-            android:id="@+id/cb_issue_editor_label"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:conditionBarBackground="@color/background2"
-            app:conditionBarBackgroundTint="@color/background2"
-            app:conditionBarTextAppearance="@style/Body2.grey"
-            app:conditionBarTitle="@string/condition_title_label"
-            app:layout_constraintBottom_toTopOf="@+id/cb_issue_editor_milestone"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.example.issu_tracker.ui.common.ConditionBar
-            android:id="@+id/cb_issue_editor_milestone"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:conditionBarBackground="@color/background2"
-            app:conditionBarBackgroundTint="@color/background2"
-            app:conditionBarTextAppearance="@style/Body2.grey"
-            app:conditionBarTitle="@string/condition_title_mile_stone"
-            app:layout_constraintBottom_toTopOf="@+id/cb_issue_editor_assignee"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <com.example.issu_tracker.ui.common.ConditionBar
-            android:id="@+id/cb_issue_editor_assignee"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:conditionBarBackground="@color/background2"
-            app:conditionBarBackgroundTint="@color/background2"
-            app:conditionBarTextAppearance="@style/Body2.grey"
-            app:conditionBarTitle="@string/condition_title_user"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_my_account.xml b/app/src/main/res/layout/fragment_my_account.xml
index fc05cd757a..0fbff314f0 100644
--- a/app/src/main/res/layout/fragment_my_account.xml
+++ b/app/src/main/res/layout/fragment_my_account.xml
@@ -1,72 +1,14 @@
 <?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>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MyAccountFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".MyAccountFragment">
-
-        <TextView
-            android:id="@+id/tv_account_title"
-            style="@style/HeadLine6"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/issue_tracker_blue"
-            android:padding="15dp"
-            android:text="@string/my_account"
-            android:textColor="@color/white"
-            android:textSize="20sp"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="#00ff0000"
-            android:text="@string/add_friend"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_account_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.example.issu_tracker.ui.common.CustomToolbar
-            android:id="@+id/tb_account_title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@color/issue_tracker_blue"
-            android:theme="@style/ToolbarTheme"
-            android:visibility="gone"
-            app:firstActionText="@string/add_friend"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:toolbarTitle="@string/my_account" />
-
-        <TextView
-            android:id="@+id/tv_friend_title"
-            style="@style/HeadLine6.20.bold"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginTop="15dp"
-            android:text="@string/friend_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_account_title" />
+        android:text="@string/hello_blank_fragment" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_friend_list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_friend_title"
-            app:layout_constraintVertical_bias="0.0" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_friend.xml b/app/src/main/res/layout/item_friend.xml
deleted file mode 100644
index 84a524d6d5..0000000000
--- a/app/src/main/res/layout/item_friend.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:paddingStart="20dp"
-        android:paddingTop="10dp"
-        android:paddingEnd="20dp"
-        android:paddingBottom="10dp">
-
-        <ImageView
-            android:id="@+id/iv_fiend_photo"
-            android:layout_width="70dp"
-            android:layout_height="70dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_launcher_background" />
-
-        <TextView
-            android:id="@+id/tv_friend_name"
-            style="@style/Body2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/iv_fiend_photo"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="심준형" />
-
-        <Button
-            android:id="@+id/bt_send_msg"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
-            android:text="@string/send_msg"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@id/bt_dlt_friend"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/bt_dlt_friend"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="15dp"
-            android:layout_marginBottom="3dp"
-            android:text="@string/dlt_friend"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bt_send_msg" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:background="@color/grey05"
-            app:layout_constraintBottom_toBottomOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_issue.xml b/app/src/main/res/layout/item_issue.xml
index 857f3a6aa3..03f6031826 100644
--- a/app/src/main/res/layout/item_issue.xml
+++ b/app/src/main/res/layout/item_issue.xml
@@ -15,108 +15,62 @@
         android:layout_height="170dp"
         android:padding="15dp">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_delete_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/tv_delete_close"
-                style="@style/HeadLine6.20.bold"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_margin="5dp"
-                android:background="@color/issue_tracker_blue"
-                android:gravity="center"
-                android:text="@string/issue_close"
-                android:textColor="@color/white"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_percent="0.3" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <ImageView
 
-
-        <CheckBox
-            android:theme="@style/checkBoxStyle"
-            android:id="@+id/cb_issue_selector"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="30dp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toStartOf="@+id/cl_swipe_container"
+            android:id="@+id/iv_mile_stone"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:background="@drawable/ic_baseline_fork_right_24"
+            app:layout_constraintBottom_toBottomOf="@id/tv_issue_mile_stone"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintWidth_percent="0.2" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/cl_swipe_container"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/cb_issue_selector">
-
-            <ImageView
-                android:id="@+id/iv_mile_stone"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:background="@drawable/ic_baseline_fork_right_24"
-                app:layout_constraintBottom_toBottomOf="@id/tv_issue_mile_stone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@id/tv_issue_mile_stone" />
-
-            <TextView
-                android:id="@+id/tv_issue_mile_stone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="5dp"
-                android:text="@{issue.mileStone}"
-                android:textSize="15sp"
-                app:layout_constraintStart_toEndOf="@id/iv_mile_stone"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_issue_item_title"
-                style="@style/HeadLine6.20.bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
-                android:text="@{issue.title}"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_issue_mile_stone"
-                tools:text="@string/milestone" />
-
-            <TextView
-                android:id="@+id/tv_issue_item_description"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
-                android:text="@{issue.description}"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_issue_item_title"
-                tools:text="@string/temp_string_long" />
-
-            <androidx.core.widget.NestedScrollView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toTopOf="@id/view_issue_item"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_issue_item_description">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    labelListOnRecyclerview="@{issue.label}"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </androidx.core.widget.NestedScrollView>
+            app:layout_constraintTop_toTopOf="@id/tv_issue_mile_stone" />
+
+        <TextView
+            android:id="@+id/tv_issue_mile_stone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:text="@{issue.mileStone}"
+            android:textSize="15sp"
+            app:layout_constraintStart_toEndOf="@id/iv_mile_stone"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_marginTop="7dp"
+            android:id="@+id/tv_issue_item_title"
+            style="@style/HeadLine6.20.bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{issue.title}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_issue_mile_stone"
+            tools:text="@string/milestone" />
+
+        <TextView
+            android:layout_marginTop="7dp"
+            android:id="@+id/tv_issue_item_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@{issue.description}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_issue_item_title"
+            tools:text="@string/temp_string_long" />
 
+        <LinearLayout
+            labelList="@{issue.label}"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toTopOf="@id/view_issue_item"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_issue_item_description" />
 
-            <View
-                android:id="@+id/view_issue_item"
-                android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:layout_marginVertical="5dp"
-                android:background="@color/background2"
-                app:layout_constraintBottom_toBottomOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <View
+            android:id="@+id/view_issue_item"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:layout_marginVertical="5dp"
+            android:background="@color/background2"
+            app:layout_constraintBottom_toBottomOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_label.xml b/app/src/main/res/layout/item_label.xml
deleted file mode 100644
index 2ca891f6b9..0000000000
--- a/app/src/main/res/layout/item_label.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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">
-
-    <data>
-
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/tv_label_content"
-            style="@style/Body2.white"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_spinner.xml b/app/src/main/res/layout/item_spinner.xml
index 982fb904f0..a103c04703 100644
--- a/app/src/main/res/layout/item_spinner.xml
+++ b/app/src/main/res/layout/item_spinner.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <TextView 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"
     android:id="@+id/tv_spinner"
     style="@style/Subtitle1.black"
diff --git a/app/src/main/res/layout/view_filter_condition.xml b/app/src/main/res/layout/view_filter_condition.xml
index 742ed876fa..f33044cc8d 100644
--- a/app/src/main/res/layout/view_filter_condition.xml
+++ b/app/src/main/res/layout/view_filter_condition.xml
@@ -8,7 +8,6 @@
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_filter_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/issue_tracker_blue"
diff --git a/app/src/main/res/menu/issue_editor_context_menu.xml b/app/src/main/res/menu/issue_editor_context_menu.xml
deleted file mode 100644
index 79a1d7a9fb..0000000000
--- a/app/src/main/res/menu/issue_editor_context_menu.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/copy"
-        android:title="Copy"
-        app:showAsAction="ifRoom" />
-    <item android:id="@+id/cut"
-        android:title="Cut"
-        app:showAsAction="ifRoom" />
-    <item android:id="@+id/paste"
-        android:title="Paste"
-        app:showAsAction="ifRoom" />
-    <item android:id="@+id/insert_photo"
-        android:title="InsertPhoto"
-        app:showAsAction="ifRoom" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/navigation_graph.xml b/app/src/main/res/navigation/navigation_graph.xml
index b20fc0cc2d..b37d5a9844 100644
--- a/app/src/main/res/navigation/navigation_graph.xml
+++ b/app/src/main/res/navigation/navigation_graph.xml
@@ -13,9 +13,6 @@
         <action
             android:id="@+id/action_issueFragment2_to_filterFragment"
             app:destination="@id/filterFragment" />
-        <action
-            android:id="@+id/action_issueFragment2_to_issueEditor"
-            app:destination="@id/issueEditor" />
     </fragment>
     <fragment
         android:id="@+id/labelFragment2"
@@ -34,19 +31,11 @@
         tools:layout="@layout/fragment_my_account" />
     <fragment
         android:id="@+id/filterFragment"
-        android:name="com.example.issu_tracker.ui.filter.FilterFragment"
+        android:name="com.example.issu_tracker.filter.FilterFragment"
         android:label="fragment_filter"
         tools:layout="@layout/fragment_filter" >
         <action
             android:id="@+id/action_filterFragment_to_issueFragment2"
             app:destination="@id/issueFragment2" />
     </fragment>
-    <fragment
-        android:id="@+id/issueEditor"
-        android:name="com.example.issu_tracker.ui.issue.IssueEditor"
-        android:label="IssueEditor" >
-        <action
-            android:id="@+id/action_issueEditor_to_issueFragment2"
-            app:destination="@id/issueFragment2" />
-    </fragment>
 </navigation>
\ 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 4ce3b3208e..fa50598bf9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,9 +10,6 @@
 
     <declare-styleable name="ConditionBar">
         <attr name="conditionBarTitle" format="string" />
-        <attr name="conditionBarBackground" format="reference" />
-        <attr name="conditionBarTextAppearance" format="reference" />
-        <attr name="conditionBarBackgroundTint" format="reference" />
     </declare-styleable>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 109f4c651e..8c04974897 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,16 +16,4 @@
     <string name="condition_title_writer">작성자</string>
     <string name="condition_title_label">레이블</string>
     <string name="condition_title_mile_stone">마일스톤</string>
-    <string name="toolbar_action_preview">미리보기</string>
-    <string name="toolbar_action_save">저장</string>
-    <string name="toolbar_editor_title">이슈 작성</string>
-    <string name="issue_editor_title">제목</string>
-    <string name="condition_title_user">담당자</string>
-    <string name="issue_editor_body_hint">코멘트는 여기에 작성하세요. 반드시 먼저 제목을 작성하고 코멘트를 작성하세요.</string>
-    <string name="issue_close">닫기</string>
-    <string name="friend_title">친구목록</string>
-    <string name="add_friend">친구추가</string>
-    <string name="my_account">내 계정</string>
-    <string name="send_msg">메세지</string>
-    <string name="dlt_friend">삭제</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 029f0a3c00..24ec67351d 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="checkBoxStyle" parent="Base.Theme.AppCompat">
-        <item name="colorAccent">@color/issue_tracker_blue</item>
-        <item name="android:textColorSecondary">#A1A1A1</item>
-    </style>
-
     <style name="HeadLine1.42" parent="TextAppearance.MaterialComponents.Headline2">
         <item name="android:textColor">@color/black</item>
         <item name="android:textSize">42sp</item>
@@ -27,47 +21,44 @@
         <item name="android:textColor">@color/black</item>
     </style>
 
-    <style name="HeadLine6.white">
+    <style name="HeadLine6.white" >
         <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
 
-    <style name="Subtitle1.black">
+    <style name="Subtitle1.black" >
         <item name="android:textColor">@color/black</item>
     </style>
 
-    <style name="Subtitle1.white">
+    <style name="Subtitle1.white" >
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="Subtitle1.white.bold">
+    <style name="Subtitle1.white.bold" >
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="Subtitle1.grey">
+    <style name="Subtitle1.grey" >
         <item name="android:textColor">@color/background2</item>
     </style>
 
+
     <style name="Body2" parent="TextAppearance.MaterialComponents.Body2" />
 
-    <style name="Body2.black">
+    <style name="Body2.black" >
         <item name="android:textColor">@color/black</item>
     </style>
 
-    <style name="Body2.white">
+    <style name="Body2.white" >
         <item name="android:textColor">@color/white</item>
     </style>
-
-    <style name="Body2.grey" >
-        <item name="android:textColor">@color/label2</item>
-    </style>
     
     <style name="ToolbarTheme" parent="Theme.MaterialComponents.NoActionBar" >
         <item name="android:tint">@color/white</item>
     </style>
 
-    <style name="SpinnerDivideStyle" parent="android:style/Widget.ListView.DropDown">
+    <style name="SpinnerDivideStyle" parent="android:style/Widget.ListView.DropDown" >
         <item name="android:divider">@color/grey05</item>
         <item name="android:dividerHeight">1dp</item>
     </style>
@@ -76,9 +67,5 @@
         <item name="android:dropDownListViewStyle">@style/SpinnerDivideStyle</item>
     </style>
 
-    <style name="YOURSTYLE" parent="Widget.AppCompat.PopupMenu">
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:itemBackground">@android:color/holo_red_light</item>
-    </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b749a74797..e739fb207d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,9 +6,9 @@
         <item name="colorPrimaryVariant">@color/issue_tracker_blue</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/issue_tracker_blue</item>
-        <item name="colorSecondaryVariant">@color/issue_tracker_blue</item>
-        <item name="colorOnSecondary">@color/white</item>
+        <item name="colorSecondary">@color/issue_tracker_indigo</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
diff --git a/build.gradle b/build.gradle
index 3577d43148..0897542fc9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,10 @@ buildscript {
     ext.hilt_version = '2.40'
     ext {
         kotlin_version = '1.6.10'
-        markwon_version = "4.6.2"
     }
 
     repositories {
         google()
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
@@ -24,8 +22,6 @@ plugins {
     id 'org.jetbrains.kotlin.android' version '1.6.20' apply false
 }
 
-
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
\ No newline at end of file