API 별로 언어 코드를 쿼리 파라미터로 전송하는 코드 제거

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentActivity.kt

@@ -22,7 +22,6 @@ import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
-import kr.co.vividnext.sodalive.common.Utils
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
@@ -64,7 +63,6 @@ class AudioContentActivity : BaseActivity<ActivityAudioContentBinding>(
         }
 
         bindData()
-        viewModel.languageCode = Utils.getCurrentLanguageCode(applicationContext)
         viewModel.getCategoryList(userId = userId)
         viewModel.getAudioContentList(userId = userId) { finish() }
     }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentApi.kt

@@ -39,7 +39,6 @@ import retrofit2.http.Query
 interface AudioContentApi {
     @GET("/audio-content/all")
     fun getAllAudioContents(
-        @Query("languageCode") languageCode: String,
         @Query("isAdultContentVisible") isAdultContentVisible: Boolean,
         @Query("contentType") contentType: ContentType,
         @Query("page") page: Int,
@@ -55,7 +54,6 @@ interface AudioContentApi {
     fun getAudioContentList(
         @Query("creator-id") id: Long,
         @Query("category-id") categoryId: Long,
-        @Query("languageCode") languageCode: String,
         @Query("isAdultContentVisible") isAdultContentVisible: Boolean,
         @Query("page") page: Int,
         @Query("size") size: Int,
@@ -107,7 +105,6 @@ interface AudioContentApi {
     @GET("/audio-content/{id}")
     fun getAudioContentDetail(
         @Path("id") id: Long,
-        @Query("languageCode") languageCode: String?,
         @Query("timezone") timezone: String,
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<GetAudioContentDetailResponse>>
@@ -187,7 +184,6 @@ interface AudioContentApi {
     fun getNewContentAllOfTheme(
         @Query("isFree") isFree: Boolean,
         @Query("theme") theme: String,
-        @Query("languageCode") languageCode: String,
         @Query("isAdultContentVisible") isAdultContentVisible: Boolean,
         @Query("contentType") contentType: ContentType,
         @Query("page") page: Int,

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentRepository.kt

@@ -18,7 +18,6 @@ class AudioContentRepository(
     fun getAudioContentList(
         id: Long,
         categoryId: Long,
-        languageCode: String,
         page: Int,
         size: Int,
         sort: AudioContentViewModel.Sort,
@@ -26,7 +25,6 @@ class AudioContentRepository(
     ) = api.getAudioContentList(
         id = id,
         categoryId = categoryId,
-        languageCode = languageCode,
         isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible,
         page = page - 1,
         size = size,
@@ -74,11 +72,9 @@ class AudioContentRepository(
 
     fun getAudioContentDetail(
         audioContentId: Long,
-        languageCode: String? = null,
         token: String
     ) = api.getAudioContentDetail(
         id = audioContentId,
-        languageCode = languageCode,
         timezone = TimeZone.getDefault().id,
         authHeader = token
     )
@@ -117,7 +113,6 @@ class AudioContentRepository(
     ) = api.likeContent(request, authHeader = token)
 
     fun getNewContentAllOfTheme(
-        languageCode: String,
         isFree: Boolean,
         theme: String,
         page: Int,
@@ -126,7 +121,6 @@ class AudioContentRepository(
     ) = api.getNewContentAllOfTheme(
         isFree = isFree,
         theme = theme,
-        languageCode = languageCode,
         isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible,
         contentType = ContentType.entries[SharedPreferenceManager.contentPreference],
         page = page - 1,
@@ -202,14 +196,12 @@ class AudioContentRepository(
     fun getAllAudioContents(
         page: Int,
         size: Int,
-        languageCode: String,
         isFree: Boolean? = null,
         isPointAvailableOnly: Boolean? = null,
         sortType: AudioContentViewModel.Sort = AudioContentViewModel.Sort.NEWEST,
         theme: String? = null,
         token: String
     ) = api.getAllAudioContents(
-        languageCode = languageCode,
         isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible,
         contentType = ContentType.entries[SharedPreferenceManager.contentPreference],
         page = page - 1,

app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentViewModel.kt

@@ -49,7 +49,6 @@ class AudioContentViewModel(private val repository: AudioContentRepository) : Ba
         POPULARITY
     }
 
-    var languageCode: String = "ko"
     var isLast = false
     var page = 1
     private val size = 10
@@ -62,7 +61,6 @@ class AudioContentViewModel(private val repository: AudioContentRepository) : Ba
                 repository.getAudioContentList(
                     id = userId,
                     categoryId = selectedCategoryId,
-                    languageCode = languageCode,
                     page = page,
                     size = size,
                     token = "Bearer ${SharedPreferenceManager.token}",

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentAllActivity.kt

@@ -17,7 +17,6 @@ import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
 import kr.co.vividnext.sodalive.common.LoadingDialog
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentAllBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import kr.co.vividnext.sodalive.home.HomeContentAdapter
@@ -44,7 +43,6 @@ class AudioContentAllActivity : BaseActivity<ActivityAudioContentAllBinding>(
         super.onCreate(savedInstanceState)
 
         bindData()
-        viewModel.languageCode = getCurrentLanguageCode(this)
         viewModel.reset()
         viewModel.getThemeList(
             isFree = if (isFree) true else null,

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentAllViewModel.kt

@@ -34,8 +34,6 @@ class AudioContentAllViewModel(
     val sortLiveData: LiveData<AudioContentViewModel.Sort>
         get() = _sortLiveData
 
-    var languageCode: String = "ko"
-
     private var page = 1
     private val size = 20
     private var isLast = false
@@ -94,7 +92,6 @@ class AudioContentAllViewModel(
             repository.getAllAudioContents(
                 page = page,
                 size = size,
-                languageCode = languageCode,
                 isFree = isFree,
                 isPointAvailableOnly = isPointAvailableOnly,
                 sortType = _sortLiveData.value!!,

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllActivity.kt

@@ -17,7 +17,6 @@ import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
 import kr.co.vividnext.sodalive.common.LoadingDialog
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentNewAllBinding
 import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import kr.co.vividnext.sodalive.extensions.dpToPx
@@ -43,7 +42,6 @@ class AudioContentNewAllActivity : BaseActivity<ActivityAudioContentNewAllBindin
         super.onCreate(savedInstanceState)
 
         bindData()
-        viewModel.languageCode = getCurrentLanguageCode(this)
         viewModel.getThemeList()
         viewModel.getNewContentList(isFree = isFree)
     }

app/src/main/java/kr/co/vividnext/sodalive/audio_content/all/AudioContentNewAllViewModel.kt

@@ -35,8 +35,6 @@ class AudioContentNewAllViewModel(
     val newContentTotalCountLiveData: LiveData<Int>
         get() = _newContentTotalCountLiveData
 
-    var languageCode: String = "ko"
-
     private var isLast = false
     private var page = 1
     private val size = 10
@@ -49,7 +47,6 @@ class AudioContentNewAllViewModel(
 
             compositeDisposable.add(
                 repository.getNewContentAllOfTheme(
-                    languageCode = languageCode,
                     isFree = isFree,
                     theme = selectedTheme,
                     page = page,

app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailActivity.kt

@@ -43,7 +43,6 @@ import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
 import kr.co.vividnext.sodalive.common.Utils
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.ActivityAudioContentDetailBinding
 import kr.co.vividnext.sodalive.explorer.profile.CreatorFollowNotifyFragment
 import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
@@ -130,7 +129,6 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
         }
 
         bindData()
-        viewModel.languageCode = getCurrentLanguageCode(applicationContext)
         viewModel.getAudioContentDetail(audioContentId = audioContentId) { finish() }
     }
 

app/src/main/java/kr/co/vividnext/sodalive/audio_content/detail/AudioContentDetailViewModel.kt

@@ -55,8 +55,6 @@ class AudioContentDetailViewModel(
     val isContentPlayLoopLiveData: LiveData<Boolean>
         get() = _isContentPlayLoopLiveData
 
-    var languageCode: String = "ko"
-
     private fun getString(@StringRes resId: Int, vararg args: Any) =
         SodaLiveApplicationHolder.get().getString(resId, *args)
 
@@ -71,7 +69,6 @@ class AudioContentDetailViewModel(
         compositeDisposable.add(
             repository.getAudioContentDetail(
                 audioContentId = audioContentId,
-                languageCode = languageCode,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())

app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterApi.kt

@@ -16,15 +16,13 @@ import retrofit2.http.Query
 interface CharacterApi {
     @GET("/api/chat/character/main")
     fun getCharacterMain(
-        @Query("languageCode") languageCode: String,
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<CharacterHomeResponse>>
 
     @GET("/api/chat/character/{characterId}")
     fun getCharacterDetail(
         @Header("Authorization") authHeader: String,
-        @Path("characterId") characterId: Long,
+        @Path("characterId") characterId: Long
-        @Query("languageCode") languageCode: String
     ): Single<ApiResponse<CharacterDetailResponse>>
 
     @GET("/api/chat/character/image/list")
@@ -50,14 +48,12 @@ interface CharacterApi {
     fun getRecentCharacters(
         @Header("Authorization") authHeader: String,
         @Query("page") page: Int,
-        @Query("size") size: Int,
+        @Query("size") size: Int
-        @Query("languageCode") languageCode: String
     ): Single<ApiResponse<kr.co.vividnext.sodalive.chat.character.newcharacters.RecentCharactersResponse>>
 
     // 추천 캐릭터 새로고침
     @GET("/api/chat/character/recommend")
     fun refreshRecommendCharacters(
-        @Query("languageCode") languageCode: String,
         @Header("Authorization") authHeader: String
     ): Single<ApiResponse<List<Character>>>
 

app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabFragment.kt

@@ -27,7 +27,6 @@ import kr.co.vividnext.sodalive.chat.character.newcharacters.NewCharactersAllAda
 import kr.co.vividnext.sodalive.chat.character.recent.RecentCharacterAdapter
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.FragmentCharacterTabBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import kr.co.vividnext.sodalive.main.MainActivity
@@ -57,7 +56,7 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
         setupView()
         observeViewModel()
 
-        viewModel.fetchData(languageCode = getCurrentLanguageCode(requireContext()))
+        viewModel.fetchData()
     }
 
     private fun setupView() {
@@ -355,9 +354,7 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
 
         // 새로고침 버튼 클릭 처리
         binding.ivRecommendRefresh.setOnClickListener {
-            viewModel.refreshRecommendCharacters(
+            viewModel.refreshRecommendCharacters()
-                languageCode = getCurrentLanguageCode(requireContext())
-            )
         }
 
         // 추천 캐릭터 관찰

app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabRepository.kt

@@ -1,16 +1,9 @@
 package kr.co.vividnext.sodalive.chat.character
 
 class CharacterTabRepository(private val api: CharacterApi) {
-    fun getCharacterMain(
+    fun getCharacterMain(token: String) = api.getCharacterMain(authHeader = token)
-        languageCode: String,
-        token: String
-    ) = api.getCharacterMain(
-        languageCode = languageCode,
-        authHeader = token
-    )
 
     fun refreshRecommendCharacters(
-        languageCode: String,
         token: String
-    ) = api.refreshRecommendCharacters(languageCode = languageCode, authHeader = token)
+    ) = api.refreshRecommendCharacters(authHeader = token)
 }

app/src/main/java/kr/co/vividnext/sodalive/chat/character/CharacterTabViewModel.kt

@@ -46,12 +46,11 @@ class CharacterTabViewModel(
     val recommendCharacters: LiveData<List<Character>>
         get() = _recommendCharacters
 
-    fun fetchData(languageCode: String) {
+    fun fetchData() {
         _isLoading.value = true
 
         compositeDisposable.add(
             repository.getCharacterMain(
-                languageCode = languageCode,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())
@@ -83,11 +82,10 @@ class CharacterTabViewModel(
         )
     }
 
-    fun refreshRecommendCharacters(languageCode: String) {
+    fun refreshRecommendCharacters() {
         _isLoading.value = true
         compositeDisposable.add(
             repository.refreshRecommendCharacters(
-                languageCode = languageCode,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())

app/src/main/java/kr/co/vividnext/sodalive/chat/character/detail/detail/CharacterDetailFragment.kt

@@ -23,7 +23,6 @@ import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity.Co
 import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.FragmentCharacterDetailBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
@@ -79,7 +78,7 @@ class CharacterDetailFragment : BaseFragment<FragmentCharacterDetailBinding>(
         setupView()
         bindObservers()
 
-        viewModel.load(characterId, languageCode = getCurrentLanguageCode(requireContext()))
+        viewModel.load(characterId)
     }
 
     @SuppressLint("SetTextI18n")
@@ -318,8 +317,7 @@ class CharacterDetailFragment : BaseFragment<FragmentCharacterDetailBinding>(
                                 binding.etCommentInput.setText("")
                                 showToast(getString(R.string.character_detail_comment_register_success))
                                 viewModel.load(
-                                    targetCharacterId,
+                                    targetCharacterId
-                                    languageCode = getCurrentLanguageCode(requireContext())
                                 )
                             } else {
                                 showToast(

app/src/main/java/kr/co/vividnext/sodalive/chat/character/detail/detail/CharacterDetailRepository.kt

@@ -10,12 +10,10 @@ class CharacterDetailRepository(
 ) {
     fun getCharacterDetail(
         token: String,
-        characterId: Long,
+        characterId: Long
-        languageCode: String
     ) = characterApi.getCharacterDetail(
         authHeader = token,
-        characterId = characterId,
+        characterId = characterId
-        languageCode = languageCode
     )
 
     fun createChatRoom(token: String, request: CreateChatRoomRequest) =

app/src/main/java/kr/co/vividnext/sodalive/chat/character/detail/detail/CharacterDetailViewModel.kt

@@ -33,15 +33,14 @@ class CharacterDetailViewModel(
     private val _uiState = MutableLiveData(UiState())
     val uiState: LiveData<UiState> get() = _uiState
 
-    fun load(characterId: Long, languageCode: String) {
+    fun load(characterId: Long) {
         _uiState.value = _uiState.value?.copy(isLoading = true, error = null)
         val token = "Bearer ${SharedPreferenceManager.token}"
 
         compositeDisposable.add(
             repository.getCharacterDetail(
                 token = token,
-                characterId = characterId,
+                characterId = characterId
-                languageCode = languageCode
             )
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllActivity.kt

@@ -12,7 +12,6 @@ import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity
 import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity.Companion.EXTRA_CHARACTER_ID
 import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
 import kr.co.vividnext.sodalive.common.LoadingDialog
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.ActivityNewCharactersAllBinding
 import kr.co.vividnext.sodalive.extensions.dpToPx
 import org.koin.android.ext.android.inject
@@ -29,7 +28,6 @@ class NewCharactersAllActivity : BaseActivity<ActivityNewCharactersAllBinding>(
         super.onCreate(savedInstanceState)
         setupView()
         bindData()
-        viewModel.languageCode = getCurrentLanguageCode(this)
         viewModel.loadMore()
     }
 

app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersAllViewModel.kt

@@ -27,8 +27,6 @@ class NewCharactersAllViewModel(
     private val _items = MutableLiveData<List<Character>>(emptyList())
     val items: LiveData<List<Character>> get() = _items
 
-    var languageCode: String = "ko"
-
     private var page = 0
     private val size = 20
     private var isLast = false
@@ -41,8 +39,7 @@ class NewCharactersAllViewModel(
             repository.getRecentCharacters(
                 token = "Bearer ${SharedPreferenceManager.token}",
                 page = page,
-                size = size,
+                size = size
-                languageCode = languageCode
             )
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/kr/co/vividnext/sodalive/chat/character/newcharacters/NewCharactersRepository.kt

@@ -10,14 +10,12 @@ class NewCharactersRepository(
     fun getRecentCharacters(
         token: String,
         page: Int,
-        size: Int,
+        size: Int
-        languageCode: String
     ): Single<ApiResponse<RecentCharactersResponse>> {
         return api.getRecentCharacters(
             authHeader = token,
             page = page,
-            size = size,
+            size = size
-            languageCode = languageCode
         )
     }
 }

app/src/main/java/kr/co/vividnext/sodalive/common/Utils.kt

@@ -41,9 +41,4 @@ object Utils {
 
         return "https://voiceon.onelink.me/RkTm?$encodedParams"
     }
-
-    fun getCurrentLanguageCode(context: Context): String {
-        // 효과적 언어 코드(사용자 설정 > 시스템 지원 언어 > ko)를 반환한다.
-        return LanguageManager.getEffectiveLanguage(context)
-    }
 }

app/src/main/java/kr/co/vividnext/sodalive/home/HomeApi.kt

@@ -13,7 +13,6 @@ interface HomeApi {
     @GET("/api/home")
     fun getHomeData(
         @Query("timezone") timezone: String,
-        @Query("languageCode") languageCode: String,
         @Query("isAdultContentVisible") isAdultContentVisible: Boolean,
         @Query("contentType") contentType: ContentType,
         @Header("Authorization") authHeader: String

app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt

@@ -43,8 +43,6 @@ import kr.co.vividnext.sodalive.chat.character.detail.CharacterDetailActivity.Co
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.common.SharedPreferenceManager
-import kr.co.vividnext.sodalive.common.Utils
-import kr.co.vividnext.sodalive.common.Utils.getCurrentLanguageCode
 import kr.co.vividnext.sodalive.databinding.FragmentHomeBinding
 import kr.co.vividnext.sodalive.explorer.profile.UserProfileActivity
 import kr.co.vividnext.sodalive.extensions.dpToPx
@@ -125,7 +123,7 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(FragmentHomeBinding::infl
         setupView()
         bindData()
 
-        viewModel.fetchData(languageCode = getCurrentLanguageCode(requireContext()))
+        viewModel.fetchData()
     }
 
     override fun onDestroyView() {

app/src/main/java/kr/co/vividnext/sodalive/home/HomeRepository.kt

@@ -5,9 +5,8 @@ import kr.co.vividnext.sodalive.settings.ContentType
 import java.util.TimeZone
 
 class HomeRepository(private val api: HomeApi) {
-    fun fetchData(languageCode: String, token: String) = api.getHomeData(
+    fun fetchData(token: String) = api.getHomeData(
         timezone = TimeZone.getDefault().id,
-        languageCode = languageCode,
         isAdultContentVisible = SharedPreferenceManager.isAdultContentVisible,
         contentType = ContentType.entries[SharedPreferenceManager.contentPreference],
         authHeader = token

app/src/main/java/kr/co/vividnext/sodalive/home/HomeViewModel.kt

@@ -85,12 +85,11 @@ class HomeViewModel(
     val recommendContentListLiveData: LiveData<List<AudioContentMainItem>>
         get() = _recommendContentListLiveData
 
-    fun fetchData(languageCode: String) {
+    fun fetchData() {
         _isLoading.value = true
 
         compositeDisposable.add(
             repository.fetchData(
-                languageCode = languageCode,
                 token = "Bearer ${SharedPreferenceManager.token}"
             )
                 .subscribeOn(Schedulers.io())

app/src/main/java/kr/co/vividnext/sodalive/settings/language/LocaleHelper.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.settings.language
 import android.content.Context
 import android.os.Build
 import android.os.LocaleList
-import android.text.TextUtils
 import java.util.Locale
 
 object LocaleHelper {