feature(#28): Update parsing module of Api Response

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.matthaigh27.chatgptwrapper"
         minSdk 28
         targetSdk 33
-        versionCode 7
-        versionName "1.5"
+        versionCode 1
+        versionName "1.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -29,7 +29,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Design.NoActionBar">
         <activity
-            android:name=".activites.HomeActivity"
+            android:name=".ui.activites.HomeActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>

app/src/main/java/com/matthaigh27/chatgptwrapper/database/MyDatabase.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/local/MyDatabase.kt

@@ -1,13 +1,13 @@
-package com.matthaigh27.chatgptwrapper.database
+package com.matthaigh27.chatgptwrapper.data.local
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import com.matthaigh27.chatgptwrapper.database.dao.ContactDao
-import com.matthaigh27.chatgptwrapper.database.dao.ImageDao
-import com.matthaigh27.chatgptwrapper.database.entity.ContactEntity
-import com.matthaigh27.chatgptwrapper.database.entity.ImageEntity
+import com.matthaigh27.chatgptwrapper.data.local.dao.ContactDao
+import com.matthaigh27.chatgptwrapper.data.local.dao.ImageDao
+import com.matthaigh27.chatgptwrapper.data.local.entity.ContactEntity
+import com.matthaigh27.chatgptwrapper.data.local.entity.ImageEntity
 
 @Database(entities = [ImageEntity::class, ContactEntity::class], version = 1, exportSchema = false)
 abstract class MyDatabase : RoomDatabase() {

app/src/main/java/com/matthaigh27/chatgptwrapper/database/dao/ContactDao.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/local/dao/ContactDao.kt

@@ -1,8 +1,7 @@
-package com.matthaigh27.chatgptwrapper.database.dao
+package com.matthaigh27.chatgptwrapper.data.local.dao
 
-import androidx.lifecycle.LiveData
 import androidx.room.*
-import com.matthaigh27.chatgptwrapper.database.entity.ContactEntity
+import com.matthaigh27.chatgptwrapper.data.local.entity.ContactEntity
 
 @Dao
 interface ContactDao {

app/src/main/java/com/matthaigh27/chatgptwrapper/database/dao/ImageDao.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/local/dao/ImageDao.kt

@@ -1,8 +1,7 @@
-package com.matthaigh27.chatgptwrapper.database.dao
+package com.matthaigh27.chatgptwrapper.data.local.dao
 
-import androidx.lifecycle.LiveData
 import androidx.room.*
-import com.matthaigh27.chatgptwrapper.database.entity.ImageEntity
+import com.matthaigh27.chatgptwrapper.data.local.entity.ImageEntity
 
 @Dao
 interface ImageDao {

app/src/main/java/com/matthaigh27/chatgptwrapper/database/entity/ContactEntity.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/local/entity/ContactEntity.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.database.entity
+package com.matthaigh27.chatgptwrapper.data.local.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

app/src/main/java/com/matthaigh27/chatgptwrapper/database/entity/ImageEntity.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/local/entity/ImageEntity.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.database.entity
+package com.matthaigh27.chatgptwrapper.data.local.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey

app/src/main/java/com/matthaigh27/chatgptwrapper/models/viewmodels/ChatMessageModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/common/ChatMessageModel.kt

@@ -1,11 +1,11 @@
-package com.matthaigh27.chatgptwrapper.models.viewmodels
+package com.matthaigh27.chatgptwrapper.data.models.common
 
 import androidx.lifecycle.ViewModel
 
 /**
  * ChatModel for Chat RecyclerView
  */
-class ChatMessageModel: ViewModel() {
+class ChatMessageModel {
     var message: String = ""
     var isMe: Boolean = true
     var image: ByteArray? = null

app/src/main/java/com/matthaigh27/chatgptwrapper/models/common/ContactModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/common/ContactModel.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.models.common
+package com.matthaigh27.chatgptwrapper.data.models.common
 
 class ContactModel {
     var id: String = ""

app/src/main/java/com/matthaigh27/chatgptwrapper/models/common/HelpCommandModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/common/HelpCommandModel.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.models.common
+package com.matthaigh27.chatgptwrapper.data.models.common
 
 class HelpCommandModel {
     var mainCommandName: String = ""

app/src/main/java/com/matthaigh27/chatgptwrapper/models/common/HelpPromptModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/common/HelpPromptModel.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.models.common
+package com.matthaigh27.chatgptwrapper.data.models.common
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder

app/src/main/java/com/matthaigh27/chatgptwrapper/models/common/ImagePromptModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/common/ImagePromptModel.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.models.common
+package com.matthaigh27.chatgptwrapper.data.models.common
 
 class ImagePromptModel {
     var id: String = ""

app/src/main/java/com/matthaigh27/chatgptwrapper/models/requestmodels/RequestBodyModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/requestmodels/RequestBodyModel.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.models.requestmodels
+package com.matthaigh27.chatgptwrapper.data.models.requestmodels
 
 import com.matthaigh27.chatgptwrapper.MyApplication
 import org.json.JSONException

app/src/main/java/com/matthaigh27/chatgptwrapper/models/requestmodels/RequestTrainContactModel.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/requestmodels/RequestTrainContactModel.kt

@@ -1,7 +1,7 @@
-package com.matthaigh27.chatgptwrapper.models.requestmodels
+package com.matthaigh27.chatgptwrapper.data.models.requestmodels
 
 import com.matthaigh27.chatgptwrapper.MyApplication
-import com.matthaigh27.chatgptwrapper.models.common.ContactModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ContactModel
 import com.matthaigh27.chatgptwrapper.utils.Utils
 import org.json.JSONArray
 import org.json.JSONException

app/src/main/java/com/matthaigh27/chatgptwrapper/services/api/HttpClient.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/data/remote/ApiClient.kt

@@ -1,10 +1,10 @@
-package com.matthaigh27.chatgptwrapper.services.api
+package com.matthaigh27.chatgptwrapper.data.remote
 
 import android.util.Log
 import com.matthaigh27.chatgptwrapper.BuildConfig
-import com.matthaigh27.chatgptwrapper.models.common.ContactModel
-import com.matthaigh27.chatgptwrapper.models.requestmodels.RequestBodyModel
-import com.matthaigh27.chatgptwrapper.models.requestmodels.RequestTrainContactModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ContactModel
+import com.matthaigh27.chatgptwrapper.data.models.requestmodels.RequestBodyModel
+import com.matthaigh27.chatgptwrapper.data.models.requestmodels.RequestTrainContactModel
 import com.matthaigh27.chatgptwrapper.utils.Constants
 import com.matthaigh27.chatgptwrapper.utils.Constants.GET
 import com.matthaigh27.chatgptwrapper.utils.Constants.POST
@@ -20,7 +20,7 @@ import org.json.JSONObject
 import java.io.IOException
 import java.util.concurrent.TimeUnit
 
-class HttpClient {
+class ApiClient {
     /* Server URL and Api Endpoints */
     val SERVER_URL = BuildConfig.BASE_URL
     val SEND_NOTIFICATION_URL = SERVER_URL + "sendNotification"
@@ -29,9 +29,9 @@ class HttpClient {
     val GET_ALL_HELP_COMMANDS = SERVER_URL + "commands"
     val TRAIN_CONTACTS = SERVER_URL + "train/contacts"
 
-    var mCallback: HttpRisingInterface
+    var mCallback: ApiResponse
 
-    constructor(callback: HttpRisingInterface) {
+    constructor(callback: ApiResponse) {
         mCallback = callback
     }
 

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

@@ -0,0 +1,7 @@
+package com.matthaigh27.chatgptwrapper.data.remote;
+
+interface ApiResponse {
+    fun onSuccessResult(msg: String)
+
+    fun onFailureResult(msg: String)
+}

app/src/main/java/com/matthaigh27/chatgptwrapper/activites/HomeActivity.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/activites/HomeActivity.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.activites
+package com.matthaigh27.chatgptwrapper.ui.activites
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -10,8 +10,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.tabs.TabLayout.TabGravity
 import com.matthaigh27.chatgptwrapper.R
-import com.matthaigh27.chatgptwrapper.dialogs.CommonConfirmDialog
-import com.matthaigh27.chatgptwrapper.fragments.ChatFragment
+import com.matthaigh27.chatgptwrapper.ui.dialogs.CommonConfirmDialog
+import com.matthaigh27.chatgptwrapper.ui.fragments.ChatFragment
 import java.io.File
 
 

app/src/main/java/com/matthaigh27/chatgptwrapper/adapters/ChatAdapter.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/adapters/ChatAdapter.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.adapters
+package com.matthaigh27.chatgptwrapper.ui.adapters
 
 import android.annotation.SuppressLint
 import android.app.Dialog
@@ -8,26 +8,23 @@ import android.graphics.BitmapFactory
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.RecyclerView
 import com.matthaigh27.chatgptwrapper.R
-import com.matthaigh27.chatgptwrapper.models.common.ContactModel
-import com.matthaigh27.chatgptwrapper.models.common.HelpPromptModel
-import com.matthaigh27.chatgptwrapper.models.viewmodels.ChatMessageModel
+import com.matthaigh27.chatgptwrapper.data.models.common.HelpPromptModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ChatMessageModel
 import com.matthaigh27.chatgptwrapper.utils.Constants.MSG_WIDGET_TYPE_HELP_PRMOPT
 import com.matthaigh27.chatgptwrapper.utils.Constants.MSG_WIDGET_TYPE_SEARCH_CONTACT
 import com.matthaigh27.chatgptwrapper.utils.Constants.MSG_WIDGET_TYPE_SMS
 import com.matthaigh27.chatgptwrapper.utils.ImageHelper
 import com.matthaigh27.chatgptwrapper.utils.Utils
-import com.matthaigh27.chatgptwrapper.widgets.ContactDetailItem
-import com.matthaigh27.chatgptwrapper.widgets.ContactDetailWidget
-import com.matthaigh27.chatgptwrapper.widgets.HelpPromptWidget
-import com.matthaigh27.chatgptwrapper.widgets.SearchContactWidget
-import com.matthaigh27.chatgptwrapper.widgets.SmsEditorWidget
+import com.matthaigh27.chatgptwrapper.ui.widgets.ContactDetailItem
+import com.matthaigh27.chatgptwrapper.ui.widgets.HelpPromptWidget
+import com.matthaigh27.chatgptwrapper.ui.widgets.SearchContactWidget
+import com.matthaigh27.chatgptwrapper.ui.widgets.SmsEditorWidget
 import org.json.JSONArray
 
 class ChatAdapter(list: ArrayList<ChatMessageModel>, context: Context) :

app/src/main/java/com/matthaigh27/chatgptwrapper/dialogs/CommonConfirmDialog.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/dialogs/CommonConfirmDialog.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.dialogs
+package com.matthaigh27.chatgptwrapper.ui.dialogs
 
 import android.app.Dialog
 import android.content.Context

app/src/main/java/com/matthaigh27/chatgptwrapper/fragments/ChatFragment.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/fragments/ChatFragment.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.fragments
+package com.matthaigh27.chatgptwrapper.ui.fragments
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -30,20 +30,20 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.firebase.storage.FirebaseStorage
 import com.matthaigh27.chatgptwrapper.MyApplication
 import com.matthaigh27.chatgptwrapper.R
-import com.matthaigh27.chatgptwrapper.adapters.ChatAdapter
-import com.matthaigh27.chatgptwrapper.database.MyDatabase
-import com.matthaigh27.chatgptwrapper.database.entity.ImageEntity
-import com.matthaigh27.chatgptwrapper.widgets.ChatToolsWidget
-import com.matthaigh27.chatgptwrapper.widgets.ChatToolsWidget.OnPositiveButtonClickListener
-import com.matthaigh27.chatgptwrapper.models.*
-import com.matthaigh27.chatgptwrapper.models.common.HelpCommandModel
-import com.matthaigh27.chatgptwrapper.models.common.HelpPromptModel
-import com.matthaigh27.chatgptwrapper.models.viewmodels.ChatMessageModel
-import com.matthaigh27.chatgptwrapper.services.api.HttpClient
-import com.matthaigh27.chatgptwrapper.services.api.HttpRisingInterface
+import com.matthaigh27.chatgptwrapper.ui.adapters.ChatAdapter
+import com.matthaigh27.chatgptwrapper.data.local.MyDatabase
+import com.matthaigh27.chatgptwrapper.data.local.entity.ImageEntity
+import com.matthaigh27.chatgptwrapper.ui.widgets.ChatToolsWidget
+import com.matthaigh27.chatgptwrapper.ui.widgets.ChatToolsWidget.OnPositiveButtonClickListener
+import com.matthaigh27.chatgptwrapper.data.models.*
+import com.matthaigh27.chatgptwrapper.data.models.common.HelpCommandModel
+import com.matthaigh27.chatgptwrapper.data.models.common.HelpPromptModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ChatMessageModel
+import com.matthaigh27.chatgptwrapper.data.remote.ApiClient
+import com.matthaigh27.chatgptwrapper.data.remote.ApiResponse
 import com.matthaigh27.chatgptwrapper.utils.Constants.*
 import com.matthaigh27.chatgptwrapper.utils.Utils
-import com.matthaigh27.chatgptwrapper.widgets.ContactDetailItem
+import com.matthaigh27.chatgptwrapper.ui.widgets.ContactDetailItem
 import com.qw.photo.CoCo
 import com.qw.photo.callback.CoCoAdapter
 import com.qw.photo.callback.CoCoCallBack
@@ -60,7 +60,7 @@ import java.io.*
 import java.util.*
 import kotlin.collections.ArrayList
 
-class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
+class ChatFragment : Fragment(), OnClickListener, ApiResponse {
     private lateinit var rootView: View
     private var mContext: Context? = null
 
@@ -95,8 +95,8 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
     private lateinit var mChatToolsWidget: ChatToolsWidget
     private var mImagePickerType: String = ""
 
-    /** HttpClient for restful apis */
-    private lateinit var httpClient: HttpClient
+    /** apiClient for restful apis */
+    private lateinit var apiClient: ApiClient
 
     /** list of help prompt commands */
     private var mHelpPromptList: ArrayList<HelpPromptModel>? = null
@@ -132,14 +132,14 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
         initView()
         initDatabase()
 
-        trainImages()
+//        trainImages()
         getAllPromptCommands()
     }
 
 
     private fun getAllPromptCommands() {
         showLoading(true, "Loading Help Prompt Data")
-        httpClient.getALlHelpPromptCommands()
+        apiClient.getALlHelpPromptCommands()
     }
 
 
@@ -151,7 +151,7 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
     private fun initValues() {
         mContext = context
 
-        httpClient = HttpClient(this)
+        apiClient = ApiClient(this)
 
         rotate.duration = 3000
         rotate.repeatCount = Animation.INFINITE
@@ -494,9 +494,9 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
 
             showLoading(visible = true, text = LOADING_ASKING_TO_GPT)
             if (msg.image != null) {
-                httpClient.callImageRelatedness(msg.imageName)
+                apiClient.callImageRelatedness(msg.imageName)
             } else {
-                httpClient.callSendNotification(message)
+                apiClient.callSendNotification(message)
             }
         }
     }
@@ -652,7 +652,7 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
             Log.d(TAG, "Success upload to firebase storage")
 
             showLoading(false)
-            httpClient.callImageUpload("$uuid")
+            apiClient.callImageUpload("$uuid")
         }
     }
 
@@ -807,7 +807,7 @@ class ChatFragment : Fragment(), OnClickListener, HttpRisingInterface {
         val contacts = Utils.instance.getContacts(mContext!!)
         CoroutineScope(Dispatchers.Main).launch {
             val changedContacts = Utils.instance.getChangedContacts(contacts, mRoomDataHandler)
-            httpClient.trainContacts(changedContacts)
+            apiClient.trainContacts(changedContacts)
         }
     }
 

app/src/main/java/com/matthaigh27/chatgptwrapper/widgets/ChatToolItem.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/widgets/ChatToolItem.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.widgets
+package com.matthaigh27.chatgptwrapper.ui.widgets
 
 import android.content.Context
 import android.util.AttributeSet

app/src/main/java/com/matthaigh27/chatgptwrapper/widgets/ChatToolsWidget.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/widgets/ChatToolsWidget.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.widgets
+package com.matthaigh27.chatgptwrapper.ui.widgets
 
 import android.content.Context
 import android.view.LayoutInflater

app/src/main/java/com/matthaigh27/chatgptwrapper/widgets/ContactDetailItem.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/widgets/ContactDetailItem.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.widgets
+package com.matthaigh27.chatgptwrapper.ui.widgets
 
 import android.content.ContentUris
 import android.content.Context
@@ -14,7 +14,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.matthaigh27.chatgptwrapper.R
-import com.matthaigh27.chatgptwrapper.models.common.ContactModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ContactModel
 
 class ContactDetailItem(
     context: Context, attrs: AttributeSet? = null

app/src/main/java/com/matthaigh27/chatgptwrapper/widgets/ContactDetailWidget.kt → app/src/main/java/com/matthaigh27/chatgptwrapper/ui/widgets/ContactDetailWidget.kt

@@ -1,4 +1,4 @@
-package com.matthaigh27.chatgptwrapper.widgets
+package com.matthaigh27.chatgptwrapper.ui.widgets
 
 import android.content.ContentUris
 import android.content.Context
@@ -14,7 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.forEach
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.matthaigh27.chatgptwrapper.R
-import com.matthaigh27.chatgptwrapper.models.common.ContactModel
+import com.matthaigh27.chatgptwrapper.data.models.common.ContactModel
 import com.matthaigh27.chatgptwrapper.utils.Utils
 
 class ContactDetailWidget(