Merge branch 'main' of github.com:lambiengcode/compose_chatgpt_kotlin

Author: lambiengcode

.idea/deploymentTargetDropDown.xml

@@ -97,8 +97,8 @@ The project also contains other files and directories at the root level, includi
  - [ ] stream: false
  - [ ] gpt-3.5-turbo
  - [ ] text-davinci-003, text-curie-001, text-babbage-001, text-ada-001
-- [ ] Stop generating
-- [ ] Delete conversation
+- [x] Stop generating
+- [x] Delete conversation
 - [ ] Settings for ChatGPT
 - [ ] Light/Dart Themes
 
@@ -108,6 +108,10 @@ The project also contains other files and directories at the root level, includi
 - [OpenAI GPT-3 API](https://beta.openai.com/docs/api-reference/introduction)
 - [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html)
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=lambiengcode/compose-chatgpt-kotlin-android-chatbot&type=Date)](https://star-history.com/#lambiengcode/compose-chatgpt-kotlin-android-chatbot&Date)
+
 ## Contributing
 Contributions are welcome! Please feel free to submit a pull request or open an issue if you encounter any problems or have suggestions for improvements.
 

README.md

@@ -63,8 +63,10 @@ class MainActivity : ComponentActivity() {
  focusManager.clearFocus()
  }
  }
-
- ChatGPTLiteTheme() {
+ val darkTheme = remember(key1 = "darkTheme") {
+ mutableStateOf(true)
+ }
+ ChatGPTLiteTheme(darkTheme.value) {
  Surface(
  color = MaterialTheme.colorScheme.background,
  ) {
@@ -79,18 +81,23 @@ class MainActivity : ComponentActivity() {
  scope.launch {
  drawerState.close()
  }
+ },
+ onIconClicked = {
+ darkTheme.value = !darkTheme.value
  }
  ) {
- Column( modifier = Modifier
- .fillMaxSize()) {
- AppBar (onClickMenu = {
- scope.launch {
- drawerState.open()
- }
- })
- Divider()
- Conversation()
- }
+ Column(
+ modifier = Modifier
+ .fillMaxSize()
+ ) {
+ AppBar(onClickMenu = {
+ scope.launch {
+ drawerState.open()
+ }
+ })
+ Divider()
+ Conversation()
+ }
  }
  }
  }

app/src/main/java/com/chatgptlite/wanted/MainActivity.kt

@@ -8,4 +8,5 @@ const val urlToAvatarGPT = "https://gptapk.com/wp-content/uploads/2023/02/chatgp
 const val urlToGithub = "https://github.com/lambiengcode"
 
 const val matchResultString = "\"text\":"
-const val matchResultTurboString = "\"content\":"
+const val matchResultTurboString = "\"content\":"
+const val conversationTestTag = "ConversationTestTag"

app/src/main/java/com/chatgptlite/wanted/constants/Constants.kt

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

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

@@ -1,7 +1,11 @@
 package com.chatgptlite.wanted.data.remote
 
+import android.content.ContentValues
+import android.util.Log
 import com.chatgptlite.wanted.constants.conversationCollection
+import com.chatgptlite.wanted.helpers.DataHolder
 import com.chatgptlite.wanted.models.ConversationModel
