makes some more changes

app/src/main/java/chat/rocket/android/createChannel/addMembers/ui/AddMembersActivity.kt

@@ -9,7 +9,6 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.MenuItem
 import android.widget.EditText
-import android.widget.Toast
 import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.createChannel.addMembers.presentation.AddMembersPresenter
@@ -17,7 +16,6 @@ import chat.rocket.android.createChannel.addMembers.presentation.AddMembersView
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.viewmodel.MemberViewModel
-import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.widget.DividerItemDecoration
@@ -148,10 +146,8 @@ class AddMembersActivity : AppCompatActivity(), AddMembersView {
     }
 
     private fun addNewChip(memberViewModel: MemberViewModel) {
-        memberViewModel.username?.let {
-            buildNewChip(it)
-            membersToAdd.add(it)
-        }
+        buildNewChip(memberViewModel.displayName)
+        membersToAdd.add(memberViewModel.displayName)
     }
 
     private fun buildNewChip(chipText: String) {

app/src/main/java/chat/rocket/android/createChannel/ui/CreateNewChannelActivity.kt

@@ -12,12 +12,10 @@ import chat.rocket.android.R
 import chat.rocket.android.createChannel.addMembers.ui.AddMembersActivity
 import chat.rocket.android.createChannel.presentation.CreateNewChannelPresenter
 import chat.rocket.android.createChannel.presentation.CreateNewChannelView
-import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
 import chat.rocket.common.model.RoomType
-import com.jakewharton.rxbinding2.widget.RxTextView
 import dagger.android.AndroidInjection
-import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.activity_create_new_channel.*
 import kotlinx.android.synthetic.main.layout_toolbar.*
 import javax.inject.Inject
@@ -29,7 +27,6 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
     lateinit var presenter: CreateNewChannelPresenter
     private var channelType: RoomType = RoomType.CHANNEL
     private var listOfUsers: ArrayList<String> = ArrayList()
-    private lateinit var observableForToolbarAction: Disposable
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -39,23 +36,12 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
         setUpOnClickListeners()
     }
 
-    override fun onStart() {
-        super.onStart()
-        setUpToolbarObservable()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        observableForToolbarAction.dispose()
-    }
-
     override fun onOptionsItemSelected(item: MenuItem?): Boolean {
         when (item?.itemId) {
             android.R.id.home -> {
                 finish()
                 return true
             }
-
         }
         return super.onOptionsItemSelected(item)
     }
@@ -117,22 +103,12 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
         setSupportActionBar(toolbar)
         toolbar_title.text = getString(R.string.title_create_new_channel)
         toolbar_action_text.text = getString(R.string.action_create_new_channel)
+        toolbar_action_text.alpha = 1.0f
+        toolbar_action_text.isEnabled = true
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
-    private fun setUpToolbarObservable(){
-        observableForToolbarAction =
-                RxTextView.textChanges(channel_name_edit_text).subscribe { text ->
-                    toolbar_action_text.isEnabled = (text.isNotEmpty() && listOfUsers.isNotEmpty())
-                    if (text.isEmpty()) {
-                        toolbar_action_text.alpha = 0.8f
-                    } else {
-                        toolbar_action_text.alpha = 1.0f
-                    }
-                }
-    }
-
     private fun setUpOnClickListeners() {
         public_channel.setOnClickListener {
             channelType = RoomType.CHANNEL
@@ -183,13 +159,15 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
         }
 
         toolbar_action_text.setOnClickListener {
-            if (toolbar_action_text.isEnabled) {
+            if (channel_name_edit_text.textContent.isNotEmpty()) {
                 presenter.createNewChannel(
                     channelType,
                     channel_name_edit_text.text.toString(),
                     listOfUsers,
                     false
                 )
+            } else{
+                showToast(getString(R.string.msg_channel_name_required))
             }
         }
 

app/src/main/java/chat/rocket/android/members/viewmodel/MemberViewModel.kt

@@ -5,7 +5,11 @@ import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.common.model.User
 import chat.rocket.core.model.Value
 
-class MemberViewModel(private val member: User, private val settings: Map<String, Value<Any>>, private val baseUrl: String?) {
+class MemberViewModel(
+    private val member: User,
+    private val settings: Map<String, Value<Any>>,
+    private val baseUrl: String?
+) {
     val avatarUri: String?
     val displayName: String
     val realName: String?
@@ -32,6 +36,11 @@ class MemberViewModel(private val member: User, private val settings: Map<String
     private fun getUserDisplayName(): String {
         val username = member.username
         val realName = member.name
+        if (username == null && realName != null) {
+            return realName
+        } else if (username != null && realName == null) {
+            return username
+        }
         val senderName = if (settings.useRealName()) realName else username
         return senderName ?: username.toString()
     }

app/src/main/res/layout/fragment_chat_rooms.xml

@@ -65,6 +65,6 @@
         app:useCompatPadding="true"
         android:layout_alignParentBottom="true"
         android:src="@drawable/ic_add_white_24dp"
-        app:backgroundTint="@color/colorBlack"
+        app:backgroundTint="@color/colorAccent"
         />
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/values-es/strings.xml

@@ -140,6 +140,7 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">Mensaje copiado</string>
+    <string name="msg_channel_name_required">Por favor ingrese un nombre de canal</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nombre de la sala cambiado para: %1$s por %2$s</string>

app/src/main/res/values-fr/strings.xml

@@ -140,6 +140,7 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">Message copié</string>
+    <string name="msg_channel_name_required">Veuillez entrer un nom de chaîne</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Le nom de le salle a changé à: %1$s par %2$s</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -142,6 +142,7 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">संदेश कॉपी किया गया</string>
+    <string name="msg_channel_name_required">कृपया एक चैनल नाम दर्ज करें</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s ने रूम का नाम बदलकर %1$s किया</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -132,6 +132,7 @@
     // TODO: Add proper translation.
     <string name="msg_search">Search</string>
     <string name="msg_message_copied">Mensagem copiada</string>
+    <string name="msg_channel_name_required">Por favor insira um nome de canal</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>

app/src/main/res/values-uk-rRU/strings.xml

@@ -120,6 +120,7 @@
     <string name="msg_add_members">Додати членів</string>
     <string name="msg_search">Пошук</string>
     <string name="msg_member_already_added">Ви вже вибрали цього користувача</string>
+    <string name="msg_channel_name_required">Будь ласка, введіть назву каналу</string>
 
     <!--info for creating a channel-->
     <string name="private_channel_type">Приватно</string>

app/src/main/res/values/strings.xml

@@ -123,6 +123,7 @@
     <string name="msg_several_users_are_typing">Several users are typing…</string>
     <string name="msg_no_search_found">No result found</string>
     <string name="msg_member_already_added">You have already selected this user</string>
+    <string name="msg_channel_name_required">Please enter a channel name</string>
 
     <!--info for creating a channel-->
     <string name="private_channel_type">Private</string>