Feat/week xml 07

app/build.gradle

@@ -71,5 +71,7 @@ dependencies {
 // define any required OkHttp artifacts without version
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
 
+    implementation 'com.google.android.gms:play-services-location:21.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
         android:allowBackup="true"
@@ -12,24 +14,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NOWSOPTAndroid"
-        tools:targetApi="31"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.Login.LoginActivity"
             android:exported="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name=".MainActivity"
-            android:exported="false"></activity>
+            android:name=".presentation.MainActivity"
+            android:exported="false" />
         <activity
-            android:name=".SignUpActivity"
+            android:name=".presentation.SignUpActivity"
             android:exported="false" />
     </application>
 

app/src/main/java/com/sopt/now/Test.kt

@@ -0,0 +1,121 @@
+//package com.sopt.now
+//
+//import android.content.pm.PackageManager
+//import android.location.Location
+//import android.os.Bundle
+//import android.os.PersistableBundle
+//import android.widget.Toast
+//import androidx.activity.result.ActivityResultLauncher
+//import androidx.activity.result.contract.ActivityResultContracts
+//import androidx.appcompat.app.AlertDialog
+//import androidx.appcompat.app.AppCompatActivity
+//import androidx.core.app.ActivityCompat
+//import androidx.core.content.ContextCompat
+//import com.google.android.gms.location.FusedLocationProviderClient
+//import com.google.android.gms.location.LocationServices
+//import com.sopt.now.databinding.ActivityLoginBinding
+//import com.sopt.now.databinding.ActivityTestBinding
+//
+////class TestActivity : AppCompatActivity(){
+////    private lateinit var binding: ActivityTestBinding
+////
+////    override fun onCreate(savedInstanceState: Bundle?) {
+////        super.onCreate(savedInstanceState)
+////        binding = ActivityTestBinding.inflate(layoutInflater)
+////        setContentView(binding.root)
+////    }
+////}
+//
+//class TestActivity : AppCompatActivity() {
+//
+//    private lateinit var binding: ActivityTestBinding
+//    private lateinit var fusedLocationClient: FusedLocationProviderClient
+//    private lateinit var requestPermissionLauncher: ActivityResultLauncher<String>
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        binding = ActivityTestBinding.inflate(layoutInflater)
+//        setContentView(binding.root)
+//
+//        // 위치 제공자 초기화
+//        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
+//
+//        // 권한 요청 런처 초기화
+//        requestPermissionLauncher =
+//            registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+//                if (isGranted) {
+//                    // 권한이 허용된 경우 위치 정보 가져오기
+//                    getLastKnownLocation()
+//                } else {
+//                    // 권한이 거부된 경우 처리
+//                    showPermissionDeniedMessage()
+//                }
+//            }
+//
+//        binding.getLocationButton.setOnClickListener {
+//            checkPermissionAndRequestLocation()
+//        }
+//    }
+//
+//    private fun checkPermissionAndRequestLocation() {
+//        when {
+//            ContextCompat.checkSelfPermission(
+//                this,
+//                android.Manifest.permission.ACCESS_FINE_LOCATION
+//            ) == PackageManager.PERMISSION_GRANTED -> {
+//                // 권한이 이미 허용된 경우
+//                getLastKnownLocation()
+//            }
+//
+//            ActivityCompat.shouldShowRequestPermissionRationale(
+//                this,
+//                android.Manifest.permission.ACCESS_FINE_LOCATION
+//            ) -> {
+//                // 권한 요청 이유 설명이 필요한 경우
+//                showRationaleDialog()
+//            }
+//
+//            else -> {
+//                // 권한 요청
+//                requestPermissionLauncher.launch(android.Manifest.permission.ACCESS_FINE_LOCATION)
+//            }
+//        }
+//    }
+//
+//    private fun getLastKnownLocation() {
+//        if (ActivityCompat.checkSelfPermission(
+//                this,
+//                android.Manifest.permission.ACCESS_FINE_LOCATION
+//            ) == PackageManager.PERMISSION_GRANTED
+//        ) {
+//            fusedLocationClient.lastLocation
+//                .addOnSuccessListener { location: Location? ->
+//                    // 위치 정보를 성공적으로 가져온 경우
+//                    if (location != null) {
+//                        binding.locationTextView.text =
+//                            "위도: ${location.latitude}, 경도: ${location.longitude}"
+//                    } else {
+//                        binding.locationTextView.text = "위치 정보를 가져올 수 없습니다."
+//                    }
+//                }
+//        }
+//    }
+//
+//    private fun showRationaleDialog() {
+//        // 권한 요청 이유를 사용자에게 설명하는 다이얼로그 등을 표시
+//        // 예시: AlertDialog를 사용하여 권한 요청 이유 설명
+//        AlertDialog.Builder(this)
+//            .setTitle("권한 필요")
+//            .setMessage("위치 정보를 가져오려면 위치 접근 권한이 필요합니다.")
+//            .setPositiveButton("확인") { _, _ ->
+//                requestPermissionLauncher.launch(android.Manifest.permission.ACCESS_FINE_LOCATION)
+//            }
+//            .setNegativeButton("취소", null)
+//            .show()
+//    }
+//
+//    private fun showPermissionDeniedMessage() {
+//        // 권한 거부 시 사용자에게 표시할 메시지
+//        Toast.makeText(this, "권한이 거부되었습니다. 위치 정보를 가져올 수 없습니다.", Toast.LENGTH_SHORT).show()
+//    }
+//}

app/src/main/java/com/sopt/now/data/AuthRepoImpl.kt

@@ -0,0 +1,32 @@
+package com.sopt.now.data
+
+import com.sopt.now.data.api.AuthService
+import com.sopt.now.data.dto.LoginDto.RequestLogInDto
+import com.sopt.now.data.dto.SignUp.RequestSignUpDto
+import com.sopt.now.domain.AuthRepository
+import com.sopt.now.domain.model.AuthEntity
+import retrofit2.Response
+
+class AuthRepoImpl(
+    private val authService: AuthService,
+) : AuthRepository {
+    override suspend fun logIn(authData: AuthEntity): Result<Response<Unit>> = runCatching {
+        authService.logIn(
+            request = RequestLogInDto(
+                authenticationId = authData.id,
+                password = authData.pw
+            )
+        )
+    }
+
+    override suspend fun signUp(authData: AuthEntity): Result<Response<Unit>> = runCatching {
+        authService.signUp(
+            RequestSignUpDto(
+                authenticationId = authData.id,
+                password = authData.pw,
+                nickname = authData.name ?: "",
+                phone = authData.phone ?: ""
+            )
+        )
+    }
+}

app/src/main/java/com/sopt/now/api/ApiFactory.kt → app/src/main/java/com/sopt/now/data/api/ApiFactory.kt

@@ -1,16 +1,27 @@
-package com.sopt.now.api
+package com.sopt.now.data.api
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-import com.sopt.now.BuildConfig
+import com.sopt.now.compose.BuildConfig
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 
 object ApiFactory {
     private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
 
+    val loggingInterceptor = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    val client = OkHttpClient.Builder()
+        .addInterceptor(loggingInterceptor)
+        .build()
+
     val retrofit: Retrofit by lazy {
         Retrofit.Builder()
+            .client(client)
             .baseUrl(BASE_URL)
             .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
             .build()

app/src/main/java/com/sopt/now/api/AuthService.kt → app/src/main/java/com/sopt/now/data/api/AuthService.kt

@@ -1,26 +1,27 @@
-package com.sopt.now.api
+package com.sopt.now.data.api
 
-import com.sopt.now.dto.LoginDto.RequestLogInDto
-import com.sopt.now.dto.SignUp.RequestSignUpDto
-import com.sopt.now.dto.LoginDto.ResponseLogInDto
-import com.sopt.now.dto.SignUp.ResponseSignUpDto
-import com.sopt.now.dto.ResponseUserProfile
+import com.sopt.now.data.dto.LoginDto.RequestLogInDto
+import com.sopt.now.data.dto.SignUp.RequestSignUpDto
+import com.sopt.now.data.dto.LoginDto.ResponseLogInDto
+import com.sopt.now.data.dto.SignUp.ResponseSignUpDto
+import com.sopt.now.data.dto.ResponseUserProfile
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("member/join")
-    fun signUp(
+    suspend fun signUp(
         @Body request: RequestSignUpDto,
-    ): Call<ResponseSignUpDto>
+    ): Response<Unit>
 
     @POST("member/login")
-    fun logIn(
+    suspend fun logIn(
         @Body request: RequestLogInDto,
-    ): Call<ResponseLogInDto>
+    ): Response<Unit>
 
     @GET("member/info")
     fun getUserInfo(

app/src/main/java/com/sopt/now/dto/LoginDto/RequestLogInDto.kt → app/src/main/java/com/sopt/now/data/dto/LoginDto/RequestLogInDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.dto.LoginDto
+package com.sopt.now.data.dto.LoginDto
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/dto/LoginDto/ResponseLogInDto.kt → app/src/main/java/com/sopt/now/data/dto/LoginDto/ResponseLogInDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.dto.LoginDto
+package com.sopt.now.data.dto.LoginDto
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/dto/ResponseUserProfile.kt → app/src/main/java/com/sopt/now/data/dto/ResponseUserProfile.kt

@@ -1,10 +1,10 @@
-package com.sopt.now.dto
+package com.sopt.now.data.dto
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ResponseUserProfile(
+data class ResponseUserProfile( //응답 구조
     @SerialName("code")
     val code: Int,
     @SerialName("message")
@@ -13,7 +13,7 @@ data class ResponseUserProfile(
     val data: UserData,
 ) {
     @Serializable
-    data class UserData(
+    data class UserData( //JSON 응답의 data 구조
         @SerialName("authenticationId")
         val authenticationId: String,
         @SerialName("nickname")