[feat] 4주차 과제

app/build.gradle.kts

@@ -1,10 +1,16 @@
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.serialization)
 }
 
+val properties = Properties().apply {
+    load(project.rootProject.file("local.properties").inputStream())
+}
+
 android {
     namespace = "org.sopt.and"
     compileSdk = 34
@@ -17,6 +23,8 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -37,6 +45,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.0"
@@ -70,4 +79,15 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.collections.immutable)
 
+    // Network
+    implementation(platform(libs.okhttp.bom))
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.logging.interceptor)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.kotlin.serialization.converter)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.retrofit.v2110)
+    implementation(libs.converter.gson)
+    implementation(libs.coil.compose)
+
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,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" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,6 +13,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ANDANDROID"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".presentation.main.MainActivity"

app/src/main/java/org/sopt/and/data/datalocal/datasource/UserInfoLocalDataSource.kt

@@ -0,0 +1,7 @@
+package org.sopt.and.data.datalocal.datasource
+
+interface UserInfoLocalDataSource {
+    var accessToken: String
+    var nickname: String
+    fun clear()
+}

app/src/main/java/org/sopt/and/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt

@@ -0,0 +1,27 @@
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import org.sopt.and.data.datalocal.datasource.UserInfoLocalDataSource
+
+class UserInfoLocalDataSourceImpl(context: Context) : UserInfoLocalDataSource {
+
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+
+    override var accessToken: String
+        get() = sharedPreferences.getString(TOKEN, INITIAL_VALUE).toString()
+        set(value) = sharedPreferences.edit { putString(TOKEN, value) }
+
+    override var nickname: String
+        get() = sharedPreferences.getString(NICKNAME, INITIAL_VALUE).toString()
+        set(value) = sharedPreferences.edit { putString(NICKNAME, value) }
+
+    override fun clear() = sharedPreferences.edit { clear() }
+
+    companion object {
+        const val PREFERENCES_NAME = "user_preferences"
+        const val TOKEN = "token"
+        const val NICKNAME = "nickname"
+        const val INITIAL_VALUE = ""
+    }
+}

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

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

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

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

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

@@ -0,0 +1,17 @@
+package org.sopt.and.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class ResponseLoginDto(
+    @SerialName("result")
+    val result: Result
+) {
+    @Serializable
+    data class Result(
+        @SerialName("token")
+        val token: String
+    )
+}

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

@@ -0,0 +1,18 @@
+package org.sopt.and.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseMyHobbyDto(
+    @SerialName("result")
+    val result: Result? = null,
+    @SerialName("code")
+    val code: String? = null
+)
+
+@Serializable
+data class Result(
+    @SerialName("hobby")
+    val hobby: String
+)

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

@@ -0,0 +1,23 @@
+package org.sopt.and.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseFailedDto(
+    @SerialName("code")
+    val code: String
+)
+
+@Serializable
+data class ResponseSignUpDto(
+    @SerialName("result")
+    val result: Result
+) {
+    @Serializable
+    data class Result(
+        @SerialName("no")
+        val no: Int
+    )
+}
+

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

@@ -0,0 +1,21 @@
+package org.sopt.and.data.service
+
+import org.sopt.and.BuildConfig
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object RetrofitInstance {
+    private const val BASE_URL = BuildConfig.BASE_URL
+
+    private val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    val userService: UserService by lazy {
+        retrofit.create(UserService::class.java)
+    }
+}
+

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

@@ -0,0 +1,28 @@
+package org.sopt.and.data.service
+
+import org.sopt.and.data.model.request.RequestLoginDto
+import org.sopt.and.data.model.request.RequestSignUpDto
+import org.sopt.and.data.model.response.ResponseLoginDto
+import org.sopt.and.data.model.response.ResponseMyHobbyDto
+import org.sopt.and.data.model.response.ResponseSignUpDto
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+
+interface UserService {
+    @POST("/user")
+    suspend fun postSignup(@Body requestDto: RequestSignUpDto): Response<ResponseSignUpDto>
+
+    @POST("/login")
+    suspend fun postLogin(@Body requestDto: RequestLoginDto): Response<ResponseLoginDto>
+
+
+    @GET("/user/my-hobby")
+    suspend fun getUserHobby(
+        @Header("token") token: String
+    ): Response<ResponseMyHobbyDto>
+
+}

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

@@ -2,5 +2,6 @@ package org.sopt.and.domain
 
 data class User(
     var email: String = "",
-    var password: String = ""
+    var password: String = "",
+    var hobby: String = ""
 )

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

@@ -22,18 +22,18 @@ import androidx.compose.ui.unit.dp
 import org.sopt.and.R
 
 @Composable
-fun EmailTextField(
-    userEmail: MutableState<String>,
+fun BaseTextField(
+    text: MutableState<String>,
     placeHolder: String,
     onValueChange: (String) -> Unit = {},
     modifier: Modifier = Modifier
 ) {
     val containerColor = Color(0xFF2F2F2F)
     OutlinedTextField(
         modifier = modifier.fillMaxWidth(),
-        value = userEmail.value,
+        value = text.value,
         onValueChange = { newValue ->
-            userEmail.value = newValue
+            text.value = newValue
             onValueChange(newValue)
         },
         placeholder = {
@@ -112,17 +112,23 @@ fun PasswordTextField(
 private fun TextFieldPreview() {
     val userEmail = remember { mutableStateOf("") }
     val userPassword = remember { mutableStateOf("") }
+    val userHobby = remember { mutableStateOf("") }
     val passwordVisible = remember { mutableStateOf(false) }
 
     Column {
-        EmailTextField(
-            userEmail = userEmail,
+        BaseTextField(
+            text = userEmail,
             placeHolder = stringResource(id = R.string.sign_up_email_placeholder)
         )
+
         PasswordTextField(
             userPassword = userPassword,
             passwordVisible = passwordVisible,
             placeHolder = stringResource(id = R.string.sign_up_password_placeholder)
         )
+        BaseTextField(
+            text = userHobby,
+            placeHolder = stringResource(id = R.string.sign_up_hobby_placeholder)
+        )
     }
 }

app/src/main/java/org/sopt/and/presentation/home/componenet/HomeViewLazyRowList.kt

@@ -27,9 +27,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import org.sopt.and.ImageRatio.LARGE
-import org.sopt.and.ImageRatio.SMALL
 import org.sopt.and.R
+import org.sopt.and.util.ImageRatio.LARGE
+import org.sopt.and.util.ImageRatio.SMALL
 
 @Composable
 fun HomeViewLazyRow(images: ImmutableList<Int>, modifier: Modifier = Modifier) {

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

@@ -4,18 +4,43 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.navigation.compose.rememberNavController
+import org.sopt.and.presentation.navigation.BottomNavigationBar
+import org.sopt.and.presentation.navigation.NavGraph
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+
         setContent {
             ANDANDROIDTheme {
-                MainScreen()
+                val navController = rememberNavController()
+                var bottomNaviVisible by remember { mutableStateOf(false) }
+
+                Scaffold(bottomBar = {
+                    if (bottomNaviVisible) {
+                        BottomNavigationBar(
+                            navController = navController
+                        )
+                    }
+                }) { innerPadding: PaddingValues ->
+                    NavGraph(
+                        navController = navController,
+                        isLogined = { bottomNaviVisible = it },
+                        Modifier.padding(innerPadding)
+                    )
+                }
             }
         }
     }
 }
-
-