feature(#105): update setting page with uuid

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/data/remote/ApiService.kt

@@ -7,6 +7,7 @@ import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainContactsApiReque
 import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainImageApiRequest
 import com.matthaigh27.chatgptwrapper.data.remote.responses.ApiResponse
 import com.matthaigh27.chatgptwrapper.data.remote.responses.EmptyResultApiResponse
+import com.matthaigh27.chatgptwrapper.data.remote.responses.ImageRelatenessApiResponse
 import com.matthaigh27.chatgptwrapper.data.remote.responses.TrainImageApiResponse
 import retrofit2.Call
 import retrofit2.http.Body
@@ -20,7 +21,7 @@ interface ApiService {
     @POST("train/contacts")
     fun trainContacts(@Body request: TrainContactsApiRequest) : Call<EmptyResultApiResponse>
     @POST("image_relatedness")
-    fun getImageRelatedness(@Body request: ImageRelatednessApiRequest) : Call<ApiResponse>
+    fun getImageRelatedness(@Body request: ImageRelatednessApiRequest) : Call<ImageRelatenessApiResponse>
     @POST("uploadImage")
     fun trainImage(@Body request: TrainImageApiRequest) : Call<TrainImageApiResponse>
 }

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/data/remote/responses/ImageRelatenessApiResponse.kt

@@ -0,0 +1,17 @@
+package com.matthaigh27.chatgptwrapper.data.remote.responses
+
+data class ImageRelatenessApiResponse(
+    val status_code: Int,
+    val message: List<String>,
+    val result: RelatenessResult
+)
+
+data class RelatenessResult(
+    val program: String,
+    val content: RelatenessContent
+)
+
+data class RelatenessContent (
+    val image_name: String,
+    val image_desc: String
+)

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/data/repository/RemoteRepository.kt

@@ -8,6 +8,7 @@ import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainContactsApiReque
 import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainImageApiRequest
 import com.matthaigh27.chatgptwrapper.data.remote.responses.ApiResponse
 import com.matthaigh27.chatgptwrapper.data.remote.responses.EmptyResultApiResponse
+import com.matthaigh27.chatgptwrapper.data.remote.responses.ImageRelatenessApiResponse
 import com.matthaigh27.chatgptwrapper.data.remote.responses.TrainImageApiResponse
 import com.matthaigh27.chatgptwrapper.utils.helpers.OnFailure
 import com.matthaigh27.chatgptwrapper.utils.helpers.OnSuccess
@@ -111,14 +112,14 @@ object RemoteRepository {
 
     fun getImageRelatedness(
         request: ImageRelatednessApiRequest,
-        onSuccess: OnSuccess<ApiResponse>,
+        onSuccess: OnSuccess<ImageRelatenessApiResponse>,
         onFailure: OnFailure<String>
     ) {
         val call = apiService.getImageRelatedness(request)
 
-        call.enqueue(object : Callback<ApiResponse> {
+        call.enqueue(object : Callback<ImageRelatenessApiResponse> {
             override fun onResponse(
-                call: Call<ApiResponse>, response: Response<ApiResponse>
+                call: Call<ImageRelatenessApiResponse>, response: Response<ImageRelatenessApiResponse>
             ) {
                 response.body()?.let { data ->
                     onSuccess(data)
@@ -127,7 +128,7 @@ object RemoteRepository {
                 }
             }
 
-            override fun onFailure(call: Call<ApiResponse>, t: Throwable) {
+            override fun onFailure(call: Call<ImageRelatenessApiResponse>, t: Throwable) {
                 onFailure(t.message.toString())
             }
         })

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/ui/chat/view/adapters/ChatMainAdapter.kt

@@ -121,6 +121,8 @@ class ChatMainAdapter(
 
                 data.content?.let { message ->
                     holder.txtMessage.text = message
+                    if(message.isEmpty())
+                        holder.txtMessage.visibility = View.GONE
                 } ?: run {
                     holder.txtMessage.visibility = View.GONE
                 }
@@ -138,6 +140,7 @@ class ChatMainAdapter(
 
     private fun setMessageData(holder: ChatWidgetViewHolder, data: ChatMessageModel) {
         holder.itemLayout.visibility = View.VISIBLE
+        holder.itemLayout.removeAllViews()
         val index = holder.adapterPosition
 
         when (data.content) {
@@ -197,11 +200,8 @@ class ChatMainAdapter(
             }
 
             TYPE_WIDGET_SCHEDULE_ALARM -> {
-                var props = ScheduleAlarmProps()
-                data.data?.run {
-                    val widgetDesc = data.data.asJsonObject[PROPS_WIDGET_DESC].asString
-                    props = ScheduleAlarmProps.init(widgetDesc)
-                }
+                val widgetDesc = data.data!!.asJsonObject[PROPS_WIDGET_DESC].asString
+                val props = ScheduleAlarmProps.init(widgetDesc)
                 val scheduleAlarmWidget =
                     ScheduleAlarmWidget(context, props.time, props.label, props.repeat).apply {
                         this.callback = callbacks

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/ui/chat/view/fragments/ChatMainFragment.kt

@@ -36,7 +36,6 @@ import com.matthaigh27.chatgptwrapper.utils.Constants.ERROR_MSG_NOEXIST_COMMAND
 import com.matthaigh27.chatgptwrapper.utils.Constants.HELP_COMMAND_ALL
 import com.matthaigh27.chatgptwrapper.utils.Constants.PROPS_WIDGET_DESC
 import com.matthaigh27.chatgptwrapper.utils.Constants.TYPE_RESPONSE_ALARM
-import com.matthaigh27.chatgptwrapper.utils.Constants.TYPE_RESPONSE_ALERT
 import com.matthaigh27.chatgptwrapper.utils.Constants.TYPE_RESPONSE_BROWSER
 import com.matthaigh27.chatgptwrapper.utils.Constants.TYPE_RESPONSE_CONTACT
 import com.matthaigh27.chatgptwrapper.utils.Constants.TYPE_RESPONSE_IMAGE
@@ -53,7 +52,6 @@ import com.matthaigh27.chatgptwrapper.utils.helpers.chat.CommandHelper.makePromp
 import com.matthaigh27.chatgptwrapper.utils.helpers.chat.CommandHelper.makePromptUsage
 import com.matthaigh27.chatgptwrapper.utils.helpers.ui.NoNewLineInputFilter
 import org.json.JSONArray
-import java.util.Calendar
 
 class ChatMainFragment : Fragment(), OnClickListener {
 
@@ -102,7 +100,6 @@ class ChatMainFragment : Fragment(), OnClickListener {
     }
 
 
-
     private fun initViewModel() {
         viewModel = ViewModelProvider(this)[ChatViewModel::class.java]
     }
@@ -168,7 +165,7 @@ class ChatMainFragment : Fragment(), OnClickListener {
             showloadingCount++
         } else {
             showloadingCount--
-            if(showloadingCount == 0) {
+            if (showloadingCount == 0) {
                 imgLoading.clearAnimation()
                 imgLoading.visibility = View.GONE
                 edtMessageInput?.isEnabled = true
@@ -200,6 +197,58 @@ class ChatMainFragment : Fragment(), OnClickListener {
                         )
                     )
                     isImagePicked = false
+                    currentUploadedImageName?.let {
+                        viewModel.getImageRelatedness(it, content)
+                            .observe(viewLifecycleOwner, Observer { relatenessResource ->
+                                when (relatenessResource) {
+                                    is ApiResource.Loading -> {
+                                        showLoading(true)
+                                    }
+
+                                    is ApiResource.Success -> {
+                                        showLoading(false)
+                                        relatenessResource.data?.result?.content?.image_name?.let { imageName ->
+                                            viewModel.downloadImageFromFirebase(
+                                                imageName
+                                            ).observe(viewLifecycleOwner, Observer { resource ->
+                                                when (resource) {
+                                                    is ApiResource.Loading -> {
+                                                        showLoading(true)
+                                                    }
+
+                                                    is ApiResource.Success -> {
+                                                        addMessage(
+                                                            type = TYPE_CHAT_RECEIVE,
+                                                            content = relatenessResource.data.result.content.image_desc,
+                                                            data = null,
+                                                            hasImage = true,
+                                                            image = resource.data
+                                                        )
+                                                        showLoading(false)
+                                                    }
+                                                    is ApiResource.Error -> {
+                                                        addErrorMessage(resource.message!!)
+                                                        showLoading(false)
+                                                    }
+                                                }
+                                            })
+                                        } ?: run {
+                                            addMessage(
+                                                type = TYPE_CHAT_RECEIVE,
+                                                content = relatenessResource.data?.result?.content?.image_desc,
+                                            )
+                                        }
+                                    }
+
+                                    is ApiResource.Error -> {
+                                        showLoading(false)
+                                        addErrorMessage(relatenessResource.message!!)
+                                    }
+                                }
+                            })
+                    }
+                    currentUploadedImageName = null
+                    currentSelectedImage = null
                 } else {
                     addChatItemToList(ChatMessageModel(type, content, data, hasImage, image))
                     sendNotification(content)
@@ -216,8 +265,7 @@ class ChatMainFragment : Fragment(), OnClickListener {
         message: String
     ) {
         addMessage(
-            type = TYPE_CHAT_RECEIVE,
-            content = message
+            type = TYPE_CHAT_RECEIVE, content = message
         )
     }
 
@@ -331,7 +379,10 @@ class ChatMainFragment : Fragment(), OnClickListener {
                     showLoading(false)
                     val apiResponse = resource.data
                     when (apiResponse?.result?.program) {
-                        TYPE_RESPONSE_MESSAGE -> addMessage(TYPE_CHAT_RECEIVE, apiResponse.result.content.toString())
+                        TYPE_RESPONSE_MESSAGE -> addMessage(
+                            TYPE_CHAT_RECEIVE, apiResponse.result.content.toString()
+                        )
+
                         TYPE_RESPONSE_BROWSER -> fetchResponseBrowser(apiResponse)
                         TYPE_RESPONSE_CONTACT -> fetchResponseContact(apiResponse)
                         TYPE_RESPONSE_IMAGE -> fetchResponseImage(apiResponse)
@@ -399,7 +450,8 @@ class ChatMainFragment : Fragment(), OnClickListener {
     }
 
     private fun fetchResponseAlarm(apiResponse: ApiResponse) {
-        val time: Time = Converter.stringToTime(apiResponse.result.content.asJsonObject.get("time").asString)
+        val time: Time =
+            Converter.stringToTime(apiResponse.result.content.asJsonObject.get("time").asString)
         val label = apiResponse.result.content.asJsonObject.get("label").asString
         val props = ScheduleAlarmProps(time, label)
         val widgetDesc = JsonObject().apply {
@@ -426,29 +478,25 @@ class ChatMainFragment : Fragment(), OnClickListener {
 
             override fun sentHelpPrompt(prompt: String) {
                 addMessage(
-                    type = TYPE_CHAT_SENT,
-                    content = prompt
+                    type = TYPE_CHAT_SENT, content = prompt
                 )
             }
 
             override fun canceledHelpPrompt() {
                 addMessage(
-                    type = TYPE_CHAT_RECEIVE,
-                    content = "You canceled Help prompt."
+                    type = TYPE_CHAT_RECEIVE, content = "You canceled Help prompt."
                 )
             }
 
             override fun doVoiceCall(phoneNumber: String) {
                 addMessage(
-                    type = TYPE_CHAT_RECEIVE,
-                    content = "You made a voice call to $phoneNumber"
+                    type = TYPE_CHAT_RECEIVE, content = "You made a voice call to $phoneNumber"
                 )
             }
 
             override fun doVideoCall(phoneNumber: String) {
                 addMessage(
-                    type = TYPE_CHAT_RECEIVE,
-                    content = "You made a video call to $phoneNumber"
+                    type = TYPE_CHAT_RECEIVE, content = "You made a video call to $phoneNumber"
                 )
             }
 
@@ -457,15 +505,15 @@ class ChatMainFragment : Fragment(), OnClickListener {
                     this.addProperty(PROPS_WIDGET_DESC, phoneNumber)
                 }
                 addMessage(
-                    type = TYPE_CHAT_WIDGET,
-                    content = TYPE_WIDGET_SMS,
-                    data = widgetDesc
+                    type = TYPE_CHAT_WIDGET, content = TYPE_WIDGET_SMS, data = widgetDesc
                 )
             }
 
             override fun pickImage(isSuccess: Boolean, data: ByteArray?) {
-                if (!isSuccess)
+                if (!isSuccess) {
                     addErrorMessage("Fail to pick image")
+                    return
+                }
                 viewModel.uploadImageToFirebase(data!!)
                     .observe(viewLifecycleOwner, Observer { resource ->
                         when (resource) {
@@ -497,8 +545,7 @@ class ChatMainFragment : Fragment(), OnClickListener {
 
             override fun cancelAlarm() {
                 addMessage(
-                    type = TYPE_CHAT_RECEIVE,
-                    content = "You canceled setting an alarm."
+                    type = TYPE_CHAT_RECEIVE, content = "You canceled setting an alarm."
                 )
             }
         }

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/ui/chat/viewmodel/ChatViewModel.kt

@@ -12,6 +12,7 @@ import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainContactsApiReque
 import com.matthaigh27.chatgptwrapper.data.remote.requests.TrainImageApiRequest
 import com.matthaigh27.chatgptwrapper.data.remote.responses.ApiResponse
 import com.matthaigh27.chatgptwrapper.data.remote.responses.EmptyResultApiResponse
+import com.matthaigh27.chatgptwrapper.data.remote.responses.ImageRelatenessApiResponse
 import com.matthaigh27.chatgptwrapper.data.repository.FirebaseRepository
 import com.matthaigh27.chatgptwrapper.data.repository.RemoteRepository
 import com.matthaigh27.chatgptwrapper.data.repository.RoomRepository
@@ -205,8 +206,8 @@ class ChatViewModel : ViewModel() {
         return state
     }
 
-    fun getImageRelatedness(imageName: String, message: String): MutableLiveData<ApiResource<ApiResponse>> {
-        val resource: MutableLiveData<ApiResource<ApiResponse>> = MutableLiveData()
+    fun getImageRelatedness(imageName: String, message: String): MutableLiveData<ApiResource<ImageRelatenessApiResponse>> {
+        val resource: MutableLiveData<ApiResource<ImageRelatenessApiResponse>> = MutableLiveData()
         val request = ImageRelatednessApiRequest(
             image_name = imageName, message = message, confs = buildApiKeys()
         )

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/ui/setting/view/SettingActivity.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.View.OnClickListener
 import com.google.android.material.textfield.TextInputLayout
 import com.matthaigh27.chatgptwrapper.R
+import com.matthaigh27.chatgptwrapper.RisingApplication.Companion.appContext
 import com.matthaigh27.chatgptwrapper.ui.base.BaseActivity
 import com.matthaigh27.chatgptwrapper.ui.chat.view.ChatActivity
 
@@ -15,6 +16,8 @@ class SettingActivity : BaseActivity() {
     private lateinit var txtPineconeEnv: TextInputLayout
     private lateinit var txtFirebaseKey: TextInputLayout
     private lateinit var txtTemperature: TextInputLayout
+    private lateinit var txtUUID: TextInputLayout
+    private lateinit var txtOpenAIKey: TextInputLayout
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,9 +31,14 @@ class SettingActivity : BaseActivity() {
         txtPineconeEnv = findViewById(R.id.txt_pinecone_env)
         txtFirebaseKey = findViewById(R.id.txt_firebase_key)
         txtTemperature = findViewById(R.id.txt_temperature)
+        txtUUID = findViewById(R.id.txt_uuid)
+        txtOpenAIKey = findViewById(R.id.txt_openai_key)
 
         findViewById<View>(R.id.btn_setting_save).setOnClickListener { saveSettingData() }
         findViewById<View>(R.id.btn_back_chat).setOnClickListener { backToChatMain() }
+
+        val uuid = appContext.getUUID()
+        txtUUID.editText?.setText(uuid)
     }
 
     private fun saveSettingData() {
@@ -38,6 +46,7 @@ class SettingActivity : BaseActivity() {
         val pineconeEnv = txtPineconeEnv.editText?.text.toString()
         val firebaseKey = txtFirebaseKey.editText?.text.toString()
         val temperature = txtTemperature.editText?.text.toString()
+        val openai = txtTemperature.editText?.text.toString()
     }
 
     private fun backToChatMain() {

Android/app/src/main/res/layout/activity_setting.xml

@@ -47,10 +47,35 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="vertical"
-        android:padding="@dimen/spacing_tiny"
+        android:padding="@dimen/spacing_small"
         app:layout_constraintBottom_toTopOf="@+id/ll_action"
         app:layout_constraintTop_toBottomOf="@+id/cl_header">
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/txt_uuid"
+            style="@style/SettingEditText"
+            android:layout_marginBottom="@dimen/spacing_tiny"
+            android:enabled="false"
+            android:hint="@string/label_setting_uuid">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/txt_openai_key"
+            style="@style/SettingEditText"
+            android:layout_marginBottom="@dimen/spacing_tiny"
+            android:hint="@string/label_setting_openai_key">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/txt_pinecone_key"
             style="@style/SettingEditText"

Android/app/src/main/res/values/colors.xml

@@ -3,9 +3,9 @@
     <color name="white">#ffffff</color>
     <color name="transparent">#00000000</color>
 
-    <color name="color_primary_light">#f0f0f0</color>
-    <color name="color_primary">#ebebeb</color>
-    <color name="color_primary_dark">#707070</color>
+    <color name="color_primary_light">#eeeeee</color>
+    <color name="color_primary">#e9e9e9</color>
+    <color name="color_primary_dark">#505050</color>
     <color name="color_accent">#222222</color>
 
     <color name="bg_color_message_receive">#99DBA7</color>

Android/app/src/main/res/values/strings.xml

@@ -17,6 +17,8 @@
     <string name="title_chat_widget">widget title</string>
     <string name="title_chat_widget_sms">SMS</string>
 
+    <string name="label_setting_uuid">uuid</string>
+    <string name="label_setting_openai_key">OpenAI Key</string>
     <string name="label_setting_pinecone_key">Pinecone Key</string>
     <string name="label_setting_pinecone_env">Pinecone Env</string>
     <string name="label_setting_firebase_key">Firebase Key</string>

Android/app/src/main/res/values/styles.xml

@@ -10,6 +10,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="boxStrokeWidth">@dimen/width_stroke_thin</item>
+        <item name="android:disabledAlpha">0.1</item>
     </style>