Week4 필수과제 구현

app/build.gradle.kts

@@ -77,6 +77,8 @@ dependencies {
     // Accompanist
     implementation(libs.accompanist.pager)
     implementation(libs.accompanist.pager.indicators)
+    implementation(libs.androidx.datastore.core.android)
+    implementation(libs.androidx.datastore.preferences.core.jvm)
 
     // Testing
     testImplementation(libs.junit)
@@ -94,4 +96,8 @@ dependencies {
     implementation(libs.retrofit)
     implementation(libs.retrofit.kotlin.serialization.converter)
     implementation(libs.kotlinx.serialization.json)
+
+    // DataStore
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+    implementation("androidx.datastore:datastore-preferences-core:1.0.0")
 }

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
 
         <activity

app/src/main/java/org/sopt/and/Route.kt

@@ -1,18 +1,22 @@
 package org.sopt.and
 
+import kotlinx.serialization.Serializable
+
+
+@Serializable
 sealed class Route(val route: String) {
+    @Serializable
     data object Home : Route("home")
 
-    data class SignIn(val email: String = "", val password: String = "") :
-        Route("signIn?email={email}&password={password}") {
-        fun createRoute(email: String = "", password: String = "") =
-            "signIn?email=$email&password=$password"
-    }
+    @Serializable
+    data object SignIn : Route("signIn")
 
+    @Serializable
     data object SignUp : Route("signUp")
+
+    @Serializable
     data object Search : Route("search")
 
-    data class MyPage(val email: String) : Route("myPage?email={email}") {
-        fun createRoute(email: String) = "myPage?email=$email"
-    }
+    @Serializable
+    data object MyPage : Route("myPage")
 }

app/src/main/java/org/sopt/and/data/ServicePool.kt

@@ -0,0 +1,32 @@
+// data/ServicePool.kt
+package org.sopt.and.data
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import org.sopt.and.BuildConfig
+import org.sopt.and.data.service.AuthService
+import retrofit2.Retrofit
+
+object ServicePool {
+    private val json = Json {
+        ignoreUnknownKeys = true
+        coerceInputValues = true
+    }
+
+    private val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor(HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        })
+        .build()
+
+    private val retrofit: Retrofit = Retrofit.Builder()
+        .baseUrl(BuildConfig.BASE_URL)
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+        .client(okHttpClient)
+        .build()
+
+    val authService: AuthService by lazy { retrofit.create(AuthService::class.java) }
+}

app/src/main/java/org/sopt/and/data/local/AuthLoaclDataSource.kt

@@ -0,0 +1,43 @@
+package org.sopt.and.data.local
+
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+private val Context.dataStore by preferencesDataStore(name = "auth")
+
+class AuthLocalDataSource(private val context: Context) {
+    private val tokenKey = stringPreferencesKey("token")
+
+    suspend fun saveToken(token: String) {
+        context.dataStore.edit { preferences ->
+            preferences[tokenKey] = token
+        }
+    }
+
+    fun getToken(): Flow<String?> = context.dataStore.data.map { preferences ->
+        preferences[tokenKey]
+    }
+
+    suspend fun clearToken() {
+        context.dataStore.edit { preferences ->
+            preferences.remove(tokenKey)
+        }
+    }
+
+    companion object {
+        @Volatile
+        private var instance: AuthLocalDataSource? = null
+
+        fun getInstance(context: Context): AuthLocalDataSource {
+            return instance ?: synchronized(this) {
+                instance ?: AuthLocalDataSource(context.applicationContext).also {
+                    instance = it
+                }
+            }
+        }
+    }
+}

app/src/main/java/org/sopt/and/data/model/request/AuthRequest.kt

@@ -0,0 +1,22 @@
+package org.sopt.and.data.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SignUpRequest(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String,
+    @SerialName("hobby")
+    val hobby: String
+)
+
+@Serializable
+data class SignInRequest(
+    @SerialName("username")
+    val username: String,
+    @SerialName("password")
+    val password: String
+)

app/src/main/java/org/sopt/and/data/model/response/AuthResponse.kt

@@ -0,0 +1,30 @@
+package org.sopt.and.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BaseResponse<T>(
+    @SerialName("result")
+    val result: T? = null,
+    @SerialName("code")
+    val code: String? = null
+)
+
+@Serializable
+data class SignUpResponse(
+    @SerialName("no")
+    val no: Int
+)
+
+@Serializable
+data class SignInResponse(
+    @SerialName("token")
+    val token: String
+)
+
+@Serializable
+data class HobbyResponse(
+    @SerialName("hobby")
+    val hobby: String
+)

app/src/main/java/org/sopt/and/data/service/AuthService.kt

@@ -0,0 +1,30 @@
+package org.sopt.and.data.service
+
+import org.sopt.and.data.model.request.SignInRequest
+import org.sopt.and.data.model.request.SignUpRequest
+import org.sopt.and.data.model.response.BaseResponse
+import org.sopt.and.data.model.response.HobbyResponse
+import org.sopt.and.data.model.response.SignInResponse
+import org.sopt.and.data.model.response.SignUpResponse
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("user")
+    suspend fun signUp(
+        @Body request: SignUpRequest
+    ): Response<BaseResponse<SignUpResponse>>
+
+    @POST("login")
+    suspend fun signIn(
+        @Body request: SignInRequest
+    ): Response<BaseResponse<SignInResponse>>
+
+    @GET("user/my-hobby")
+    suspend fun getMyHobby(
+        @Header("token") token: String
+    ): Response<BaseResponse<HobbyResponse>>
+}

