Feat/conversations by device

README.md

@@ -23,7 +23,7 @@ Overall, Compose ChatGPT Kotlin is a powerful and flexible chatbot solution that
 
 
 ## Requirements
-- Android Studio Arctic Fox or later
+- Android Studio Ladybug or later
 - OpenAI API Key
 - Firebase
 

app/build.gradle

@@ -14,7 +14,7 @@ plugins {
 
 android {
     namespace 'com.chatgptlite.wanted'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.chatgptlite.wanted"
@@ -50,7 +50,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.2.0'
+        kotlinCompilerExtensionVersion '1.5.11'
     }
     packagingOptions {
         resources {
@@ -63,18 +63,18 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.activity:activity-compose:1.7.0'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation "androidx.compose.ui:ui:1.7.5"
+    implementation "androidx.compose.ui:ui-tooling-preview:1.7.5"
     implementation 'androidx.compose.material3:material3:1.1.0-beta01'
     implementation 'androidx.compose.ui:ui-viewbinding:1.4.0'
     implementation 'androidx.compose.ui:ui-util:1.4.0'
     implementation 'androidx.compose.material:material-icons-extended:1.4.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.7.5"
+    debugImplementation "androidx.compose.ui:ui-tooling:1.7.5"
+    debugImplementation "androidx.compose.ui:ui-test-manifest:1.7.5"
     def nav_version = "2.5.3"
     implementation("androidx.navigation:navigation-compose:$nav_version")
     implementation("io.coil-kt:coil-compose:2.3.0")
@@ -92,9 +92,9 @@ dependencies {
     implementation 'com.google.firebase:firebase-firestore-ktx'
 
     // Dependency injection
-    implementation "com.google.dagger:hilt-android:2.44"
+    implementation "com.google.dagger:hilt-android:2.48"
     implementation "androidx.hilt:hilt-navigation-compose:1.0.0"
-    kapt "com.google.dagger:hilt-compiler:2.44"
+    kapt "com.google.dagger:hilt-compiler:2.48"
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 

app/src/main/java/com/chatgptlite/wanted/data/remote/ConversationRepository.kt

@@ -3,7 +3,7 @@ package com.chatgptlite.wanted.data.remote
 import com.chatgptlite.wanted.models.ConversationModel
 
 interface ConversationRepository {
-    suspend fun fetchConversations() : MutableList<ConversationModel>
+    suspend fun fetchConversations(deviceId: String) : MutableList<ConversationModel>
     fun newConversation(conversation: ConversationModel) : ConversationModel
     suspend fun deleteConversation(conversationId: String)
 }

app/src/main/java/com/chatgptlite/wanted/data/remote/ConversationRepositoryImpl.kt

@@ -11,14 +11,16 @@ class ConversationRepositoryImpl @Inject constructor(
     private val fsInstance: FirebaseFirestore,
 ) : ConversationRepository {
 
-    override suspend fun fetchConversations(): MutableList<ConversationModel> {
-
-        if (getFireBaseSnapShot().documents.isNotEmpty()) {
-            val documents = getFireBaseSnapShot().documents
+    override suspend fun fetchConversations(deviceId: String): MutableList<ConversationModel> {
+        val snapshot = fsInstance.collection(conversationCollection)
+            .whereEqualTo("deviceId", deviceId)
+            .get()
+            .await()
 
-            return documents.map {
+        if (snapshot.documents.isNotEmpty()) {
+            return snapshot.documents.mapNotNull {
                 it.toObject(ConversationModel::class.java)
-            }.toList() as MutableList<ConversationModel>
+            }.toMutableList()
         }
 
         return mutableListOf()

app/src/main/java/com/chatgptlite/wanted/models/ConversationModel.kt

@@ -5,5 +5,6 @@ import java.util.*
 data class ConversationModel(
     var id: String = Date().time.toString(),
     var title: String = "",
+    var deviceId: String = "",
     var createdAt: Date = Date(),
 )

app/src/main/java/com/chatgptlite/wanted/ui/common/AppScaffold.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.*
 import androidx.compose.material3.DrawerValue.Closed
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.LocalContext
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.chatgptlite.wanted.ui.conversations.ConversationViewModel
 import com.chatgptlite.wanted.ui.theme.BackGroundColor
@@ -24,9 +25,10 @@ fun AppScaffold(
     content: @Composable () -> Unit,
 ) {
     val scope = rememberCoroutineScope()
+    val context = LocalContext.current
 
     scope.launch {
-        conversationViewModel.initialize()
+        conversationViewModel.initialize(context = context)
     }
 
     ModalNavigationDrawer(

app/src/main/java/com/chatgptlite/wanted/ui/conversations/ConversationViewModel.kt

@@ -2,6 +2,9 @@
 
 package com.chatgptlite.wanted.ui.conversations
 
+import android.annotation.SuppressLint
+import android.content.Context
+import android.provider.Settings
 import androidx.lifecycle.ViewModel
 import com.chatgptlite.wanted.data.remote.ConversationRepository
 import com.chatgptlite.wanted.data.remote.MessageRepository
@@ -31,6 +34,7 @@ class ConversationViewModel @Inject constructor(
         MutableStateFlow(HashMap())
     private val _isFetching: MutableStateFlow<Boolean> = MutableStateFlow(false)
     private val _isFabExpanded = MutableStateFlow(false)
+    private val _deviceId: MutableStateFlow<String> = MutableStateFlow("")
 
     val currentConversationState: StateFlow<String> = _currentConversation.asStateFlow()
     val conversationsState: StateFlow<MutableList<ConversationModel>> = _conversations.asStateFlow()
@@ -41,12 +45,12 @@ class ConversationViewModel @Inject constructor(
 
     private var stopReceivingResults = false
 
+    suspend fun initialize(context: Context) {
+        _deviceId.value = _getDeviceUniqueId(context)
 
-
-    suspend fun initialize() {
         _isFetching.value = true
 
-        _conversations.value = conversationRepo.fetchConversations()
+        _conversations.value = conversationRepo.fetchConversations(deviceId = _deviceId.value)
 
         if (_conversations.value.isNotEmpty()) {
             _currentConversation.value = _conversations.value.first().id
@@ -113,6 +117,7 @@ class ConversationViewModel @Inject constructor(
         val newConversation: ConversationModel = ConversationModel(
             id = _currentConversation.value,
             title = title,
+            deviceId = _deviceId.value,
             createdAt = Date(),
         )
 
@@ -223,10 +228,17 @@ class ConversationViewModel @Inject constructor(
 
         _messages.value = messagesMap
     }
+
     fun stopReceivingResults() {
         stopReceivingResults = true
     }
+
     private fun setFabExpanded(expanded: Boolean) {
         _isFabExpanded.value = expanded
     }
+
+    @SuppressLint("HardwareIds")
+    private fun _getDeviceUniqueId(context: Context): String {
+        return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+    }
 }