Merge branch 'feat/week4_advanced' into develop

app/build.gradle

@@ -10,7 +10,7 @@ Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 
 android {
-    namespace 'org.sopt.dosopttemplate'
+    namespace 'org.sopt.dosoptkwanheejo'
     compileSdk 33
 
     defaultConfig {
@@ -22,6 +22,9 @@ android {
 
         buildConfigField "String", "BASE_URL", properties["base.url"]
         buildConfigField "String", "USER_BASE_URL", properties["user.base.url"]
+        buildConfigField "String", "NAVER_PAPAGO_BASE_URL", properties["naver.papago.base.url"]
+        buildConfigField "String", "NAVER_CLIENT_ID", properties["naver.client.id"]
+        buildConfigField "String", "NAVER_CLIENT_SECRET", properties["naver.client.secret"]
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/androidTest/java/org/sopt/dosopttemplate/ExampleInstrumentedTest.kt → app/src/androidTest/java/org/sopt/dosoptkwanheejo/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate
+package org.sopt.dosoptkwanheejo
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/java/org/sopt/dosopttemplate/DoSoptApp.kt → app/src/main/java/org/sopt/dosoptkwanheejo/DoSoptApp.kt

@@ -1,11 +1,12 @@
-package org.sopt.dosopttemplate
+package org.sopt.dosoptkwanheejo
 
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
-import org.sopt.dosopttemplate.db.remote.AuthApiHelper
-import org.sopt.dosopttemplate.db.remote.RetrofitServicePool
-import org.sopt.dosopttemplate.db.remote.UserApiHelper
+import org.sopt.dosoptkwanheejo.db.remote.AuthApiHelper
+import org.sopt.dosoptkwanheejo.db.remote.NaverApiHelper
+import org.sopt.dosoptkwanheejo.db.remote.RetrofitServicePool
+import org.sopt.dosoptkwanheejo.db.remote.UserApiHelper
 
 class DoSoptApp : Application() {
     override fun onCreate() {
@@ -17,6 +18,7 @@ class DoSoptApp : Application() {
         lateinit var sharedPreferencesInstance: SharedPreferences
         private lateinit var authApiHelper: AuthApiHelper
         private lateinit var userApiHelper: UserApiHelper
+        private lateinit var naverApiHelper: NaverApiHelper
 
         @Synchronized
         private fun getSharedPreferencesInstance(context: Context): SharedPreferences {
@@ -31,7 +33,11 @@ class DoSoptApp : Application() {
 
         fun getApiHelperInstance(): AuthApiHelper {
             if (!::authApiHelper.isInitialized) {
-                authApiHelper = AuthApiHelper(RetrofitServicePool.authService)
+                try {
+                    authApiHelper = AuthApiHelper(RetrofitServicePool.authService)
+                } catch (e: ExceptionInInitializerError) {
+                    e.printStackTrace()
+                }
             }
             return authApiHelper
         }
@@ -42,5 +48,12 @@ class DoSoptApp : Application() {
             }
             return userApiHelper
         }
+
+        fun getNaverApiHelperInstance(): NaverApiHelper {
+            if (!::naverApiHelper.isInitialized) {
+                naverApiHelper = NaverApiHelper(RetrofitServicePool.naverPapagoService)
+            }
+            return naverApiHelper
+        }
     }
 }

app/src/main/java/org/sopt/dosopttemplate/adapter/user/UserAdapter.kt → app/src/main/java/org/sopt/dosoptkwanheejo/adapter/user/UserAdapter.kt

@@ -1,11 +1,11 @@
-package org.sopt.dosopttemplate.adapter.user
+package org.sopt.dosoptkwanheejo.adapter.user
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
-import org.sopt.dosopttemplate.databinding.ItemUserBinding
-import org.sopt.dosopttemplate.model.dto.resp.user.UserDataResp
+import org.sopt.dosoptkwanheejo.databinding.ItemUserBinding
+import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserDataResp
 
 class UserAdapter : ListAdapter<UserDataResp, UserViewHolder>(diffUtil) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): UserViewHolder {

app/src/main/java/org/sopt/dosopttemplate/adapter/user/UserViewHolder.kt → app/src/main/java/org/sopt/dosoptkwanheejo/adapter/user/UserViewHolder.kt

@@ -1,10 +1,9 @@
-package org.sopt.dosopttemplate.adapter.user
+package org.sopt.dosoptkwanheejo.adapter.user
 
 import androidx.recyclerview.widget.RecyclerView
-import org.sopt.dosopttemplate.databinding.ItemUserBinding
-import org.sopt.dosopttemplate.model.dto.resp.user.UserDataResp
-import org.sopt.dosopttemplate.util.loadUrl
-import org.sopt.dosopttemplate.util.roundedCornerGlide
+import org.sopt.dosoptkwanheejo.databinding.ItemUserBinding
+import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserDataResp
+import org.sopt.dosoptkwanheejo.util.loadUrl
 
 class UserViewHolder(
     private val binding: ItemUserBinding

app/src/main/java/org/sopt/dosopttemplate/api/AuthAPI.kt → app/src/main/java/org/sopt/dosoptkwanheejo/api/AuthAPI.kt

@@ -1,8 +1,8 @@
-package org.sopt.dosopttemplate.api
+package org.sopt.dosoptkwanheejo.api
 
-import org.sopt.dosopttemplate.model.dto.req.LoginReq
-import org.sopt.dosopttemplate.model.dto.req.SignUpReq
-import org.sopt.dosopttemplate.model.dto.resp.auth.LoginResp
+import org.sopt.dosoptkwanheejo.model.dto.req.LoginReq
+import org.sopt.dosoptkwanheejo.model.dto.req.SignUpReq
+import org.sopt.dosoptkwanheejo.model.dto.resp.auth.LoginResp
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST

app/src/main/java/org/sopt/dosoptkwanheejo/api/NaverAPI.kt

@@ -0,0 +1,17 @@
+package org.sopt.dosoptkwanheejo.api
+
+import org.sopt.dosoptkwanheejo.model.dto.resp.NaverPapagoResp
+import retrofit2.Call
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.POST
+
+interface NaverAPI {
+    @FormUrlEncoded
+    @POST("v1/papago/n2mt")
+    fun getTranslatedTextToPapago(
+        @Field("source") source: String,
+        @Field("target") target: String,
+        @Field("text") text: String
+    ): Call<NaverPapagoResp>
+}

app/src/main/java/org/sopt/dosopttemplate/api/UserAPI.kt → app/src/main/java/org/sopt/dosoptkwanheejo/api/UserAPI.kt

@@ -1,6 +1,6 @@
-package org.sopt.dosopttemplate.api
+package org.sopt.dosoptkwanheejo.api
 
-import org.sopt.dosopttemplate.model.dto.resp.user.UserResp
+import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserResp
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query

app/src/main/java/org/sopt/dosopttemplate/base/BaseActivity.kt → app/src/main/java/org/sopt/dosoptkwanheejo/base/BaseActivity.kt

@@ -1,10 +1,9 @@
-package org.sopt.dosopttemplate.base
+package org.sopt.dosoptkwanheejo.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
-import com.google.android.material.snackbar.Snackbar
 
 abstract class BaseActivity<T : ViewBinding>(val bindingFactory: (LayoutInflater) -> T) :
     AppCompatActivity() {

app/src/main/java/org/sopt/dosopttemplate/base/BaseDialogFragment.kt → app/src/main/java/org/sopt/dosoptkwanheejo/base/BaseDialogFragment.kt

@@ -1,17 +1,13 @@
-package org.sopt.dosopttemplate.base
+package org.sopt.dosoptkwanheejo.base
 
-import android.content.DialogInterface
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import androidx.annotation.LayoutRes
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.DialogFragment
-import org.sopt.dosopttemplate.util.showShortSnackBar
 
 abstract class BaseDialogFragment<T : ViewDataBinding> : DialogFragment() {
     @get:LayoutRes

app/src/main/java/org/sopt/dosopttemplate/base/BaseFragment.kt → app/src/main/java/org/sopt/dosoptkwanheejo/base/BaseFragment.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.base
+package org.sopt.dosoptkwanheejo.base
 
 import android.os.Bundle
 import android.view.LayoutInflater

app/src/main/java/org/sopt/dosopttemplate/db/local/PreferenceManager.kt → app/src/main/java/org/sopt/dosoptkwanheejo/db/local/PreferenceManager.kt

@@ -1,8 +1,7 @@
-package org.sopt.dosopttemplate.db.local
+package org.sopt.dosoptkwanheejo.db.local
 
 import androidx.core.content.edit
-import org.sopt.dosopttemplate.DoSoptApp.Companion.sharedPreferencesInstance
-import org.sopt.dosopttemplate.model.User
+import org.sopt.dosoptkwanheejo.DoSoptApp.Companion.sharedPreferencesInstance
 
 class PreferenceManager {
     fun setAutoLogin(auto: Boolean) {

app/src/main/java/org/sopt/dosopttemplate/db/remote/AuthApiHelper.kt → app/src/main/java/org/sopt/dosoptkwanheejo/db/remote/AuthApiHelper.kt

@@ -1,15 +1,14 @@
-package org.sopt.dosopttemplate.db.remote
+package org.sopt.dosoptkwanheejo.db.remote
 
-import android.util.Log
-import org.sopt.dosopttemplate.api.AuthAPI
-import org.sopt.dosopttemplate.db.local.PreferenceManager
-import org.sopt.dosopttemplate.db.remote.RetrofitManager.BASE_URL
-import org.sopt.dosopttemplate.model.dto.RespResult
-import org.sopt.dosopttemplate.model.dto.req.LoginReq
-import org.sopt.dosopttemplate.model.dto.req.SignUpReq
-import org.sopt.dosopttemplate.model.dto.resp.auth.LoginResp
-import org.sopt.dosopttemplate.model.dto.resp.auth.SignUpResp
-import org.sopt.dosopttemplate.util.toErrorResult
+import org.sopt.dosoptkwanheejo.api.AuthAPI
+import org.sopt.dosoptkwanheejo.db.local.PreferenceManager
+import org.sopt.dosoptkwanheejo.db.remote.RetrofitManager.BASE_URL
+import org.sopt.dosoptkwanheejo.model.dto.RespResult
+import org.sopt.dosoptkwanheejo.model.dto.req.LoginReq
+import org.sopt.dosoptkwanheejo.model.dto.req.SignUpReq
+import org.sopt.dosoptkwanheejo.model.dto.resp.auth.LoginResp
+import org.sopt.dosoptkwanheejo.model.dto.resp.auth.SignUpResp
+import org.sopt.dosoptkwanheejo.util.toErrorResult
 import retrofit2.Call
 import retrofit2.Response
 

app/src/main/java/org/sopt/dosoptkwanheejo/db/remote/NaverApiHelper.kt

@@ -0,0 +1,25 @@
+package org.sopt.dosoptkwanheejo.db.remote
+
+import org.sopt.dosoptkwanheejo.api.NaverAPI
+import org.sopt.dosoptkwanheejo.model.dto.resp.NaverPapagoResp
+import org.sopt.dosoptkwanheejo.model.dto.resp.NaverPapagoResult
+import retrofit2.Call
+import retrofit2.Response
+
+class NaverApiHelper(private val naverAPI: NaverAPI) {
+    fun getTranslatedTextToPapago(source: String, target: String, text: String, onResponse: (NaverPapagoResult) -> Unit) {
+        naverAPI.getTranslatedTextToPapago(source, target, text).enqueue(object: retrofit2.Callback<NaverPapagoResp>{
+            override fun onResponse(
+                call: Call<NaverPapagoResp>,
+                response: Response<NaverPapagoResp>
+            ) {
+                if (response.isSuccessful) {
+                    response.body()?.message?.result?.let { onResponse(it) }
+                }
+            }
+
+            override fun onFailure(call: Call<NaverPapagoResp>, t: Throwable) {
+            }
+        })
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/db/remote/RetrofitManager.kt → app/src/main/java/org/sopt/dosoptkwanheejo/db/remote/RetrofitManager.kt

@@ -1,27 +1,39 @@
-package org.sopt.dosopttemplate.db.remote
+package org.sopt.dosoptkwanheejo.db.remote
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.json.Json
+import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import org.sopt.dosopttemplate.BuildConfig
-import org.sopt.dosopttemplate.BuildConfig.BASE_URL
-import org.sopt.dosopttemplate.api.AuthAPI
-import org.sopt.dosopttemplate.api.UserAPI
-import org.sopt.dosopttemplate.db.remote.RetrofitManager.USER_BASE_URL
+import org.sopt.dosoptkwanheejo.BuildConfig
+import org.sopt.dosoptkwanheejo.BuildConfig.BASE_URL
+import org.sopt.dosoptkwanheejo.api.AuthAPI
+import org.sopt.dosoptkwanheejo.api.NaverAPI
+import org.sopt.dosoptkwanheejo.api.UserAPI
+import org.sopt.dosoptkwanheejo.db.remote.RetrofitManager.NAVER_PAPAGO_BASE_URL
+import org.sopt.dosoptkwanheejo.db.remote.RetrofitManager.USER_BASE_URL
 import retrofit2.Retrofit
 
 object RetrofitManager {
     const val BASE_URL = BuildConfig.BASE_URL
     const val USER_BASE_URL = BuildConfig.USER_BASE_URL
+    const val NAVER_PAPAGO_BASE_URL = BuildConfig.NAVER_PAPAGO_BASE_URL
 
     private val httpLoggingInterceptor = HttpLoggingInterceptor()
         .setLevel(HttpLoggingInterceptor.Level.BODY)
 
-    private val okHttpClient = OkHttpClient
-        .Builder()
+    private val okHttpClient = OkHttpClient.Builder()
         .addInterceptor(httpLoggingInterceptor)
+        .addInterceptor { it: Interceptor.Chain ->
+            val request = it.request()
+                .newBuilder()
+                .addHeader("X-Naver-Client-Id", BuildConfig.NAVER_CLIENT_ID)
+                .addHeader("X-Naver-Client-Secret", BuildConfig.NAVER_CLIENT_SECRET)
+                .build()
+
+            it.proceed(request)
+        }
         .build()
 
     fun getRetrofit(url: String): Retrofit =
@@ -38,4 +50,5 @@ object RetrofitManager {
 object RetrofitServicePool {
     val authService = RetrofitManager.create<AuthAPI, String>(BASE_URL)
     val userService = RetrofitManager.create<UserAPI, String>(USER_BASE_URL)
+    val naverPapagoService = RetrofitManager.create<NaverAPI, String>(NAVER_PAPAGO_BASE_URL)
 }

app/src/main/java/org/sopt/dosopttemplate/db/remote/UserApiHelper.kt → app/src/main/java/org/sopt/dosoptkwanheejo/db/remote/UserApiHelper.kt

@@ -1,9 +1,7 @@
-package org.sopt.dosopttemplate.db.remote
+package org.sopt.dosoptkwanheejo.db.remote
 
-import android.util.Log
-import org.sopt.dosopttemplate.api.AuthAPI
-import org.sopt.dosopttemplate.api.UserAPI
-import org.sopt.dosopttemplate.model.dto.resp.user.UserResp
+import org.sopt.dosoptkwanheejo.api.UserAPI
+import org.sopt.dosoptkwanheejo.model.dto.resp.user.UserResp
 import retrofit2.Call
 import retrofit2.Response
 

app/src/main/java/org/sopt/dosopttemplate/model/HomeBottomItem.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/HomeBottomItem.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.model
+package org.sopt.dosoptkwanheejo.model
 
 enum class HomeBottomItem {
     ANDROID, HOME, MYPAGE

app/src/main/java/org/sopt/dosopttemplate/model/Music.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/Music.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.model
+package org.sopt.dosoptkwanheejo.model
 
 
 data class Music(

app/src/main/java/org/sopt/dosopttemplate/model/User.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/User.kt

@@ -1,8 +1,8 @@
-package org.sopt.dosopttemplate.model
+package org.sopt.dosoptkwanheejo.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
-import org.sopt.dosopttemplate.util.MBTI
+import org.sopt.dosoptkwanheejo.util.MBTI
 
 @Parcelize
 data class User(

app/src/main/java/org/sopt/dosopttemplate/model/dto/RespResult.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/dto/RespResult.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.model.dto
+package org.sopt.dosoptkwanheejo.model.dto
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/model/dto/req/LoginReq.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/dto/req/LoginReq.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.model.dto.req
+package org.sopt.dosoptkwanheejo.model.dto.req
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosopttemplate/model/dto/req/SignUpReq.kt → app/src/main/java/org/sopt/dosoptkwanheejo/model/dto/req/SignUpReq.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.model.dto.req
+package org.sopt.dosoptkwanheejo.model.dto.req
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/org/sopt/dosoptkwanheejo/model/dto/resp/NaverPapagoResp.kt

@@ -0,0 +1,35 @@
+package org.sopt.dosoptkwanheejo.model.dto.resp
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class NaverPapagoResp(
+    @SerialName("message")
+    val message: NaverPapagoType
+)
+
+@Serializable
+data class NaverPapagoType(
+    @SerialName("@type")
+    val type: String,
+    @SerialName("@service")
+    val service: String,
+    @SerialName("@version")
+    val version: String,
+    @SerialName("result")
+    val result: NaverPapagoResult
+)
+
+@Serializable
+data class NaverPapagoResult(
+    @SerialName("srcLangType")
+    val srcLangType: String,
+    @SerialName("tarLangType")
+    val tarLangType: String,
+    @SerialName("translatedText")
+    val translatedText: String,
+    @SerialName("engineType")
+    val engineType: String
+)