[MERGE] #460 -> develop

[HOTFIX/#460] 상점뷰 / 보상형 admob 서버 응답 시간 조정
team-yello · Aug 1, 2024 · b5d7a1c · b5d7a1c
2 parents 9eca240 + 64ac2fa
commit b5d7a1c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/app/src/main/java/com/el/yello/di/RetrofitModule.kt b/app/src/main/java/com/el/yello/di/RetrofitModule.kt
@@ -21,6 +21,7 @@ import org.json.JSONObject
 import retrofit2.Converter
 import retrofit2.Retrofit
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
 @Module
@@ -79,6 +80,9 @@ object RetrofitModule {
         .addInterceptor(loggingInterceptor)
         .addInterceptor(authInterceptor)
         .addFlipperNetworkPlugin()
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .writeTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
         .build()
 
     @Provides

diff --git a/...sentation/onboarding/fragment/universityinfo/university/SearchDialogUniversityFragment.kt b/...sentation/onboarding/fragment/universityinfo/university/SearchDialogUniversityFragment.kt
@@ -64,7 +64,7 @@ class SearchDialogUniversityFragment :
 
     private fun initUniversityDialogView() {
         setHideKeyboard()
-        binding.etSchoolSearch.doAfterTextChanged { input ->
+        binding.etUnivSearch.doAfterTextChanged { input ->
             searchJob?.cancel()
             searchJob = viewModel.viewModelScope.launch {
                 delay(Companion.debounceTime)

diff --git a/app/src/main/res/layout/fragment_dialog_university.xml b/app/src/main/res/layout/fragment_dialog_university.xml
@@ -55,7 +55,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <EditText
-            android:id="@+id/et_school_search"
+            android:id="@+id/et_univ_search"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="20dp"
@@ -89,7 +89,7 @@
             android:textSize="12sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/et_school_search" />
+            app:layout_constraintTop_toBottomOf="@+id/et_univ_search" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_school_list"

diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt
@@ -3,7 +3,7 @@ object Constants {
     const val compileSdk = 34
     const val minSdk = 28
     const val targetSdk = 34
-    const val versionCode = 49
+    const val versionCode = 50
     const val versionName = "2.2"
     const val jvmVersion = "18"
 }