From 7fd05889276f848f81164b74cc0169588a8edfe3 Mon Sep 17 00:00:00 2001
From: mac <karanbedi0304@gmail.com>
Date: Sun, 14 Oct 2018 07:09:48 +0530
Subject: [PATCH 01/16] Add Floating Action Button

---
 .../rocket/android/chatrooms/ui/ChatRoomsFragment.kt  |  9 +++++++++
 app/src/main/res/drawable/ic_add_white_24dp.xml       |  9 +++++++++
 app/src/main/res/layout/fragment_chat_rooms.xml       | 11 +++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 2c453eb80e..cef17a9e7c 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -109,6 +109,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         subscribeUi()
 
         setupToolbar()
+        setupFab()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRooms)
     }
@@ -179,11 +180,13 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                 // Simply setting sortView to visible won't work, so we invalidate the options
                 // to recreate the entire menu...
                 activity?.invalidateOptionsMenu()
+                create_new_channel_fab.isVisible = true
                 return true
             }
 
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {
                 sortView?.isVisible = false
+                create_new_channel_fab.isVisible = false
                 return true
             }
         }
@@ -351,4 +354,10 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         }
         return true
     }
+
+    private fun setupFab() {
+        create_new_channel_fab.setOnClickListener {
+            showToast("fab click")
+        }
+    }
 }
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
new file mode 100644
index 0000000000..b9b8eca8b9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_chat_rooms.xml b/app/src/main/res/layout/fragment_chat_rooms.xml
index 1a82b796a5..8045f97aa9 100644
--- a/app/src/main/res/layout/fragment_chat_rooms.xml
+++ b/app/src/main/res/layout/fragment_chat_rooms.xml
@@ -56,4 +56,15 @@
         android:textSize="20sp"
         android:visibility="gone"
         tools:visibility="visible" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/create_new_channel_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="20dp"
+        android:src="@drawable/ic_add_white_24dp"
+        app:backgroundTint="@color/color_black" />
 </RelativeLayout>

From c1011d1475ca3d4a1226eb6db791a3776b7d97fd Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Tue, 23 Oct 2018 14:00:32 +0530
Subject: [PATCH 02/16] Add the fragment transaction to contacts' list when FAB
 clicked

---
 .../chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index c76d30bf80..b739d7bf06 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -30,9 +30,11 @@ import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModel
 import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModelFactory
 import chat.rocket.android.chatrooms.viewmodel.LoadingState
 import chat.rocket.android.chatrooms.viewmodel.Query
+import chat.rocket.android.contacts.ContactListFragment
 import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
+import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.util.extension.onQueryTextListener
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
@@ -359,8 +361,10 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     }
 
     private fun setupFab() {
-        create_new_channel_fab.setOnClickListener {
-            showToast("fab click")
+        create_new_channel_fab.setOnClickListener { view ->
+            var mainActivity: MainActivity = activity as MainActivity
+            var contactsListFragment: ContactListFragment = ContactListFragment()
+            activity?.getSupportFragmentManager()?.beginTransaction()?.replace(this.id, contactsListFragment, "contactListFragment")?.addToBackStack(null)?.commit();
         }
     }
 }

From a5ea82ee519fabb93fdbd897da05514a49f81e9b Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Tue, 23 Oct 2018 14:01:02 +0530
Subject: [PATCH 03/16] Fix incorrect renames caused by autorefactoring tool

---
 app/src/main/res/layout/item_chat.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/item_chat.xml b/app/src/main/res/layout/item_chat.xml
index c8e8eae862..e07d655725 100644
--- a/app/src/main/res/layout/item_chat.xml
+++ b/app/src/main/res/layout/item_chat.xml
@@ -24,13 +24,13 @@
         android:layout_width="12dp"
         android:layout_height="0dp"
         android:layout_marginStart="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/contact_name"
+        app:layout_constraintBottom_toBottomOf="@+id/text_chat_name"
         app:layout_constraintStart_toEndOf="@+id/image_avatar"
-        app:layout_constraintTop_toTopOf="@+id/contact_name"
+        app:layout_constraintTop_toTopOf="@+id/text_chat_name"
         tools:src="@drawable/ic_hashtag_unread_12dp" />
 
     <TextView
-        android:id="@+id/phone_number"
+        android:id="@+id/text_last_message"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -43,12 +43,12 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
-        app:layout_constraintTop_toBottomOf="@+id/contact_name"
+        app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
         tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
 
 
     <TextView
-        android:id="@+id/contact_name"
+        android:id="@+id/text_chat_name"
         style="@style/ChatRoom.Name.TextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
         android:maxLines="1"
         android:textDirection="locale"
         android:textColor="@color/colorSecondaryText"
-        app:layout_constraintBottom_toTopOf="@+id/phone_number"
+        app:layout_constraintBottom_toTopOf="@+id/text_last_message"
         app:layout_constraintEnd_toStartOf="@+id/text_last_message_date_time"
         app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
         app:layout_constraintTop_toTopOf="parent"
@@ -77,7 +77,7 @@
         android:maxLines="2"
         android:textDirection="locale"
         app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
-        app:layout_constraintTop_toTopOf="@+id/contact_name"
+        app:layout_constraintTop_toTopOf="@+id/text_chat_name"
         tools:text="11:45 AM" />
 
     <include
@@ -86,6 +86,6 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/contact_name" />
+        app:layout_constraintTop_toTopOf="@+id/text_chat_name" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e8cc1973cf6b552eb9d9197ea25df3643278afab Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Tue, 23 Oct 2018 16:52:47 +0530
Subject: [PATCH 04/16] Add create channel and invite contact buttons

---
 .../android/contacts/ContactListFragment.kt   |  2 +
 .../contacts/ContactRecyclerViewAdapter.kt    | 24 +++++----
 app/src/main/res/layout/fragment_contacts.xml | 54 ++++++++++++++-----
 app/src/main/res/layout/item_contact.xml      |  9 ++++
 4 files changed, 66 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
index 24db7d7efd..e303a70f3b 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
@@ -65,6 +65,8 @@ class ContactListFragment : Fragment() {
                         contactHashMap[phoneNo] = "INDETERMINATE"
                     }
                     pCur.close()
+                    contactArrayList.sortWith(Comparator { o1, o2 -> o1.getName()!!.compareTo(o2.getName()!!)
+                    })
                 }
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
index b07a6fe1a3..2afe8c70a9 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.provider.ContactsContract
 import android.view.ViewGroup
+import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
@@ -44,27 +45,28 @@ class ContactRecyclerViewAdapter(
 
     }
 
