Merge pull request #991 from RocketChat/remove-facebook-twitter-meteor-for-now

[FIX] Remove Facebook, Twitter and Meteor auth methods

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -118,8 +118,9 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                     var totalSocialAccountsEnabled = 0
 
                     if (settings.isFacebookAuthenticationEnabled()) {
-                        view.enableLoginByFacebook()
-                        totalSocialAccountsEnabled++
+//                        //TODO: Remove until we have this implemented
+//                        view.enableLoginByFacebook()
+//                        totalSocialAccountsEnabled++
                     }
                     if (settings.isGithubAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_GITHUB)
@@ -146,12 +147,14 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                         }
                     }
                     if (settings.isMeteorAuthenticationEnabled()) {
-                        view.enableLoginByMeteor()
-                        totalSocialAccountsEnabled++
+                        //TODO: Remove until we have this implemented
+//                        view.enableLoginByMeteor()
+//                        totalSocialAccountsEnabled++
                     }
                     if (settings.isTwitterAuthenticationEnabled()) {
-                        view.enableLoginByTwitter()
-                        totalSocialAccountsEnabled++
+                        //TODO: Remove until we have this implemented
+//                        view.enableLoginByTwitter()
+//                        totalSocialAccountsEnabled++
                     }
                     if (settings.isGitlabAuthenticationEnabled()) {
                         val clientId = getOauthClientId(services, SERVICE_NAME_GILAB)

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -102,11 +102,8 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
         return fragmentDispatchingAndroidInjector
     }
 
-    private fun setupToolbar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayShowTitleEnabled(false)
-        text_room_name.textContent = chatRoomName
-
+    fun showRoomTypeIcon(showRoomTypeIcon: Boolean) {
+        if (showRoomTypeIcon) {
             val roomType = roomTypeOf(chatRoomType)
             val drawable = when (roomType) {
                 is RoomType.Channel -> {
@@ -127,6 +124,17 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
                 DrawableHelper.tintDrawable(mutableDrawable, this, R.color.white)
                 DrawableHelper.compoundDrawable(text_room_name, mutableDrawable)
             }
+        } else {
+            text_room_name.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
+        }
+    }
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        text_room_name.textContent = chatRoomName
+
+        showRoomTypeIcon(true)
 
         toolbar.setNavigationOnClickListener {
             finishActivity()

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -123,6 +123,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         setupMessageComposer()
         setupSuggestionsView()
         setupActionSnackbar()
+        activity?.apply {
+            (this as? ChatRoomActivity)?.showRoomTypeIcon(true)
+        }
+
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

@@ -6,6 +6,7 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import chat.rocket.android.R
@@ -83,8 +84,19 @@ class MembersFragment : Fragment(), MembersView {
             } else {
                 adapter.appendData(dataSet)
             }
+            if (this is ChatRoomActivity) {
+                this.showRoomTypeIcon(false)
             }
         }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            (activity as ChatRoomActivity).showRoomTypeIcon(true)
+            return super.onOptionsItemSelected(item)
+        }
+        return super.onOptionsItemSelected(item)
+    }
 
     override fun showLoading() = view_loading.setVisible(true)