resolve conflicts

divyanshub024 · divyanshub024 · commit 2502679beede · 2018-10-19T18:52:07.000+05:30
diff --git a/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt b/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt
@@ -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)
+        }
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -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'

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- classpath 'com.android.tools.build:gradle:3.2.0'`
	`13`	`+ classpath 'com.android.tools.build:gradle:3.3.0-alpha12'`
`14`	`14`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"`
`15`	`15`	`classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"`
`16`	`16`	`classpath 'com.google.gms:google-services:4.0.2'`