-    inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view), View.OnClickListener {
+    inner class ViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
         var contact: Contact? = null
         var status: String? = null
 
         var contactName: TextView
         var phoneNumber: TextView
+        var inviteButton: Button
 
         init {
-            this.view.setOnClickListener(this)
             this.contactName = view.findViewById(R.id.contact_name) as TextView
             this.phoneNumber = view.findViewById(R.id.phone_number) as TextView
-        }
-
-        override fun onClick(view: View) {
-                Toast.makeText(
-                        context,
-                        "Contact was clicked: ${this.contact!!.getName()!!}",
-                        Toast.LENGTH_LONG
-                ).show()
-//            Handle the click on the contact
+            this.inviteButton = view.findViewById(R.id.invite_contact) as Button
 
+            this.inviteButton.setOnClickListener { view ->
+                run {
+                    Toast.makeText(
+                            context,
+                            "Contact invite button was clicked: ${this.contact!!.getName()!!}",
+                            Toast.LENGTH_LONG
+                    ).show()
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/res/layout/fragment_contacts.xml b/app/src/main/res/layout/fragment_contacts.xml
index 07e16e5487..5d9f0f227b 100644
--- a/app/src/main/res/layout/fragment_contacts.xml
+++ b/app/src/main/res/layout/fragment_contacts.xml
@@ -6,19 +6,49 @@
     android:layout_height="match_parent"
     tools:context=".contacts.ContactListFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
+    <LinearLayout
+        android:layout_marginTop="10dp"
+        android:id="@+id/create_section"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/item_contact" />
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp">
+
+        <ImageView
+            android:layout_marginStart="10dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:contentDescription="@string/Create_A_New_Channel"
+            android:src="@drawable/ic_add_24dp" />
+
+        <TextView
+            android:layout_marginStart="10dp"
+            android:textSize="22dp"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/Create_A_New_Channel" />
+
+    </LinearLayout>
 
-    <TextView
-        android:id="@+id/text_no_data_to_display"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="@string/msg_no_data_to_display"
-        android:visibility="gone"
-        tools:visibility="visible" />
+        android:layout_below="@id/create_section">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_contact" />
+
+        <TextView
+            android:id="@+id/text_no_data_to_display"
+            style="@style/TextAppearance.AppCompat.Subhead"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/msg_no_data_to_display"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index b26393b860..9bd16b7ec6 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -52,4 +52,13 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Name goes here" />
 
+    <Button
+        android:id="@+id/invite_contact"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="INVITE"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/image_avatar"
+        tools:layout_editor_absoluteY="4dp" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 20f757a4207106528e415cc7f72e3b8f88069b91 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Wed, 24 Oct 2018 09:55:39 +0530
Subject: [PATCH 05/16] fix sort

---
 .../java/chat/rocket/android/contacts/ContactListFragment.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
index e303a70f3b..045a50d73e 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
@@ -65,12 +65,13 @@ class ContactListFragment : Fragment() {
                         contactHashMap[phoneNo] = "INDETERMINATE"
                     }
                     pCur.close()
-                    contactArrayList.sortWith(Comparator { o1, o2 -> o1.getName()!!.compareTo(o2.getName()!!)
-                    })
+
                 }
             }
         }
         cur?.close()
+        contactArrayList.sortWith(Comparator { o1, o2 -> o1.getName()!!.compareTo(o2.getName()!!)
+        })
     }
 
 

From 04ed7ccd3ce38fa23fb220aeb66d8700a3baaa33 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Wed, 24 Oct 2018 17:26:07 +0530
Subject: [PATCH 06/16] Fetch email for contacts, add search, add animations,
 back button, new activity

---
 app/src/main/AndroidManifest.xml              |  22 +-
 .../android/chatrooms/ui/ChatRoomsFragment.kt |   9 +-
 .../android/contacts/ContactListFragment.kt   | 100 +-----
 .../contacts/ContactRecyclerViewAdapter.kt    |  18 +-
 .../android/contacts/ContactsFragment.kt      | 293 ++++++++++++++++++
 .../android/contacts/NewChatActivity.kt       |  51 +++
 .../rocket/android/contacts/models/Contact.kt |  16 +-
 app/src/main/res/layout/activity_new_chat.xml |  22 ++
 .../res/layout/fragment_contact_parent.xml    |  39 +++
 app/src/main/res/layout/fragment_contacts.xml |  54 +---
 app/src/main/res/layout/item_contact.xml      |   2 +-
 app/src/main/res/values-de/strings.xml        |   2 +-
 app/src/main/res/values-es/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-hi-rIN/strings.xml    |   2 +-
 app/src/main/res/values-ja/strings.xml        |   2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   2 +-
 app/src/main/res/values-ru-rRU/strings.xml    |   2 +-
 app/src/main/res/values-tr/strings.xml        |   2 +-
 app/src/main/res/values-uk/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   4 +-
 21 files changed, 474 insertions(+), 174 deletions(-)
 create mode 100644 app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
 create mode 100644 app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
 create mode 100644 app/src/main/res/layout/activity_new_chat.xml
 create mode 100644 app/src/main/res/layout/fragment_contact_parent.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b078083205..d6927ac0d4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,21 +19,23 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         tools:replace="android:name">
-
+        <activity android:name=".contacts.NewChatActivity"
+            android:configChanges="orientation"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -43,49 +45,39 @@
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
-
                 <data
                     android:host="go.rocket.chat"
                     android:path="/auth"
                     android:scheme="https" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".server.ui.ChangeServerActivity"
             android:theme="@style/AppTheme" />
-
         <activity
             android:name=".main.ui.MainActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.ui.WebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.sso.ui.SsoWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.oauth.ui.OauthWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
-        <!-- TODO: Change to fragment-->
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
@@ -109,4 +101,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index b739d7bf06..ec79daf1fd 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -2,6 +2,7 @@ package chat.rocket.android.chatrooms.ui
 
 import android.app.AlertDialog
 import android.app.ProgressDialog
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -31,6 +32,8 @@ import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModelFactory
 import chat.rocket.android.chatrooms.viewmodel.LoadingState
 import chat.rocket.android.chatrooms.viewmodel.Query
 import chat.rocket.android.contacts.ContactListFragment
+import chat.rocket.android.contacts.ContactsFragment
+import chat.rocket.android.contacts.NewChatActivity
 import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
