Commit 2502679b authored by divyanshu's avatar divyanshu

resolve conflicts

parent 0e768192
......@@ -17,6 +17,7 @@ import chat.rocket.android.chatinformation.presentation.MessageInfoPresenter
import chat.rocket.android.chatinformation.presentation.MessageInfoView
import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
import chat.rocket.android.util.extensions.showToast
import chat.rocket.android.util.extensions.ui
import dagger.android.support.AndroidSupportInjection
import kotlinx.android.synthetic.main.fragment_message_info.*
import javax.inject.Inject
......@@ -54,9 +55,9 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
}
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
return inflater.inflate(R.layout.fragment_message_info, container, false)
}
......@@ -84,16 +85,22 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
}
override fun showLoading() {
view_loading.isVisible = true
view_loading.show()
ui {
view_loading.isVisible = true
view_loading.show()
}
}
override fun hideLoading() {
view_loading.hide()
view_loading.isVisible = false
ui {
view_loading.isVisible = false
view_loading.hide()
}
}
override fun showReadReceipts(messageReceipts: List<ReadReceiptViewModel>) {
adapter.addAll(messageReceipts)
ui {
adapter.addAll(messageReceipts)
}
}
}
}
\ No newline at end of file
......@@ -10,7 +10,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'com.android.tools.build:gradle:3.3.0-alpha12'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath 'com.google.gms:google-services:4.0.2'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment