Feat/chat/channel message screen

.github/workflows/AndroidBuild.yml

@@ -29,12 +29,31 @@ jobs:
           SERVICE_KEY: ${{ secrets.SERVICE_KEY }}
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           POWERSYNC_URL: ${{ secrets.POWERSYNC_URL }}
+          STADIA_MAPS_KEY: ${{ secrets.STADIA_MAPS_KEY }}
+          STREAM_SDK_KEY: ${{ secrets.STREAM_SDK_KEY }}
+          STREAM_SDK_SECRET: ${{ secrets.STREAM_SDK_SECRET }}
         run: |
           sed -e "s|SAFE_DEFAULT_VALUE_SERVICE_KEY|$SERVICE_KEY|g;" \
               -e "s|SAFE_DEFAULT_VALUE_SUPABASE_KEY|$SUPABASE_KEY|g;" \
               -e "s|SAFE_DEFAULT_VALUE_SUPABASE_URL|$SUPABASE_URL|g;" \
-              -e "s|SAFE_DEFAULT_VALUE_POWERSYNC_URL|$POWERSYNC_URL|g;" secrets.defaults.properties > secrets.properties
+              -e "s|SAFE_DEFAULT_VALUE_POWERSYNC_URL|$POWERSYNC_URL|g;" \
+              -e "s|SAFE_DEFAULT_STADIA_MAPS_KEY|$STADIA_MAPS_KEY|g;" \
+              -e "s|SAFE_DEFAULT_VALUE_STREAM_SDK_KEY|$STREAM_SDK_KEY|g;" \
+              -e "s|SAFE_DEFAULT_VALUE_STREAM_SDK_SECRET|$STREAM_SDK_SECRET|g;" secrets.defaults.properties > secrets.properties
 
+      # Load google-services.json from the secrets
+      - name: Setup google-services.json
+        env:
+          GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }}
+        run: |
+          echo "$GOOGLE_SERVICES" | base64 --decode > ./app/google-services.json
+
+      # Load service-account.json from the secrets
+      - name: Setup service-account.json
+        env:
+          SERVICE_ACCOUNT: ${{ secrets.SERVICE_ACCOUNT }}
+        run: |
+          echo "$SERVICE_ACCOUNT" | base64 --decode > ./supabase/functions/service-account.json
 
       - name: Build with Gradle
         run: ./gradlew build

.github/workflows/ci.yml

@@ -94,12 +94,17 @@ jobs:
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           POWERSYNC_URL: ${{ secrets.POWERSYNC_URL }}
           STADIA_MAPS_KEY: ${{ secrets.STADIA_MAPS_KEY }}
+          STREAM_SDK_KEY: ${{ secrets.STREAM_SDK_KEY }}
+          STREAM_SDK_SECRET: ${{ secrets.STREAM_SDK_SECRET }}
         run: |
           sed -e "s|SAFE_DEFAULT_VALUE_SERVICE_KEY|$SERVICE_KEY|g;" \
               -e "s|SAFE_DEFAULT_VALUE_SUPABASE_KEY|$SUPABASE_KEY|g;" \
               -e "s|SAFE_DEFAULT_VALUE_SUPABASE_URL|$SUPABASE_URL|g;" \
               -e "s|SAFE_DEFAULT_VALUE_POWERSYNC_URL|$POWERSYNC_URL|g;" \
-              -e "s|SAFE_DEFAULT_STADIA_MAPS_KEY|$STADIA_MAPS_KEY|g;" secrets.defaults.properties > secrets.properties
+              -e "s|SAFE_DEFAULT_STADIA_MAPS_KEY|$STADIA_MAPS_KEY|g;" \
+              -e "s|SAFE_DEFAULT_VALUE_STREAM_SDK_KEY|$STREAM_SDK_KEY|g;" \
+              -e "s|SAFE_DEFAULT_VALUE_STREAM_SDK_SECRET|$STREAM_SDK_SECRET|g;" secrets.defaults.properties > secrets.properties
+
 
       # Load google-services.json from the secrets
       - name: Setup google-services.json

app/src/main/AndroidManifest.xml

@@ -26,11 +26,18 @@
         android:usesCleartextTraffic="false"
         tools:targetApi="31">
         <activity
-            android:name="com.android.periodpals.MainActivity"
+            android:name=".ChannelActivity"
+            android:exported="false"
+            android:label="@string/title_activity_channel"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.PeriodPals"
+            android:windowSoftInputMode="adjustResize"/>
+        <activity
+            android:name=".MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.PeriodPals"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.PeriodPals">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -45,6 +52,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-
     </application>
+
 </manifest>

app/src/main/java/com/android/periodpals/ChannelActivity.kt

@@ -0,0 +1,44 @@
+package com.android.periodpals
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import io.getstream.chat.android.compose.ui.messages.MessagesScreen
+import io.getstream.chat.android.compose.ui.theme.ChatTheme
+import io.getstream.chat.android.compose.viewmodel.messages.MessagesViewModelFactory
+
+/**
+ * Activity that displays a chat channel. It uses the [MessagesScreen] to display the messages of a
+ * channel.
+ */
+class ChannelActivity : ComponentActivity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    // Load the ID of the selected channel
+    val channelId = intent.getStringExtra(KEY_CHANNEL_ID)!!
+
+    // Add the MessagesScreen to your UI
+    setContent {
+      ChatTheme {
+        MessagesScreen(
+            viewModelFactory =
+                MessagesViewModelFactory(context = this, channelId = channelId, messageLimit = 30),
+            onBackPressed = { finish() })
+      }
+    }
+  }
+
+  // Create an intent to start this Activity, with a given channelId
+  companion object {
+    private const val KEY_CHANNEL_ID = "channelId"
+
+    fun getIntent(context: Context, channelId: String): Intent {
+      return Intent(context, ChannelActivity::class.java).apply {
+        putExtra(KEY_CHANNEL_ID, channelId)
+      }
+    }
+  }
+}

app/src/main/java/com/android/periodpals/MainActivity.kt

@@ -38,6 +38,7 @@ import com.android.periodpals.ui.alert.CreateAlertScreen
 import com.android.periodpals.ui.alert.EditAlertScreen
 import com.android.periodpals.ui.authentication.SignInScreen
 import com.android.periodpals.ui.authentication.SignUpScreen
+import com.android.periodpals.ui.chat.ChannelsScreenContainer
 import com.android.periodpals.ui.map.MapScreen
 import com.android.periodpals.ui.navigation.NavigationActions
 import com.android.periodpals.ui.navigation.Route
@@ -51,7 +52,6 @@ import com.android.periodpals.ui.timer.TimerScreen
 import com.google.android.gms.common.GoogleApiAvailability
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.logger.ChatLogLevel
-import io.getstream.chat.android.compose.ui.channels.ChannelsScreen
 import io.getstream.chat.android.compose.ui.theme.ChatTheme
 import io.getstream.chat.android.models.InitializationState
 import io.getstream.chat.android.offline.plugin.factory.StreamOfflinePluginFactory
@@ -64,7 +64,6 @@ import io.github.jan.supabase.storage.Storage
 import org.osmdroid.config.Configuration
 
 private const val TAG = "MainActivity"
