0.2.4

Author: kirillTolmachev

README.md

@@ -77,9 +77,7 @@ Then need to add implementation of QuickBlox UIKit and QuickBlox SDK to dependen
 
 ```
 dependencies {
-    implementation "com.quickblox:android-ui-kit:0.2.3"
-    implementation "com.quickblox:android-ai-answer-assistant:1.0.1"
-    implementation "com.quickblox:android-ai-translate:1.0.0"
+    implementation "com.quickblox:android-ui-kit:0.2.4"
 
     implementation 'com.quickblox:quickblox-android-sdk-messages:4.1.1'
     implementation 'com.quickblox:quickblox-android-sdk-chat:4.1.1'
@@ -331,4 +329,4 @@ To use your own theme you just need to set it. This method must be called before
 
 ```
 QuickBloxUiKit.setTheme(CustomUiKitTheme())
-```
+```

ui-kit/build.gradle

@@ -10,7 +10,7 @@ ext {
     qbSdkVersion = '4.1.1'
 
     uiKitVersionCode = 1
-    uiKitVersionName = "0.2.3"
+    uiKitVersionName = "0.2.4"
 }
 
 android {
@@ -71,6 +71,7 @@ dependencies {
     // QuickBlox AI
     api "com.quickblox:android-ai-answer-assistant:1.0.1"
     api "com.quickblox:android-ai-translate:1.0.0"
+    api "com.quickblox:android-ai-editing-assistant:1.0.0"
 
     implementation 'androidx.fragment:fragment-ktx:1.5.6'
     implementation 'androidx.core:core-ktx:1.9.0'

ui-kit/src/androidTest/java/com/quickblox/android_ui_kit/BaseTest.kt

@@ -18,21 +18,21 @@ import com.quickblox.core.exception.QBResponseException
 import com.quickblox.users.QBUsers
 import com.quickblox.users.model.QBUser
 
-const val APP_ID = ""
-const val AUTH_KEY = ""
-const val AUTH_SECRET = ""
-const val ACCOUNT_KEY = ""
+const val APP_ID = "75949"
+const val AUTH_KEY = "DdS7zxMEm5Q7DaS"
+const val AUTH_SECRET = "g88RhdOjnDOqFkv"
+const val ACCOUNT_KEY = "uK_8uinNyz8-npTNB6tx"
 
-const val USER_LOGIN = ""
-const val USER_ID = 0
-const val USER_PASSWORD = ""
+const val USER_LOGIN = "qwe11"
+const val USER_ID = 109364779
+const val USER_PASSWORD = "quickblox"
 
-const val OPPONENT_LOGIN = ""
-const val OPPONENT_ID = 0
-const val OPPONENT_PASSWORD = ""
+const val OPPONENT_LOGIN = "qwe22"
+const val OPPONENT_ID = 109364799
+const val OPPONENT_PASSWORD = "quickblox"
 
-const val USER_OPPONENT_ID_1 = 0
-const val USER_OPPONENT_ID_2 = 0
+const val USER_OPPONENT_ID_1 = 109364799
+const val USER_OPPONENT_ID_2 = 131163237
 
 open class BaseTest {
     private var loggedUser: QBUser? = null

ui-kit/src/main/java/com/quickblox/android_ui_kit/QuickBloxUiKit.kt

@@ -6,6 +6,7 @@ package com.quickblox.android_ui_kit
 
 import android.content.Context
 import android.util.Log
+import com.quickblox.android_ai_editing_assistant.QBAIRephrase
 import com.quickblox.android_ai_translate.Languages
 import com.quickblox.android_ai_translate.QBAITranslate
 import com.quickblox.android_ai_translate.exception.QBAITranslateException
@@ -26,6 +27,7 @@ object QuickBloxUiKit {
     private var theme: UiKitTheme = LightUIKitTheme()
     private var enabledAIAnswerAssistant = true
     private var enabledAITranslate = true
+    private var enabledAIRephrase = true
     private var openAIToken: String = ""
     private var proxyServerURL: String = ""
 
@@ -48,6 +50,7 @@ object QuickBloxUiKit {
         if (dependency == null) {
             dependency = DependencyImpl(context)
         }
+        QBAIRephrase.init(context)
         AppLifecycleManager.init()
 
         val defaultLanguage = getDefaultLanguage()
@@ -122,7 +125,7 @@ object QuickBloxUiKit {
             throw RuntimeException("The AI Answer assistant is disabled")
         }
 
-        if (openAIToken.isNotBlank() && proxyServerURL.isNotBlank()) {
+        if (isExistAITokenAndProxyServer()) {
             throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Answer Assistant should be initialized by Open AI Token or QuickBlox Token")
         }
 
@@ -135,7 +138,55 @@ object QuickBloxUiKit {
             throw RuntimeException("The AI Answer assistant is disabled")
         }
 
-        if (openAIToken.isNotBlank() && proxyServerURL.isNotBlank()) {
+        if (isExistAITokenAndProxyServer()) {
+            throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Answer Assistant should be initialized by Open AI Token or QuickBlox Token")
+        }
+
+        return proxyServerURL.isNotBlank()
+    }
+
+    fun enableAIRephraseWithOpenAIToken(openAIToken: String) {
+        if (openAIToken.isBlank()) {
+            throw RuntimeException("The openAIToken shouldn't be empty")
+        }
+        this.openAIToken = openAIToken
+        this.proxyServerURL = ""
+        enabledAIRephrase = true
+    }
+
+    fun enableAIRephraseWithQuickBloxToken(proxyServerURL: String) {
+        if (proxyServerURL.isBlank()) {
+            throw RuntimeException("The proxyServerURL shouldn't be empty")
+        }
+        this.openAIToken = ""
+        this.proxyServerURL = proxyServerURL
+        enabledAIRephrase = true
+    }
+
+    fun disableAIRephrase() {
+        enabledAIRephrase = false
+    }
+
+    fun isAIRephraseEnabledByOpenAIToken(): Boolean {
+        val isNotEnabledAIRephrase = !isEnabledAIRephrase()
+        if (isNotEnabledAIRephrase) {
+            throw RuntimeException("The AI Answer assistant is disabled")
+        }
+
+        if (isExistAITokenAndProxyServer()) {
+            throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Rephrase should be initialized by Open AI Token or QuickBlox Token")
+        }
+
+        return openAIToken.isNotBlank()
+    }
+
+    fun isAIRephraseEnabledByQuickBloxToken(): Boolean {
+        val isNotEnabledAIRephrase = !isEnabledAIRephrase()
+        if (isNotEnabledAIRephrase) {
+            throw RuntimeException("The AI Answer assistant is disabled")
+        }
+
+        if (isExistAITokenAndProxyServer()) {
             throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Answer Assistant should be initialized by Open AI Token or QuickBlox Token")
         }
 
@@ -170,7 +221,7 @@ object QuickBloxUiKit {
             throw RuntimeException("The AI Translate is disabled")
         }
 
-        if (openAIToken.isNotBlank() && proxyServerURL.isNotBlank()) {
+        if (isExistAITokenAndProxyServer()) {
             throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Translate should be initialized by Open AI Token or QuickBlox Token")
         }
 
@@ -183,13 +234,17 @@ object QuickBloxUiKit {
             throw RuntimeException("The AI Translate is disabled")
         }
 
-        if (openAIToken.isNotBlank() && proxyServerURL.isNotBlank()) {
+        if (isExistAITokenAndProxyServer()) {
             throw RuntimeException("Error initialization. There are Open AI Token and Proxy Server Url. The AI Translate should be initialized by Open AI Token or QuickBlox Token")
         }
 
         return proxyServerURL.isNotBlank()
     }
 
+    private fun isExistAITokenAndProxyServer(): Boolean {
+        return openAIToken.isNotBlank() && proxyServerURL.isNotBlank()
+    }
+
     fun getProxyServerURL(): String {
         return proxyServerURL
     }
@@ -205,4 +260,8 @@ object QuickBloxUiKit {
     fun isEnabledAITranslate(): Boolean {
         return enabledAITranslate
     }
+
+    fun isEnabledAIRephrase(): Boolean {
+        return enabledAIRephrase
+    }
 }

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/dto/ai/AIRephraseDTO.kt

@@ -0,0 +1,14 @@
+/*
+ * Created by Injoit on 11.8.2023.
+ * Copyright © 2023 Quickblox. All rights reserved.
+ *
+ */
+
+package com.quickblox.android_ui_kit.data.dto.ai
+
+class AIRephraseDTO {
+    var toneName: String = ""
+    var smileCode: String = ""
+    var originalText = ""
+    var rephrasedText = ""
+}

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/repository/ai/AIRepositoryImpl.kt

@@ -6,9 +6,11 @@
 
 package com.quickblox.android_ui_kit.data.repository.ai
 
+import com.quickblox.android_ui_kit.data.repository.mapper.AIRephraseMapper
 import com.quickblox.android_ui_kit.data.repository.mapper.AITranslateMapper
 import com.quickblox.android_ui_kit.data.source.ai.AIDataSource
 import com.quickblox.android_ui_kit.data.source.exception.AIDataSourceException
+import com.quickblox.android_ui_kit.domain.entity.AIRephraseToneEntity
 import com.quickblox.android_ui_kit.domain.entity.implementation.message.AITranslateIncomingChatMessageEntity
 import com.quickblox.android_ui_kit.domain.entity.message.IncomingChatMessageEntity
 import com.quickblox.android_ui_kit.domain.exception.repository.AIRepositoryException
@@ -39,4 +41,35 @@ class AIRepositoryImpl(private val aiDataSource: AIDataSource) : AIRepository {
             throw AIRepositoryException(exception.message ?: "Unexpected Exception")
         }
     }
+
+    override fun rephraseByOpenAIToken(toneEntity: AIRephraseToneEntity): AIRephraseToneEntity {
+        try {
+            val requestDTO = AIRephraseMapper.entityToDto(toneEntity)
+            val resultDTO = aiDataSource.rephraseByOpenAIToken(requestDTO)
+            val resultEntity = AIRephraseMapper.dtoToEntity(resultDTO)
+            return resultEntity
+        } catch (exception: AIDataSourceException) {
+            throw AIRepositoryException(exception.message ?: "Unexpected Exception")
+        }
+    }
+
+    override fun rephraseByQuickBloxToken(toneEntity: AIRephraseToneEntity, token: String): AIRephraseToneEntity {
+        try {
+            val requestDTO = AIRephraseMapper.entityToDto(toneEntity)
+            val resultDTO = aiDataSource.rephraseByQuickBloxToken(requestDTO, token)
+            val resultEntity = AIRephraseMapper.dtoToEntity(resultDTO)
+            return resultEntity
+        } catch (exception: AIDataSourceException) {
+            throw AIRepositoryException(exception.message ?: "Unexpected Exception")
+        }
+    }
+
+    override fun getAllRephraseTones(): List<AIRephraseToneEntity> {
+        try {
+            val results = aiDataSource.getAllRephraseTones()
+            return AIRephraseMapper.dtosToEntities(results)
+        } catch (exception: AIDataSourceException) {
+            throw AIRepositoryException(exception.message ?: "Unexpected Exception")
+        }
+    }
 }

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/repository/mapper/AIRephraseMapper.kt

@@ -0,0 +1,52 @@
+/*
+ * Created by Injoit on 11.8.2023.
+ * Copyright © 2023 Quickblox. All rights reserved.
+ *
+ */
+
+package com.quickblox.android_ui_kit.data.repository.mapper
+
+import android.text.TextUtils
+import com.quickblox.android_ui_kit.ExcludeFromCoverage
+import com.quickblox.android_ui_kit.data.dto.ai.AIRephraseDTO
+import com.quickblox.android_ui_kit.domain.entity.AIRephraseToneEntity
+import com.quickblox.android_ui_kit.domain.entity.implementation.AIRephraseToneEntityImpl
+import com.quickblox.android_ui_kit.domain.exception.repository.MappingException
+
+@ExcludeFromCoverage
+object AIRephraseMapper {
+    fun dtosToEntities(dtos: List<AIRephraseDTO>): List<AIRephraseToneEntity> {
+        val entities = mutableListOf<AIRephraseToneEntity>()
+
+        dtos.forEach { dto ->
+            val entity = dtoToEntity(dto)
+            entities.add(entity)
+        }
+
+        return entities
+    }
+
+    fun dtoToEntity(dto: AIRephraseDTO): AIRephraseToneEntity {
+        val toneName = dto.toneName
+        if (TextUtils.isEmpty(toneName)) {
+            throw MappingException("toneName should not be blank")
+        }
+
+        val smileCode = dto.smileCode
+        val entity = AIRephraseToneEntityImpl(toneName, smileCode)
+        entity.setRephrasedText(dto.rephrasedText)
+        entity.setOriginalText(dto.originalText)
+
+        return entity
+    }
+
+    fun entityToDto(rephraseEntity: AIRephraseToneEntity): AIRephraseDTO {
+        val dto = AIRephraseDTO()
+        dto.toneName = rephraseEntity.getName()
+        dto.smileCode = rephraseEntity.getSmileCode()
+        dto.rephrasedText = rephraseEntity.getRephrasedText()
+        dto.originalText = rephraseEntity.getOriginalText()
+
+        return dto
+    }
+}

ui-kit/src/main/java/com/quickblox/android_ui_kit/data/source/ai/AIDataSource.kt

@@ -6,6 +6,7 @@
 
 package com.quickblox.android_ui_kit.data.source.ai
 
+import com.quickblox.android_ui_kit.data.dto.ai.AIRephraseDTO
 import com.quickblox.android_ui_kit.data.dto.ai.AITranslateDTO
 
 interface AIDataSource {
@@ -14,4 +15,8 @@ interface AIDataSource {
         translateDTO: AITranslateDTO,
         token: String,
     ): AITranslateDTO
+
+    fun rephraseByOpenAIToken(rephraseDTO: AIRephraseDTO): AIRephraseDTO
+    fun rephraseByQuickBloxToken(rephraseDTO: AIRephraseDTO, token: String): AIRephraseDTO
+    fun getAllRephraseTones(): List<AIRephraseDTO>
 }