Week4 필수과제

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,7 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
     }
 
     buildTypes {
@@ -37,11 +44,11 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
 dependencies {
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -53,6 +60,15 @@ dependencies {
     implementation(libs.lifecycle.viewmodel.compose)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.androidx.compose.navigation)
+    implementation(libs.androidx.runtime.livedata)
+    // 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.androidx.datastore.preferences)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

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

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

@@ -1,13 +1,14 @@
 package org.sopt.and
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Search
+import android.content.Context
+import android.widget.Toast
+import androidx.annotation.StringRes
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
-import org.sopt.and.navigation.Routes
-import org.sopt.and.navigation.WavveBottomNavigationItem
+import androidx.core.content.ContextCompat.getString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 object WavveUtils {
     const val MIN_PASSWORD_LENGTH = 8
@@ -17,27 +18,6 @@ object WavveUtils {
     const val SEARCH_SCREEN_INDEX = 1
     const val HOME_SCREEN_INDEX = 0
 
-    val wavveBottomNavigationItems = listOf<WavveBottomNavigationItem>(
-        WavveBottomNavigationItem(
-            label = R.string.bottom_navigation_home_label,
-            icon = Icons.Default.Home,
-            route = Routes.Home,
-            index = 0
-        ),
-        WavveBottomNavigationItem(
-            label = R.string.bottom_navigation_search_label,
-            icon = Icons.Default.Search,
-            route = Routes.Search,
-            index = 1
-        ),
-        WavveBottomNavigationItem(
-            label = R.string.bottom_navigation_my_info_label,
-            icon = Icons.Default.AccountCircle,
-            route = Routes.MyInfo(""),
-            index = 2
-        )
-    )
-
     val linkableSNS = listOf<Pair<Int, Int>>(
         Pair(R.drawable.kakao_talk_icon, R.string.link_kakao_icon_description),
         Pair(R.drawable.t_world_icon, R.string.link_tworld_icon_description),
@@ -48,4 +28,27 @@ object WavveUtils {
 
     fun transformationPasswordVisual(isVisible: Boolean): VisualTransformation =
         if (isVisible) VisualTransformation.None else PasswordVisualTransformation()
+
+    fun showToast(
+        context: Context,
+        @StringRes message: Int
+    ) = Toast.makeText(
+        context,
+        context.getString(message),
+        Toast.LENGTH_SHORT
+    ).show()
+
+    fun showSnackbar(
+        scope: CoroutineScope,
+        context: Context,
+        snackbarHostState: SnackbarHostState,
+        @StringRes message: Int
+    ) = scope.launch {
+        snackbarHostState.showSnackbar(
+            message = getString(
+                context,
+                message
+            )
+        )
+    }
 }

app/src/main/java/org/sopt/and/components/SignInOrSignUpTextField.kt

@@ -16,14 +16,14 @@ import org.sopt.and.ui.theme.Grey200
 
 @Composable
 fun SignInOrSignUpTextField(
-    emailOrPassword: String,
+    information: String,
     onValueChange: (String) -> Unit,
     placeholder: Int,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     trailingIcon: @Composable (() -> Unit)? = null
 ) {
     TextField(
-        value = emailOrPassword,
+        value = information,
         onValueChange = onValueChange,
         modifier = Modifier.fillMaxWidth(),
         colors = TextFieldDefaults.colors(

app/src/main/java/org/sopt/and/home/HomeScreen.kt

@@ -8,16 +8,16 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import org.sopt.and.R
 import org.sopt.and.home.components.HomeBannerPager
@@ -31,10 +31,8 @@ import org.sopt.and.ui.theme.Grey100
 fun HomeScreen(
     innerPadding: PaddingValues
 ) {
-    val scrollState = rememberScrollState()
-
     val homeViewModel = viewModel<HomeViewModel>()
-    val homeUiState by homeViewModel.uiState.collectAsState()
+    val homeUiState by homeViewModel.uiState.collectAsStateWithLifecycle()
 
     Column(
         modifier = Modifier
@@ -44,23 +42,32 @@ fun HomeScreen(
     ) {
         HomeTopBar(genres = homeUiState.genres)
 
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .verticalScroll(scrollState)
+        LazyColumn(
+            modifier = Modifier.fillMaxWidth(),
+            state = rememberLazyListState()
         ) {
-            HomeBannerPager(homeUiState.banners)
+            item {
+                HomeBannerPager(homeUiState.banners)
+            }
 
-            Spacer(modifier = Modifier.height(20.dp))
+            item {
+                Spacer(modifier = Modifier.height(20.dp))
+            }
 
-            RecommendList(
-                title = stringResource(R.string.home_picks_of_editor_title),
-                items = homeUiState.recommends
-            )
+            item {
+                RecommendList(
+                    title = stringResource(R.string.home_picks_of_editor_title),
+                    items = homeUiState.recommends
+                )
+            }
 
-            Spacer(modifier = Modifier.height(20.dp))
+            item {
+                Spacer(modifier = Modifier.height(20.dp))
+            }
 
-            Top20List(homeUiState.rankers)
+            item {
+                Top20List(homeUiState.rankers)
+            }
         }
 
         HomeBottomCoupon()

app/src/main/java/org/sopt/and/home/components/HomeTopBar.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -63,15 +64,18 @@ fun HomeTopBar(
             )
         }
 
-        Row(
+        LazyRow(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(vertical = 10.dp),
             horizontalArrangement = Arrangement.spacedBy(14.dp)
         ) {
-            genres.forEach { genre ->
+            items(
+                count = genres.size,
+                key = { genres[it] }
+            ) { index ->
                 Text(
-                    text = stringResource(genre),
+                    text = stringResource(genres[index]),
                     color = Grey200,
                     fontSize = 14.sp
                 )

app/src/main/java/org/sopt/and/myinfo/MyInfoScreen.kt

@@ -23,7 +23,8 @@ import org.sopt.and.ui.theme.Black100
 @Composable
 fun MyInfoScreen(
     paddingValues: PaddingValues,
-    myEmail: String,
+    myInfoViewModel: MyInfoViewModel,
+    myInfoUiState: MyInfoUiState,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -33,7 +34,8 @@ fun MyInfoScreen(
             .padding(paddingValues)
     ) {
         MyInfoProfile(
-            myEmail = myEmail,
+            myInfoViewModel = myInfoViewModel,
+            myInfoUiState = myInfoUiState,
             modifier = Modifier.weight(0.16f)
         )
 
@@ -73,7 +75,8 @@ fun MyScreenPreview() {
         Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
             MyInfoScreen(
                 paddingValues = innerPadding,
-                myEmail = ""
+                myInfoViewModel = TODO(),
+                myInfoUiState = TODO()
             )
         }
     }

app/src/main/java/org/sopt/and/myinfo/MyInfoUiState.kt

@@ -1,5 +1,5 @@
 package org.sopt.and.myinfo
 
 data class MyInfoUiState(
-    val myEmail: String = ""
+    val myHobby: String = ""
 )

app/src/main/java/org/sopt/and/myinfo/MyInfoViewModel.kt

@@ -1,16 +1,44 @@
 package org.sopt.and.myinfo
 
-import androidx.lifecycle.ViewModel
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import org.sopt.and.myinfo.dto.GetHobbyResponseDto
+import org.sopt.and.services.ServicePool
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class MyInfoViewModel(application: Application) : AndroidViewModel(application) {
+    private val userService by lazy { ServicePool.userService(application) }
 
-class MyInfoViewModel(
-) : ViewModel() {
     private val _uiState = MutableStateFlow(MyInfoUiState())
     val uiState: StateFlow<MyInfoUiState> = _uiState.asStateFlow()
 
-    fun setMyEmail(email: String) {
-        _uiState.value = _uiState.value.copy(myEmail = email)
+    fun setMyHobby(myHobby: String) {
+        _uiState.value = _uiState.value.copy(myHobby = myHobby)
+    }
+
+    fun getMyHobby() {
+        userService.getMyHobby().enqueue(
+            object : Callback<GetHobbyResponseDto> {
+                override fun onResponse(
+                    call: Call<GetHobbyResponseDto>,
+                    response: Response<GetHobbyResponseDto>
+                ) {
+                    if (response.isSuccessful) {
+                        response.body()?.result?.hobby?.let { setMyHobby(it) }
+                    } else {
+                        setMyHobby("오류")
+                    }
+                }
+
+                override fun onFailure(call: Call<GetHobbyResponseDto>, t: Throwable) {
+                    // 어떤 처리를 할까요?
+                }
+            }
+        )
     }
 }

app/src/main/java/org/sopt/and/myinfo/components/MyInfoProfile.kt

@@ -19,14 +19,19 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import org.sopt.and.R
+import org.sopt.and.myinfo.MyInfoUiState
+import org.sopt.and.myinfo.MyInfoViewModel
 import org.sopt.and.ui.theme.Grey100
 import org.sopt.and.ui.theme.White100
 
 @Composable
 fun MyInfoProfile(
-    myEmail: String,
+    myInfoViewModel: MyInfoViewModel,
+    myInfoUiState: MyInfoUiState,
     modifier: Modifier = Modifier
 ) {
+    myInfoViewModel.getMyHobby()
+
     Row(
         modifier = modifier
             .fillMaxWidth()
@@ -43,8 +48,8 @@ fun MyInfoProfile(
 
         Spacer(modifier = Modifier.width(5.dp))
 
-        Text(
-            text = myEmail,
+        Text(   // 만약에 네트워크 통신이 늦었을 때 얘가 recomposition이 되나요??
+            text = if (myInfoUiState.myHobby.isNotEmpty()) myInfoUiState.myHobby else "Loading...",
             color = White100
         )