-private const val CHANNEL_SCREEN_TITLE = "Your Chats"
 
 class MainActivity : ComponentActivity() {
   private lateinit var gpsService: GPSServiceImpl
@@ -227,8 +226,10 @@ fun PeriodPalsApp(
         AlertListsScreen(
             alertViewModel,
             authenticationViewModel,
+            userViewModel,
             locationViewModel,
             gpsService,
+            chatViewModel,
             navigationActions)
       }
       composable(Screen.EDIT_ALERT) {
@@ -247,14 +248,17 @@ fun PeriodPalsApp(
             InitializationState.COMPLETE -> {
               Log.d(TAG, "Client initialization completed")
               Log.d(TAG, "Client connection state $clientConnectionState")
-              ChannelsScreen(
-                  title = CHANNEL_SCREEN_TITLE,
-                  isShowingHeader = true,
-                  onChannelClick = {
-                    /** TODO: implement channels here */
-                  },
-                  onBackPressed = { navigationActions.navigateTo(Screen.ALERT_LIST) },
-              )
+
+              ChannelsScreenContainer(navigationActions = navigationActions) {
+                io.getstream.chat.android.compose.ui.channels.ChannelsScreen(
+                    isShowingHeader = false,
+                    onChannelClick = { channel ->
+                      val intent = ChannelActivity.getIntent(context, channel.cid)
+                      context.startActivity(intent)
+                    },
+                    onBackPressed = { navigationActions.navigateTo(Screen.ALERT_LIST) },
+                )
+              }
             }
             InitializationState.INITIALIZING -> {
               Log.d(TAG, "Client initializing")

app/src/main/java/com/android/periodpals/model/chat/ChatViewModel.kt

@@ -47,7 +47,7 @@ class ChatViewModel(private val chatClient: ChatClient) : ViewModel() {
               io.getstream.chat.android.models.User(
                   id = uid, name = profile.name, image = userImage)
 
-          chatClient.connectUser(user = user, token = token).enqueue()
+          chatClient.connectUser(user = user, token = token).execute()
           Log.d(TAG, "User connected successfully.")
           onSuccess()
         },
@@ -56,4 +56,93 @@ class ChatViewModel(private val chatClient: ChatClient) : ViewModel() {
           onFailure(it)
         })
   }
+
+  /**
+   * Creates a channel between the current user and a pal.
+   *
+   * @param myUid The current user's UID.
+   * @param palUid The pal's UID.
+   * @param myName The current user's name.
+   * @param palName The pal's name.
+   * @return The CID (Channel ID) of the created channel of the format `channelType:channelId`.
+   */
+  fun createChannel(myUid: String, palUid: String, myName: String, palName: String): String? {
+    Log.d(TAG, "Creating channel between $myUid and $palUid.")
+    val channelId = generateChannelId(myUid, palUid)
+    val channelType = "messaging"
+    var channelCid = ""
+
+    try {
+      channelCid = generateCid(channelType, channelId)
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to generate channel CID: ${e.message}")
+      return null
+    }
+
+    // Create a unique channel name for the user and pal
+    val channelName = generateChannelName(myUid, palUid, myName, palName)
+
+    chatClient
+        .createChannel(
+            channelType = channelType,
+            channelId = channelId,
+            memberIds = listOf(myUid, palUid),
+            extraData = mapOf("name" to channelName) // Use dynamic name based on users
+            )
+        .enqueue { result ->
+          if (result.isSuccess) {
+            Log.d(TAG, "Channel created successfully!")
+          } else {
+            Log.e(TAG, "Failed to create channel!")
+          }
+        }
+    return channelCid
+  }
+
+  /**
+   * Generates a unique channel name by combining and sorting the names of the current user and the
+   * pal.
+   *
+   * @param myUid The current user's UID.
+   * @param palUid The pal's UID.
+   * @param myName The current user's name.
+   * @param palName The pal's name.
+   * @return A unique channel name generated by concatenating the sorted names with a separator.
+   */
+  fun generateChannelName(myUid: String, palUid: String, myName: String, palName: String): String {
+    return if (myUid == palUid) {
+      "Self-Chat"
+    } else {
+      val sortedNames = listOf(myName, palName).sorted()
+      sortedNames.joinToString(separator = " & ")
+    }
+  }
+
+  /**
+   * Generates a unique channel ID by combining and sorting the UIDs of the current user and the
+   * pal.
+   *
+   * @param myUid The current user's UID.
+   * @param palUid The pal's UID.
+   * @return A unique channel ID generated by concatenating the sorted UIDs without separators or
+   *   dashes.
+   */
+  fun generateChannelId(myUid: String, palUid: String): String {
+    val sortedUids = listOf(myUid, palUid).sorted()
+    return sortedUids.joinToString(separator = "").replace("-", "")
+  }
+
+  /**
+   * Generates a channel CID (Channel ID) in the format `channelType:channelId`.
+   *
+   * @param channelType The type of the channel (e.g., messaging).
+   * @param channelId The unique identifier for the channel.
+   * @return The generated CID in the format `channelType:channelId`.
+   * @throws IllegalArgumentException if `channelType` or `channelId` is empty.
+   */
+  fun generateCid(channelType: String, channelId: String): String {
+    require(channelType.isNotEmpty()) { "channelType must not be empty" }
+    require(channelId.isNotEmpty()) { "channelId must not be empty" }
+    return listOf(channelType, channelId).joinToString(separator = ":")
+  }
 }

app/src/main/java/com/android/periodpals/resources/C.kt

@@ -214,5 +214,10 @@ object C {
       const val USEFUL_TIP = "usefulTip"
       const val USEFUL_TIP_TEXT = "usefulTipText"
     }
+
+    object ChannelsScreen {
+      const val SCREEN = "channelsScreen"
+      const val CHANNELS = "channels"
+    }
   }
 }