Use the same adapter between issue and merge request notes

app/src/main/java/com/commit451/gitlab/adapter/NotesAdapter.kt

@@ -11,7 +11,7 @@ import java.util.*
 /**
  * Nice notes
  */
-class IssueNotesAdapter(private val project: Project) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class NotesAdapter(private val project: Project) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     companion object {

app/src/main/java/com/commit451/gitlab/fragment/IssueDiscussionFragment.kt

@@ -18,7 +18,7 @@ import com.commit451.addendum.parceler.putParcelerParcelable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.AttachActivity
-import com.commit451.gitlab.adapter.IssueNotesAdapter
+import com.commit451.gitlab.adapter.NotesAdapter
 import com.commit451.gitlab.api.response.FileUploadResponse
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.extension.setup
@@ -63,7 +63,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
     @BindView(R.id.send_message_view) lateinit var sendMessageView: SendMessageView
     @BindView(R.id.progress) lateinit var progress: View
-    lateinit var adapter: IssueNotesAdapter
+    lateinit var adapter: NotesAdapter
     lateinit var layoutManagerNotes: LinearLayoutManager
     lateinit var teleprinter: Teleprinter
@@ -98,7 +98,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
         super.onViewCreated(view, savedInstanceState)
         teleprinter = Teleprinter(activity)
-        adapter = IssueNotesAdapter(project)
+        adapter = NotesAdapter(project)
         layoutManagerNotes = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
         listNotes.layoutManager = layoutManagerNotes
         listNotes.adapter = adapter

app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.kt

@@ -19,6 +19,7 @@ import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.AttachActivity
 import com.commit451.gitlab.adapter.MergeRequestDetailAdapter
+import com.commit451.gitlab.adapter.NotesAdapter
 import com.commit451.gitlab.api.response.FileUploadResponse
 import com.commit451.gitlab.event.MergeRequestChangedEvent
 import com.commit451.gitlab.extension.setup
@@ -63,7 +64,7 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
     @BindView(R.id.send_message_view) lateinit var sendMessageView: SendMessageView
     @BindView(R.id.progress) lateinit var progress: View
-    lateinit var adapterMergeRequestDetail: MergeRequestDetailAdapter
+    lateinit var adapterNotes: NotesAdapter
     lateinit var layoutManagerNotes: LinearLayoutManager
     lateinit var teleprinter: Teleprinter
@@ -98,10 +99,10 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
         super.onViewCreated(view, savedInstanceState)
         teleprinter = Teleprinter(activity)
-        adapterMergeRequestDetail = MergeRequestDetailAdapter(activity, mergeRequest, project)
+        adapterNotes = NotesAdapter(project)
         layoutManagerNotes = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, true)
         listNotes.layoutManager = layoutManagerNotes
-        listNotes.adapter = adapterMergeRequestDetail
+        listNotes.adapter = adapterNotes
         listNotes.addOnScrollListener(onScrollListener)
         sendMessageView.callback = object : SendMessageView.Callback {
@@ -161,13 +162,13 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
                         swipeRefreshLayout.isRefreshing = false
                         loading = false
                         nextPageUrl = LinkHeaderParser.parse(response()).next
-                        adapterMergeRequestDetail.setNotes(notes)
+                        adapterNotes.setNotes(notes)
                     }
                 })
     }
     fun loadMoreNotes() {
-        adapterMergeRequestDetail.setLoading(true)
+        adapterNotes.setLoading(true)
         App.get().gitLab.getMergeRequestNotes(nextPageUrl!!.toString())
                 .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
                 .subscribe(object : CustomResponseSingleObserver<List<Note>>() {
@@ -175,16 +176,16 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
                     override fun error(e: Throwable) {
                         loading = false
                         Timber.e(e)
-                        adapterMergeRequestDetail.setLoading(false)
+                        adapterNotes.setLoading(false)
                         Snackbar.make(root, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
                                 .show()
                     }
                     override fun responseNonNullSuccess(notes: List<Note>) {
-                        adapterMergeRequestDetail.setLoading(false)
+                        adapterNotes.setLoading(false)
                         loading = false
                         nextPageUrl = LinkHeaderParser.parse(response()).next
-                        adapterMergeRequestDetail.addNotes(notes)
+                        adapterNotes.addNotes(notes)
                     }
                 })
     }
@@ -215,12 +216,13 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
                     override fun success(note: Note) {
                         progress.visibility = View.GONE
-                        adapterMergeRequestDetail.addNote(note)
+                        adapterNotes.addNote(note)
                         listNotes.smoothScrollToPosition(MergeRequestDetailAdapter.headerCount)
                     }
                 })
     }
+    @Suppress("unused")
     @Subscribe
     fun onMergeRequestChangedEvent(event: MergeRequestChangedEvent) {
         if (mergeRequest.id == event.mergeRequest.id) {