@@ -362,9 +365,9 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     private fun setupFab() {
         create_new_channel_fab.setOnClickListener { view ->
-            var mainActivity: MainActivity = activity as MainActivity
-            var contactsListFragment: ContactListFragment = ContactListFragment()
-            activity?.getSupportFragmentManager()?.beginTransaction()?.replace(this.id, contactsListFragment, "contactListFragment")?.addToBackStack(null)?.commit();
+            val intent = Intent(this.activity, NewChatActivity::class.java)
+            startActivity(intent)
         }
+
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
index 045a50d73e..41785a355d 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
@@ -29,105 +29,22 @@ class ContactListFragment : Fragment() {
     /**
      * The list of contacts to load in the recycler view
      */
-    private var contactArrayList: ArrayList<Contact> = ArrayList()
+    private var contactArrayList: ArrayList<Contact?>? = null
 
     /**
      *  The mapping of contacts with their registration status
      */
     private var contactHashMap: HashMap<String, String> = HashMap()
 
-    private val MY_PERMISSIONS_REQUEST_RW_CONTACTS = 0
-
-    private fun getContactList() {
-        val cr = context!!.contentResolver
-        val cur = cr.query(ContactsContract.Contacts.CONTENT_URI, null, null, null, null)
-
-        if ((cur?.count ?: 0) > 0) {
-            while (cur != null && cur.moveToNext()) {
-                val id = cur.getString(
-                        cur.getColumnIndex(ContactsContract.Contacts._ID))
-                val name = cur.getString(cur.getColumnIndex(
-                        ContactsContract.Contacts.DISPLAY_NAME))
-
-                if (cur.getInt(cur.getColumnIndex(
-                                ContactsContract.Contacts.HAS_PHONE_NUMBER)) > 0) {
-                    val pCur = cr.query(
-                            ContactsContract.CommonDataKinds.Phone.CONTENT_URI, null,
-                            ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?",
-                            arrayOf<String>(id), null)
-                    while (pCur!!.moveToNext()) {
-                        val phoneNo = pCur.getString(pCur.getColumnIndex(
-                                ContactsContract.CommonDataKinds.Phone.NUMBER))
-                        val contact: Contact = Contact()
-                        contact.setName(name)
-                        contact.setPhoneNumber(phoneNo)
-                        contactArrayList.add(contact)
-                        contactHashMap[phoneNo] = "INDETERMINATE"
-                    }
-                    pCur.close()
-
-                }
-            }
-        }
-        cur?.close()
-        contactArrayList.sortWith(Comparator { o1, o2 -> o1.getName()!!.compareTo(o2.getName()!!)
-        })
-    }
-
-
-    private fun setupToolbar() {
-        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_contacts)
-    }
-
-    private fun populateContacts(actualContacts: Boolean) {
-        if (actualContacts) {
-            getContactList()
-        }
-    }
-
-    override fun onRequestPermissionsResult(
-            requestCode: Int,
-            permissions: Array<String>,
-            grantResults: IntArray
-    ) {
-        when (requestCode) {
-            MY_PERMISSIONS_REQUEST_RW_CONTACTS -> {
-                if (
-                        grantResults.isNotEmpty()
-                        && grantResults[0] == PackageManager.PERMISSION_GRANTED
-                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
-                ) {
-                    // Permission granted
-                    populateContacts(true)
-                } else {
-                    populateContacts(false)
-                }
-                return
-            }
-            else -> {
-                // Ignore all other requests.
-            }
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        if (
-                ContextCompat.checkSelfPermission(context!!, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
-                && ContextCompat.checkSelfPermission(context!!, Manifest.permission.WRITE_CONTACTS) == PackageManager.PERMISSION_GRANTED
-        ) {
-            populateContacts(true)
-        } else {
-            ActivityCompat.requestPermissions(
-                    this.activity as Activity,
-                    arrayOf(
-                            Manifest.permission.READ_CONTACTS,
-                            Manifest.permission.WRITE_CONTACTS
-                    ),
-                    MY_PERMISSIONS_REQUEST_RW_CONTACTS
-            )
+        val bundle = arguments
+        if (bundle != null) {
+            contactArrayList = bundle.getParcelableArrayList("CONTACT_ARRAY_LIST")
+            contactHashMap= bundle.getSerializable("CONTACT_HASH_MAP") as HashMap<String, String>
         }
+
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -137,7 +54,7 @@ class ContactListFragment : Fragment() {
         val recyclerView = view.findViewById(R.id.recycler_view) as RecyclerView
         val emptyTextView = view.findViewById(R.id.text_no_data_to_display) as TextView
 
-        if (contactArrayList.size == 0) {
+        if (contactArrayList!!.size == 0) {
             emptyTextView.visibility = View.VISIBLE
             recyclerView.visibility = View.GONE
         } else {
@@ -146,9 +63,8 @@ class ContactListFragment : Fragment() {
 
             recyclerView.setHasFixedSize(true)
             recyclerView.layoutManager = LinearLayoutManager(context)
-            recyclerView.adapter = ContactRecyclerViewAdapter(context, contactArrayList, contactHashMap)
+            recyclerView.adapter = ContactRecyclerViewAdapter(context, contactArrayList!!, contactHashMap)
         }
-        setupToolbar()
 
         return view
     }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
index 2afe8c70a9..51c24b1d47 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import timber.log.Timber
 import android.view.LayoutInflater
 import android.view.View
-import android.provider.ContactsContract
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
@@ -12,13 +11,12 @@ import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.contacts.models.Contact
-import com.facebook.drawee.view.DraweeView
 import java.util.*
 import kotlin.collections.HashMap
 
 class ContactRecyclerViewAdapter(
         private val context: Context,
-        private val contactArrayList: ArrayList<Contact>,
+        private val contactArrayList: ArrayList<Contact?>,
         private val contactHashMap: HashMap<String, String>
 ) : RecyclerView.Adapter<ContactRecyclerViewAdapter.ViewHolder>() {
 
@@ -38,7 +36,11 @@ class ContactRecyclerViewAdapter(
         holder.status = contactHashMap.get(holder.contact!!.getPhoneNumber())
         try {
             holder.contactName.text = holder.contact!!.getName()
-            holder.phoneNumber.text = holder.contact!!.getPhoneNumber()
+            if (holder.contact!!.isPhone()) {
+                holder.contactDetail.text = holder.contact!!.getPhoneNumber()
+            } else {
+                holder.contactDetail.text = holder.contact!!.getEmailAddress()
+            }
         } catch (exception: NullPointerException) {
             Timber.e("Failed to send resolution. Exception is: $exception")
         }
@@ -50,20 +52,20 @@ class ContactRecyclerViewAdapter(
         var status: String? = null
 
         var contactName: TextView
-        var phoneNumber: TextView
+        var contactDetail: TextView
         var inviteButton: Button
 
         init {
             this.contactName = view.findViewById(R.id.contact_name) as TextView
-            this.phoneNumber = view.findViewById(R.id.phone_number) as TextView
+            this.contactDetail = view.findViewById(R.id.contact_detail) as TextView
             this.inviteButton = view.findViewById(R.id.invite_contact) as Button
 
             this.inviteButton.setOnClickListener { view ->
                 run {
                     Toast.makeText(
                             context,
-                            "Contact invite button was clicked: ${this.contact!!.getName()!!}",
-                            Toast.LENGTH_LONG
+                            "${contact!!.getName()!!}: ${contactDetail.text}",
+                            Toast.LENGTH_SHORT
                     ).show()
                 }
             }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
new file mode 100644
index 0000000000..a4e0a7c872
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -0,0 +1,293 @@
+package chat.rocket.android.contacts
+
+import android.Manifest
+import android.app.Activity
+import android.content.pm.PackageManager
+import android.os.Bundle
+import android.provider.ContactsContract
+import android.view.*
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import chat.rocket.android.R
+import chat.rocket.android.contacts.models.Contact
+import chat.rocket.android.createchannel.ui.CreateChannelFragment
+import chat.rocket.android.main.ui.MainActivity
+import chat.rocket.android.util.extension.onQueryTextListener
+import chat.rocket.android.util.extensions.showToast
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
+import timber.log.Timber
+import java.util.ArrayList
+import kotlin.Comparator
+import kotlin.collections.HashMap
+
+
+/**
+ * Load a list of contacts in a recycler view
+ */
+class ContactsFragment : Fragment() {
+    /**
+     * The list of contacts to load in the recycler view
+     */
+    private var contactArrayList: ArrayList<Contact> = ArrayList()
+
+    /**
+     *  The mapping of contacts with their registration status
+     */
+    private var contactHashMap: HashMap<String, String> = HashMap()
+
+    private val MY_PERMISSIONS_REQUEST_RW_CONTACTS = 0
+
+    private var createNewChannelLink: View? = null
+    private var searchView: SearchView? = null
+    private var sortView: MenuItem? = null
+
+    private fun getContactList() {
+        val cr = context!!.contentResolver
+
+        val cur = cr.query(ContactsContract.Contacts.CONTENT_URI, null, null, null, null)
+
+        if ((cur?.count ?: 0) > 0) {
+            while (cur != null && cur.moveToNext()) {
+                val id = cur.getString(
+                        cur.getColumnIndex(ContactsContract.Contacts._ID))
+                val name = cur.getString(cur.getColumnIndex(
+                        ContactsContract.Contacts.DISPLAY_NAME))
+
+                if (cur.getInt(cur.getColumnIndex(ContactsContract.Contacts.HAS_PHONE_NUMBER)) > 0) {
+                    // Has phone numbers
+
+                    val pCur = cr.query(
+                            ContactsContract.CommonDataKinds.Phone.CONTENT_URI, null,
+                            ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " = ?",
+                            arrayOf<String>(id), null)
+                    while (pCur!!.moveToNext()) {
+                        val phoneNo = pCur.getString(pCur.getColumnIndex(
+                                ContactsContract.CommonDataKinds.Phone.NUMBER))
+                        val contact = Contact()
+                        contact.setName(name)
+                        contact.setPhoneNumber(phoneNo)
+                        contactArrayList.add(contact)
+                        contactHashMap[phoneNo] = "INDETERMINATE"
+                    }
+                    pCur.close()
+                }
+
+                if (true) {
+                    // No check for having email address
+
+                    val eCur = cr.query(
+                            ContactsContract.CommonDataKinds.Email.CONTENT_URI, null,
+                            ContactsContract.CommonDataKinds.Email.CONTACT_ID + " = ?",
+                            arrayOf<String>(id), null)
+                    while (eCur!!.moveToNext()) {
+                        val emailID = eCur.getString(eCur.getColumnIndex(
+                                ContactsContract.CommonDataKinds.Email.DATA))
+                        val contact = Contact()
+                        contact.setName(name)
+                        contact.setEmailAddress(emailID)
+                        contactArrayList.add(contact)
+                        contactHashMap[emailID] = "INDETERMINATE"
+                    }
+                    eCur.close()
+                }
+            }
+        }
+        cur?.close()
+        contactArrayList.sortWith(Comparator { o1, o2 ->
+            o1.getName()!!.compareTo(o2.getName()!!)
+        })
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.chatrooms, menu)
+
+        sortView = menu.findItem(R.id.action_sort)
+        sortView!!.isVisible = false
+
+        val searchItem = menu.findItem(R.id.action_search)
+        searchView = searchItem?.actionView as? SearchView
+        searchView?.setIconifiedByDefault(false)
+        searchView?.maxWidth = Integer.MAX_VALUE
+        searchView?.onQueryTextListener { queryContacts(it) }
+
+        val expandListener = object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                // Simply setting sortView to visible won't work, so we invalidate the options
+                // to recreate the entire menu...
+                activity?.invalidateOptionsMenu()
+                queryContacts("")
+                return true
+            }
+
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                return true
+            }
+        }
+        searchItem?.setOnActionExpandListener(expandListener)
+    }
+
+    fun containsIgnoreCase(src: String, what: String): Boolean {
+        val length = what.length
+        if (length == 0)
+            return true // Empty string is contained
+
+        val firstLo = Character.toLowerCase(what[0])
+        val firstUp = Character.toUpperCase(what[0])
+
+        for (i in src.length - length downTo 0) {
+            // Quick check before calling the more expensive regionMatches() method:
+            val ch = src[i]
+            if (ch != firstLo && ch != firstUp)
+                continue
+
+            if (src.regionMatches(i, what, 0, length, ignoreCase = true))
+                return true
+        }
+
+        return false
+    }
+
+    fun queryContacts(query: String) {
+        if (query.isBlank() or query.isEmpty()) {
+            setupFrameLayout(contactArrayList)
+        } else {
+            var filteredContactArrayList: ArrayList<Contact> = ArrayList()
+            for (contact in contactArrayList) {
+                if (containsIgnoreCase(contact.getName()!!, query)
+                        || (contact.isPhone() && containsIgnoreCase(contact.getPhoneNumber()!!, query))
+                        || (!contact.isPhone() && containsIgnoreCase(contact.getEmailAddress()!!, query))
+                ) {
+                    filteredContactArrayList.add(contact)
+                }
+            }
+            setupFrameLayout(filteredContactArrayList)
+        }
+    }
+
+    private fun populateContacts(actualContacts: Boolean) {
+        if (actualContacts) {
+            getContactList()
+        }
+    }
+
+    override fun onRequestPermissionsResult(
+            requestCode: Int,
+            permissions: Array<String>,
+            grantResults: IntArray
+    ) {
+        when (requestCode) {
+            MY_PERMISSIONS_REQUEST_RW_CONTACTS -> {
+                if (
+                        grantResults.isNotEmpty()
+                        && grantResults[0] == PackageManager.PERMISSION_GRANTED
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
+                ) {
+                    // Permission granted
+                    populateContacts(true)
+                } else {
+                    populateContacts(false)
+                }
+                return
+            }
+            else -> {
+                // Ignore all other requests.
+            }
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+        setupToolbar()
+
+        if (
+                ContextCompat.checkSelfPermission(context!!, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
+                && ContextCompat.checkSelfPermission(context!!, Manifest.permission.WRITE_CONTACTS) == PackageManager.PERMISSION_GRANTED
+        ) {
+            populateContacts(true)
+        } else {
+            ActivityCompat.requestPermissions(
+                    this.activity as Activity,
+                    arrayOf(
+                            Manifest.permission.READ_CONTACTS,
+                            Manifest.permission.WRITE_CONTACTS
+                    ),
+                    MY_PERMISSIONS_REQUEST_RW_CONTACTS
+            )
+        }
+
+        // Filter before sending to FrameLayout
+        setupFrameLayout(contactArrayList)
+    }
+
+    fun setupToolbar(){
+        (this.activity as AppCompatActivity).supportActionBar?.title = getString(R.string.title_contacts)
+    }
+
+    override fun setUserVisibleHint(isVisibleToUser: Boolean) {
+        super.setUserVisibleHint(isVisibleToUser)
+    }
+
+    fun setupFrameLayout(filteredContactArrayList: ArrayList<Contact>) {
+        try {
+            val contactListFragment = ContactListFragment.newInstance(
+                    filteredContactArrayList,
+                    contactHashMap
+            )
+            val fragmentTransaction = childFragmentManager.beginTransaction()
+            fragmentTransaction.replace(
+                    R.id.contacts_area,
+                    contactListFragment,
+                    "CONTACT_LIST_FRAGMENT"
+            )
+            fragmentTransaction.commit()
+        } catch (exception: IllegalStateException) {
+            //This is one bad user who clicks too fast
+        } catch (exception: NullPointerException) {
+        }
+
+
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_contact_parent, container, false)
+
+        createNewChannelLink = view.findViewById(R.id.create_new_channel_button)
+        createNewChannelLink!!.setOnClickListener {
+            val createChannelFragment = CreateChannelFragment()
+            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
+        }
+
+        return view
+    }
+
+    companion object {
+
+        /**
+         * Create a new ContactList fragment that displays the given list of contacts
+         *
+         * @param contactArrayList the list of contacts to load in the recycler view
+         * @param contactHashMap the mapping of contacts with their registration status
+         * @return the newly created ContactList fragment
+         */
+        fun newInstance(
+                contactArrayList: ArrayList<Contact>,
+                contactHashMap: HashMap<String, String>
+        ): ContactsFragment {
+            val contactsFragment = ContactsFragment()
+
+            val arguments = Bundle()
+            arguments.putParcelableArrayList("CONTACT_ARRAY_LIST", contactArrayList)
+            arguments.putSerializable("CONTACT_HASH_MAP", contactHashMap)
+
+            contactsFragment.arguments = arguments
+
+            return contactsFragment
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt b/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
new file mode 100644
index 0000000000..1bb3166b27
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
@@ -0,0 +1,51 @@
+package chat.rocket.android.contacts
+
+import android.app.Activity
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.fragment.app.Fragment
+import chat.rocket.android.R
+import chat.rocket.android.main.ui.onNavDrawerItemSelected
+import chat.rocket.android.main.ui.setupMenu
+import chat.rocket.android.util.extensions.addFragment
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.HasActivityInjector
+import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.activity_main.*
+import kotlinx.android.synthetic.main.app_bar.*
+import javax.inject.Inject
+
+class NewChatActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_new_chat)
+        val contactsFragment = ContactsFragment()
+        supportFragmentManager!!.beginTransaction().add(R.id.fragment_container, contactsFragment, "contactsFragment").commit();
+        setupToolbar()
+        setupNavigationView()
+    }
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+    }
+
+    private fun setupNavigationView() {
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        toolbar.setNavigationOnClickListener { finishActivity() }
+    }
+
+    override fun onBackPressed() {
+        finishActivity()
+    }
+
+    private fun finishActivity() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.enter_from_left, R.anim.exit_to_right)
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/contacts/models/Contact.kt b/app/src/main/java/chat/rocket/android/contacts/models/Contact.kt
index 61bb9a4a09..d567183c9e 100644
--- a/app/src/main/java/chat/rocket/android/contacts/models/Contact.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/models/Contact.kt
@@ -7,8 +7,9 @@ import android.os.Parcelable
 class Contact() : Parcelable {
     private var id: Int = 0
     private var name: String? = null
-
     private var phoneNumber: String? = null
+    private var emailAddress: String? = null
+    private var isPhone: Boolean = true
 
     fun getName(): String? {
         return name
@@ -26,6 +27,19 @@ class Contact() : Parcelable {
         this.phoneNumber = phoneNumber
     }
 
+    fun getEmailAddress(): String? {
+        return emailAddress
+    }
+
+    fun setEmailAddress(emailAddress: String) {
+        this.emailAddress = emailAddress
+        this.isPhone = false
+    }
+
+    fun isPhone(): Boolean {
+        return this.isPhone
+    }
+
     constructor(parcel: Parcel) : this() {
         this.id = parcel.readInt()
         this.name = parcel.readString()
diff --git a/app/src/main/res/layout/activity_new_chat.xml b/app/src/main/res/layout/activity_new_chat.xml
new file mode 100644
index 0000000000..88d85e04f8
--- /dev/null
+++ b/app/src/main/res/layout/activity_new_chat.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/layout_app_bar"
+            layout="@layout/app_bar" />
+
+        <FrameLayout
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_contact_parent.xml b/app/src/main/res/layout/fragment_contact_parent.xml
new file mode 100644
index 0000000000..8edbdf9181
--- /dev/null
+++ b/app/src/main/res/layout/fragment_contact_parent.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".contacts.ContactsFragment">
+
+    <LinearLayout
+        android:layout_marginTop="10dp"
+        android:id="@+id/create_new_channel_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="50dp">
+
+        <ImageView
+            android:layout_marginStart="10dp"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:contentDescription="@string/Create_A_New_Channel"
+            android:src="@drawable/ic_add_24dp" />
+
+        <TextView
+            android:layout_marginStart="10dp"
+            android:textSize="22dp"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/Create_A_New_Channel" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/contacts_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/create_new_channel_button">
+    </FrameLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_contacts.xml b/app/src/main/res/layout/fragment_contacts.xml
index 5d9f0f227b..01e217940e 100644
--- a/app/src/main/res/layout/fragment_contacts.xml
+++ b/app/src/main/res/layout/fragment_contacts.xml
@@ -1,54 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".contacts.ContactListFragment">
 
-    <LinearLayout
-        android:layout_marginTop="10dp"
-        android:id="@+id/create_section"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="50dp">
-
-        <ImageView
-            android:layout_marginStart="10dp"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:contentDescription="@string/Create_A_New_Channel"
-            android:src="@drawable/ic_add_24dp" />
-
-        <TextView
-            android:layout_marginStart="10dp"
-            android:textSize="22dp"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/Create_A_New_Channel" />
-
-    </LinearLayout>
+        android:layout_height="match_parent"
+        tools:listitem="@layout/item_contact" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/text_no_data_to_display"
+        style="@style/TextAppearance.AppCompat.Subhead"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/create_section">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/item_contact" />
-
-        <TextView
-            android:id="@+id/text_no_data_to_display"
-            style="@style/TextAppearance.AppCompat.Subhead"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/msg_no_data_to_display"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </LinearLayout>
+        android:text="@string/msg_no_data_to_display"
+        android:visibility="gone"
+        tools:visibility="visible" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index 9bd16b7ec6..1552b94cce 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -20,7 +20,7 @@
         app:roundedCornerRadius="3dp" />
 
     <TextView
-        android:id="@+id/phone_number"
+        android:id="@+id/contact_detail"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/text_view_drawable_padding"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b9e7a29908..f2ad23130f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Login Daten prüfen</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">Chats</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Profil</string>
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7b195d111c..5511479d22 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -8,7 +8,7 @@
     <string name="title_authentication">Autenticación</string>
     <string name="title_legal_terms">Términos legales</string>
     <string name="title_chats">Chats</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Perfil</string>
     <string name="title_members">Miembros</string>
     <string name="title_counted_members">Miembros (%d)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cce5a8d775..8a4e624c08 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Authentification</string>
     <string name="title_legal_terms">Termes juridiques</string>
     <string name="title_chats">Chats</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Profil</string>
     <string name="title_members">Membres</string>
     <string name="title_counted_members">Membres (%d)</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 8f006ddf3f..da170dbccb 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">प्रमाणीकरण</string>
     <string name="title_legal_terms">कानूनी शर्तें</string>
     <string name="title_chats">चैट</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">नया चैट</string>
     <string name="title_profile">प्रोफाइल</string>
     <string name="title_members">सदस्य</string>
     <string name="title_counted_members">सदस्य (%d)</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index de1843d2c2..6750640dcb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -11,7 +11,7 @@
     <string name="title_authentication">認証</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">チャット</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New チャット</string>
     <string name="title_profile">プロフィール</string>
     <string name="title_members">メンバー</string>
     <string name="title_counted_members">メンバー (%d)</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f12f060183..80df7980f9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Autenticação</string>
     <string name="title_legal_terms">Termos Legais</string>
     <string name="title_chats">Chats</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Perfil</string>
     <string name="title_members">Membros</string>
     <string name="title_counted_members">Membros (%d)</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 38978790e5..b4411e64e8 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Аутентификация</string>
     <string name="title_legal_terms">Юридические условия</string>
     <string name="title_chats">Чаты</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Профиль</string>
     <string name="title_members">Пользователи</string>
     <string name="title_counted_members">Пользователи (%d)</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 699629b50b..37bf6e9c60 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Doğrulama</string>
     <string name="title_legal_terms">Yasal Şartlar</string>
     <string name="title_chats">Sohbetler</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Sohbetler</string>
     <string name="title_profile">Profil</string>
     <string name="title_members">Üyeler</string>
     <string name="title_counted_members">Üyeler (%d)</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 894081643f..0556768e20 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -9,7 +9,7 @@
     <string name="title_authentication">Аутентифікація</string>
     <string name="title_legal_terms">Юридичні умови</string>
     <string name="title_chats">Чати</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Профіль</string>
     <string name="title_members">Користувачі</string>
     <string name="title_counted_members">Користувачі (%d)</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a60e5d6af..36188c3cb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,7 +21,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_authentication">Authentication</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">Chats</string>
-    <string name="title_contacts">Contacts</string>
+    <string name="title_contacts">New Chat</string>
     <string name="title_profile">Profile</string>
     <string name="title_members">Members</string>
     <string name="title_counted_members">Members (%d)</string>
@@ -178,7 +178,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
     <string name="msg_view_more">view more</string>
     <string name="msg_view_less">view less</string>
-    
+
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">Analytics tracking</string>
     <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>

From dbebbb6116cbd732b2003eca735924a38845454a Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Thu, 25 Oct 2018 17:36:36 +0530
Subject: [PATCH 07/16] UI improvements

---
 .../android/chatrooms/ui/ChatRoomsFragment.kt |  1 +
 .../android/contacts/ContactsFragment.kt      |  5 +-
 .../android/contacts/NewChatActivity.kt       |  2 +-
 .../res/layout/fragment_contact_parent.xml    | 32 ++++++++++---
 app/src/main/res/layout/item_contact.xml      | 48 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index ec79daf1fd..69bc106fbb 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -21,6 +21,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index a4e0a7c872..11d7e3e20f 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -258,8 +258,9 @@ class ContactsFragment : Fragment() {
 
         createNewChannelLink = view.findViewById(R.id.create_new_channel_button)
         createNewChannelLink!!.setOnClickListener {
-            val createChannelFragment = CreateChannelFragment()
-            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
+//            val createChannelFragment = CreateChannelFragment()
+//            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
+            showToast("Clicked")
         }
 
         return view
diff --git a/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt b/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
index 1bb3166b27..f57718e584 100644
--- a/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
@@ -46,6 +46,6 @@ class NewChatActivity : AppCompatActivity() {
 
     private fun finishActivity() {
         super.onBackPressed()
-        overridePendingTransition(R.anim.enter_from_left, R.anim.exit_to_right)
+        overridePendingTransition(R.anim.abc_slide_in_bottom, R.anim.abc_slide_out_bottom)
     }
 }
diff --git a/app/src/main/res/layout/fragment_contact_parent.xml b/app/src/main/res/layout/fragment_contact_parent.xml
index 8edbdf9181..ca48795778 100644
--- a/app/src/main/res/layout/fragment_contact_parent.xml
+++ b/app/src/main/res/layout/fragment_contact_parent.xml
@@ -7,33 +7,51 @@
     tools:context=".contacts.ContactsFragment">
 
     <LinearLayout
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="12dp"
         android:id="@+id/create_new_channel_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="50dp">
 
         <ImageView
-            android:layout_marginStart="10dp"
             android:layout_width="40dp"
             android:layout_height="40dp"
+            android:layout_marginStart="10dp"
             android:contentDescription="@string/Create_A_New_Channel"
-            android:src="@drawable/ic_add_24dp" />
+            android:src="@drawable/ic_person_black_20dp" />
 
         <TextView
-            android:layout_marginStart="10dp"
-            android:textSize="22dp"
+            android:layout_marginStart="12dp"
+            android:textSize="18sp"
             android:layout_gravity="center"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/Create_A_New_Channel" />
+            android:text="New Channel" />
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/contacts_heading"
+        android:textSize="20sp"
+        android:layout_marginStart="18dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/create_new_channel_button"
+        android:paddingBottom="12dp"
+        android:text="CONTACTS"/>
+
     <FrameLayout
         android:id="@+id/contacts_area"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/create_new_channel_button">
+        android:layout_below="@id/divider3">
     </FrameLayout>
+
+    <View
+        android:id="@+id/divider3"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignBottom="@+id/contacts_heading"
+        android:layout_marginTop="16dp"
+        android:background="?android:attr/listDivider" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact.xml
index 1552b94cce..b786030e11 100644
--- a/app/src/main/res/layout/item_contact.xml
+++ b/app/src/main/res/layout/item_contact.xml
@@ -5,34 +5,25 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingBottom="@dimen/chat_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/chat_item_top_and_bottom_padding">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/image_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundedCornerRadius="3dp" />
+    android:paddingTop="@dimen/chat_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding">
 
     <TextView
         android:id="@+id/contact_detail"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/text_view_drawable_padding"
-        android:layout_marginEnd="8dp"
         android:layout_marginTop="2dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="@dimen/chat_item_top_and_bottom_padding"
         android:layout_weight="0.8"
         android:ellipsize="end"
         android:maxLines="2"
         android:textDirection="locale"
         android:visibility="visible"
-        app:layout_constraintLeft_toRightOf="@id/image_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/contact_name"
         tools:text="Phone number goes here" />
 
@@ -42,23 +33,42 @@
         style="@style/ChatRoom.Name.TextView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/text_view_drawable_padding"
+        android:layout_marginStart="8dp"
         android:ellipsize="end"
         android:lines="1"
         android:maxLines="1"
-        android:textDirection="locale"
         android:textColor="@color/colorSecondaryText"
-        app:layout_constraintLeft_toRightOf="@id/image_avatar"
+        android:textDirection="locale"
+        app:layout_constraintLeft_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Name goes here" />
 
     <Button
         android:id="@+id/invite_contact"
+        style="?android:attr/borderlessButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="INVITE"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:text="@string/Invite"
+        app:layout_constraintEnd_toStartOf="@id/image_avatar"
         app:layout_constraintTop_toTopOf="@id/image_avatar"
         tools:layout_editor_absoluteY="4dp" />
 
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/image_avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginTop="5dp"
+        app:layout_constraintStart_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:visibility="invisible"
+        app:roundedCornerRadius="3dp" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 36188c3cb7..572260f87a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -285,6 +285,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="Mute_someone_in_room">Mute someone in the room</string>
     <string name="Unmute_someone_in_room">Unmute someone in the room</string>
     <string name="Invite_user_to_join_channel">Invite one user to join this channel</string>
+    <string name="Invite">Invite</string>
     <string name="Unarchive">Unarchive</string>
     <string name="Join_the_given_channel">Join the given channel</string>
     <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>

From 6b3480091553502756ef467707a8f850b7fa2753 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Tue, 6 Nov 2018 14:04:43 +0530
Subject: [PATCH 08/16] remove contact activity, use only fragment

---
 app/src/main/AndroidManifest.xml              |  5 --
 .../android/chatrooms/ui/ChatRoomsFragment.kt | 16 ++----
 .../android/contacts/ContactListFragment.kt   |  3 +-
 .../contacts/ContactRecyclerViewAdapter.kt    | 12 ++---
 .../android/contacts/ContactsFragment.kt      |  9 ++--
 .../android/contacts/NewChatActivity.kt       | 51 -------------------
 .../rocket/android/main/ui/MainActivity.kt    | 25 +++++----
 7 files changed, 30 insertions(+), 91 deletions(-)
 delete mode 100644 app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d6927ac0d4..a6fed36c65 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,11 +19,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         tools:replace="android:name">
-        <activity android:name=".contacts.NewChatActivity"
-            android:configChanges="orientation"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 69bc106fbb..3306b86b76 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -2,7 +2,6 @@ package chat.rocket.android.chatrooms.ui
 
 import android.app.AlertDialog
 import android.app.ProgressDialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -21,7 +20,6 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
@@ -32,19 +30,13 @@ import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModel
 import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModelFactory
 import chat.rocket.android.chatrooms.viewmodel.LoadingState
 import chat.rocket.android.chatrooms.viewmodel.Query
-import chat.rocket.android.contacts.ContactListFragment
 import chat.rocket.android.contacts.ContactsFragment
-import chat.rocket.android.contacts.NewChatActivity
 import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.util.extension.onQueryTextListener
-import chat.rocket.android.util.extensions.fadeIn
-import chat.rocket.android.util.extensions.fadeOut
-import chat.rocket.android.util.extensions.inflate
-import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.*
 import chat.rocket.android.widget.DividerItemDecoration
 import chat.rocket.core.internal.realtime.socket.model.State
 import dagger.android.support.AndroidSupportInjection
@@ -353,6 +345,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     private fun setupToolbar() {
         (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_chats)
+        (activity as MainActivity).setupNavigationView("hamburger")
     }
 
     private fun queryChatRoomsByName(name: String?): Boolean {
@@ -366,9 +359,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     private fun setupFab() {
         create_new_channel_fab.setOnClickListener { view ->
-            val intent = Intent(this.activity, NewChatActivity::class.java)
-            startActivity(intent)
+            val contactsFragment = ContactsFragment()
+            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, contactsFragment, "contactsFragment")?.addToBackStack(null)?.commit();
         }
-
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
index 41785a355d..61cf88ff4e 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactListFragment.kt
@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.contacts.models.Contact
+import chat.rocket.android.main.ui.MainActivity
 import timber.log.Timber
 import java.util.ArrayList
 import kotlin.collections.HashMap
@@ -63,7 +64,7 @@ class ContactListFragment : Fragment() {
 
             recyclerView.setHasFixedSize(true)
             recyclerView.layoutManager = LinearLayoutManager(context)
-            recyclerView.adapter = ContactRecyclerViewAdapter(context, contactArrayList!!, contactHashMap)
+            recyclerView.adapter = ContactRecyclerViewAdapter(this.activity as MainActivity, contactArrayList!!, contactHashMap)
         }
 
         return view
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
index 51c24b1d47..1d44d6dccd 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
@@ -8,14 +8,17 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.contacts.models.Contact
+import chat.rocket.android.main.ui.MainActivity
 import java.util.*
 import kotlin.collections.HashMap
+import chat.rocket.android.util.extensions.showToast
 
 class ContactRecyclerViewAdapter(
-        private val context: Context,
+        private val context: MainActivity,
         private val contactArrayList: ArrayList<Contact?>,
         private val contactHashMap: HashMap<String, String>
 ) : RecyclerView.Adapter<ContactRecyclerViewAdapter.ViewHolder>() {
@@ -62,11 +65,8 @@ class ContactRecyclerViewAdapter(
 
             this.inviteButton.setOnClickListener { view ->
                 run {
-                    Toast.makeText(
-                            context,
-                            "${contact!!.getName()!!}: ${contactDetail.text}",
-                            Toast.LENGTH_SHORT
-                    ).show()
+                    // Make API call using context.presenter
+                    context.showToast("${contact!!.getName()!!}: ${contactDetail.text}")
                 }
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index 11d7e3e20f..ff49071d96 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -16,9 +16,6 @@ import chat.rocket.android.contacts.models.Contact
 import chat.rocket.android.createchannel.ui.CreateChannelFragment
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.util.extension.onQueryTextListener
-import chat.rocket.android.util.extensions.showToast
-import kotlinx.android.synthetic.main.app_bar_chat_room.*
-import timber.log.Timber
 import java.util.ArrayList
 import kotlin.Comparator
 import kotlin.collections.HashMap
@@ -226,6 +223,7 @@ class ContactsFragment : Fragment() {
 
     fun setupToolbar(){
         (this.activity as AppCompatActivity).supportActionBar?.title = getString(R.string.title_contacts)
+        (activity as MainActivity).setupNavigationView("back")
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
@@ -258,9 +256,8 @@ class ContactsFragment : Fragment() {
 
         createNewChannelLink = view.findViewById(R.id.create_new_channel_button)
         createNewChannelLink!!.setOnClickListener {
-//            val createChannelFragment = CreateChannelFragment()
-//            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
-            showToast("Clicked")
+            val createChannelFragment = CreateChannelFragment()
+            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
         }
 
         return view
diff --git a/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt b/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
deleted file mode 100644
index f57718e584..0000000000
--- a/app/src/main/java/chat/rocket/android/contacts/NewChatActivity.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package chat.rocket.android.contacts
-
-import android.app.Activity
-import android.content.Context
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.util.AttributeSet
-import android.view.View
-import androidx.fragment.app.Fragment
-import chat.rocket.android.R
-import chat.rocket.android.main.ui.onNavDrawerItemSelected
-import chat.rocket.android.main.ui.setupMenu
-import chat.rocket.android.util.extensions.addFragment
-import dagger.android.AndroidInjection
-import dagger.android.AndroidInjector
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasActivityInjector
-import dagger.android.support.HasSupportFragmentInjector
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar.*
-import javax.inject.Inject
-
-class NewChatActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_new_chat)
-        val contactsFragment = ContactsFragment()
-        supportFragmentManager!!.beginTransaction().add(R.id.fragment_container, contactsFragment, "contactsFragment").commit();
-        setupToolbar()
-        setupNavigationView()
-    }
-
-    private fun setupToolbar() {
-        setSupportActionBar(toolbar)
-    }
-
-    private fun setupNavigationView() {
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        toolbar.setNavigationOnClickListener { finishActivity() }
-    }
-
-    override fun onBackPressed() {
-        finishActivity()
-    }
-
-    private fun finishActivity() {
-        super.onBackPressed()
-        overridePendingTransition(R.anim.abc_slide_in_bottom, R.anim.abc_slide_out_bottom)
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index 2740ede296..e49bcb38a7 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -5,6 +5,7 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.app.ProgressDialog
 import android.os.Bundle
+import android.text.Layout
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
@@ -215,21 +216,25 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         setSupportActionBar(toolbar)
     }
 
-    fun setupNavigationView() {
-        with (view_navigation.menu) {
+    fun setupNavigationView(type:String = "hamburger") {
+        with(view_navigation.menu) {
             clear()
             setupMenu(this)
         }
+        if (type == "back") {
+            toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            toolbar.setNavigationOnClickListener { onBackPressed() }
+        }else{
+            view_navigation.setNavigationItemSelectedListener {
+                it.isChecked = true
+                closeDrawer()
+                onNavDrawerItemSelected(it)
+                true
+            }
 
-        view_navigation.setNavigationItemSelectedListener {
-            it.isChecked = true
-            closeDrawer()
-            onNavDrawerItemSelected(it)
-            true
+            toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
+            toolbar.setNavigationOnClickListener { openDrawer() }
         }
-
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
-        toolbar.setNavigationOnClickListener { openDrawer() }
     }
 
     fun setAvatar(avatarUrl: String) {

From 4a4206ea1e2724595cd34748d3972978d3743c72 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Fri, 9 Nov 2018 23:23:44 +0530
Subject: [PATCH 09/16] Reverte change to MainActivity, update toolbar icon in
 fragments

---
 .../android/chatrooms/ui/ChatRoomsFragment.kt |  2 +-
 .../android/contacts/ContactsFragment.kt      |  6 +++--
 .../rocket/android/main/ui/MainActivity.kt    | 24 ++++++++-----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 3306b86b76..c9c6783f05 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -345,7 +345,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     private fun setupToolbar() {
         (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_chats)
-        (activity as MainActivity).setupNavigationView("hamburger")
+        (activity as MainActivity).setupNavigationView()
     }
 
     private fun queryChatRoomsByName(name: String?): Boolean {
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index ff49071d96..504147117a 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -16,6 +16,7 @@ import chat.rocket.android.contacts.models.Contact
 import chat.rocket.android.createchannel.ui.CreateChannelFragment
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.util.extension.onQueryTextListener
+import kotlinx.android.synthetic.main.app_bar.*
 import java.util.ArrayList
 import kotlin.Comparator
 import kotlin.collections.HashMap
@@ -222,8 +223,9 @@ class ContactsFragment : Fragment() {
     }
 
     fun setupToolbar(){
-        (this.activity as AppCompatActivity).supportActionBar?.title = getString(R.string.title_contacts)
-        (activity as MainActivity).setupNavigationView("back")
+        (activity as AppCompatActivity).supportActionBar?.title = getString(R.string.title_contacts)
+        (activity as MainActivity).toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        (activity as MainActivity).toolbar.setNavigationOnClickListener { activity?.onBackPressed() }
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index e49bcb38a7..ae6e082e04 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -216,25 +216,21 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         setSupportActionBar(toolbar)
     }
 
-    fun setupNavigationView(type:String = "hamburger") {
-        with(view_navigation.menu) {
+    fun setupNavigationView() {
+        with (view_navigation.menu) {
             clear()
             setupMenu(this)
         }
-        if (type == "back") {
-            toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-            toolbar.setNavigationOnClickListener { onBackPressed() }
-        }else{
-            view_navigation.setNavigationItemSelectedListener {
-                it.isChecked = true
-                closeDrawer()
-                onNavDrawerItemSelected(it)
-                true
-            }
 
-            toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
-            toolbar.setNavigationOnClickListener { openDrawer() }
+        view_navigation.setNavigationItemSelectedListener {
+            it.isChecked = true
+            closeDrawer()
+            onNavDrawerItemSelected(it)
+            true
         }
+
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
+        toolbar.setNavigationOnClickListener { openDrawer() }
     }
 
     fun setAvatar(avatarUrl: String) {

From 55d750a2161354d036cd4306804316385f2e6452 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Fri, 9 Nov 2018 23:33:48 +0530
Subject: [PATCH 10/16] set transition on fab click and create new channel
 click transaction

---
 .../chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt    | 5 ++++-
 .../java/chat/rocket/android/contacts/ContactsFragment.kt    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index c9c6783f05..63106f41ea 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -360,7 +360,10 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     private fun setupFab() {
         create_new_channel_fab.setOnClickListener { view ->
             val contactsFragment = ContactsFragment()
-            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, contactsFragment, "contactsFragment")?.addToBackStack(null)?.commit();
+            val transaction = activity?.supportFragmentManager?.beginTransaction();
+            transaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
+            transaction?.replace(this.id, contactsFragment, "contactsFragment");
+            transaction?.addToBackStack(null)?.commit();
         }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index 504147117a..669ff36210 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -259,7 +259,10 @@ class ContactsFragment : Fragment() {
         createNewChannelLink = view.findViewById(R.id.create_new_channel_button)
         createNewChannelLink!!.setOnClickListener {
             val createChannelFragment = CreateChannelFragment()
-            activity?.supportFragmentManager?.beginTransaction()?.replace(this.id, createChannelFragment, "createChannelFragment")?.addToBackStack(null)?.commit();
+            val transaction = activity?.supportFragmentManager?.beginTransaction();
+            transaction?.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
+            transaction?.replace(this.id, createChannelFragment, "createChannelFragment");
+            transaction?.addToBackStack(null)?.commit();
         }
 
         return view

From 57d434aab05dcecf3580035e8459cbd1c6ee3f6c Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Fri, 9 Nov 2018 23:47:42 +0530
Subject: [PATCH 11/16] Fix new chat toolbar

---
 .../java/chat/rocket/android/contacts/ContactsFragment.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index 669ff36210..c41785b252 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -200,7 +200,6 @@ class ContactsFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        setupToolbar()
 
         if (
                 ContextCompat.checkSelfPermission(context!!, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
@@ -222,6 +221,11 @@ class ContactsFragment : Fragment() {
         setupFrameLayout(contactArrayList)
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+    }
+
     fun setupToolbar(){
         (activity as AppCompatActivity).supportActionBar?.title = getString(R.string.title_contacts)
         (activity as MainActivity).toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)

From da73e8b324791dc8fcee10c652b393fa59131134 Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Sat, 10 Nov 2018 01:55:47 +0530
Subject: [PATCH 12/16] Integrate invite methods from SDK

---
 .../contacts/ContactRecyclerViewAdapter.kt    |  6 +-
 .../main/presentation/MainPresenter.kt        | 58 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
index 1d44d6dccd..39824c1e56 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactRecyclerViewAdapter.kt
@@ -66,7 +66,11 @@ class ContactRecyclerViewAdapter(
             this.inviteButton.setOnClickListener { view ->
                 run {
                     // Make API call using context.presenter
-                    context.showToast("${contact!!.getName()!!}: ${contactDetail.text}")
+                    if(contact!!.isPhone()){
+                        context.presenter.inviteViaSMS(contact!!.getPhoneNumber()!!);
+                        }else{
+                        context.presenter.inviteViaEmail(contact!!.getEmailAddress()!!);
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
index bb8ad3e93b..eb9c1b9dfd 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
@@ -39,12 +39,16 @@ import chat.rocket.core.internal.rest.getCustomEmojis
 import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.unregisterPushToken
+import chat.rocket.core.internal.rest.inviteViaEmail
+import chat.rocket.core.internal.rest.inviteViaSMS
 import chat.rocket.core.model.Myself
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
 import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
+import chat.rocket.android.util.extensions.showToast
+
 
 class MainPresenter @Inject constructor(
     private val view: MainView,
@@ -233,6 +237,60 @@ class MainPresenter @Inject constructor(
         }
     }
 
+    fun inviteViaEmail(email:String) {
+        launchUI(strategy) {
+            try {
+                val result:Boolean = retryIO("inviteViaEmail") { client.inviteViaEmail(email) }
+                if (result) {
+                    view.showMessage("Invitation Email Sent")
+                } else{
+                    view.showMessage("Failed to send Invitation Email")
+                }
+            } catch (ex: Exception) {
+                when (ex) {
+                    is RocketChatAuthException -> {
+                        logout()
+                    }
+                    else -> {
+                        Timber.d(ex, "Error while inviting via email")
+                        ex.message?.let {
+                            view.showMessage(it)
+                        }.ifNull {
+                            view.showGenericErrorMessage()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fun inviteViaSMS(phone:String) {
+        launchUI(strategy) {
+            try {
+                val result:Boolean = retryIO("inviteViaSMS") { client.inviteViaSMS(phone) }
+                if (result) {
+                    view.showMessage("Invitation SMS Sent")
+                } else{
+                    view.showMessage("Failed to send Invitation SMS")
+                }
+            } catch (ex: Exception) {
+                when (ex) {
+                    is RocketChatAuthException -> {
+                        logout()
+                    }
+                    else -> {
+                        Timber.d(ex, "Error while inviting via SMS")
+                        ex.message?.let {
+                            view.showMessage(it)
+                        }.ifNull {
+                            view.showGenericErrorMessage()
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     private suspend fun saveAccount(uiModel: NavHeaderUiModel) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

From 6757d39fef842a438c20b25fdc6bc34035f418a1 Mon Sep 17 00:00:00 2001
From: Karan Bedi <karanbedi0304@gmail.com>
Date: Wed, 14 Nov 2018 01:08:26 +0530
Subject: [PATCH 13/16] Update AndroidManifest.xml

---
 app/src/main/AndroidManifest.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a6fed36c65..f806acde9a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,18 +19,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         tools:replace="android:name">
+        
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize">
+            
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -40,39 +43,49 @@
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
+                
                 <data
                     android:host="go.rocket.chat"
                     android:path="/auth"
                     android:scheme="https" />
             </intent-filter>
         </activity>
+        
         <activity
             android:name=".server.ui.ChangeServerActivity"
             android:theme="@style/AppTheme" />
+        
         <activity
             android:name=".main.ui.MainActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        
         <activity
             android:name=".webview.ui.WebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        
         <activity
             android:name=".webview.sso.ui.SsoWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        
         <activity
             android:name=".webview.oauth.ui.OauthWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+        
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> <!-- TODO: Change to fragment -->
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> 
+        
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
@@ -96,4 +109,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From 5e25bd785affe1f163474287a2d5d5cb9a1d3003 Mon Sep 17 00:00:00 2001
From: Karan Bedi <karanbedi0304@gmail.com>
Date: Wed, 14 Nov 2018 01:09:58 +0530
Subject: [PATCH 14/16] Update AndroidManifest.xml

---
 app/src/main/AndroidManifest.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f806acde9a..459d8d7f92 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,21 +19,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         tools:replace="android:name">
-        
+
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize">
-            
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -50,41 +50,41 @@
                     android:scheme="https" />
             </intent-filter>
         </activity>
-        
+
         <activity
             android:name=".server.ui.ChangeServerActivity"
             android:theme="@style/AppTheme" />
-        
+
         <activity
             android:name=".main.ui.MainActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-        
+
         <activity
             android:name=".webview.ui.WebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-        
+
         <activity
             android:name=".webview.sso.ui.SsoWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-        
+
         <activity
             android:name=".webview.oauth.ui.OauthWebViewActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-        
+
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-        
+
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> 
-        
+
         <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"

From ab7a6f1f4e633155268c11e6bbd2a3b3eabccc08 Mon Sep 17 00:00:00 2001
From: Karan Bedi <karanbedi0304@gmail.com>
Date: Wed, 14 Nov 2018 01:10:52 +0530
Subject: [PATCH 15/16] Update AndroidManifest.xml

---
 app/src/main/AndroidManifest.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 459d8d7f92..b078083205 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
-                
+
                 <data
                     android:host="go.rocket.chat"
                     android:path="/auth"
@@ -83,9 +83,9 @@
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> 
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment -->
+        <!-- TODO: Change to fragment-->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />

From a2dd445d802fd6240de7d52258dc85991f1fdd42 Mon Sep 17 00:00:00 2001
From: Karan Bedi <karanbedi0304@gmail.com>
Date: Wed, 14 Nov 2018 23:30:21 +0530
Subject: [PATCH 16/16] Update ContactsFragment.kt

---
 .../main/java/chat/rocket/android/contacts/ContactsFragment.kt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
index c41785b252..345f94a93d 100644
--- a/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/contacts/ContactsFragment.kt
@@ -21,7 +21,6 @@ import java.util.ArrayList
 import kotlin.Comparator
 import kotlin.collections.HashMap
 
-
 /**
  * Load a list of contacts in a recycler view
  */
@@ -297,4 +296,4 @@ class ContactsFragment : Fragment() {
         }
     }
 
-}
\ No newline at end of file
+}