+import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.QuerySnapshot
@@ -11,12 +15,11 @@ import javax.inject.Inject
 class ConversationRepositoryImpl @Inject constructor(
  private val fsInstance: FirebaseFirestore,
 ) : ConversationRepository {
+
  override suspend fun fetchConversations(): MutableList<ConversationModel> {
- val result: QuerySnapshot = fsInstance.collection(conversationCollection)
- .orderBy("createdAt", Query.Direction.DESCENDING).get().await()
 
- if (result.documents.isNotEmpty()) {
- val documents = result.documents
+ if (getFireBaseSnapShot().documents.isNotEmpty()) {
+ val documents = getFireBaseSnapShot().documents
 
  return documents.map {
  it.toObject(ConversationModel::class.java)
@@ -31,8 +34,45 @@ class ConversationRepositoryImpl @Inject constructor(
  return conversation
  }
 
- override fun deleteConversation() {
- TODO("Not yet implemented")
+ override suspend fun deleteConversation(conversationId: String) {
+ var desiredKey: String? = null
+
+ getFireBaseSnapShot().documents.map { documentSnapshot ->
+ val id = documentSnapshot.getString("id")
+ if (id == conversationId) {
+ desiredKey = documentSnapshot.id
+ } else {
+ null
+ }
+ }
+ DataHolder.docPath = desiredKey.toString()
+
+ val docRef = fsInstance
+ .collection("conversations")
+ .document(DataHolder.docPath)
+
+ // Remove the 'capital' field from the document
+ val updates = hashMapOf<String, Any>(
+ "id" to FieldValue.delete(),
+ "title" to FieldValue.delete(),
+ "createdAt" to FieldValue.delete()
+ )
+ docRef.update(updates)
+ .addOnSuccessListener {
+ Log.d(
+ ContentValues.TAG,
+ "DocumentSnapshot successfully deleted from message!"
+ )
+ }
+ .addOnFailureListener { e ->
+ Log.w(
+ ContentValues.TAG,
+ "Error deleting document", e
+ )
+ }
  }
+ private suspend fun getFireBaseSnapShot() =
+ fsInstance.collection(conversationCollection)
+ .orderBy("createdAt", Query.Direction.DESCENDING).get().await()
 
 }

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

@@ -6,5 +6,5 @@ import kotlinx.coroutines.flow.Flow
 interface MessageRepository {
  fun fetchMessages(conversationId: String): Flow<List<MessageModel>>
  fun createMessage(message: MessageModel): MessageModel
- fun deleteMessage(message: MessageModel)
+ fun deleteMessage()
 }

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

@@ -1,7 +1,11 @@
 package com.chatgptlite.wanted.data.remote
 
+import android.content.ContentValues
+import android.util.Log
 import com.chatgptlite.wanted.constants.messageCollection
+import com.chatgptlite.wanted.helpers.DataHolder
 import com.chatgptlite.wanted.models.MessageModel
+import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.QuerySnapshot
@@ -14,9 +18,13 @@ import javax.inject.Inject
 class MessageRepositoryImpl @Inject constructor(
  private val fsInstance: FirebaseFirestore,
 ) : MessageRepository {
- override fun fetchMessages(conversationId: String): Flow<List<MessageModel>> = callbackFlow {
- val result: QuerySnapshot =
- fsInstance.collection(messageCollection).whereEqualTo("conversationId", conversationId)
+ private lateinit var result: QuerySnapshot
+ override fun fetchMessages(conversationId: String): Flow<List<MessageModel>> =
+ callbackFlow {
+ result =
+ fsInstance
+ .collection(messageCollection)
+ .whereEqualTo("conversationId", conversationId)
  .orderBy("createdAt", Query.Direction.DESCENDING).get().await()
 
  if (result.documents.isNotEmpty()) {
@@ -44,7 +52,32 @@ class MessageRepositoryImpl @Inject constructor(
  return message
  }
 
- override fun deleteMessage(message: MessageModel) {
- TODO("Not yet implemented")
+ override fun deleteMessage() {
+ val docRef = fsInstance
+ .collection("messages")
+ .document(DataHolder.docPath)
+
+ // Remove the fields from the document
+ val updates = hashMapOf<String, Any>(
+ "answer" to FieldValue.delete(),
+ "conversationId" to FieldValue.delete(),
+ "createdAt" to FieldValue.delete(),
+ "id" to FieldValue.delete(),
+ "question" to FieldValue.delete()
+ )
+ docRef.update(updates)
+ .addOnSuccessListener {
+ Log.d(
+ ContentValues.TAG,
+ "DocumentSnapshot successfully deleted from message!"
+ )
+ }
+ .addOnFailureListener { e ->
+ Log.w(
+ ContentValues.TAG,
+ "Error deleting document", e
+ )
+ }
+
  }
 }

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

@@ -0,0 +1,5 @@
+package com.chatgptlite.wanted.helpers
+
+object DataHolder {
+ var docPath: String = ""
+}