app/src/main/java/org/sopt/and/domain/User.kt

@@ -1,6 +1,7 @@
 package org.sopt.and.domain
 
 data class User(
-    var email: String = "",
-    var password: String = ""
+    val username: String = "",
+    val password: String = "",
+    val hobby: String = ""     // hobby 필드 추가
 )

app/src/main/java/org/sopt/and/presentation/component/TextFeild.kt → app/src/main/java/org/sopt/and/presentation/component/PasswordInputField.kt

@@ -19,59 +19,6 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
-@Composable
-fun EmailInputField(
-    value: String,
-    placeholder: String,
-    onValueChange: (String) -> Unit,
-    modifier: Modifier = Modifier,
-    isError: Boolean = false,
-    errorMessage: String? = null
-) {
-    val containerColor by animateColorAsState(
-        targetValue = if (isError) Color.DarkGray.copy(red = 0.4f) else Color.DarkGray,
-        label = "containerColor"
-    )
-
-    Column {
-        TextField(
-            value = value,
-            onValueChange = onValueChange,
-            modifier = modifier
-                .fillMaxWidth()
-                .height(60.dp),
-            placeholder = {
-                Text(
-                    text = placeholder,
-                    color = Color.Gray
-                )
-            },
-            colors = TextFieldDefaults.colors(
-                focusedContainerColor = containerColor,
-                unfocusedContainerColor = containerColor,
-                focusedTextColor = Color.White,
-                unfocusedTextColor = Color.White,
-                focusedIndicatorColor = if (isError) Color.Red.copy(alpha = 0.5f) else Color.Transparent,
-                unfocusedIndicatorColor = if (isError) Color.Red.copy(alpha = 0.5f) else Color.Transparent,
-                errorContainerColor = containerColor,
-                errorIndicatorColor = Color.Red.copy(alpha = 0.5f)
-            ),
-            shape = RoundedCornerShape(5.dp),
-            singleLine = true,
-            isError = isError
-        )
-
-        if (isError && errorMessage != null) {
-            Text(
-                text = errorMessage,
-                color = Color.Red.copy(alpha = 0.8f),
-                fontSize = 12.sp,
-                modifier = Modifier.padding(start = 4.dp, top = 4.dp)
-            )
-        }
-    }
-}
-
 @Composable
 fun PasswordInputField(
     value: String,

app/src/main/java/org/sopt/and/presentation/component/TextInputField.kt

@@ -0,0 +1,55 @@
+// presentation/component/TextInputField.kt
+package org.sopt.and.presentation.component
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun TextInputField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    placeholder: String = "",
+    isError: Boolean = false,
+    maxLength: Int = 8,
+    singleLine: Boolean = true
+) {
+    TextField(
+        value = value,
+        onValueChange = {
+            if (it.length <= maxLength) {
+                onValueChange(it)
+            }
+        },
+        modifier = modifier
+            .fillMaxWidth()
+            .height(60.dp),
+        placeholder = {
+            Text(
+                text = placeholder,
+                color = Color.Gray
+            )
+        },
+        colors = TextFieldDefaults.colors(
+            focusedContainerColor = Color.DarkGray,
+            unfocusedContainerColor = Color.DarkGray,
+            focusedTextColor = Color.White,
+            unfocusedTextColor = Color.White,
+            focusedIndicatorColor = if (isError) Color.Red.copy(alpha = 0.5f) else Color.Transparent,
+            unfocusedIndicatorColor = if (isError) Color.Red.copy(alpha = 0.5f) else Color.Transparent,
+            errorContainerColor = Color.DarkGray,
+            errorIndicatorColor = Color.Red.copy(alpha = 0.5f)
+        ),
+        shape = RoundedCornerShape(5.dp),
+        singleLine = singleLine,
+        isError = isError
+    )
+}

app/src/main/java/org/sopt/and/presentation/main/MainScreen.kt

@@ -1,6 +1,5 @@
 package org.sopt.and.presentation.main
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
@@ -17,26 +16,21 @@ import org.sopt.and.presentation.navigation.NavGraph
 @Composable
 fun MainScreen() {
     val navController = rememberNavController()
-    var bottomNaviVisible by remember { mutableStateOf(false) }
-    var userEmail by remember { mutableStateOf("") }
+    var isLoggedIn by remember { mutableStateOf(false) }
 
     Scaffold(
         bottomBar = {
-            if (bottomNaviVisible) {
+            if (isLoggedIn) {
                 BottomNavigationBar(
-                    navController = navController,
-                    userEmail = userEmail
+                    navController = navController
                 )
             }
         }
-    ) { innerPadding: PaddingValues ->
+    ) { innerPadding ->
         NavGraph(
             navController = navController,
-            isLogined = { isLogined ->
-                bottomNaviVisible = isLogined
-            },
-            onEmailUpdated = { email ->
-                userEmail = email
+            isLoggedIn = { loggedIn ->
+                isLoggedIn = loggedIn
             },
             modifier = Modifier.padding(innerPadding)
         )