From 3159a4dce0251446a19edc871582951e0ff7cb33 Mon Sep 17 00:00:00 2001
From: Jay Panchal <jay@logicrays.com>
Date: Thu, 3 Oct 2024 19:29:04 +0530
Subject: [PATCH 1/3] Added tables

Added tables and DB upgradation
---
 .../models/ConnectMessagingChannelRecord.java | 130 +++++++++++++++++
 .../models/ConnectMessagingMessageRecord.java | 131 ++++++++++++++++++
 .../org/commcare/connect/MessageManager.java  |  14 ++
 .../connect/ConnectDatabaseUpgrader.java      |  12 ++
 .../connect/DatabaseConnectOpenHelper.java    |  10 +-
 5 files changed, 296 insertions(+), 1 deletion(-)
 create mode 100644 app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java
 create mode 100644 app/src/org/commcare/android/database/connect/models/ConnectMessagingMessageRecord.java
 create mode 100644 app/src/org/commcare/connect/MessageManager.java

diff --git a/app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java
new file mode 100644
index 000000000..e6cf5f42f
--- /dev/null
+++ b/app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java
@@ -0,0 +1,130 @@
+package org.commcare.android.database.connect.models;
+
+import org.commcare.android.storage.framework.Persisted;
+import org.commcare.models.framework.Persisting;
+import org.commcare.modern.database.Table;
+import org.commcare.modern.models.MetaField;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.Serializable;
+import java.text.ParseException;
+
+@Table(ConnectMessagingChannelRecord.STORAGE_KEY)
+public class ConnectMessagingChannelRecord extends Persisted implements Serializable {
+
+    /**
+     * Name of database that stores Connect payment units
+     */
+    public static final String STORAGE_KEY = "connect_messaging_channel";
+
+    public static final String META_CHANNEL_ID = "channel_id ";
+    public static final String META_CHANNEL_CREATED = "created";
+    public static final String META_ANSWERED_CONSENT = "answered_consent";
+    public static final String META_CONSENTED = "consented";
+    public static final String META_CHANNEL_NAME = "name";
+    public static final String META_KEY_URL = "key_url";
+    public static final String META_KEY = "key";
+
+    public ConnectMessagingChannelRecord() {
+
+    }
+
+    @Persisting(1)
+    @MetaField(META_CHANNEL_ID)
+    private int channelId;  
+
+    @Persisting(2)
+    @MetaField(META_CHANNEL_CREATED)
+    private String channelCreated;
+
+    @Persisting(3)
+    @MetaField(META_ANSWERED_CONSENT)
+    private String answeredConsent;
+
+    @Persisting(4)
+    @MetaField(META_CONSENTED)
+    private String consented;
+
+    @Persisting(5)
+    @MetaField(META_CHANNEL_NAME)
+    private String channelName;
+
+    @Persisting(6)
+    @MetaField(META_KEY_URL)
+    private String keyUrl;
+
+    @Persisting(7)
+    @MetaField(META_KEY)
+    private String key;
+
+    public static ConnectMessagingChannelRecord fromJson(JSONObject json) throws JSONException, ParseException {
+        ConnectMessagingChannelRecord connectMessagingChannelRecord = new ConnectMessagingChannelRecord();
+
+        connectMessagingChannelRecord.channelId = json.getInt(META_CHANNEL_ID);
+        connectMessagingChannelRecord.channelCreated = json.getString(META_CHANNEL_CREATED);
+        connectMessagingChannelRecord.answeredConsent = json.getString(META_ANSWERED_CONSENT);
+        connectMessagingChannelRecord.consented = json.getString(META_CONSENTED);
+        connectMessagingChannelRecord.channelName = json.getString(META_CHANNEL_NAME);
+        connectMessagingChannelRecord.keyUrl = json.getString(META_KEY_URL);
+        connectMessagingChannelRecord.key = json.getString(META_KEY);
+
+        return connectMessagingChannelRecord;
+    }
+
+    public int getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(int channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelCreated() {
+        return channelCreated;
+    }
+
+    public void setChannelCreated(String channelCreated) {
+        this.channelCreated = channelCreated;
+    }
+
+    public String getAnsweredConsent() {
+        return answeredConsent;
+    }
+
+    public void setAnsweredConsent(String answeredConsent) {
+        this.answeredConsent = answeredConsent;
+    }
+
+    public String getConsented() {
+        return consented;
+    }
+
+    public void setConsented(String consented) {
+        this.consented = consented;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public String getKeyUrl() {
+        return keyUrl;
+    }
+
+    public void setKeyUrl(String keyUrl) {
+        this.keyUrl = keyUrl;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectMessagingMessageRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectMessagingMessageRecord.java
new file mode 100644
index 000000000..8e3910682
--- /dev/null
+++ b/app/src/org/commcare/android/database/connect/models/ConnectMessagingMessageRecord.java
@@ -0,0 +1,131 @@
+package org.commcare.android.database.connect.models;
+
+import org.commcare.android.storage.framework.Persisted;
+import org.commcare.models.framework.Persisting;
+import org.commcare.modern.database.Table;
+import org.commcare.modern.models.MetaField;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.simpleframework.xml.core.PersistenceException;
+
+import java.io.Serializable;
+import java.text.ParseException;
+
+@Table(ConnectMessagingMessageRecord.STORAGE_KEY)
+public class ConnectMessagingMessageRecord extends Persisted implements Serializable {
+
+    /**
+     * Name of database that stores Connect payment units
+     */
+    public static final String STORAGE_KEY = "connect_messaging_message";
+
+    public static final String META_MESSAGE_ID = "message_id";
+    public static final String META_MESSAGE_CHANNEL_ID = "channel_id";
+    public static final String META_MESSAGE_TIMESTAMP = "timestamp";
+    public static final String META_MESSAGE = "message";
+    public static final String META_MESSAGE_IS_OUTGOING = "is_outgoing";
+    public static final String META_MESSAGE_CONFIRM = "confirmed";
+    public static final String META_MESSAGE_USER_VIEWED = "user_viewed";
+
+    public ConnectMessagingMessageRecord() {
+
+    }
+
+    @Persisting(1)
+    @MetaField(META_MESSAGE_ID)
+    private int messageId;
+
+    @Persisting(2)
+    @MetaField(META_MESSAGE_CHANNEL_ID)
+    private int channelId;
+
+    @Persisting(3)
+    @MetaField(META_MESSAGE_TIMESTAMP)
+    private String timeStamp;
+
+    @Persisting(4)
+    @MetaField(META_MESSAGE)
+    private String message;
+
+    @Persisting(5)
+    @MetaField(META_MESSAGE_IS_OUTGOING)
+    private String isOutgoing;
+
+    @Persisting(6)
+    @MetaField(META_MESSAGE_CONFIRM)
+    private String confirmed;
+
+    @Persisting(7)
+    @MetaField(META_MESSAGE_USER_VIEWED)
+    private String userViewed;
+
+    private static ConnectMessagingMessageRecord fromJson(JSONObject json) throws JSONException, ParseException{
+        ConnectMessagingMessageRecord connectMessagingMessageRecord = new ConnectMessagingMessageRecord();
+
+        connectMessagingMessageRecord.messageId = json.getInt(META_MESSAGE_ID);
+        connectMessagingMessageRecord.channelId = json.getInt(META_MESSAGE_CHANNEL_ID);
+        connectMessagingMessageRecord.timeStamp = json.getString(META_MESSAGE_TIMESTAMP);
+        connectMessagingMessageRecord.message = json.getString(META_MESSAGE);
+        connectMessagingMessageRecord.isOutgoing = json.getString(META_MESSAGE_IS_OUTGOING);
+        connectMessagingMessageRecord.confirmed = json.getString(META_MESSAGE_CONFIRM);
+        connectMessagingMessageRecord.userViewed = json.getString (META_MESSAGE_USER_VIEWED);
+
+        return connectMessagingMessageRecord;
+    }
+
+    public int getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(int messageId) {
+        this.messageId = messageId;
+    }
+
+    public int getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(int channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getTimeStamp() {
+        return timeStamp;
+    }
+
+    public void setTimeStamp(String timeStamp) {
+        this.timeStamp = timeStamp;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getIsOutgoing() {
+        return isOutgoing;
+    }
+
+    public void setIsOutgoing(String isOutgoing) {
+        this.isOutgoing = isOutgoing;
+    }
+
+    public String getConfirmed() {
+        return confirmed;
+    }
+
+    public void setConfirmed(String confirmed) {
+        this.confirmed = confirmed;
+    }
+
+    public String getUserViewed() {
+        return userViewed;
+    }
+
+    public void setUserViewed(String userViewed) {
+        this.userViewed = userViewed;
+    }
+}
diff --git a/app/src/org/commcare/connect/MessageManager.java b/app/src/org/commcare/connect/MessageManager.java
new file mode 100644
index 000000000..1da2dd9e1
--- /dev/null
+++ b/app/src/org/commcare/connect/MessageManager.java
@@ -0,0 +1,14 @@
+package org.commcare.connect;
+
+public class MessageManager {
+
+    private static MessageManager manager = null;
+
+    public static MessageManager getInstance() {
+        if (manager == null) {
+            manager = new MessageManager();
+        }
+
+        return manager;
+    }
+}
diff --git a/app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java b/app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java
index 34a2bc6a8..30e2bfd7f 100644
--- a/app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java
+++ b/app/src/org/commcare/models/database/connect/ConnectDatabaseUpgrader.java
@@ -20,6 +20,8 @@
 import org.commcare.android.database.connect.models.ConnectLinkedAppRecordV3;
 import org.commcare.android.database.connect.models.ConnectLinkedAppRecordV8;
 import org.commcare.android.database.connect.models.ConnectLinkedAppRecordV9;
+import org.commcare.android.database.connect.models.ConnectMessagingChannelRecord;
+import org.commcare.android.database.connect.models.ConnectMessagingMessageRecord;
 import org.commcare.android.database.connect.models.ConnectPaymentUnitRecord;
 import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.android.database.connect.models.ConnectUserRecordV5;
@@ -81,6 +83,11 @@ public void upgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             upgradeNineTen(db);
             oldVersion = 10;
         }
+
+        if (oldVersion == 10) {
+            upgradeTenEleven(db);
+            oldVersion = 11;
+        }
     }
 
     private void upgradeOneTwo(SQLiteDatabase db) {
@@ -432,6 +439,11 @@ private void upgradeNineTen(SQLiteDatabase db) {
         }
     }
 
+    private void upgradeTenEleven(SQLiteDatabase db) {
+        addTableForNewModel(db, ConnectMessagingChannelRecord.STORAGE_KEY, new ConnectMessagingChannelRecord());
+        addTableForNewModel(db, ConnectMessagingMessageRecord.STORAGE_KEY, new ConnectMessagingMessageRecord());
+    }
+
     private static void addTableForNewModel(SQLiteDatabase db, String storageKey,
                                                Persistable modelToAdd) {
         db.beginTransaction();
diff --git a/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java b/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
index ef010c4fd..5658df162 100644
--- a/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
+++ b/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
@@ -14,6 +14,8 @@
 import org.commcare.android.database.connect.models.ConnectJobRecord;
 import org.commcare.android.database.connect.models.ConnectLearnModuleSummaryRecord;
 import org.commcare.android.database.connect.models.ConnectLinkedAppRecord;
+import org.commcare.android.database.connect.models.ConnectMessagingChannelRecord;
+import org.commcare.android.database.connect.models.ConnectMessagingMessageRecord;
 import org.commcare.android.database.connect.models.ConnectPaymentUnitRecord;
 import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.logging.DataChangeLog;
@@ -45,7 +47,7 @@ public class DatabaseConnectOpenHelper extends SQLiteOpenHelper {
      * V.9 - Added using_local_passphrase to ConnectLinkedAppRecord
      * V.10 - Added last_accessed column to ConnectLinkedAppRecord
      */
-    private static final int CONNECT_DB_VERSION = 10;
+    private static final int CONNECT_DB_VERSION = 11;
 
     private static final String CONNECT_DB_LOCATOR = "database_connect";
 
@@ -112,6 +114,12 @@ public void onCreate(SQLiteDatabase database) {
             builder = new TableBuilder(ConnectPaymentUnitRecord.class);
             database.execSQL(builder.getTableCreateString());
 
+            builder = new TableBuilder(ConnectMessagingChannelRecord.class);
+            database.execSQL(builder.getTableCreateString());
+
+            builder = new TableBuilder(ConnectMessagingMessageRecord.class);
+            database.execSQL(builder.getTableCreateString());
+
             DbUtil.createNumbersTable(database);
 
             database.setVersion(CONNECT_DB_VERSION);

From fe368a947ba85c9373ac19c8398023dc2688e7e2 Mon Sep 17 00:00:00 2001
From: Jay Panchal <jay@logicrays.com>
Date: Mon, 7 Oct 2024 12:41:43 +0530
Subject: [PATCH 2/3] Retrieve Message API Integration

Retrieve Message API Integration
---
 app/AndroidManifest.xml                       | 138 ++++++++----------
 app/res/drawable/ic_connect_menu_3_dot.xml    |  13 ++
 .../drawable/ic_connect_menu_notification.xml |  13 ++
 app/res/drawable/ic_connect_menu_search.xml   |  10 ++
 app/res/layout/activity_connect_messaging.xml |  22 +++
 app/res/layout/fragment_channel_list.xml      |  14 ++
 app/res/layout/item_channel.xml               |  79 ++++++++++
 app/res/menu/menu_connect_messaging.xml       |  20 +++
 .../nav_graph_connect_messaging.xml           |  13 ++
 .../connect/ConnectMessagingActivity.java     | 115 +++++++++++++++
 .../org/commcare/adapters/ChannelAdapter.java |  47 ++++++
 .../connectMessaging/ChannelListFragment.java |  48 ++++++
 .../connect/DatabaseConnectOpenHelper.java    |   1 +
 13 files changed, 459 insertions(+), 74 deletions(-)
 create mode 100644 app/res/drawable/ic_connect_menu_3_dot.xml
 create mode 100644 app/res/drawable/ic_connect_menu_notification.xml
 create mode 100644 app/res/drawable/ic_connect_menu_search.xml
 create mode 100644 app/res/layout/activity_connect_messaging.xml
 create mode 100644 app/res/layout/fragment_channel_list.xml
 create mode 100644 app/res/layout/item_channel.xml
 create mode 100644 app/res/menu/menu_connect_messaging.xml
 create mode 100644 app/res/navigation/nav_graph_connect_messaging.xml
 create mode 100644 app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
 create mode 100644 app/src/org/commcare/adapters/ChannelAdapter.java
 create mode 100644 app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index da9698ed6..008ccf440 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.commcare.dalvik"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    package="org.commcare.dalvik"
     android:versionCode="106"
     android:versionName="2.55">
 
+    <uses-sdk tools:overrideLibrary="com.dimagi.android.zebraprinttool, com.simprints.libsimprints,     ru.noties.markwon.il, ru.noties.markwon.view, ru.noties.markwon.renderer,     com.google.firebase.crashlytics, com.google.firebase.iid, com.appmattus.certificatetransparency" />
+
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
-
     <uses-permission xmlns:android="http://schemas.android.com/apk/res/android"
         android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission xmlns:android="http://schemas.android.com/apk/res/android"
@@ -22,8 +23,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- required to ensure app compatibility -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- required to ensure app compatibility -->
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
@@ -55,15 +55,10 @@
         android:name="android.hardware.camera"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.dimagi.android.zebraprinttool, com.simprints.libsimprints,
-    ru.noties.markwon.il, ru.noties.markwon.view, ru.noties.markwon.renderer,
-    com.google.firebase.crashlytics, com.google.firebase.iid, com.appmattus.certificatetransparency" />
-
     <permission-group
         android:name="commcare.permission-group.DATABASE"
         android:description="@string/permission_content_provider_description"
         android:label="@string/permission_content_provider_label" />
-
     <permission-group
         android:name="commcare.permission-group.EXTERNAL_ACTION"
         android:description="@string/permission_external_action_description"
@@ -74,14 +69,13 @@
         android:description="@string/permission_content_provider_description"
         android:label="@string/permission_content_provider_label"
         android:permissionGroup="commcare.permission-group.DATABASE"
-        android:protectionLevel="dangerous"></permission>
-
+        android:protectionLevel="dangerous" />
     <permission
         android:name="${applicationId}.permission.COMMCARE_LOGOUT"
         android:description="@string/permission_commcare_logout_description"
         android:label="@string/permission_commcare_logout_label"
         android:permissionGroup="commcare.permission-group.EXTERNAL_ACTION"
-        android:protectionLevel="dangerous"></permission>
+        android:protectionLevel="dangerous" />
 
     <queries>
         <intent>
@@ -89,10 +83,12 @@
         </intent>
         <intent>
             <action android:name="android.intent.action.SEND" />
+
             <data android:mimeType="*/*" />
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW" />
+
             <data
                 android:mimeType="*/*"
                 android:scheme="*" />
@@ -120,6 +116,15 @@
         android:theme="@style/AppBaseTheme"
         android:usesCleartextTraffic="true"
         tools:replace="android:label,android:icon,android:theme, android:allowBackup">
+        <activity
+            android:name="org.commcare.activities.connect.ConnectMessagingActivity"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
@@ -130,7 +135,7 @@
             android:exported="true"
             android:permission="com.google.android.gms.auth.api.phone.permission.SEND">
             <intent-filter>
-                <action android:name="com.google.android.gms.auth.api.phone.SMS_RETRIEVED"/>
+                <action android:name="com.google.android.gms.auth.api.phone.SMS_RETRIEVED" />
             </intent-filter>
         </receiver>
 
@@ -138,11 +143,7 @@
             android:name="org.commcare.activities.DispatchActivity"
             android:exported="true"
             android:label="@string/application_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.CommCareSession" />
 
@@ -161,14 +162,13 @@
         <activity
             android:name="org.commcare.activities.LoginActivity"
             android:label="@string/application_name"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.CrashWarningActivity"
-            android:label="CommCare Forced Closure"></activity>
+            android:label="CommCare Forced Closure" />
         <activity android:name="org.commcare.activities.StandardHomeActivity" />
         <activity android:name="org.commcare.activities.RootMenuHomeActivity" />
         <activity android:name="org.commcare.activities.MenuActivity" />
-
         <activity
             android:name="org.commcare.activities.connect.ConnectIdActivity"
             android:exported="true" />
@@ -209,13 +209,13 @@
 
         <activity
             android:name="org.commcare.activities.CommCarePreferenceActivity"
-            android:theme="@style/PreferenceTheme"></activity>
+            android:theme="@style/PreferenceTheme" />
         <activity
             android:name="org.commcare.activities.SessionAwarePreferenceActivity"
-            android:theme="@style/PreferenceTheme"></activity>
+            android:theme="@style/PreferenceTheme" />
         <activity
             android:name="org.commcare.activities.FullscreenVideoViewActivity"
-            android:theme="@style/FullscreenTheme"></activity>
+            android:theme="@style/FullscreenTheme" />
         <activity
             android:name="org.commcare.activities.DotsEntryActivity"
             android:exported="false">
@@ -225,7 +225,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name="org.commcare.activities.CallOutActivity"></activity>
+        <activity android:name="org.commcare.activities.CallOutActivity" />
         <activity
             android:name="org.commcare.activities.CommCareSetupActivity"
             android:exported="true"
@@ -294,51 +294,48 @@
         </activity>
         <activity
             android:name="org.commcare.activities.UpdateActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.SingleAppManagerActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.EntitySelectActivity"
-            android:windowSoftInputMode="stateUnchanged|adjustResize"></activity>
-        <activity android:name="org.commcare.activities.CommCareGraphActivity"></activity>
+            android:windowSoftInputMode="stateUnchanged|adjustResize" />
+        <activity android:name="org.commcare.activities.CommCareGraphActivity" />
         <activity
             android:name="org.commcare.activities.EntityDetailActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.FormRecordListActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
 
         <service
             android:name="org.commcare.services.CommCareSessionService"
-            android:enabled="true"></service>
+            android:enabled="true" />
 
         <activity
             android:name="org.commcare.activities.FormEntryActivity"
             android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.DrawActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.FormHierarchyActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.GeoPointActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.GeoPointMapActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.InstallArchiveActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
-
-        <activity android:name="org.commcare.gis.EntityMapActivity"></activity>
-
+            android:windowSoftInputMode="adjustResize" />
+        <activity android:name="org.commcare.gis.EntityMapActivity" />
         <activity
             android:name="org.commcare.gis.EntityMapboxActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"></activity>
-
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
             android:name="org.commcare.gis.DrawingBoundaryActivity"
             android:exported="false"
@@ -349,11 +346,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <activity android:name="org.commcare.activities.RefreshToLatestBuildActivity"></activity>
-        <activity android:name="org.commcare.activities.MultipleAppsLimitWarningActivity"></activity>
-        <activity android:name="org.commcare.activities.GlobalPrivilegeClaimingActivity"></activity>
-        <activity android:name="org.commcare.activities.InstallFromListActivity"></activity>
+        <activity android:name="org.commcare.activities.RefreshToLatestBuildActivity" />
+        <activity android:name="org.commcare.activities.MultipleAppsLimitWarningActivity" />
+        <activity android:name="org.commcare.activities.GlobalPrivilegeClaimingActivity" />
+        <activity android:name="org.commcare.activities.InstallFromListActivity" />
         <activity
             android:name="org.commcare.gis.MapboxLocationPickerActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
@@ -362,9 +358,9 @@
             android:name="com.google.android.maps"
             android:required="false" />
 
-        <activity android:name="org.commcare.activities.MessageActivity"></activity>
+        <activity android:name="org.commcare.activities.MessageActivity" />
 
-        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver"></receiver>
+        <receiver android:name="org.commcare.views.notifications.NotificationClearReceiver" />
 
         <activity
             android:name="org.commcare.activities.ReportProblemActivity"
@@ -375,8 +371,8 @@
         </activity>
         <activity
             android:name="org.commcare.activities.CommCareVerificationActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
-        <activity android:name="org.commcare.activities.UnrecoverableErrorActivity"></activity>
+            android:windowSoftInputMode="adjustResize" />
+        <activity android:name="org.commcare.activities.UnrecoverableErrorActivity" />
         <activity
             android:name="org.commcare.activities.KeyAccessRequestActivity"
             android:exported="true">
@@ -410,20 +406,20 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.api.action.ExternalAction" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-
         <receiver
             android:name="org.commcare.provider.CommCareLogoutReceiver"
             android:exported="true"
             android:permission="org.commcare.dalvik.permission.COMMCARE_LOGOUT">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.api.action.CommCareLogoutAction" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
-
         <receiver
             android:name="org.commcare.provider.RefreshToLatestBuildReceiver"
             android:exported="false">
@@ -473,17 +469,17 @@
             </intent-filter>
         </receiver>
 
-        <activity android:name="org.commcare.activities.MultimediaInflaterActivity"></activity>
+        <activity android:name="org.commcare.activities.MultimediaInflaterActivity" />
         <activity
             android:name="org.commcare.activities.CommCareFormDumpActivity"
-            android:windowSoftInputMode="adjustPan"></activity>
+            android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="org.commcare.activities.ConnectionDiagnosticActivity"
-            android:windowSoftInputMode="adjustResize"></activity>
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="org.commcare.activities.CommCareWiFiDirectActivity"
-            android:screenOrientation="portrait"></activity>
-        <activity android:name="org.commcare.activities.RecoveryActivity"></activity>
+            android:screenOrientation="portrait" />
+        <activity android:name="org.commcare.activities.RecoveryActivity" />
         <activity
             android:name="org.commcare.print.TemplatePrinterActivity"
             android:exported="false"
@@ -494,16 +490,15 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
         <activity android:name="org.commcare.activities.SeatAppActivity" />
         <activity android:name="org.commcare.activities.PostRequestActivity" />
         <activity android:name="org.commcare.activities.QueryRequestActivity" />
         <activity
             android:name="org.commcare.activities.CreatePinActivity"
-            android:windowSoftInputMode="stateVisible|adjustResize"></activity>
+            android:windowSoftInputMode="stateVisible|adjustResize" />
         <activity
             android:name="org.commcare.activities.PinAuthenticationActivity"
-            android:windowSoftInputMode="stateVisible|adjustResize"></activity>
+            android:windowSoftInputMode="stateVisible|adjustResize" />
         <activity android:name="org.commcare.activities.PromptApkUpdateActivity" />
         <activity android:name="org.commcare.activities.PromptCczUpdateActivity" />
         <activity
@@ -516,9 +511,7 @@
         </activity>
         <activity android:name="org.commcare.activities.TargetMismatchErrorActivity" />
         <activity android:name="org.commcare.recovery.measures.ExecuteRecoveryMeasuresActivity" />
-        <activity android:name="org.commcare.activities.PromptCCReinstallActivity" />
-        <!-- Start Collect Manifest -->
-
+        <activity android:name="org.commcare.activities.PromptCCReinstallActivity" /> <!-- Start Collect Manifest -->
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="${googlePlayMapsApiKey}" />
@@ -529,23 +522,20 @@
             android:name="android.content.APP_RESTRICTIONS"
             android:resource="@xml/app_restrictions" />
 
-
-        <activity android:name="org.commcare.activities.CommcareListActivity" />
-
-        <!-- This is to disable fabric for debug builds properly - https://stackoverflow.com/a/49836972/3811963 -->
+        <activity android:name="org.commcare.activities.CommcareListActivity" /> <!-- This is to disable fabric for debug builds properly - https://stackoverflow.com/a/49836972/3811963 -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="false" />
-
-        <!-- Somehow this receiver is getting triggered in Android 8+ devices and causing
+        <!--
+ Somehow this receiver is getting triggered in Android 8+ devices and causing
             IllegalStateException while trying to start map downloader service from background.
             Below code removes this receiver's entry from Manifest.
-         -->
+        -->
         <receiver
             android:name="io.ona.kujaku.receivers.KujakuNetworkChangeReceiver"
             tools:node="remove" />
-
-        <!-- The zebra-print-android library is not yet targeting Android 12 and at least one
+        <!--
+ The zebra-print-android library is not yet targeting Android 12 and at least one
             Activity doesn't have the required attribute exported. The entry below adds the
             attribute to the final Manifest.
         -->
diff --git a/app/res/drawable/ic_connect_menu_3_dot.xml b/app/res/drawable/ic_connect_menu_3_dot.xml
new file mode 100644
index 000000000..cd15adea6
--- /dev/null
+++ b/app/res/drawable/ic_connect_menu_3_dot.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M12,19.269C11.587,19.269 11.234,19.122 10.941,18.829C10.647,18.535 10.5,18.182 10.5,17.769C10.5,17.357 10.647,17.003 10.941,16.71C11.234,16.416 11.587,16.269 12,16.269C12.413,16.269 12.766,16.416 13.059,16.71C13.353,17.003 13.5,17.357 13.5,17.769C13.5,18.182 13.353,18.535 13.059,18.829C12.766,19.122 12.413,19.269 12,19.269ZM12,13.5C11.587,13.5 11.234,13.353 10.941,13.059C10.647,12.766 10.5,12.413 10.5,12C10.5,11.587 10.647,11.234 10.941,10.941C11.234,10.647 11.587,10.5 12,10.5C12.413,10.5 12.766,10.647 13.059,10.941C13.353,11.234 13.5,11.587 13.5,12C13.5,12.413 13.353,12.766 13.059,13.059C12.766,13.353 12.413,13.5 12,13.5ZM12,7.731C11.587,7.731 11.234,7.584 10.941,7.29C10.647,6.996 10.5,6.643 10.5,6.231C10.5,5.818 10.647,5.465 10.941,5.171C11.234,4.878 11.587,4.731 12,4.731C12.413,4.731 12.766,4.878 13.059,5.171C13.353,5.465 13.5,5.818 13.5,6.231C13.5,6.643 13.353,6.996 13.059,7.29C12.766,7.584 12.413,7.731 12,7.731Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_menu_notification.xml b/app/res/drawable/ic_connect_menu_notification.xml
new file mode 100644
index 000000000..a17b7fb9d
--- /dev/null
+++ b/app/res/drawable/ic_connect_menu_notification.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M11.998,21.692C11.501,21.692 11.075,21.515 10.722,21.161C10.369,20.807 10.192,20.382 10.192,19.885H13.808C13.808,20.383 13.631,20.809 13.276,21.163C12.922,21.516 12.496,21.692 11.998,21.692ZM4.5,18.885V17.385H6.308V9.923C6.308,8.578 6.723,7.389 7.553,6.356C8.383,5.322 9.449,4.661 10.75,4.373V3.75C10.75,3.403 10.871,3.108 11.114,2.865C11.357,2.622 11.652,2.5 11.999,2.5C12.346,2.5 12.641,2.622 12.884,2.865C13.128,3.108 13.25,3.403 13.25,3.75V3.95C13.086,4.246 12.956,4.547 12.859,4.854C12.763,5.16 12.704,5.478 12.683,5.808C12.569,5.787 12.458,5.769 12.35,5.754C12.242,5.738 12.125,5.731 12,5.731C10.842,5.731 9.854,6.14 9.035,6.959C8.217,7.777 7.808,8.765 7.808,9.923V17.385H16.192V11.133C16.422,11.215 16.664,11.279 16.919,11.325C17.174,11.371 17.432,11.391 17.692,11.385V17.385H19.5V18.885H4.5ZM17.482,9.202C16.718,9.202 16.069,8.935 15.534,8.4C14.998,7.866 14.731,7.217 14.731,6.453C14.731,5.689 14.998,5.04 15.533,4.505C16.067,3.97 16.716,3.702 17.479,3.702C18.243,3.702 18.893,3.969 19.428,4.504C19.963,5.038 20.231,5.687 20.231,6.451C20.231,7.214 19.963,7.864 19.429,8.399C18.895,8.934 18.245,9.202 17.482,9.202Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_menu_search.xml b/app/res/drawable/ic_connect_menu_search.xml
new file mode 100644
index 000000000..c7c2b636b
--- /dev/null
+++ b/app/res/drawable/ic_connect_menu_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.76,13.27L20.49,19L19,20.49L13.27,14.76C12.2,15.53 10.91,16 9.5,16C5.91,16 3,13.09 3,9.5C3,5.91 5.91,3 9.5,3C13.09,3 16,5.91 16,9.5C16,10.91 15.53,12.2 14.76,13.27ZM9.5,5C7.01,5 5,7.01 5,9.5C5,11.99 7.01,14 9.5,14C11.99,14 14,11.99 14,9.5C14,7.01 11.99,5 9.5,5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/res/layout/activity_connect_messaging.xml b/app/res/layout/activity_connect_messaging.xml
new file mode 100644
index 000000000..744f60fbb
--- /dev/null
+++ b/app/res/layout/activity_connect_messaging.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.commcare.activities.connect.ConnectMessagingActivity">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment_connect_messaging"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:defaultNavHost="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navGraph="@navigation/nav_graph_connect_messaging" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/layout/fragment_channel_list.xml b/app/res/layout/fragment_channel_list.xml
new file mode 100644
index 000000000..027d509c6
--- /dev/null
+++ b/app/res/layout/fragment_channel_list.xml
@@ -0,0 +1,14 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dp"
+    tools:context="org.commcare.fragments.connectMessaging.ChannelListFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvChannel"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipToPadding="false"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/layout/item_channel.xml b/app/res/layout/item_channel.xml
new file mode 100644
index 000000000..893921e8e
--- /dev/null
+++ b/app/res/layout/item_channel.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:id="@+id/itemRootLayout"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="8dp">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/imgChannel"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        app:cardBackgroundColor="@color/connect_light_grey"
+        app:cardElevation="0dp"
+        app:cardCornerRadius="7dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <org.commcare.views.connect.connecttextview.ConnectMediumTextView
+        android:id="@+id/tvChannelName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:text="Channel Name"
+        android:textColor="@color/black"
+        android:textSize="15sp"
+        app:layout_constraintStart_toEndOf="@+id/imgChannel"
+        app:layout_constraintTop_toTopOf="@+id/imgChannel" />
+
+    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+        android:id="@+id/tvChannelDescription"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="4dp"
+        android:text="message preview on top of the card..."
+        android:textColor="@color/connect_grey"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toStartOf="@+id/tvLastChatTime"
+        app:layout_constraintStart_toEndOf="@+id/imgChannel"
+        app:layout_constraintTop_toBottomOf="@+id/tvChannelName" />
+
+    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+        android:id="@+id/tvLastChatTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="10:00"
+        android:layout_marginRight="10dp"
+        android:textColor="@color/connect_grey"
+        android:textSize="13sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+        android:id="@+id/tvUnreadCount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="10dp"
+        android:background="@drawable/shape_border_10px_blue"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="2dp"
+        android:text="15"
+        android:textColor="@color/white"
+        android:textSize="10sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvLastChatTime" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginHorizontal="10dp"
+        android:background="@color/connect_divider_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvUnreadCount" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/res/menu/menu_connect_messaging.xml b/app/res/menu/menu_connect_messaging.xml
new file mode 100644
index 000000000..7ac1815e3
--- /dev/null
+++ b/app/res/menu/menu_connect_messaging.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_connect_menu_search"
+        android:title="Search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_notification"
+        android:icon="@drawable/ic_connect_menu_notification"
+        android:title="Notification"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/action_menu"
+        android:icon="@drawable/ic_connect_menu_3_dot"
+        android:title="Menu"
+        app:showAsAction="always" />
+</menu>
diff --git a/app/res/navigation/nav_graph_connect_messaging.xml b/app/res/navigation/nav_graph_connect_messaging.xml
new file mode 100644
index 000000000..97bc463af
--- /dev/null
+++ b/app/res/navigation/nav_graph_connect_messaging.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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:id="@+id/nav_graph_connect_messaging"
+    app:startDestination="@+id/channelListFragment">
+
+    <fragment
+        android:id="@+id/channelListFragment"
+        android:name="org.commcare.fragments.connectMessaging.ChannelListFragment"
+        android:label="Message"
+        tools:layout="@layout/fragment_channel_list" />
+</navigation>
\ No newline at end of file
diff --git a/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java b/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
new file mode 100644
index 000000000..4849ec4a9
--- /dev/null
+++ b/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
@@ -0,0 +1,115 @@
+package org.commcare.activities.connect;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.Window;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.navigation.ui.NavigationUI;
+
+import org.commcare.dalvik.R;
+import org.commcare.fragments.connectMessaging.ChannelListFragment;
+
+public class ConnectMessagingActivity extends AppCompatActivity {
+
+    public NavController controller;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_connect_messaging);
+        Window window = getWindow();
+        window.setStatusBarColor(getResources().getColor(R.color.connect_status_bar_color));
+        ColorDrawable colorDrawable = new ColorDrawable(getResources().getColor(R.color.connect_blue_color));
+        getSupportActionBar().setBackgroundDrawable(colorDrawable);
+        setTitle("Messaging");
+         getSupportActionBar().setTitle("Messaging");
+
+        NavHostFragment navHostFragment =
+                (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment_connect_messaging);
+        controller = navHostFragment.getNavController();
+        NavigationUI.setupActionBarWithNavController(this, controller);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_connect_messaging, menu);
+        MenuItem searchItem = menu.findItem(R.id.action_search);
+
+        if (searchItem != null) {
+            SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem);
+
+            searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+                @Override
+                public boolean onClose() {
+                    return false;
+                }
+            });
+
+            EditText searchPlate = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
+            searchPlate.setHint("Search");
+
+            View searchPlateView = searchView.findViewById(androidx.appcompat.R.id.search_plate);
+            searchPlateView.setBackgroundColor(ContextCompat.getColor(this, android.R.color.transparent));
+
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    // Do your logic here
+                    Toast.makeText(getApplicationContext(), query, Toast.LENGTH_SHORT).show();
+                    sendSearchQueryToFragment(query);
+                    return false;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String newText) {
+                    return false;
+                }
+            });
+
+            SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+        }
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    public void sendSearchQueryToFragment(String query) {
+        NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment_connect_messaging);
+        if (navHostFragment != null) {
+            Fragment currentFragment = navHostFragment.getChildFragmentManager().getFragments().get(0);
+            if (currentFragment instanceof ChannelListFragment) {
+                ((ChannelListFragment) currentFragment).onSearchQueryReceived(query);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        return switch (id) {
+            case R.id.action_notification -> true;
+            default -> super.onOptionsItemSelected(item);
+        };
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment_connect_messaging);
+        return navHostFragment.getNavController().navigateUp() || super.onSupportNavigateUp();
+    }
+}
diff --git a/app/src/org/commcare/adapters/ChannelAdapter.java b/app/src/org/commcare/adapters/ChannelAdapter.java
new file mode 100644
index 000000000..0951e18f0
--- /dev/null
+++ b/app/src/org/commcare/adapters/ChannelAdapter.java
@@ -0,0 +1,47 @@
+package org.commcare.adapters;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.commcare.dalvik.databinding.ItemChannelBinding;
+
+public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelViewHolder> {
+
+
+    public ChannelAdapter() {
+    }
+
+    @NonNull
+    @Override
+    public ChannelViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ChannelViewHolder(ItemChannelBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ChannelViewHolder holder, int position) {
+        holder.bind(holder.binding);
+    }
+
+    @Override
+    public int getItemCount() {
+        return 20;
+    }
+
+    static class ChannelViewHolder extends RecyclerView.ViewHolder {
+
+        private final ItemChannelBinding binding;
+
+        public ChannelViewHolder(@NonNull ItemChannelBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void bind(ItemChannelBinding binding) {
+            binding.itemRootLayout.setOnClickListener(view -> {});
+        }
+    }
+}
diff --git a/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java b/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java
new file mode 100644
index 000000000..96f0a630f
--- /dev/null
+++ b/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java
@@ -0,0 +1,48 @@
+package org.commcare.fragments.connectMessaging;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import org.commcare.adapters.ChannelAdapter;
+import org.commcare.dalvik.databinding.FragmentChannelListBinding;
+
+public class ChannelListFragment extends Fragment {
+
+    private FragmentChannelListBinding binding;
+
+    public static ChannelListFragment newInstance() {
+        ChannelListFragment fragment = new ChannelListFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentChannelListBinding.inflate(inflater, container, false);
+        View view = binding.getRoot();
+
+        binding.rvChannel.setLayoutManager(new LinearLayoutManager(getContext()));
+        ChannelAdapter channelAdapter = new ChannelAdapter();
+        binding.rvChannel.setAdapter(channelAdapter);
+
+        return view;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    public void onSearchQueryReceived(String query) {
+    }
+}
diff --git a/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java b/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
index 5658df162..624ce1cde 100644
--- a/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
+++ b/app/src/org/commcare/models/database/connect/DatabaseConnectOpenHelper.java
@@ -46,6 +46,7 @@ public class DatabaseConnectOpenHelper extends SQLiteOpenHelper {
      * V.8 - Added is_user_suspended to ConnectJobRecord
      * V.9 - Added using_local_passphrase to ConnectLinkedAppRecord
      * V.10 - Added last_accessed column to ConnectLinkedAppRecord
+     * V.11 - Added ConnectMessagingChannelRecord table and ConnectMessagingMessageRecord table
      */
     private static final int CONNECT_DB_VERSION = 11;
 

From 4cc4882b8a9ddc0ff3571932cdae9b3494b0471a Mon Sep 17 00:00:00 2001
From: Jay Panchal <jay@logicrays.com>
Date: Wed, 9 Oct 2024 10:52:07 +0530
Subject: [PATCH 3/3] Created message screen UI

Created message screen UI
---
 app/AndroidManifest.xml                       |   9 +-
 ...c_connect_message_editext_bg_24_border.xml |   9 ++
 .../ic_connect_message_photo_camera.xml       |  13 ++
 app/res/drawable/ic_connect_message_read.xml  |  10 ++
 .../ic_connect_message_receiver_bg.xml        |   9 ++
 .../ic_connect_message_receiver_edge.xml      |   9 ++
 app/res/drawable/ic_connect_message_send.png  | Bin 0 -> 3076 bytes
 .../drawable/ic_connect_message_sender_bg.xml |   9 ++
 .../ic_connect_message_sender_edge.xml        |   9 ++
 .../ic_connect_message_speak_button.png       | Bin 0 -> 3404 bytes
 .../drawable/ic_connect_message_unread.xml    |  10 ++
 app/res/layout/fragment_channel_list.xml      |   2 +-
 app/res/layout/fragment_connect_message.xml   |  72 ++++++++++
 app/res/layout/item_channel.xml               | 128 ++++++++++--------
 app/res/layout/item_chat_left_view.xml        |  63 +++++++++
 app/res/layout/item_chat_right_view.xml       |  79 +++++++++++
 .../nav_graph_connect_messaging.xml           |  14 +-
 app/res/values/colors.xml                     |   3 +
 app/res/values/strings.xml                    |   3 +
 .../connect/ConnectMessagingActivity.java     |   7 +-
 .../org/commcare/adapters/ChannelAdapter.java |  19 ++-
 .../adapters/ConnectMessageAdapter.java       |  83 ++++++++++++
 .../connect/network/ApiConnectId.java         |   6 +
 .../connectMessaging/ChannelListFragment.java |  48 -------
 .../ConnectMessageChannelListFragment.java    | 100 ++++++++++++++
 .../ConnectMessageChatData.java               |  59 ++++++++
 .../ConnectMessageFragment.java               |  91 +++++++++++++
 27 files changed, 741 insertions(+), 123 deletions(-)
 create mode 100644 app/res/drawable/ic_connect_message_editext_bg_24_border.xml
 create mode 100644 app/res/drawable/ic_connect_message_photo_camera.xml
 create mode 100644 app/res/drawable/ic_connect_message_read.xml
 create mode 100644 app/res/drawable/ic_connect_message_receiver_bg.xml
 create mode 100644 app/res/drawable/ic_connect_message_receiver_edge.xml
 create mode 100644 app/res/drawable/ic_connect_message_send.png
 create mode 100644 app/res/drawable/ic_connect_message_sender_bg.xml
 create mode 100644 app/res/drawable/ic_connect_message_sender_edge.xml
 create mode 100644 app/res/drawable/ic_connect_message_speak_button.png
 create mode 100644 app/res/drawable/ic_connect_message_unread.xml
 create mode 100644 app/res/layout/fragment_connect_message.xml
 create mode 100644 app/res/layout/item_chat_left_view.xml
 create mode 100644 app/res/layout/item_chat_right_view.xml
 create mode 100644 app/src/org/commcare/adapters/ConnectMessageAdapter.java
 delete mode 100644 app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java
 create mode 100644 app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java
 create mode 100644 app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java
 create mode 100644 app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java

diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 008ccf440..b9ccdc7d1 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -119,11 +119,6 @@
         <activity
             android:name="org.commcare.activities.connect.ConnectMessagingActivity"
             android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
 
         <meta-data
@@ -143,7 +138,11 @@
             android:name="org.commcare.activities.DispatchActivity"
             android:exported="true"
             android:label="@string/application_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.CommCareSession" />
 
diff --git a/app/res/drawable/ic_connect_message_editext_bg_24_border.xml b/app/res/drawable/ic_connect_message_editext_bg_24_border.xml
new file mode 100644
index 000000000..aa9c6891c
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_editext_bg_24_border.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/connect_message_sender_bg" />
+    <corners android:radius="50dp" />
+    <stroke
+        android:width="0.5dp"
+        android:color="@color/connect_divider_color" />
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/ic_connect_message_photo_camera.xml b/app/res/drawable/ic_connect_message_photo_camera.xml
new file mode 100644
index 000000000..8e30510cd
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_photo_camera.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M12,17.115C13.148,17.115 14.12,16.716 14.918,15.918C15.716,15.12 16.115,14.148 16.115,13C16.115,11.852 15.716,10.88 14.918,10.082C14.12,9.284 13.148,8.885 12,8.885C10.852,8.885 9.88,9.284 9.082,10.082C8.284,10.88 7.885,11.852 7.885,13C7.885,14.148 8.284,15.12 9.082,15.918C9.88,16.716 10.852,17.115 12,17.115ZM12,15.616C11.262,15.616 10.641,15.364 10.139,14.861C9.636,14.359 9.384,13.738 9.384,13C9.384,12.262 9.636,11.641 10.139,11.139C10.641,10.636 11.262,10.384 12,10.384C12.738,10.384 13.359,10.636 13.861,11.139C14.364,11.641 14.616,12.262 14.616,13C14.616,13.738 14.364,14.359 13.861,14.861C13.359,15.364 12.738,15.616 12,15.616ZM4.308,20.5C3.803,20.5 3.375,20.325 3.025,19.975C2.675,19.625 2.5,19.197 2.5,18.692V7.308C2.5,6.803 2.675,6.375 3.025,6.025C3.375,5.675 3.803,5.5 4.308,5.5H7.361L9.212,3.5H14.788L16.639,5.5H19.692C20.197,5.5 20.625,5.675 20.975,6.025C21.325,6.375 21.5,6.803 21.5,7.308V18.692C21.5,19.197 21.325,19.625 20.975,19.975C20.625,20.325 20.197,20.5 19.692,20.5H4.308ZM4.308,19H19.692C19.782,19 19.856,18.971 19.913,18.913C19.971,18.856 20,18.782 20,18.692V7.308C20,7.218 19.971,7.144 19.913,7.087C19.856,7.029 19.782,7 19.692,7H15.969L14.134,5H9.866L8.031,7H4.308C4.218,7 4.144,7.029 4.087,7.087C4.029,7.144 4,7.218 4,7.308V18.692C4,18.782 4.029,18.856 4.087,18.913C4.144,18.971 4.218,19 4.308,19Z"
+        android:fillColor="#150168"/>
+  </group>
+</vector>
diff --git a/app/res/drawable/ic_connect_message_read.xml b/app/res/drawable/ic_connect_message_read.xml
new file mode 100644
index 000000000..2dfc3ea4d
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_read.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="14dp"
+    android:viewportWidth="16"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M8.114,10.986L15.094,2.986L13.963,2L7.506,9.401L7.054,8.958L6.003,10.029L7.023,11.029L7.591,11.585L8.114,10.986ZM4.131,10.965L10.611,2.965L9.446,2.021L3.488,9.376L1.057,6.961L0,8.025L3.02,11.025L3.609,11.61L4.131,10.965Z"
+      android:fillColor="#3A42C7"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_message_receiver_bg.xml b/app/res/drawable/ic_connect_message_receiver_bg.xml
new file mode 100644
index 000000000..954f363de
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_receiver_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/connect_message_receiver_bg" />
+    <corners
+        android:bottomLeftRadius="16dp"
+        android:bottomRightRadius="16dp"
+        android:topRightRadius="16dp" />
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/ic_connect_message_receiver_edge.xml b/app/res/drawable/ic_connect_message_receiver_edge.xml
new file mode 100644
index 000000000..34ea7b545
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_receiver_edge.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+  <path
+      android:pathData="M8,8V0C8,0 8,0 2.3324,0C-5.2245,0 8,8 8,8Z"
+      android:fillColor="@color/connect_message_receiver_bg"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_message_send.png b/app/res/drawable/ic_connect_message_send.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3e2eeda17f77d847893e70ea057cc8a7ecf23ad
GIT binary patch
literal 3076
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
SZw|)*0000<MNUMnLSTZde6ybb

literal 0
HcmV?d00001

diff --git a/app/res/drawable/ic_connect_message_sender_bg.xml b/app/res/drawable/ic_connect_message_sender_bg.xml
new file mode 100644
index 000000000..9fb09b83c
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_sender_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/connect_message_sender_bg" />
+    <corners
+        android:bottomLeftRadius="16dp"
+        android:bottomRightRadius="16dp"
+        android:topLeftRadius="16dp" />
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/ic_connect_message_sender_edge.xml b/app/res/drawable/ic_connect_message_sender_edge.xml
new file mode 100644
index 000000000..7360221b7
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_sender_edge.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+  <path
+      android:pathData="M0,8V0C0,0 0,0 5.6677,0C13.2245,0 0,8 0,8Z"
+      android:fillColor="@color/connect_message_sender_bg"/>
+</vector>
diff --git a/app/res/drawable/ic_connect_message_speak_button.png b/app/res/drawable/ic_connect_message_speak_button.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b7e422a1b488e9b30cc46405f5be1e0ef81a81f
GIT binary patch
literal 3404
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

literal 0
HcmV?d00001

diff --git a/app/res/drawable/ic_connect_message_unread.xml b/app/res/drawable/ic_connect_message_unread.xml
new file mode 100644
index 000000000..ead2ff8ba
--- /dev/null
+++ b/app/res/drawable/ic_connect_message_unread.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="14dp"
+    android:viewportWidth="16"
+    android:viewportHeight="14">
+  <path
+      android:pathData="M8.114,10.986L15.094,2.986L13.963,2L7.506,9.401L7.054,8.958L6.003,10.029L7.023,11.029L7.591,11.585L8.114,10.986ZM4.131,10.965L10.611,2.965L9.446,2.021L3.488,9.376L1.057,6.961L0,8.025L3.02,11.025L3.609,11.61L4.131,10.965Z"
+      android:fillColor="#94A3B8"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/res/layout/fragment_channel_list.xml b/app/res/layout/fragment_channel_list.xml
index 027d509c6..3f0bb28b7 100644
--- a/app/res/layout/fragment_channel_list.xml
+++ b/app/res/layout/fragment_channel_list.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp"
-    tools:context="org.commcare.fragments.connectMessaging.ChannelListFragment">
+    tools:context="org.commcare.fragments.connectMessaging.ConnectMessageChannelListFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvChannel"
diff --git a/app/res/layout/fragment_connect_message.xml b/app/res/layout/fragment_connect_message.xml
new file mode 100644
index 000000000..bf3ccd3bc
--- /dev/null
+++ b/app/res/layout/fragment_connect_message.xml
@@ -0,0 +1,72 @@
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:background="@color/white"
+    tools:context="org.commcare.fragments.connectMessaging.ConnectMessageFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvChat"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginHorizontal="4dp"
+        android:orientation="vertical"
+        android:overScrollMode="never"
+        android:paddingBottom="10dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toTopOf="@+id/cardMessage"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/cardMessage"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:layout_marginBottom="15dp"
+        android:layout_marginHorizontal="10dp"
+        android:background="@drawable/ic_connect_message_editext_bg_24_border"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/imgSendMessage"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+<!--        android:drawableEnd="@drawable/ic_connect_message_photo_camera"-->
+            <androidx.appcompat.widget.AppCompatEditText
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:id="@+id/etMessage"
+                android:background="@null"
+                android:hint="Type message"
+                android:textColorHint="@color/black"
+                android:inputType="textMultiLine"
+                android:gravity="center_vertical"
+                android:fontFamily="@font/roboto_medium"
+                android:paddingVertical="10dp"
+                android:textColor="@color/black"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                android:scrollbars="vertical"
+                android:textSize="14sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/imgSendMessage"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginEnd="10dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_connect_message_send"
+        app:layout_constraintBottom_toBottomOf="@+id/cardMessage"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cardMessage" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/layout/item_channel.xml b/app/res/layout/item_channel.xml
index 893921e8e..c69236576 100644
--- a/app/res/layout/item_channel.xml
+++ b/app/res/layout/item_channel.xml
@@ -4,76 +4,88 @@
     android:layout_width="match_parent"
     android:id="@+id/itemRootLayout"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp">
+    android:background="?attr/selectableItemBackground"
+    android:orientation="vertical">
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/imgChannel"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        app:cardBackgroundColor="@color/connect_light_grey"
-        app:cardElevation="0dp"
-        app:cardCornerRadius="7dp"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <org.commcare.views.connect.connecttextview.ConnectMediumTextView
-        android:id="@+id/tvChannelName"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:text="Channel Name"
-        android:textColor="@color/black"
-        android:textSize="15sp"
-        app:layout_constraintStart_toEndOf="@+id/imgChannel"
-        app:layout_constraintTop_toTopOf="@+id/imgChannel" />
+        <androidx.cardview.widget.CardView
+            android:id="@+id/imgChannel"
+            android:layout_width="45dp"
+            android:layout_height="45dp"
+            app:cardBackgroundColor="@color/connect_light_grey"
+            app:cardCornerRadius="7dp"
+            app:cardElevation="0dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-        android:id="@+id/tvChannelDescription"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
-        android:text="message preview on top of the card..."
-        android:textColor="@color/connect_grey"
-        android:textSize="13sp"
-        app:layout_constraintEnd_toStartOf="@+id/tvLastChatTime"
-        app:layout_constraintStart_toEndOf="@+id/imgChannel"
-        app:layout_constraintTop_toBottomOf="@+id/tvChannelName" />
+        <org.commcare.views.connect.connecttextview.ConnectMediumTextView
+            android:id="@+id/tvChannelName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:text="Channel Name"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            app:layout_constraintStart_toEndOf="@+id/imgChannel"
+            app:layout_constraintTop_toTopOf="@+id/imgChannel" />
 
-    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-        android:id="@+id/tvLastChatTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="10:00"
-        android:layout_marginRight="10dp"
-        android:textColor="@color/connect_grey"
-        android:textSize="13sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+            android:id="@+id/tvChannelDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="4dp"
+            android:text="message preview on top of the card..."
+            android:textColor="@color/connect_grey"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toStartOf="@+id/tvLastChatTime"
+            app:layout_constraintStart_toEndOf="@+id/imgChannel"
+            app:layout_constraintTop_toBottomOf="@+id/tvChannelName" />
 
-    <org.commcare.views.connect.connecttextview.ConnectRegularTextView
-        android:id="@+id/tvUnreadCount"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="10dp"
-        android:background="@drawable/shape_border_10px_blue"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="2dp"
-        android:text="15"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvLastChatTime" />
+        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+            android:id="@+id/tvLastChatTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:text="10:00"
+            android:textColor="@color/connect_grey"
+            android:textSize="13sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+            android:id="@+id/tvUnreadCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="10dp"
+            android:background="@drawable/shape_border_10px_blue"
+            android:paddingHorizontal="8dp"
+            android:paddingVertical="2dp"
+            android:text="15"
+            android:textColor="@color/white"
+            android:textSize="10sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvLastChatTime" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="2dp"
         android:layout_marginHorizontal="10dp"
         android:background="@color/connect_divider_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvUnreadCount" />
+        app:layout_constraintTop_toBottomOf="@+id/constraint" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/res/layout/item_chat_left_view.xml b/app/res/layout/item_chat_left_view.xml
new file mode 100644
index 000000000..97773416c
--- /dev/null
+++ b/app/res/layout/item_chat_left_view.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="start">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/guideline"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/edge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@null"
+            android:src="@drawable/ic_connect_message_receiver_edge" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@+id/edge"
+            android:background="@drawable/ic_connect_message_receiver_bg"
+            android:orientation="vertical"
+            android:padding="10dp">
+
+            <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                android:id="@+id/tvChatMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/roboto_regular"
+                android:text="Some dummy text message from user A"
+                android:textColor="@color/white"
+                android:textSize="14sp" />
+
+            <org.commcare.views.connect.connecttextview.ConnectRegularTextView
+                android:id="@+id/tvUserName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="3dp"
+                android:fontFamily="@font/roboto_regular"
+                android:text="11:00 AM"
+                android:textColor="@color/white"
+                android:textSize="11sp" />
+
+        </LinearLayout>
+    </RelativeLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.7" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/layout/item_chat_right_view.xml b/app/res/layout/item_chat_right_view.xml
new file mode 100644
index 000000000..c95729b50
--- /dev/null
+++ b/app/res/layout/item_chat_right_view.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="end">
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="5dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/guideline"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/edge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:src="@drawable/ic_connect_message_sender_edge" />
+
+        <LinearLayout
+            android:id="@+id/llChatMsg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/edge"
+            android:background="@drawable/ic_connect_message_sender_bg"
+            android:orientation="vertical"
+            android:padding="8dp">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvChatMessage"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/roboto_regular"
+                android:text="Some dummy text message from user A"
+                android:textColor="@color/connect_message_sender_text_color"
+                android:textSize="14sp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvUserName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/roboto_regular"
+                    android:text="12:00 AM"
+                    android:textColor="@color/connect_message_sender_text_color"
+                    android:textSize="11sp" />
+
+                <ImageView
+                    android:id="@+id/imgMessageReadStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:src="@drawable/ic_connect_message_read" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </RelativeLayout>
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.3" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/res/navigation/nav_graph_connect_messaging.xml b/app/res/navigation/nav_graph_connect_messaging.xml
index 97bc463af..8633cda44 100644
--- a/app/res/navigation/nav_graph_connect_messaging.xml
+++ b/app/res/navigation/nav_graph_connect_messaging.xml
@@ -7,7 +7,17 @@
 
     <fragment
         android:id="@+id/channelListFragment"
-        android:name="org.commcare.fragments.connectMessaging.ChannelListFragment"
+        android:name="org.commcare.fragments.connectMessaging.ConnectMessageChannelListFragment"
         android:label="Message"
-        tools:layout="@layout/fragment_channel_list" />
+        tools:layout="@layout/fragment_channel_list" >
+        <action
+            android:id="@+id/action_channelListFragment_to_connectMessageFragment"
+            app:destination="@id/connectMessageFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/connectMessageFragment"
+        android:name="org.commcare.fragments.connectMessaging.ConnectMessageFragment"
+        android:label="Channel Name"
+        tools:layout="@layout/fragment_connect_message" />
 </navigation>
\ No newline at end of file
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 217cfaca4..174aca29d 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -171,4 +171,7 @@
     <color name="connect_aquva">#88BEE1</color>
     <color name="connect_green">#16A085</color>
     <color name="connect_red">#EA6944</color>
+    <color name="connect_message_receiver_bg">#5C6FD0</color>
+    <color name="connect_message_sender_bg">#F1F5F9</color>
+    <color name="connect_message_sender_text_color">#334155</color>
 </resources>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 79f3f4b01..7e0318ffe 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -43,6 +43,9 @@
     <string name="ConnectInitiateUserAccountDeactivationURL">https://connectid.dimagi.com/users/recover/initiate_deactivation</string>
     <string name="ConnectConfirmUserAccountDeactivationURL">https://connectid.dimagi.com/users/recover/confirm_deactivation</string>
 
+    <!--    Connect Messaging URLs-->
+    <string name="ConnectMessageRetrieveMessagesURL">https://connectid.dimagi.com/users/retrieve_messages</string>
+
     <!-- region: All strings for multiple apps and app-agnostic properties -->
 
     <string name="key_server">https://pact.dimagi.com/keys/getkey</string>
diff --git a/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java b/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
index 4849ec4a9..50e199340 100644
--- a/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
+++ b/app/src/org/commcare/activities/connect/ConnectMessagingActivity.java
@@ -9,7 +9,6 @@
 import android.view.View;
 import android.view.Window;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -22,7 +21,7 @@
 import androidx.navigation.ui.NavigationUI;
 
 import org.commcare.dalvik.R;
-import org.commcare.fragments.connectMessaging.ChannelListFragment;
+import org.commcare.fragments.connectMessaging.ConnectMessageChannelListFragment;
 
 public class ConnectMessagingActivity extends AppCompatActivity {
 
@@ -92,8 +91,8 @@ public void sendSearchQueryToFragment(String query) {
         NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment_connect_messaging);
         if (navHostFragment != null) {
             Fragment currentFragment = navHostFragment.getChildFragmentManager().getFragments().get(0);
-            if (currentFragment instanceof ChannelListFragment) {
-                ((ChannelListFragment) currentFragment).onSearchQueryReceived(query);
+            if (currentFragment instanceof ConnectMessageChannelListFragment) {
+                ((ConnectMessageChannelListFragment) currentFragment).onSearchQueryReceived(query);
             }
         }
     }
diff --git a/app/src/org/commcare/adapters/ChannelAdapter.java b/app/src/org/commcare/adapters/ChannelAdapter.java
index 0951e18f0..5a8e4328e 100644
--- a/app/src/org/commcare/adapters/ChannelAdapter.java
+++ b/app/src/org/commcare/adapters/ChannelAdapter.java
@@ -1,7 +1,6 @@
 package org.commcare.adapters;
 
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
@@ -11,8 +10,10 @@
 
 public class ChannelAdapter extends RecyclerView.Adapter<ChannelAdapter.ChannelViewHolder> {
 
+    private final OnChannelClickListener clickListener;
 
-    public ChannelAdapter() {
+    public ChannelAdapter(OnChannelClickListener clickListener) {
+        this.clickListener = clickListener;
     }
 
     @NonNull
@@ -23,7 +24,7 @@ public ChannelViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewT
 
     @Override
     public void onBindViewHolder(@NonNull ChannelViewHolder holder, int position) {
-        holder.bind(holder.binding);
+        holder.bind(holder.binding, position, clickListener);
     }
 
     @Override
@@ -40,8 +41,16 @@ public ChannelViewHolder(@NonNull ItemChannelBinding binding) {
             this.binding = binding;
         }
 
-        public void bind(ItemChannelBinding binding) {
-            binding.itemRootLayout.setOnClickListener(view -> {});
+        public void bind(ItemChannelBinding binding, int position, OnChannelClickListener clickListener) {
+            binding.itemRootLayout.setOnClickListener(view -> {
+                if (clickListener != null) {
+                    clickListener.onChannelClick(position);
+                }
+            });
         }
     }
+
+    public interface OnChannelClickListener {
+        void onChannelClick(int position);
+    }
 }
diff --git a/app/src/org/commcare/adapters/ConnectMessageAdapter.java b/app/src/org/commcare/adapters/ConnectMessageAdapter.java
new file mode 100644
index 000000000..a15a4888f
--- /dev/null
+++ b/app/src/org/commcare/adapters/ConnectMessageAdapter.java
@@ -0,0 +1,83 @@
+package org.commcare.adapters;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.commcare.dalvik.databinding.ItemChatLeftViewBinding;
+import org.commcare.dalvik.databinding.ItemChatRightViewBinding;
+import org.commcare.fragments.connectMessaging.ConnectMessageChatData;
+
+import java.util.ArrayList;
+
+public class ConnectMessageAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public static final int LEFTVIEW = 0;
+    public static final int RIGHTVIEW = 1;
+    ArrayList<ConnectMessageChatData> dummyData;
+
+    public ConnectMessageAdapter(ArrayList<ConnectMessageChatData> dummyData) {
+        this.dummyData = dummyData;
+    }
+
+    public static class LeftViewHolder extends RecyclerView.ViewHolder {
+        ItemChatLeftViewBinding binding;
+
+        public LeftViewHolder(ItemChatLeftViewBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void bind() {
+
+        }
+    }
+
+    public static class RightViewHolder extends RecyclerView.ViewHolder {
+        ItemChatRightViewBinding binding;
+
+        public RightViewHolder(ItemChatRightViewBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void bind() {
+
+        }
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        if (viewType == LEFTVIEW) {
+            ItemChatLeftViewBinding binding = ItemChatLeftViewBinding.inflate(
+                    LayoutInflater.from(parent.getContext()), parent, false);
+            return new LeftViewHolder(binding);
+        } else {
+            ItemChatRightViewBinding binding = ItemChatRightViewBinding.inflate(
+                    LayoutInflater.from(parent.getContext()), parent, false);
+            return new RightViewHolder(binding);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (getItemViewType(position) == LEFTVIEW) {
+            ((LeftViewHolder) holder).bind();
+        } else {
+            ((RightViewHolder) holder).bind();
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return dummyData.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return dummyData.get(position).getType() == LEFTVIEW ? LEFTVIEW : RIGHTVIEW;
+    }
+}
diff --git a/app/src/org/commcare/connect/network/ApiConnectId.java b/app/src/org/commcare/connect/network/ApiConnectId.java
index f330c3931..d252ab2b3 100644
--- a/app/src/org/commcare/connect/network/ApiConnectId.java
+++ b/app/src/org/commcare/connect/network/ApiConnectId.java
@@ -424,4 +424,10 @@ public static boolean confirmUserDeactivation(Context context, String phone, Str
         return ConnectNetworkHelper.post(context, context.getString(urlId),
                 API_VERSION_CONNECT_ID, authInfo, params, false, false, callback);
     }
+
+    public static boolean retrieveChannel(Context context,IApiCallback callback) {
+        return ConnectNetworkHelper.get(context,
+                context.getString(R.string.ConnectMessageRetrieveMessagesURL),
+                API_VERSION_CONNECT_ID, new AuthInfo.NoAuth(), null, false, callback);
+    }
 }
diff --git a/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java b/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java
deleted file mode 100644
index 96f0a630f..000000000
--- a/app/src/org/commcare/fragments/connectMessaging/ChannelListFragment.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.commcare.fragments.connectMessaging;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import org.commcare.adapters.ChannelAdapter;
-import org.commcare.dalvik.databinding.FragmentChannelListBinding;
-
-public class ChannelListFragment extends Fragment {
-
-    private FragmentChannelListBinding binding;
-
-    public static ChannelListFragment newInstance() {
-        ChannelListFragment fragment = new ChannelListFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        binding = FragmentChannelListBinding.inflate(inflater, container, false);
-        View view = binding.getRoot();
-
-        binding.rvChannel.setLayoutManager(new LinearLayoutManager(getContext()));
-        ChannelAdapter channelAdapter = new ChannelAdapter();
-        binding.rvChannel.setAdapter(channelAdapter);
-
-        return view;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        binding = null;
-    }
-
-    public void onSearchQueryReceived(String query) {
-    }
-}
diff --git a/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java
new file mode 100644
index 000000000..4550eb8cb
--- /dev/null
+++ b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java
@@ -0,0 +1,100 @@
+package org.commcare.fragments.connectMessaging;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.navigation.NavDirections;
+import androidx.navigation.Navigation;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import org.commcare.adapters.ChannelAdapter;
+import org.commcare.connect.network.ApiConnectId;
+import org.commcare.connect.network.IApiCallback;
+import org.commcare.dalvik.R;
+import org.commcare.dalvik.databinding.FragmentChannelListBinding;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+
+public class ConnectMessageChannelListFragment extends Fragment {
+
+    private FragmentChannelListBinding binding;
+
+    public static ConnectMessageChannelListFragment newInstance() {
+        ConnectMessageChannelListFragment fragment = new ConnectMessageChannelListFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentChannelListBinding.inflate(inflater, container, false);
+        View view = binding.getRoot();
+
+        binding.rvChannel.setLayoutManager(new LinearLayoutManager(getContext()));
+        ChannelAdapter channelAdapter = new ChannelAdapter(position -> {
+            NavDirections directions;
+            directions = ConnectMessageChannelListFragmentDirections.actionChannelListFragmentToConnectMessageFragment();
+            Navigation.findNavController(binding.rvChannel).navigate(directions);
+        });
+        binding.rvChannel.setAdapter(channelAdapter);
+//        retrieveChannel();
+        return view;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    public void onSearchQueryReceived(String query) {
+    }
+
+    public void retrieveChannel() {
+        IApiCallback callback = new IApiCallback() {
+            @Override
+            public void processSuccess(int responseCode, InputStream responseData) {
+                Log.e("DEBUG_TESTING", "processSuccess: ");
+            }
+
+            @Override
+            public void processFailure(int responseCode, IOException e) {
+                Log.e("DEBUG_TESTING", "processFailure: " + responseCode);
+                String message = "";
+                if (responseCode > 0) {
+                    message = String.format(Locale.getDefault(), "(%d)", responseCode);
+                } else if (e != null) {
+                    message = e.toString();
+                }
+            }
+
+            @Override
+            public void processNetworkFailure() {
+                Log.e("DEBUG_TESTING", "processNetworkFailure: ");
+            }
+
+            @Override
+            public void processOldApiError() {
+                Log.e("DEBUG_TESTING", "processOldApiError: ");
+            }
+        };
+
+        boolean isBusy;
+
+        isBusy = !ApiConnectId.retrieveChannel(requireActivity(), callback);
+
+        if (isBusy) {
+            Toast.makeText(requireActivity(), R.string.busy_message, Toast.LENGTH_SHORT).show();
+        }
+    }
+}
diff --git a/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java
new file mode 100644
index 000000000..819ee4957
--- /dev/null
+++ b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java
@@ -0,0 +1,59 @@
+package org.commcare.fragments.connectMessaging;
+
+public class ConnectMessageChatData {
+
+    private int type;
+    private String message;
+    private String userName;
+    private int countUnread;
+    private boolean isMessageRead;
+
+    // Constructor with parameters
+    public ConnectMessageChatData(int type, String message, String userName, boolean isMessageRead) {
+        this.type = type;
+        this.message = message;
+        this.userName = userName;
+        this.isMessageRead = isMessageRead;
+    }
+
+    // Getters and setters
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public int getCountUnread() {
+        return countUnread;
+    }
+
+    public void setCountUnread(int countUnread) {
+        this.countUnread = countUnread;
+    }
+
+    public boolean isMessageRead() {
+        return isMessageRead;
+    }
+
+    public void setMessageRead(boolean messageRead) {
+        isMessageRead = messageRead;
+    }
+}
diff --git a/app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java
new file mode 100644
index 000000000..41d9e7409
--- /dev/null
+++ b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java
@@ -0,0 +1,91 @@
+package org.commcare.fragments.connectMessaging;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import org.commcare.adapters.ConnectMessageAdapter;
+import org.commcare.dalvik.R;
+import org.commcare.dalvik.databinding.FragmentConnectMessageBinding;
+
+import java.util.ArrayList;
+
+public class ConnectMessageFragment extends Fragment {
+
+    private FragmentConnectMessageBinding binding;
+
+    public static ConnectMessageFragment newInstance(String param1, String param2) {
+        ConnectMessageFragment fragment = new ConnectMessageFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        binding = FragmentConnectMessageBinding.inflate(inflater, container, false);
+        handleSendButtonListener();
+        setChatAdapter();
+        return binding.getRoot();
+    }
+
+    private void handleSendButtonListener() {
+        binding.etMessage.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() > 0) {
+                    binding.imgSendMessage.setVisibility(View.VISIBLE);
+//                    binding.etMessage.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); // Remove drawableEnd
+                } else {
+                    binding.imgSendMessage.setVisibility(View.GONE);
+//                    binding.etMessage.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_connect_message_photo_camera, 0); // Add back drawableEnd
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+        });
+    }
+
+    private void setChatAdapter() {
+        ConnectMessageAdapter connectMessageAdapter = new ConnectMessageAdapter(getDummyData());
+        binding.rvChat.setAdapter(connectMessageAdapter);
+    }
+
+    public static ArrayList<ConnectMessageChatData> getDummyData() {
+        ArrayList<ConnectMessageChatData> dataList = new ArrayList<>();
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "I commented on Figma, I want to add some fancy icons. Do you have any icon set?", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "I am in a process of designing some. When do you need them?", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Hi! Are you there", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "Yes", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Do you want to go out", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "Sorry I am busy!!", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "I commented on Figma, I want to add some fancy icons. Do you have any icon set?", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "I am in a process of designing some. When do you need them?", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Hi! Are you there", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "Yes", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Do you want to go out", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "Sorry I am busy!!", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "I commented on Figma, I want to add some fancy icons. Do you have any icon set?", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "I am in a process of designing some. When do you need them?", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Hi! Are you there", "@Esther", true));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.LEFTVIEW, "Yes", "@Jane", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Do you want to go out", "@Esther", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Do you want to go out", "@Esther", false));
+        dataList.add(new ConnectMessageChatData(ConnectMessageAdapter.RIGHTVIEW, "Do you want to go out", "@Esther", false));
+        return dataList;
+    }
+}
+