feature: update setting page to manage server url

Android/app/build.gradle

@@ -68,7 +68,6 @@ dependencies {
     testImplementation 'org.testng:testng:6.9.6'
 
     // Testing-only dependencies
-    androidTestImplementation "androidx.test:core:$rootProject.coreVersion"
     androidTestImplementation "androidx.test.ext:junit:$rootProject.extJUnitVersion"
     androidTestImplementation "androidx.test:runner:$rootProject.runnerVersion"
 

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/data/models/setting/SettingModel.kt

@@ -5,6 +5,7 @@ import com.matthaigh27.chatgptwrapper.data.models.chat.HelpPromptModel
 import com.matthaigh27.chatgptwrapper.data.remote.requests.common.OpenAISetting
 
 data class SettingModel(
+    val serverUrl: String,
     val openaiKey: String,
     val pineconeEnv: String,
     val pineconeKey: String,

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

@@ -1,31 +1,54 @@
 package com.matthaigh27.chatgptwrapper.data.remote
 
-import com.matthaigh27.chatgptwrapper.utils.constants.CommonConstants.API_BASE_URL
+import com.matthaigh27.chatgptwrapper.data.repository.SharedPreferencesRepository
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
-object ApiClient {
+class ApiClient {
+    /**
+     * This variables are used to set time for http communication.
+     */
     val TIME_OUT_CALL = 60L
     val TIME_OUT_CONNECT = 60L
     val TIME_OUT_READ = 60L
     val TIME_OUT_WRITE = 60L
 
-    private val client = OkHttpClient
-        .Builder()
-        .callTimeout(TIME_OUT_CALL, TimeUnit.SECONDS)
-        .connectTimeout(TIME_OUT_CONNECT, TimeUnit.SECONDS)
-        .readTimeout(TIME_OUT_READ, TimeUnit.SECONDS)
-        .writeTimeout(TIME_OUT_WRITE, TimeUnit.SECONDS)
-        .build()
-
-    private val retrofit = Retrofit
-        .Builder()
-        .baseUrl(API_BASE_URL)
-        .addConverterFactory(GsonConverterFactory.create())
-        .client(client)
-        .build()
-
-    val apiService: ApiService = retrofit.create(ApiService::class.java)
+    var apiService: ApiService
+
+    private var serverUrl: String
+    private var client: OkHttpClient
+    private var retrofit: Retrofit
+
+    init {
+        /**
+         * The server url is set to url that a user stored before.
+         * If the user run this app at first, server url is set to default url.
+         */
+        val keys = SharedPreferencesRepository.getConfig()
+        serverUrl = keys.serverUrl
+
+        client = OkHttpClient
+            .Builder()
+            .callTimeout(TIME_OUT_CALL, TimeUnit.SECONDS)
+            .connectTimeout(TIME_OUT_CONNECT, TimeUnit.SECONDS)
+            .readTimeout(TIME_OUT_READ, TimeUnit.SECONDS)
+            .writeTimeout(TIME_OUT_WRITE, TimeUnit.SECONDS)
+            .build()
+
+        retrofit = Retrofit
+            .Builder()
+            .baseUrl(serverUrl)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(client)
+            .build()
+
+        apiService = retrofit.create(ApiService::class.java)
+    }
+
+
+    companion object {
+        val instance = ApiClient()
+    }
 }

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

@@ -30,8 +30,11 @@ import kotlin.coroutines.suspendCoroutine
 
 
 object RemoteRepository {
-    private val apiService = ApiClient.apiService
+    private val apiService = ApiClient.instance.apiService
 
+    /**
+     * This function is used to get keys to manage backend.
+     */
     fun getKeys(): Keys{
         RoomRepository
         val settingModel = SharedPreferencesRepository.getConfig()

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

@@ -20,6 +20,7 @@ class SettingActivity : BaseActivity() {
     private val CONFIRM_MESSAGE = "Are you sure you want to set?"
 
     private lateinit var txtPineconeKey: TextInputLayout
+    private lateinit var txtServerUrl: TextInputLayout
     private lateinit var txtPineconeEnv: TextInputLayout
     private lateinit var txtFirebaseKey: TextInputLayout
     private lateinit var txtTemperature: TextInputLayout
@@ -37,6 +38,7 @@ class SettingActivity : BaseActivity() {
 
     private fun init() {
         txtPineconeKey = findViewById(R.id.txt_pinecone_key)
+        txtServerUrl = findViewById(R.id.txt_server_url)
         txtPineconeEnv = findViewById(R.id.txt_pinecone_env)
         txtFirebaseKey = findViewById(R.id.txt_firebase_key)
         txtTemperature = findViewById(R.id.txt_temperature)
@@ -63,6 +65,7 @@ class SettingActivity : BaseActivity() {
                 is ApiResource.Success -> {
                     resource.data?.let { data ->
                         txtPineconeKey.editText?.setText(data.pineconeKey)
+                        txtServerUrl.editText?.setText(data.serverUrl)
                         txtPineconeEnv.editText?.setText(data.pineconeEnv)
                         txtFirebaseKey.editText?.setText(data.firebaseKey)
                         txtTemperature.editText?.setText(data.setting.temperature.toString())
@@ -100,17 +103,13 @@ class SettingActivity : BaseActivity() {
         val firebaseKey = txtFirebaseKey.editText?.text.toString()
         val temperature = txtTemperature.editText?.text.toString().toFloat()
         val openaiKey = txtOpenAIKey.editText?.text.toString()
-
-        if (pineconeEnv == "" || pineconeKey == "" || firebaseKey == "" || openaiKey == ""){
-            showToast("Please fill out all the inputs")
-            return
-        }
-
+        val serverUrl: String = txtServerUrl.editText?.text.toString()
 
         val confirmDialog = ConfirmDialog(this)
         confirmDialog.setOnClickListener(object : ConfirmDialog.OnDialogButtonClickListener {
             override fun onPositiveButtonClick() {
                 val setting = SettingModel(
+                    serverUrl = serverUrl,
                     openaiKey = openaiKey,
                     pineconeEnv = pineconeEnv,
                     pineconeKey = pineconeKey,

Android/app/src/main/java/com/matthaigh27/chatgptwrapper/utils/helpers/chat/SettingHelper.kt

@@ -2,10 +2,12 @@ package com.matthaigh27.chatgptwrapper.utils.helpers.chat
 
 import com.matthaigh27.chatgptwrapper.data.models.setting.SettingModel
 import com.matthaigh27.chatgptwrapper.data.remote.requests.common.OpenAISetting
+import com.matthaigh27.chatgptwrapper.utils.constants.CommonConstants.API_BASE_URL
 
 object SettingHelper {
     fun emptySettingModel(): SettingModel{
         return SettingModel(
+            serverUrl = API_BASE_URL,
             openaiKey = "",
             pineconeEnv = "",
             pineconeKey = "",

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

@@ -64,6 +64,18 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/txt_server_url"
+            style="@style/CommonEditText"
+            android:layout_marginBottom="@dimen/spacing_tiny"
+            android:hint="@string/label_setting_server_url">
+
+            <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/CommonEditText"

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

@@ -19,6 +19,7 @@
     <string name="title_chat_widget_set_alarm">Set an alarm</string>
 
     <string name="label_setting_uuid">uuid</string>
+    <string name="label_setting_server_url">Server Url</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>